svn commit: r434380 - in head: . Mk accessibility/qt4-accessible astro/xglobe/files audio/qmpdclient cad/klayout/files chinese/qt4-codecs-cn chinese/qt4-codecs-tw comms/hamfax/files comms/qt5-conne...
Tobias C. Berner
tcberner at FreeBSD.org
Sat Feb 18 19:48:11 UTC 2017
Author: tcberner
Date: Sat Feb 18 19:48:05 2017
New Revision: 434380
URL: https://svnweb.freebsd.org/changeset/ports/434380
Log:
Update Qt5 to 5.7.1, and unify the Qt4 and Qt5 ports some more
* Update Qt5 to 5.7.1
* Move Qt4 binaries to lib/qt4/bin
* Move Qt5 libraries to lib/qt5/lib
By moving the libraries we should finally be able to get rid of the inplace
upgrade bug (see ports bugs 194088, 195105 and 198720): when Qt5's libraries
were lying in /usr/local/lib, which would often get added by pkgconfig to the
linker paths via dependencies, the already installed libraries were linked
against, instead of the ones that were being built. This forced us to make
sure, that -L${WRKSRC}/lib was always coming before -L/usr/local/lib in the
linker flags. With this change this should no longer be the case.
* Rename some ports to match the rest (foo-qtX -> qtX-foo)
* Depend on new port misc/qtchooser [see UPDATING & CHANGES]
There are several new Qt5 ports which all have been created by Marie Loise Nolden
<nolden at kde.org>. Thanks again.
PR: 216797
Exp-Run by: antoine
Reviewed by: rakuco, mat, groot_kde.org
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D9213
Added:
head/deskutils/fbreader/files/patch-makefiles_arch_desktop.mk (contents, props changed)
head/devel/qt4-dbus/
- copied from r434379, head/devel/dbus-qt4/
head/devel/qt4-qmake/
- copied from r434379, head/devel/qmake4/
head/devel/qt5-core/files/
head/devel/qt5-core/files/patch-git_ea9a8672 (contents, props changed)
head/devel/qt5-core/files/patch-src_corelib_corelib.pro (contents, props changed)
head/devel/qt5-dbus/
- copied from r434379, head/devel/dbus-qt5/
head/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro (contents, props changed)
head/devel/qt5-qmake/
- copied from r434379, head/devel/qmake5/
head/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf (contents, props changed)
head/devel/qt5-scxml/
head/devel/qt5-scxml/Makefile (contents, props changed)
head/devel/qt5-scxml/pkg-plist (contents, props changed)
head/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf (contents, props changed)
head/devel/universalindentgui/files/patch-UniversalIndentGUI.pro (contents, props changed)
head/emulators/virtualbox-ose/files/patch-c++11-qt5 (contents, props changed)
head/games/goldencheetah/files/patch-src_src.pro (contents, props changed)
head/graphics/lprof-devel/files/patch-src_lprofqt_config.cpp (contents, props changed)
head/misc/qtchooser/
head/misc/qtchooser/Makefile (contents, props changed)
head/misc/qtchooser/distinfo (contents, props changed)
head/misc/qtchooser/pkg-descr (contents, props changed)
head/misc/qtchooser/pkg-message (contents, props changed)
head/misc/qtchooser/pkg-plist (contents, props changed)
head/net/rsplib/files/
head/net/rsplib/files/patch-configure (contents, props changed)
head/net/wireshark/files/extrapatch-configure-qt5 (contents, props changed)
head/textproc/qt4-clucene/
- copied from r434379, head/textproc/clucene-qt4/
head/www/qt4-webkit/
- copied from r434379, head/www/webkit-qt4/
head/www/qt5-webkit/
- copied from r434379, head/www/webkit-qt5/
head/x11-toolkits/qt5-datavis3d/
head/x11-toolkits/qt5-datavis3d/Makefile (contents, props changed)
head/x11-toolkits/qt5-datavis3d/pkg-plist (contents, props changed)
head/x11-toolkits/qt5-declarative-render2d/
head/x11-toolkits/qt5-declarative-render2d/Makefile (contents, props changed)
head/x11-toolkits/qt5-declarative-render2d/pkg-plist (contents, props changed)
head/x11-toolkits/qt5-declarative/files/
head/x11-toolkits/qt5-declarative/files/patch-git_26229cf (contents, props changed)
head/x11-toolkits/qt5-gamepad/
head/x11-toolkits/qt5-gamepad/Makefile (contents, props changed)
head/x11-toolkits/qt5-gamepad/pkg-plist (contents, props changed)
head/x11-toolkits/qt5-virtualkeyboard/
head/x11-toolkits/qt5-virtualkeyboard/Makefile (contents, props changed)
head/x11-toolkits/qt5-virtualkeyboard/pkg-plist (contents, props changed)
head/x11-wm/qlwm/files/patch-Makefile (contents, props changed)
Deleted:
head/cad/klayout/files/patch-src-Makefile.rules
head/comms/hamfax/files/patch-Makefile.in
head/devel/dbus-qt4/
head/devel/dbus-qt5/
head/devel/qmake4/
head/devel/qmake5/
head/devel/qt5-qmake/files/patch-mkspecs__features__qt_functions.prf
head/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h
head/graphics/lprof-devel/files/patch-src-lprofqt-config.cpp
head/textproc/clucene-qt4/
head/www/qt5-webkit/files/patch-Source_JavaScriptCore_disassembler_udis86_ud_opcode.py
head/www/webkit-qt4/
head/www/webkit-qt5/
head/x11-toolkits/qt5-charts/distinfo
head/x11-toolkits/qt5-charts/files/
Modified:
head/CHANGES
head/MOVED
head/Mk/bsd.qt.mk
head/UPDATING
head/accessibility/qt4-accessible/Makefile
head/astro/xglobe/files/patch-Makefile
head/audio/qmpdclient/Makefile
head/cad/klayout/files/patch-build.sh
head/chinese/qt4-codecs-cn/Makefile
head/chinese/qt4-codecs-tw/Makefile
head/comms/qt5-connectivity/pkg-plist
head/comms/qt5-sensors/pkg-plist
head/comms/qt5-serialbus/pkg-plist
head/comms/qt5-serialport/pkg-plist
head/comms/xcwcp/Makefile
head/databases/qt4-ibase-plugin/Makefile
head/databases/qt4-mysql-plugin/Makefile
head/databases/qt4-odbc-plugin/Makefile
head/databases/qt4-pgsql-plugin/Makefile
head/databases/qt4-sql/Makefile
head/databases/qt4-sqlite-plugin/Makefile
head/databases/qt4-sqlite3-plugin/Makefile
head/databases/qt5-sql/pkg-plist
head/devel/Makefile
head/devel/qscintilla2-qt5/pkg-plist
head/devel/qt4-assistant/Makefile
head/devel/qt4-assistant/pkg-plist
head/devel/qt4-corelib/Makefile
head/devel/qt4-dbus/Makefile
head/devel/qt4-designer/Makefile
head/devel/qt4-designer/pkg-plist
head/devel/qt4-help-tools/Makefile
head/devel/qt4-help/Makefile
head/devel/qt4-linguist/Makefile
head/devel/qt4-linguist/pkg-plist
head/devel/qt4-linguisttools/Makefile
head/devel/qt4-linguisttools/pkg-plist
head/devel/qt4-makeqpf/Makefile
head/devel/qt4-makeqpf/pkg-plist
head/devel/qt4-moc/Makefile
head/devel/qt4-moc/pkg-plist
head/devel/qt4-porting/Makefile
head/devel/qt4-qdbusviewer/Makefile
head/devel/qt4-qdoc3/Makefile
head/devel/qt4-qmake/Makefile
head/devel/qt4-qmake/pkg-plist
head/devel/qt4-qmlviewer/Makefile
head/devel/qt4-qt3support/Makefile
head/devel/qt4-qvfb/Makefile
head/devel/qt4-qvfb/pkg-plist
head/devel/qt4-rcc/Makefile
head/devel/qt4-script/Makefile
head/devel/qt4-scripttools/Makefile
head/devel/qt4-testlib/Makefile
head/devel/qt4-uic/Makefile
head/devel/qt4-uic/pkg-plist
head/devel/qt4-uic3/Makefile
head/devel/qt5-concurrent/pkg-plist
head/devel/qt5-core/Makefile
head/devel/qt5-core/pkg-plist
head/devel/qt5-dbus/pkg-plist
head/devel/qt5-designer/pkg-plist
head/devel/qt5-help/Makefile
head/devel/qt5-help/files/patch-src__assistant__assistant.pro
head/devel/qt5-help/pkg-plist
head/devel/qt5-linguisttools/pkg-plist
head/devel/qt5-location/pkg-plist
head/devel/qt5-qmake/Makefile
head/devel/qt5-qmake/files/patch-configure
head/devel/qt5-qmake/pkg-plist
head/devel/qt5-script/pkg-plist
head/devel/qt5-scripttools/pkg-plist
head/devel/qt5-testlib/pkg-plist
head/devel/qt5-uitools/pkg-plist
head/devel/qt5/Makefile.sqldrivers
head/devel/qt5/distinfo
head/devel/qt5/files/extrapatch-configure
head/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
head/devel/subcommander2/files/patch-configure.ac
head/devel/subcommander2/files/patch-subcommander__Makefile.am
head/devel/subcommander2/files/patch-sublib__Makefile.am
head/devel/subcommander2/files/patch-submerge__Makefile.am
head/emulators/swine/Makefile
head/emulators/virtualbox-ose/files/patch-configure
head/graphics/gle-graphics/Makefile
head/graphics/lprof-devel/Makefile
head/graphics/poppler/Makefile
head/graphics/qt4-iconengines/Makefile
head/graphics/qt4-imageformats/Makefile
head/graphics/qt4-opengl/Makefile
head/graphics/qt4-pixeltool/Makefile
head/graphics/qt4-svg/Makefile
head/graphics/qt5-3d/Makefile
head/graphics/qt5-3d/pkg-plist
head/graphics/qt5-graphicaleffects/pkg-plist
head/graphics/qt5-imageformats/pkg-plist
head/graphics/qt5-opengl/pkg-plist
head/graphics/qt5-svg/pkg-plist
head/japanese/qt4-codecs-jp/Makefile
head/korean/qt4-codecs-kr/Makefile
head/lang/qt5-qml/files/patch-src__src.pro
head/lang/qt5-qml/pkg-plist
head/misc/Makefile
head/misc/qt4-doc/Makefile
head/misc/qt4-l10n/Makefile
head/misc/qt4-qtconfig/Makefile
head/misc/qt4-qtconfig/pkg-plist
head/misc/qt4-qtdemo/Makefile
head/misc/qt5-doc/Makefile
head/misc/qt5-doc/distinfo
head/misc/qt5-doc/pkg-plist
head/misc/qt5-examples/Makefile
head/misc/qt5-examples/pkg-plist
head/misc/qt5-l10n/pkg-plist
head/multimedia/avidemux/Makefile.common
head/multimedia/mlt-qt5/Makefile
head/multimedia/py-openlp/Makefile
head/multimedia/qt4-mobility/Makefile
head/multimedia/qt4-mobility/pkg-plist
head/multimedia/qt4-multimedia/Makefile
head/multimedia/qt5-multimedia/pkg-plist
head/net-im/telepathy-logger-qt4/Makefile
head/net/qt4-network/Makefile
head/net/qt5-network/pkg-plist
head/net/wireshark/Makefile
head/print/qt5-printsupport/pkg-plist
head/sysutils/qpxtool/files/patch-configure
head/textproc/Makefile
head/textproc/goldendict/files/patch-goldendict.pro
head/textproc/qt4-clucene/Makefile
head/textproc/qt4-xml/Makefile
head/textproc/qt4-xmlpatterns-tool/Makefile
head/textproc/qt4-xmlpatterns/Makefile
head/textproc/qt5-xml/pkg-plist
head/textproc/qt5-xmlpatterns/pkg-plist
head/textproc/scim-bridge-qt4/files/patch-client-qt_qt4_Makefile.in
head/www/Makefile
head/www/qt4-webkit/Makefile
head/www/qt5-webchannel/pkg-plist
head/www/qt5-webkit/Makefile
head/www/qt5-webkit/distinfo
head/www/qt5-webkit/pkg-plist
head/www/qt5-websockets/pkg-plist
head/x11-toolkits/Makefile
head/x11-toolkits/qt4-declarative/Makefile
head/x11-toolkits/qt4-gui/Makefile
head/x11-toolkits/qt5-charts/Makefile
head/x11-toolkits/qt5-charts/pkg-plist
head/x11-toolkits/qt5-declarative/pkg-plist
head/x11-toolkits/qt5-gui/Makefile
head/x11-toolkits/qt5-gui/pkg-plist
head/x11-toolkits/qt5-quick/pkg-plist
head/x11-toolkits/qt5-quickcontrols/pkg-plist
head/x11-toolkits/qt5-quickcontrols2/pkg-plist
head/x11-toolkits/qt5-uiplugin/pkg-plist
head/x11-toolkits/qt5-widgets/Makefile
head/x11-toolkits/qt5-widgets/pkg-plist
head/x11/qt4-graphicssystems-opengl/Makefile
head/x11/qt4-inputmethods/Makefile
head/x11/qt5-x11extras/pkg-plist
Modified: head/CHANGES
==============================================================================
--- head/CHANGES Sat Feb 18 19:42:23 2017 (r434379)
+++ head/CHANGES Sat Feb 18 19:48:05 2017 (r434380)
@@ -10,6 +10,29 @@ in the release notes and/or placed into
All ports committers are allowed to commit to this file.
+20170218:
+AUTHOR: kde at FreeBSD.org
+
+ * Qt 4's binaries have been moved to lib/qt4/bin to match what is already done
+ to Qt 5's binaries. Since these binaries are no longer in ${LOCALBASE}/bin,
+ they also do not have the -qt4 suffix in their names any more.
+
+ * Consequently, there are no Qt 4 or Qt 5 binaries in the default $PATH, and
+ misc/qtchooser is now used to select the actual Qt binaries. In other
+ words, calling "qmake" or "moc" now goes through qtchooser, which prefers
+ Qt 5 binaries by default.
+
+ The ports framework handles this automatically. The UPDATING entry covers
+ this in more detail.
+
+ * Qt 5.7.1 requires a C++11-capable compiler to be used. qmake and CMake pass
+ the appropriate flags to the compiler (such as -std=c++11) automatically,
+ but if your port fetches Qt's build flags via pkg-config (which can be the
+ case for autotools-based ports), you might need to take care of this
+ manually by setting USE_CXXSTD in your Makefile:
+
+ USE_CXXSTD= c++11
+
20160116:
AUTHOR: mat at FreeBSD.org
Modified: head/MOVED
==============================================================================
--- head/MOVED Sat Feb 18 19:42:23 2017 (r434379)
+++ head/MOVED Sat Feb 18 19:48:05 2017 (r434380)
@@ -5329,8 +5329,6 @@ devel/py-gevent-zeromq|devel/py-pyzmq|20
net/erlyvideo||2014-01-06|Has expired: Development of erlyvideo is abandoned upstream. Use flussonic instead
devel/qt4-declarative|x11-toolkits/qt4-declarative|2014-01-06|Moved to unify with Qt 5
devel/qt4-qtestlib|devel/qt4-testlib|2014-01-06|Renamed to unify with Qt 5
-textproc/qt4-clucene|textproc/clucene-qt4|2014-01-06|Renamed to unify with Qt 5
-www/qt4-webkit|www/webkit-qt4|2014-01-06|Renamed to unify with Qt 5
x11/qt4-opengl|graphics/qt4-opengl|2014-01-06|Moved to unify with Qt 5
graphics/wings-devel|graphics/wings|2014-01-07|Obsoleted by the main port
devel/llvm|devel/llvm32|2014-01-08|Has expired: Migrate to devel/llvm32 or newer
@@ -9075,3 +9073,10 @@ lang/libjit||2017-02-14|Has expired: Thi
databases/php56-redis|databases/pecl-redis|2017-02-15|Merged with latest codebase that supports all php versions
databases/php70-redis|databases/pecl-redis|2017-02-15|Merged with latest codebase that supports all php versions
databases/php71-redis|databases/pecl-redis|2017-02-15|Merged with latest codebase that supports all php versions
+devel/dbus-qt4|devel/qt4-dbus|2017-02-18|Renamed to match other Qt ports
+devel/dbus-qt5|devel/qt5-dbus|2017-02-18|Renamed to match other Qt ports
+devel/qmake4|devel/qt4-qmake|2017-02-18|Renamed to match other Qt ports
+devel/qmake5|devel/qt5-qmake|2017-02-18|Renamed to match other Qt ports
+textproc/clucene-qt4|textproc/qt4-clucene|2017-02-18|Renamed to match other Qt ports
+www/webkit-qt4|www/qt4-webkit|2017-02-18|Renamed to match other Qt ports
+www/webkit-qt5|www/qt5-webkit|2017-02-18|Renamed to match other Qt ports
Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk Sat Feb 18 19:42:23 2017 (r434379)
+++ head/Mk/bsd.qt.mk Sat Feb 18 19:48:05 2017 (r434380)
@@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 4 5
QT4_VERSION?= 4.8.7
-QT5_VERSION?= 5.6.2
+QT5_VERSION?= 5.7.1
_QT_RELNAME= qt${_QT_VERSION:R:R}
_QT_VERSION= # empty
@@ -51,9 +51,6 @@ IGNORE?= can't be installed: bsd.qt.mk
QT_NONSTANDARD= yes
MASTER_SITES= ${MASTER_SITE_QT}
-# Useless, as it must be defined before including bsd.port.pre.mk (at least
-# because of bsd.options.mk).
-#PKGNAMEPREFIX?= ${_QT_RELNAME}-
DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo
LICENSE?= LGPL21
@@ -91,9 +88,12 @@ LDFLAGS+= -Wl,--as-needed
# Ensure that the "makesum" target (with its inner "fetch" one) uses
# devel/qt*/distinfo for every port.
. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
-QT_DIST= 3d base canvas3d connectivity declarative graphicaleffects imageformats \
- location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \
- translations webchannel websockets x11extras xmlpatterns
+QT_DIST= 3d base canvas3d charts connectivity datavis3d declarative \
+ declarative-render2d gamepad graphicaleffects imageformats \
+ location multimedia quickcontrols quickcontrols2 script scxml \
+ sensors serialbus serialport svg tools translations \
+ virtualkeyboard webchannel webkit websockets x11extras \
+ xmlpatterns
. endif
. endif
@@ -147,6 +147,7 @@ CONFIGURE_ARGS+=-nomake examples -nomake
. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
CONFIGURE_ARGS+=-no-sse2
. endif
+
. endif
. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
@@ -173,7 +174,7 @@ CONFIGURE_ARGS+=-verbose
_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool
. else
-_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
+_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
. endif
EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
@@ -205,22 +206,24 @@ QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*
QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
. endif
+# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
+# The binaries of both supported Qt versions are installed to
+# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
+# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
+# one depending on the value of QT_SELECT (which we pass to both
+# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
+# RUN_DEPEND on it.
+RUN_DEPENDS+= qtchooser:misc/qtchooser
+
PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
FULLVER=${DISTVERSION:C/-.*//}
.endif # defined(QT_DIST)
-.if ${_QT_VERSION:M4*}
-QT_BINDIR_REL?= bin
-QT_LIBDIR_REL?= lib/${_QT_RELNAME}
-QT_PLUGINDIR_REL?= ${QT_LIBDIR_REL}/plugins
-QT_IMPORTDIR_REL?= ${QT_LIBDIR_REL}/imports
-.endif
-
# A wrapper (qtchooser) is used to invoke binaries.
QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin
QT_INCDIR_REL?= include/${_QT_RELNAME}
-QT_LIBDIR_REL?= lib
-QT_ARCHDIR_REL?=${QT_LIBDIR_REL}/${_QT_RELNAME}
+QT_LIBDIR_REL?= lib/${_QT_RELNAME}
+QT_ARCHDIR_REL?=${QT_LIBDIR_REL}
QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins
QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME}
QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports
@@ -231,26 +234,26 @@ QT_L10NDIR_REL?=${QT_DATADIR_REL}/transl
QT_ETCDIR_REL?= etc/xdg
QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME}
QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests
+QT_CMAKEDIR_REL?= lib/cmake
+QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser
# Not customizable.
.if ${_QT_VERSION:M4*}
QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
_QT_LIBVER= # empty
-_QT_BINSUFX= -${_QT_RELNAME}
.else
QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
_QT_LIBVER= ${_QT_VERSION:R:R}
-_QT_BINSUFX= # empty
.endif
-LRELEASE?= ${QT_BINDIR}/lrelease${_QT_BINSUFX}
-LUPDATE?= ${QT_BINDIR}/lupdate${_QT_BINSUFX}
-MOC?= ${QT_BINDIR}/moc${_QT_BINSUFX}
+LRELEASE?= ${QT_BINDIR}/lrelease
+LUPDATE?= ${QT_BINDIR}/lupdate
+MOC?= ${QT_BINDIR}/moc
RCC?= ${QT_BINDIR}/rcc
-UIC?= ${QT_BINDIR}/uic${_QT_BINSUFX}
-QMAKE?= ${QT_BINDIR}/qmake${_QT_BINSUFX}
+UIC?= ${QT_BINDIR}/uic
+QMAKE?= ${QT_BINDIR}/qmake
# Needed to redefine the qmake target for internal Qt configuration.
_QMAKE?= ${QMAKE}
QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER}
@@ -264,19 +267,21 @@ QMAKE_COMPILER= $$(ccver="$$(${CXX} --ve
# Import QMAKE_ENV and QMAKE_ARGS definitions.
USES+= qmake:_env
-.for dir in INC ARCH PLUGIN LIBEXEC IMPORT \
- QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC
+.for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
+ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
+ CMAKE QTCHOOSER
QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
+# Export all directories to the plist substituion for QT_DIST ports.
+# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
+. if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST)
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
-.endfor
-
-.for dir in BIN LIB
-QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
-. if defined(QT_DIST)
-PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
. endif
.endfor
+# Pass the chosen Qt version to the environment for qtchooser.
+CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME}
+MAKE_ENV+= QT_SELECT=${_QT_RELNAME}
+
.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
@@ -284,7 +289,7 @@ PLIST_SUB+= QT_${dir}DIR=
Qt_Post_Include= bsd.qt.mk
.if !defined(QT_NONSTANDARD)
-CONFIGURE_ENV+= QTDIR="${PREFIX}" QMAKE="${QMAKE}" \
+CONFIGURE_ENV+= QTDIR="${QT_ARCHDIR}" QMAKE="${QMAKE}" \
MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
QMAKESPEC="${QMAKESPEC}"
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
@@ -306,11 +311,13 @@ _USE_QT4_ONLY= accessible assistant-adp
phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
qtestlib qvfb rcc uic uic3 xmlpatterns-tool
-_USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity core \
- examples graphicaleffects location paths phonon4 \
- printsupport qdbus qdoc qdoc-data qev qml quick quickcontrols \
- quickcontrols2 sensors serialbus serialport sql-tds \
- uiplugin uitools webchannel websockets widgets x11extras
+_USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \
+ core datavis3d declarative-render2d examples gamepad \
+ graphicaleffects location paths phonon4 printsupport \
+ qdbus qdoc qdoc-data qev qml quick quickcontrols \
+ quickcontrols2 scxml sensors serialbus serialport \
+ sql-tds uiplugin uitools virtualkeyboard webchannel \
+ websockets widgets x11extras
3d_PORT= graphics/${_QT_RELNAME}-3d
3d_LIB= libQt${_QT_LIBVER}3DCore.so
@@ -319,10 +326,10 @@ accessible_PORT= accessibility/${_QT_REL
accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so
assistant_PORT= devel/${_QT_RELNAME}-assistant
-assistant_PATH= ${QT_BINDIR}/assistant${_QT_BINSUFX}
+assistant_PATH= ${QT_BINDIR}/assistant
assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp
-assistant-adp_PATH= ${QT_BINDIR}/assistant_adp
+assistant-adp_PATH= ${PREFIX}/bin/assistant_adp
assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient
assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so
@@ -333,7 +340,10 @@ buildtools_PATH= ${MOC}
canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir
-clucene_PORT= textproc/clucene-${_QT_RELNAME}
+charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
+charts_LIB= libQt${_QT_LIBVER}Charts.so
+
+clucene_PORT= textproc/${_QT_RELNAME}-clucene
clucene_LIB= libQt${_QT_LIBVER}CLucene.so
codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn
@@ -360,17 +370,23 @@ core_LIB= libQt${_QT_LIBVER}Core.so
corelib_PORT= devel/${_QT_RELNAME}-corelib
corelib_LIB= ${core_LIB}
-dbus_PORT= devel/dbus-${_QT_RELNAME}
+datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d
+datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so
+
+dbus_PORT= devel/${_QT_RELNAME}-dbus
dbus_LIB= libQt${_QT_LIBVER}DBus.so
declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative
declarative_LIB= libQt${_QT_LIBVER}Declarative.so
+declarative-render2d_PORT= x11-toolkits/${_QT_RELNAME}-declarative-render2d
+declarative-render2d_PATH= ${QT_PLUGINDIR}/scenegraph/libsoftwarecontext.so
+
demo_PORT= misc/${_QT_RELNAME}-qtdemo
demo_PATH= ${QT_BINDIR}/qtdemo
designer_PORT= devel/${_QT_RELNAME}-designer
-designer_PATH= ${QT_BINDIR}/designer${_QT_BINSUFX}
+designer_PATH= ${QT_BINDIR}/designer
doc_PORT= misc/${_QT_RELNAME}-doc
doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
@@ -378,6 +394,9 @@ doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VE
examples_PORT= misc/${_QT_RELNAME}-examples
examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R}
+gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad
+gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so
+
graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects
graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir
@@ -403,7 +422,7 @@ inputmethods_PORT= x11/${_QT_RELNAME}-in
inputmethods_PATH= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so
linguist_PORT= devel/${_QT_RELNAME}-linguist
-linguist_PATH= ${QT_BINDIR}/linguist${_QT_BINSUFX}
+linguist_PATH= ${QT_BINDIR}/linguist
linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools
linguisttools_PATH= ${LRELEASE}
@@ -415,7 +434,7 @@ l10n_PORT= misc/${_QT_RELNAME}-l10n
l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}
makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf
-makeqpf_PATH= ${QT_BINDIR}/makeqpf${_QT_BINSUFX}
+makeqpf_PATH= ${QT_BINDIR}/makeqpf
moc_PORT= devel/${_QT_RELNAME}-moc
moc_PATH= ${MOC}
@@ -468,7 +487,7 @@ qdoc3_PATH= ${QT_BINDIR}/qdoc3
qev_PORT= x11/${_QT_RELNAME}-qev
qev_PATH= ${QT_BINDIR}/qev
-qmake_PORT= devel/qmake${_QT_VERSION:R:R}
+qmake_PORT= devel/${_QT_RELNAME}-qmake
qmake_PATH= ${QMAKE}
qml_PORT= lang/${_QT_RELNAME}-qml
@@ -481,7 +500,7 @@ qt3support_PORT= devel/${_QT_RELNAME}-qt
qt3support_LIB= libQt${_QT_LIBVER}3Support.so
qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig
-qtconfig_PATH= ${QT_BINDIR}/qtconfig${_QT_BINSUFX}
+qtconfig_PATH= ${QT_BINDIR}/qtconfig
qtestlib_PORT= ${testlib_PORT}
qtestlib_LIB= ${testlib_LIB}
@@ -493,10 +512,10 @@ quickcontrols_PORT= x11-toolkits/${_QT_R
quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir
quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
-quickcontrols2_LIB= libQt${_QT_LIBVER}LabsTemplates.so
+quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
qvfb_PORT= devel/${_QT_RELNAME}-qvfb
-qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX}
+qvfb_PATH= ${QT_BINDIR}/qvfb
rcc_PORT= devel/${_QT_RELNAME}-rcc
rcc_PATH= ${RCC}
@@ -510,6 +529,9 @@ script_LIB= libQt${_QT_LIBVER}Script.so
scripttools_PORT= devel/${_QT_RELNAME}-scripttools
scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so
+scxml_PORT= devel/${_QT_RELNAME}-scxml
+scxml_LIB= libQt${_QT_LIBVER}Scxml.so
+
serialbus_PORT= comms/${_QT_RELNAME}-serialbus
serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so
@@ -554,13 +576,16 @@ uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/
uitools_PORT= devel/${_QT_RELNAME}-uitools
uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a
+virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
+virtualkeyboard_PATH= ${QT_PLUGINDIR}/platforminputcontexts/libqtvirtualkeyboardplugin.so
+
webchannel_PORT= www/${_QT_RELNAME}-webchannel
webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
websockets_PORT= www/${_QT_RELNAME}-websockets
websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
-webkit_PORT= www/webkit-${_QT_RELNAME}
+webkit_PORT= www/${_QT_RELNAME}-webkit
webkit_LIB= libQt${_QT_LIBVER}WebKit.so
widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets
@@ -639,6 +664,10 @@ _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp
_QT_TOOLS+= ${UIC}
. endif
+# The list of QtBase components that need to be linked into WRKSRC/lib for
+# other QtBase ports. See below.
+_QT5_BASE= core dbus gui network sql widgets
+
pre-configure: qtbase-pre-configure
qtbase-pre-configure:
. for tool in ${_QT_TOOLS}
@@ -647,6 +676,28 @@ qtbase-pre-configure:
${TRUE}
. endfor
+# The following is a fix for the inplace upgrade problem we faced (see
+# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
+# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
+# would often gets added by pkgconf for the dependencies, was passed after
+# ${WRKSRC}/lib.
+# * We fix the inplace upgrade problem by moving the Qt5 libraries into
+# ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
+# * However, this means, that the ports belonging to the split up QtBase package
+# now no longer can find their depending QtBase libraries. We fix this by
+# linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
+# on them.
+. if ${QT_DIST:Mbase}
+. for basedep in ${_QT5_BASE}
+. if ${USE_QT5:M${basedep}}
+ ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
+. endif
+. endfor
+. endif
+
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
# certain paths from pkg-config calls (see the explanation in
# devel/qt5/files/patch-configure) as well as for setting
@@ -674,6 +725,9 @@ qt5-pre-configure:
# value through to the configure script in qtbase).
${MKDIR} ${CONFIGURE_WRKSRC}
${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
# the linker before -L/usr/local/lib. By default, the opposite happens, which
# is a problem when a Qt port is being upgraded, since an existing library
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sat Feb 18 19:42:23 2017 (r434379)
+++ head/UPDATING Sat Feb 18 19:48:05 2017 (r434380)
@@ -5,6 +5,26 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20170218:
+ AFFECTS: users of Qt 4 and Qt 5
+ AUTHOR: kde at FreeBSD.org
+
+ Following what is already done in Qt 5, the Qt 4 ports no longer install
+ their binaries into ${LOCALBASE}/bin (which is "/usr/local/bin" in most
+ cases). Additionally, the "-qt4" suffix has been dropped from the file names
+ of the binaries that had it, such as "qmake-qt4".
+
+ The new misc/qtchooser port is now used to choose whether a Qt 4 or Qt 5
+ version of a binary such as "moc", "qmake" or "designer" will be used. By
+ default, the Qt 5 versions are preferred, but that can be changed by setting
+ the QT_SELECT environment variable to "qt4".
+
+ qtchooser also allows one to seamlessly use other Qt installations for those
+ binaries, which is particularly beneficial to people working on Qt itself or
+ who need their own checkouts.
+
+ See qtchooser(1) for more information on how to configure qtchooser.
+
20170213:
AFFECTS: users of www/node*
AUTHOR: bradleythughes at fastmail.fm
Modified: head/accessibility/qt4-accessible/Makefile
==============================================================================
--- head/accessibility/qt4-accessible/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/accessibility/qt4-accessible/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= accessible
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= accessibility
PKGNAMEPREFIX= qt4-
Modified: head/astro/xglobe/files/patch-Makefile
==============================================================================
--- head/astro/xglobe/files/patch-Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/astro/xglobe/files/patch-Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -31,7 +31,7 @@
+CXX ?= c++
+CPP = ${CXX}
+LINK = ${CXX}
-+MOC = moc-qt4
++MOC = moc
INSTALL = install
####### compile and link options
Modified: head/audio/qmpdclient/Makefile
==============================================================================
--- head/audio/qmpdclient/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/audio/qmpdclient/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -34,8 +34,6 @@ DEBUG_QMAKE_ON= CONFIG+=debug
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
- -e 's|lupdate|lupdate-qt4|' \
- -e 's|lrelease|lrelease-qt4|' \
${WRKSRC}/${PORTNAME}.pro
@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
${WRKSRC}/src/notifications_dbus.cpp
Modified: head/cad/klayout/files/patch-build.sh
==============================================================================
--- head/cad/klayout/files/patch-build.sh Sat Feb 18 19:42:23 2017 (r434379)
+++ head/cad/klayout/files/patch-build.sh Sat Feb 18 19:48:05 2017 (r434380)
@@ -28,20 +28,6 @@
if [ "$gcc_path" = "" ]; then
echo "*** ERROR: unable to locate gcc in path"
exit 1
-@@ -398,11 +401,11 @@ mac-*)
- ;;
- esac
-
--if [ ! -r $QTBIN/moc ]; then
-+if [ ! -r $QTBIN/moc-qt4 ]; then
- echo "*** ERROR: unable to locate Qt MOC in $QTBIN"
- exit 1
- fi
--if [ ! -r $QTBIN/uic ]; then
-+if [ ! -r $QTBIN/uic-qt4 ]; then
- echo "*** ERROR: unable to locate Qt UIC in $QTBIN"
- exit 1
- fi
@@ -463,11 +466,7 @@ else
cd $CURR_DIR
fi
Modified: head/chinese/qt4-codecs-cn/Makefile
==============================================================================
--- head/chinese/qt4-codecs-cn/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/chinese/qt4-codecs-cn/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= codecs
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= chinese
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -cn
Modified: head/chinese/qt4-codecs-tw/Makefile
==============================================================================
--- head/chinese/qt4-codecs-tw/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/chinese/qt4-codecs-tw/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= codecs
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= chinese
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -tw
Modified: head/comms/qt5-connectivity/pkg-plist
==============================================================================
--- head/comms/qt5-connectivity/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/comms/qt5-connectivity/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -4,7 +4,6 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/androidbroadcastreceiver_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h
-%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/corebluetoothwrapper_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h
@@ -12,6 +11,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/hcimanager_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/inputstreamthread_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/jni_android_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/lecmaccalculator_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/localdevicebroadcastreceiver_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/lowenergynotificationhub_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/manager_p.h
@@ -23,6 +23,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_transfer1_bluez5_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_transfer_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/objectmanager_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbluetooth_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtcentralmanager_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtchanneldelegate_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtconnectionmonitor_p.h
@@ -55,6 +56,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferrequest_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qleadvertiser_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergyserviceprivate_p.h
@@ -77,11 +79,17 @@
%%QT_INCDIR%%/QtBluetooth/QBluetoothTransferReply
%%QT_INCDIR%%/QtBluetooth/QBluetoothTransferRequest
%%QT_INCDIR%%/QtBluetooth/QBluetoothUuid
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyAdvertisingData
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyAdvertisingParameters
%%QT_INCDIR%%/QtBluetooth/QLowEnergyCharacteristic
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyCharacteristicData
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyConnectionParameters
%%QT_INCDIR%%/QtBluetooth/QLowEnergyController
%%QT_INCDIR%%/QtBluetooth/QLowEnergyDescriptor
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyDescriptorData
%%QT_INCDIR%%/QtBluetooth/QLowEnergyHandle
%%QT_INCDIR%%/QtBluetooth/QLowEnergyService
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyServiceData
%%QT_INCDIR%%/QtBluetooth/QtBluetooth
%%QT_INCDIR%%/QtBluetooth/QtBluetoothDepends
%%QT_INCDIR%%/QtBluetooth/QtBluetoothVersion
@@ -100,10 +108,16 @@
%%QT_INCDIR%%/QtBluetooth/qbluetoothtransferreply.h
%%QT_INCDIR%%/QtBluetooth/qbluetoothtransferrequest.h
%%QT_INCDIR%%/QtBluetooth/qbluetoothuuid.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyadvertisingdata.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyadvertisingparameters.h
%%QT_INCDIR%%/QtBluetooth/qlowenergycharacteristic.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergycharacteristicdata.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyconnectionparameters.h
%%QT_INCDIR%%/QtBluetooth/qlowenergycontroller.h
%%QT_INCDIR%%/QtBluetooth/qlowenergydescriptor.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergydescriptordata.h
%%QT_INCDIR%%/QtBluetooth/qlowenergyservice.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyservicedata.h
%%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/adapter_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/agent_p.h
@@ -116,18 +130,15 @@
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_android_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p_p.h
-%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_simulator_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_android_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p_p.h
-%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_simulator_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefnfcsmartposterrecord_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefrecord_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_android_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_emulator_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_neard_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_p.h
-%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_simulator_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagerimpl_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagervirtualbase_p.h
%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanager_p.h
@@ -173,10 +184,10 @@
%%QT_INCDIR%%/QtNfc/qnfcglobal.h
%%QT_INCDIR%%/QtNfc/qqmlndefrecord.h
%%QT_INCDIR%%/QtNfc/qtnfcversion.h
-%%QT_LIBDIR%%/cmake/Qt5Bluetooth/Qt5BluetoothConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Nfc/Qt5NfcConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Nfc/Qt5NfcConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Bluetooth/Qt5BluetoothConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Nfc/Qt5NfcConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Nfc/Qt5NfcConfigVersion.cmake
%%QT_LIBDIR%%/libQt5Bluetooth.prl
%%QT_LIBDIR%%/libQt5Bluetooth.so
%%QT_LIBDIR%%/libQt5Bluetooth.so.5
Modified: head/comms/qt5-sensors/pkg-plist
==============================================================================
--- head/comms/qt5-sensors/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/comms/qt5-sensors/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -114,11 +114,11 @@
%%QT_INCDIR%%/QtSensors/qtapsensor.h
%%QT_INCDIR%%/QtSensors/qtiltsensor.h
%%QT_INCDIR%%/QtSensors/qtsensorsversion.h
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5SensorsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5SensorsConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake
%%QT_LIBDIR%%/libQt5Sensors.prl
%%QT_LIBDIR%%/libQt5Sensors.so
%%QT_LIBDIR%%/libQt5Sensors.so.5
Modified: head/comms/qt5-serialbus/pkg-plist
==============================================================================
--- head/comms/qt5-serialbus/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/comms/qt5-serialbus/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -17,6 +17,7 @@
%%QT_INCDIR%%/QtSerialBus/QModbusDataUnit
%%QT_INCDIR%%/QtSerialBus/QModbusDataUnitMap
%%QT_INCDIR%%/QtSerialBus/QModbusDevice
+%%QT_INCDIR%%/QtSerialBus/QModbusDeviceIdentification
%%QT_INCDIR%%/QtSerialBus/QModbusExceptionResponse
%%QT_INCDIR%%/QtSerialBus/QModbusPdu
%%QT_INCDIR%%/QtSerialBus/QModbusReply
@@ -37,6 +38,7 @@
%%QT_INCDIR%%/QtSerialBus/qmodbusclient.h
%%QT_INCDIR%%/QtSerialBus/qmodbusdataunit.h
%%QT_INCDIR%%/QtSerialBus/qmodbusdevice.h
+%%QT_INCDIR%%/QtSerialBus/qmodbusdeviceidentification.h
%%QT_INCDIR%%/QtSerialBus/qmodbuspdu.h
%%QT_INCDIR%%/QtSerialBus/qmodbusreply.h
%%QT_INCDIR%%/QtSerialBus/qmodbusrtuserialmaster.h
@@ -46,8 +48,8 @@
%%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h
%%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h
%%QT_INCDIR%%/QtSerialBus/qtserialbusversion.h
-%%QT_LIBDIR%%/cmake/Qt5SerialBus/Qt5SerialBusConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfig.cmake
+%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake
%%QT_LIBDIR%%/libQt5SerialBus.prl
%%QT_LIBDIR%%/libQt5SerialBus.so
%%QT_LIBDIR%%/libQt5SerialBus.so.5
Modified: head/comms/qt5-serialport/pkg-plist
==============================================================================
--- head/comms/qt5-serialport/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/comms/qt5-serialport/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -10,8 +10,8 @@
%%QT_INCDIR%%/QtSerialPort/qserialportglobal.h
%%QT_INCDIR%%/QtSerialPort/qserialportinfo.h
%%QT_INCDIR%%/QtSerialPort/qtserialportversion.h
-%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5SerialPort/Qt5SerialPortConfig.cmake
+%%QT_CMAKEDIR%%/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
%%QT_LIBDIR%%/libQt5SerialPort.prl
%%QT_LIBDIR%%/libQt5SerialPort.so
%%QT_LIBDIR%%/libQt5SerialPort.so.5
Modified: head/comms/xcwcp/Makefile
==============================================================================
--- head/comms/xcwcp/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/comms/xcwcp/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -14,6 +14,8 @@ MASTERDIR= ${.CURDIR}/../unixcw
PLIST= ${.CURDIR}/pkg-plist
USE_QT5= buildtools gui widgets qmake_build
USES= gettext
+# Qt from 5.7.0 on requires c++11.
+USE_CXXSTD= c++11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xcwcp
XCWCP= yes
Modified: head/databases/qt4-ibase-plugin/Makefile
==============================================================================
--- head/databases/qt4-ibase-plugin/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-ibase-plugin/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,7 +1,7 @@
# Created by: Michael Nottebrock <lofi at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Qt InterBase/Firebird database plugin
DB= ibase
Modified: head/databases/qt4-mysql-plugin/Makefile
==============================================================================
--- head/databases/qt4-mysql-plugin/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-mysql-plugin/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,7 +1,7 @@
# Created by: Kay Lehmann <kay_lehmann at web.de>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Qt MySQL database plugin
DB= mysql
Modified: head/databases/qt4-odbc-plugin/Makefile
==============================================================================
--- head/databases/qt4-odbc-plugin/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-odbc-plugin/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,7 +1,7 @@
# Created by: Michael Nottebrock <lofi at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
DB= odbc
COMMENT= Qt Open Database Connectivity plugin
Modified: head/databases/qt4-pgsql-plugin/Makefile
==============================================================================
--- head/databases/qt4-pgsql-plugin/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-pgsql-plugin/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,7 +1,7 @@
# Created by: Lauri Watts <lauri at kde.org>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Qt PostgreSQL database plugin
DB= psql
Modified: head/databases/qt4-sql/Makefile
==============================================================================
--- head/databases/qt4-sql/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-sql/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= sql
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= databases
PKGNAMEPREFIX= qt4-
Modified: head/databases/qt4-sqlite-plugin/Makefile
==============================================================================
--- head/databases/qt4-sqlite-plugin/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-sqlite-plugin/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,7 +1,7 @@
# Created by: Michael Nottebrock <lofi at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Qt SQLite 2 database plugin
DB= sqlite2
Modified: head/databases/qt4-sqlite3-plugin/Makefile
==============================================================================
--- head/databases/qt4-sqlite3-plugin/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt4-sqlite3-plugin/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,7 +1,7 @@
# Created by: Michael Nottebrock <lofi at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= Qt SQLite 3 database plugin
DB= sqlite
Modified: head/databases/qt5-sql/pkg-plist
==============================================================================
--- head/databases/qt5-sql/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/databases/qt5-sql/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -48,8 +48,8 @@
%%QT_INCDIR%%/QtSql/qsqlresult.h
%%QT_INCDIR%%/QtSql/qsqltablemodel.h
%%QT_INCDIR%%/QtSql/qtsqlversion.h
-%%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfigVersion.cmake
%%QT_LIBDIR%%/libQt5Sql.prl
%%QT_LIBDIR%%/libQt5Sql.so
%%QT_LIBDIR%%/libQt5Sql.so.5
Added: head/deskutils/fbreader/files/patch-makefiles_arch_desktop.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/fbreader/files/patch-makefiles_arch_desktop.mk Sat Feb 18 19:48:05 2017 (r434380)
@@ -0,0 +1,11 @@
+--- makefiles/arch/desktop.mk.orig 2017-01-18 21:42:48 UTC
++++ makefiles/arch/desktop.mk
+@@ -17,7 +17,7 @@ ifeq "$(UI_TYPE)" "qt"
+ MOC = moc-qt3
+ QTINCLUDE = -I /usr/include/qt3
+ else
+- MOC = moc-qt4
++ MOC = moc
+ QTINCLUDE = -I /usr/include/qt4
+ endif
+
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -384,8 +384,6 @@
SUBDIR += dbus
SUBDIR += dbus-c++
SUBDIR += dbus-glib
- SUBDIR += dbus-qt4
- SUBDIR += dbus-qt5
SUBDIR += dbus-sharp
SUBDIR += dbus-sharp-glib
SUBDIR += dbus-tcl
@@ -4941,8 +4939,6 @@
SUBDIR += qjson
SUBDIR += qjson-qt5
SUBDIR += qmake
- SUBDIR += qmake4
- SUBDIR += qmake5
SUBDIR += qprog
SUBDIR += qross
SUBDIR += qscintilla2
@@ -4954,6 +4950,7 @@
SUBDIR += qt4-assistant
SUBDIR += qt4-assistant-adp
SUBDIR += qt4-corelib
+ SUBDIR += qt4-dbus
SUBDIR += qt4-designer
SUBDIR += qt4-help
SUBDIR += qt4-help-tools
@@ -4965,6 +4962,7 @@
SUBDIR += qt4-porting
SUBDIR += qt4-qdbusviewer
SUBDIR += qt4-qdoc3
+ SUBDIR += qt4-qmake
SUBDIR += qt4-qmlviewer
SUBDIR += qt4-qt3support
SUBDIR += qt4-qtsolutions-singleapplication
@@ -4981,6 +4979,7 @@
SUBDIR += qt5-buildtools
SUBDIR += qt5-concurrent
SUBDIR += qt5-core
+ SUBDIR += qt5-dbus
SUBDIR += qt5-designer
SUBDIR += qt5-help
SUBDIR += qt5-linguist
@@ -4990,8 +4989,10 @@
SUBDIR += qt5-qdbusviewer
SUBDIR += qt5-qdoc
SUBDIR += qt5-qdoc-data
+ SUBDIR += qt5-qmake
SUBDIR += qt5-script
SUBDIR += qt5-scripttools
+ SUBDIR += qt5-scxml
SUBDIR += qt5-testlib
SUBDIR += qt5-uitools
SUBDIR += qtcreator
Modified: head/devel/qscintilla2-qt5/pkg-plist
==============================================================================
--- head/devel/qscintilla2-qt5/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qscintilla2-qt5/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -48,10 +48,10 @@
%%QT_INCDIR%%/Qsci/qsciscintillabase.h
%%QT_INCDIR%%/Qsci/qscistyle.h
%%QT_INCDIR%%/Qsci/qscistyledtext.h
-lib/libqscintilla2-qt5.so
-lib/libqscintilla2-qt5.so.12
-lib/libqscintilla2-qt5.so.12.0
-lib/libqscintilla2-qt5.so.12.0.1
+%%QT_LIBDIR%%/libqscintilla2-qt5.so
+%%QT_LIBDIR%%/libqscintilla2-qt5.so.12
+%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0
+%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1
%%QT_MKSPECDIR%%/features/qscintilla2.prf
%%QT_DATADIR%%/qsci/api/python/Python-2.4.api
%%QT_DATADIR%%/qsci/api/python/Python-2.5.api
Modified: head/devel/qt4-assistant/Makefile
==============================================================================
--- head/devel/qt4-assistant/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-assistant/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= assistant
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-assistant/pkg-plist
==============================================================================
--- head/devel/qt4-assistant/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-assistant/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,3 +1,3 @@
-%%QT_BINDIR%%/assistant-qt4
-%%DEBUG%%%%QT_BINDIR%%/assistant-qt4.debug
+%%QT_BINDIR%%/assistant
+%%DEBUG%%%%QT_BINDIR%%/assistant.debug
share/pixmaps/assistant-qt4.png
Modified: head/devel/qt4-corelib/Makefile
==============================================================================
--- head/devel/qt4-corelib/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-corelib/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-dbus/Makefile
==============================================================================
--- head/devel/dbus-qt4/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-dbus/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= dbus
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-designer/Makefile
==============================================================================
--- head/devel/qt4-designer/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-designer/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= designer
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-designer/pkg-plist
==============================================================================
--- head/devel/qt4-designer/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-designer/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,5 +1,5 @@
-%%QT_BINDIR%%/designer-qt4
-%%DEBUG%%%%QT_BINDIR%%/designer-qt4.debug
+%%QT_BINDIR%%/designer
+%%DEBUG%%%%QT_BINDIR%%/designer.debug
%%QT_INCDIR%%/QtDesigner/QAbstractExtensionFactory
%%QT_INCDIR%%/QtDesigner/QAbstractExtensionManager
%%QT_INCDIR%%/QtDesigner/QAbstractFormBuilder
Modified: head/devel/qt4-help-tools/Makefile
==============================================================================
--- head/devel/qt4-help-tools/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-help-tools/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= help
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -tools
Modified: head/devel/qt4-help/Makefile
==============================================================================
--- head/devel/qt4-help/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-help/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,6 +3,7 @@
PORTNAME= help
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-linguist/Makefile
==============================================================================
--- head/devel/qt4-linguist/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-linguist/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -3,7 +3,7 @@
PORTNAME= linguist
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-linguist/pkg-plist
==============================================================================
--- head/devel/qt4-linguist/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-linguist/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,5 +1,5 @@
-%%QT_BINDIR%%/linguist-qt4
-%%DEBUG%%%%QT_BINDIR%%/linguist-qt4.debug
+%%QT_BINDIR%%/linguist
+%%DEBUG%%%%QT_BINDIR%%/linguist.debug
share/pixmaps/linguist-qt4.png
%%QT_DATADIR%%/phrasebooks/danish.qph
%%QT_DATADIR%%/phrasebooks/dutch.qph
Modified: head/devel/qt4-linguisttools/Makefile
==============================================================================
--- head/devel/qt4-linguisttools/Makefile Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-linguisttools/Makefile Sat Feb 18 19:48:05 2017 (r434380)
@@ -2,6 +2,7 @@
PORTNAME= linguisttools
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Modified: head/devel/qt4-linguisttools/pkg-plist
==============================================================================
--- head/devel/qt4-linguisttools/pkg-plist Sat Feb 18 19:42:23 2017 (r434379)
+++ head/devel/qt4-linguisttools/pkg-plist Sat Feb 18 19:48:05 2017 (r434380)
@@ -1,6 +1,6 @@
%%QT_BINDIR%%/lconvert
%%DEBUG%%%%QT_BINDIR%%/lconvert.debug
-%%QT_BINDIR%%/lrelease-qt4
-%%DEBUG%%%%QT_BINDIR%%/lrelease-qt4.debug
-%%QT_BINDIR%%/lupdate-qt4
-%%DEBUG%%%%QT_BINDIR%%/lupdate-qt4.debug
+%%QT_BINDIR%%/lrelease
+%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
+%%QT_BINDIR%%/lupdate
+%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
Modified: head/devel/qt4-makeqpf/Makefile
==============================================================================
--- head/devel/qt4-makeqpf/Makefile Sat Feb 18 19:42:23 2017 (r434379)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list