Date: Wed, 5 Nov 2014 09:39:22 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372179 - in head: . Mk Mk/Uses comms/qt5-serialport databases/qt5-sql databases/qt5-sqldrivers-odbc databases/qt5-sqldrivers-sqlite2 databases/qt5-sqldrivers-sqlite3 devel/dbus-qt5 dev... Message-ID: <201411050939.sA59dMYd063176@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Nov 5 09:39:21 2014 New Revision: 372179 URL: https://svnweb.freebsd.org/changeset/ports/372179 QAT: https://qat.redports.org/buildarchive/r372179/ Log: Update Qt5 ports to 5.3.2. Proudly presented by the KDE on FreeBSD team, with several guest stars. This update took way longer than initially expected due to us previously accumulating assumptions and changes to Qt's build system that finally bit us back with the 5.3 release series, so we had to do a fair amount of cleanup. New ports: - comms/qt5-serialport: Qt functions to access serial ports, originally based on work by Fernando Apesteguia. [1] - devel/qt5-qdoc: Qt documentation generator, the Qt5 equivalent of devel/qt4-qdoc3. Originally worked on by Tobias Berner. It had already been half-split from devel/qt5-buildtools, we just needed to finish the work. Dead ports: - devel/qt5-qmldevtools: Merged into lang/qt5-qml. Minor changes: - devel/qt5: Add x11/qt5-x11extras and the new ports to the dependency list. - graphics/qt5-imageformats: The port now supports the JPEG2000, WEBP, Direct Draw Surface and ICNS formats. - multimedia/qt5-multimedia: The ALSA and PULSEAUDIO options are now mutually exclusive due to changes introduced in Qt 5.3.0 (the ALSA code is now a proper plugin that is only built if PulseAudio is not used). - x11/qt5-x11extras: Add USE_LDCONFIG since the port installs a shared library. The big changes: - bsd.qt.mk: Set QMAKESPEC instead of QMAKEPATH. [3] QMAKEPATH does much more than we want now that we call qmake from the top of ${WRKSRC}. qmake uses QMAKEPATH when evaluating the QMAKE_MKSPECS property, which is in turn used by qt_config.pri to load the .pri files in mkspecs/modules. In practice, this means that if people have an older Qt installation those files will be used and QT_CONFIG will have values such as "gui" even if one is building a port like textproc/qt5-xml, which passes -no-gui to the configure script. Consequently, unintended code paths may be enabled or the configuration step can just fail if the .pro files expect values that are not present in the system-wide, older .pri files. We avoid all those problems if we use QMAKESPEC, as qmake does not take its value into account when evaluating the QMAKE_MKSPECS property and will only parse the files in the mkspec's directory (mkspecs/freebsd-clang, for example, instead of all the files in mkspecs). - Stop explicitly passing ${LOCALBASE} to the compiler. [3] qmake's behavior has changed in Qt 5, and the paths set in QMAKE_INCDIR and QMAKE_LIBDIR in the mkspecs are passed before any others, such as the ones in the build directory themselves. In practice, this means that we end up with linker calls like this: c++ -o libfoo.so foo.o bar.o -L/usr/local/lib -L/wrkdir/build/lib -lQt5Gui -lQt5Core So if one already has Qt installed in the system, the older, already present version of the libraries in /usr/local/lib will be used instead of the newly-built ones in /wrkdir/build/lib. QTBUG-40825 discusses this behavior upstream, but there has been no agreement on a solution yet. For now, the solution adopted is to make the compiler and the linker aware of those paths but only try them last after all others, and this is achieved by setting the CPATH and LIBRARY_PATH environment variables when qmake is being used. In addition to setting them in CONFIGURE_ENV and MAKE_ENV, we also need to stop changing QMAKE_INCDIR and QMAKE_LIBDIR as well as filter those paths from the pkg-config calls qtbase's configure script makes. - Call qmake from the root of the ${WRKSRC}. In Qt 5.3, Qt's build infrastructure has undergone some changes that make our previous approach of calling qmake from the directories we want to build stop working. Things would break even more in Qt 5.4, in which qtbase's configure script does not accept the -process, -fully-process and -dont-process arguments anymore (it always behaves as if -process had been used). Bite the bullet and start calling qmake from ${WRKSRC}. The largest part of this change involves changing lines in Makefiles from WRKSRC_SUBDIR= foo/bar to BUILD_WRKSRC= ${WRKSRC}/foo/bar INSTALL_WRKSRC= ${WRKSRC}/foo/bar as well as adding patches to .pro files to avoid entering other subdirectories and removing post-configure targets that are not necessary anymore. Since qmake needs to be called from the top of ${WRKSRC} anyway, we can also simplify the configuration process for the qtbase ports a little. Looking at r10019 it is not clear why we started calling qmake in the pre-configure target in addition to the post-configure one (while also skipping it in do-configure), but we can now drop this call since letting configure behave as if -process had been passed means it will call qmake on its own and overwrite the files generated by the pre-configure call. We still need to call qmake in post-configure though, as the configure script does not pass -recursive when calling qmake and we need to be able to call make from any subdirectory when building. PR: 194762 [1] PR: 194566 # exp-run with base GCC and clang PR: 194088 [3] Added: head/comms/qt5-serialport/ head/comms/qt5-serialport/Makefile (contents, props changed) head/comms/qt5-serialport/pkg-plist (contents, props changed) head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf (contents, props changed) head/devel/qt5-assistant/files/ head/devel/qt5-assistant/files/patch-src__src.pro (contents, props changed) head/devel/qt5-designer/files/ head/devel/qt5-designer/files/patch-src__src.pro (contents, props changed) head/devel/qt5-help/files/ head/devel/qt5-help/files/patch-src__assistant__assistant.pro (contents, props changed) head/devel/qt5-help/files/patch-src__src.pro (contents, props changed) head/devel/qt5-linguist/files/ head/devel/qt5-linguist/files/patch-src__src.pro (contents, props changed) head/devel/qt5-qdbusviewer/files/ head/devel/qt5-qdbusviewer/files/patch-src__src.pro (contents, props changed) head/devel/qt5-qdoc/ head/devel/qt5-qdoc/Makefile (contents, props changed) head/devel/qt5-uitools/files/ head/devel/qt5-uitools/files/patch-src__designer__src__src.pro (contents, props changed) head/devel/qt5-uitools/files/patch-src__src.pro (contents, props changed) head/graphics/qt5-pixeltool/files/ head/graphics/qt5-pixeltool/files/patch-src__src.pro (contents, props changed) head/lang/qt5-qml/files/patch-git_b84f08c8 (contents, props changed) head/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp (contents, props changed) head/lang/qt5-qml/files/patch-src__src.pro (contents, props changed) head/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro (contents, props changed) head/textproc/clucene-qt5/files/patch-src__src.pro (contents, props changed) head/x11-toolkits/qt5-quick/files/ head/x11-toolkits/qt5-quick/files/patch-src__src.pro (contents, props changed) Deleted: head/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf head/devel/qt5-core/files/ head/devel/qt5-qmldevtools/ head/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h head/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp head/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp head/x11-toolkits/qt5-gui/files/ Modified: head/MOVED head/Mk/Uses/qmake.mk head/Mk/bsd.qt.mk head/databases/qt5-sql/Makefile head/databases/qt5-sqldrivers-odbc/Makefile head/databases/qt5-sqldrivers-sqlite2/Makefile head/databases/qt5-sqldrivers-sqlite3/Makefile head/devel/dbus-qt5/Makefile head/devel/qmake5/Makefile head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf head/devel/qmake5/pkg-plist head/devel/qt5-assistant/Makefile head/devel/qt5-buildtools/Makefile head/devel/qt5-concurrent/Makefile head/devel/qt5-core/Makefile head/devel/qt5-core/pkg-plist head/devel/qt5-designer/Makefile head/devel/qt5-designer/pkg-plist head/devel/qt5-help/Makefile head/devel/qt5-help/pkg-plist head/devel/qt5-linguist/Makefile head/devel/qt5-linguisttools/Makefile head/devel/qt5-qdbus/Makefile head/devel/qt5-qdbusviewer/Makefile head/devel/qt5-script/Makefile head/devel/qt5-scripttools/Makefile head/devel/qt5-testlib/Makefile head/devel/qt5-testlib/pkg-plist head/devel/qt5-uitools/Makefile head/devel/qt5/Makefile head/devel/qt5/distinfo head/devel/qt5/files/extrapatch-configure head/devel/qt5/files/extrapatch-libtool head/devel/qtcreator/Makefile head/graphics/qt5-imageformats/Makefile head/graphics/qt5-imageformats/pkg-plist head/graphics/qt5-opengl/Makefile head/graphics/qt5-opengl/pkg-plist head/graphics/qt5-pixeltool/Makefile head/graphics/qt5-svg/Makefile head/graphics/qt5-svg/pkg-plist head/lang/qt5-qml/Makefile head/lang/qt5-qml/pkg-plist head/multimedia/qt5-multimedia/Makefile head/multimedia/qt5-multimedia/pkg-plist head/net/qt5-network/Makefile head/net/qt5-network/pkg-plist head/print/qt5-printsupport/Makefile head/print/qt5-printsupport/pkg-plist head/textproc/clucene-qt5/Makefile head/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp head/textproc/qt5-xml/Makefile head/textproc/qt5-xml/pkg-plist head/textproc/qt5-xmlpatterns/Makefile head/www/webkit-qt5/Makefile head/www/webkit-qt5/pkg-plist head/x11-toolkits/qt5-declarative/Makefile 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/Makefile head/x11-toolkits/qt5-quick/pkg-plist head/x11-toolkits/qt5-quickcontrols/Makefile head/x11-toolkits/qt5-quickcontrols/pkg-plist head/x11-toolkits/qt5-widgets/Makefile head/x11-toolkits/qt5-widgets/pkg-plist head/x11/qt5-qev/Makefile head/x11/qt5-x11extras/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Wed Nov 5 09:25:04 2014 (r372178) +++ head/MOVED Wed Nov 5 09:39:21 2014 (r372179) @@ -7176,3 +7176,4 @@ deskutils/babytrans||2014-10-31|Has expi www/rt38||2014-10-31|Has expired: Has expired: End of Life March 2014 textproc/libmwaw|textproc/libmwaw03|2014-10-31|Replaced by newer version databases/pecl-yac|devel/pecl-yac|2014-11-04|Duplicate port +devel/qt5-qmldevtools||2014-11-05|Merged into lang/qt5-qml Modified: head/Mk/Uses/qmake.mk ============================================================================== --- head/Mk/Uses/qmake.mk Wed Nov 5 09:25:04 2014 (r372178) +++ head/Mk/Uses/qmake.mk Wed Nov 5 09:39:21 2014 (r372179) @@ -49,6 +49,19 @@ IGNORE= Incorrect 'USES+= qmake' usage: USE_QT${_QT_VERSION:R:R}+= qmake_build .endif +.if ${_QT_VERSION:M5*} +# We deliberately do not pass -I${LOCALBASE}/include and -L${LOCALBASE}/lib +# in the FreeBSD mkspecs because in Qt5 they are always added before the +# paths in ${WRKSRC}. In other words, if one is upgrading an existing +# installation the old headers and libraries will always be picked up. +# Those directories to be passed though, they just need to be passed last. +# See QTBUG-40825 and ports/194088 for more information. +CONFIGURE_ENV+= CPATH=${LOCALBASE}/include \ + LIBRARY_PATH=${LOCALBASE}/lib +MAKE_ENV+= CPATH=${LOCALBASE}/include \ + LIBRARY_PATH=${LOCALBASE}/lib +.endif # ${_QT_VERSION:M5*} + # QMAKESPEC belongs to bsd.qt.mk. QMAKE_ENV?= ${CONFIGURE_ENV} QMAKE_ARGS+= -spec ${QMAKESPEC} \ Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Wed Nov 5 09:25:04 2014 (r372178) +++ head/Mk/bsd.qt.mk Wed Nov 5 09:39:21 2014 (r372179) @@ -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.6 -QT5_VERSION?= 5.2.1 +QT5_VERSION?= 5.3.2 QT_PREFIX?= ${LOCALBASE} @@ -103,12 +103,15 @@ QT_DIST= base declarative doc graphical # Qt configure requires pkg-config to detect dependencies. USES+= pkgconfig -# Use mkspecs installed in QMAKEPATH/mkspecs when building qtbase. -CONFIGURE_ENV+= QMAKEPATH="${QT_MKSPECDIR:H}" -MAKE_ENV+= QMAKEPATH="${QT_MKSPECDIR:H}" +# Set QMAKESPEC when building qtbase so that qmake (called by the configure +# script) can find the mkspecs we create ourselves in devel/qmake5. +CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" +MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" . endif -# -nomake flags aren't enough. +# -nomake is only used by qtbase's configure script. +# Other ports from other Qt modules will automatically build examples and +# tests if the directories exist because of mkspecs/features/qt_parts.prf. EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ ${DISTNAME:S,$,/tests,:S,^,--exclude ,} . endif # ! ${_QT_VERSION:M4*} @@ -137,8 +140,7 @@ CONFIGURE_ARGS+=-fast \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else -CONFIGURE_ARGS+=-dont-process \ - -nomake examples -nomake tests \ +CONFIGURE_ARGS+=-nomake examples -nomake tests \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ @@ -169,9 +171,7 @@ CONFIGURE_ARGS+=-verbose EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool -. if ${_QT_VERSION:M5*} -EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp -. elif ${_QT_VERSION:M4*} +. if ${_QT_VERSION:M4*} EXTRA_PATCHES?= ${EXTRA_PATCHES} \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h . endif @@ -297,8 +297,8 @@ _USE_QT4_ONLY= accessible assistant-adp qtestlib qvfb rcc uic uic3 xmlpatterns-tool _USE_QT5_ONLY= buildtools concurrent core graphicaleffects linguisttools \ - printsupport qdbus qdoc qev qml qmldevtools quick \ - quickcontrols uitools widgets x11extras + printsupport qdbus qdoc qev qml quick \ + quickcontrols serialport uitools widgets x11extras accessible_PORT= accessibility/${_QT_RELNAME}-accessible accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so @@ -438,9 +438,6 @@ qmake_PATH= ${QMAKE} qml_PORT= lang/${_QT_RELNAME}-qml qml_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Qml.so -qmldevtools_PORT= devel/${_QT_RELNAME}-qmldevtools -qmldevtools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}QmlDevTools.a - qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer qmlviewer_PATH= ${QT_BINDIR}/qmlviewer @@ -471,6 +468,9 @@ script_PATH= ${QT_LIBDIR}/libQt${_QT_LI scripttools_PORT= devel/${_QT_RELNAME}-scripttools scripttools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}ScriptTools.so +serialport_PORT= comms/${_QT_RELNAME}-serialport +serialport_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}SerialPort.so + sql_PORT= databases/${_QT_RELNAME}-sql sql_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Sql.so @@ -551,7 +551,10 @@ _QT_TOOLS= # empty _QT_TOOLS+= ${QMAKE} . endif . if ${PORTNAME} != "buildtools" -_QT_TOOLS+= ${MOC} qdoc ${RCC} +_QT_TOOLS+= ${MOC} ${RCC} +. endif +. if ${PORTNAME} != "qdoc" +_QT_TOOLS+= qdoc . endif . if ${PORTNAME} != "dbus" _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp @@ -562,26 +565,39 @@ _QT_TOOLS+= ${UIC} pre-configure: qtbase-pre-configure qtbase-pre-configure: -. if ${PORTNAME} != "qmake" - @(cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}) -# @${RM} -rf ${CONFIGURE_WRKSRC}/mkspecs -# @${MKDIR} ${CONFIGURE_WRKSRC}/mkspecs -. endif . for tool in ${_QT_TOOLS} @${TEST} -e ${QT_BINDIR}/${tool:T} && \ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \ ${TRUE} . endfor +# 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 +# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for +# ports/194088. +post-patch: qtbase-post-patch +qtbase-post-patch: + ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \ + ${WRKSRC}/configure + . if ${PORTNAME} != "qmake" -_QMAKE_WRKSRC= ${BUILD_WRKSRC} -QMAKE_SOURCE_PATH= ${_QMAKE_WRKSRC} _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake post-configure: qmake-configure . endif . endif # ${QT_DIST} == "base" +# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that +# requires tests/auto/cmake to be present, otherwise the configure stage will +# fail. +# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same +# time, we have to disable the check in a cache file (the only way to get this +# value through to the configure script in qtbase). +pre-configure: qt5-pre-configure +qt5-pre-configure: + ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${WRKSRC}/.qmake.cache + pre-install: qt-pre-install qt-pre-install: # Search both in CONFIGURE_WRKSRC and WRKSRC, as the former is not Added: head/comms/qt5-serialport/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/qt5-serialport/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= serialport +DISTVERSION= ${QT5_VERSION} +CATEGORIES= comms +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt functions to access serial ports + +USE_QT5= core buildtools_build +QT_DIST= serialport +USES= qmake +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> Added: head/comms/qt5-serialport/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/qt5-serialport/pkg-plist Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,34 @@ +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_mac_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_unix_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qlockfile_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qringbuffer_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_symbian_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_unix_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_win_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_wince_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h +%%QT_INCDIR%%/QtSerialPort/QLockFile +%%QT_INCDIR%%/QtSerialPort/QSerialPort +%%QT_INCDIR%%/QtSerialPort/QSerialPortInfo +%%QT_INCDIR%%/QtSerialPort/QWinEventNotifier +%%QT_INCDIR%%/QtSerialPort/QtSerialPort +%%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends +%%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion +%%QT_INCDIR%%/QtSerialPort/qlockfile.h +%%QT_INCDIR%%/QtSerialPort/qserialport.h +%%QT_INCDIR%%/QtSerialPort/qserialportglobal.h +%%QT_INCDIR%%/QtSerialPort/qserialportinfo.h +%%QT_INCDIR%%/QtSerialPort/qtserialportversion.h +%%QT_INCDIR%%/QtSerialPort/qwineventnotifier.h +%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake +%%QT_LIBDIR%%/libQt5SerialPort.prl +%%QT_LIBDIR%%/libQt5SerialPort.so +%%QT_LIBDIR%%/libQt5SerialPort.so.5 +%%QT_LIBDIR%%/libQt5SerialPort.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5SerialPort.so.%%FULLVER%% +%%QT_MKSPECDIR%%/modules/qt_lib_serialport.pri +%%QT_MKSPECDIR%%/modules/qt_lib_serialport_private.pri +%%QT_LIBDIR%%data/pkgconfig/Qt5SerialPort.pc Modified: head/databases/qt5-sql/Makefile ============================================================================== --- head/databases/qt5-sql/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/databases/qt5-sql/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= sql DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt5- Modified: head/databases/qt5-sqldrivers-odbc/Makefile ============================================================================== --- head/databases/qt5-sqldrivers-odbc/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/databases/qt5-sqldrivers-odbc/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -1,7 +1,6 @@ # $FreeBSD$ COMMENT= Qt ${DB_DESC} plugin -PORTREVISION= 2 DB= ODBC DB_DESC= Open Database Connectivity Modified: head/databases/qt5-sqldrivers-sqlite2/Makefile ============================================================================== --- head/databases/qt5-sqldrivers-sqlite2/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/databases/qt5-sqldrivers-sqlite2/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -1,7 +1,5 @@ # $FreeBSD$ -PORTREVISION= 1 - DB= SQLite2 DB_DESC= SQLite 2 Modified: head/databases/qt5-sqldrivers-sqlite3/Makefile ============================================================================== --- head/databases/qt5-sqldrivers-sqlite3/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/databases/qt5-sqldrivers-sqlite3/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= sqlite3 -PORTREVISION= 1 DB= SQLite DB_DESC= SQLite 3 Modified: head/devel/dbus-qt5/Makefile ============================================================================== --- head/devel/dbus-qt5/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/dbus-qt5/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= dbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qmake5/Makefile ============================================================================== --- head/devel/qmake5/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qmake5/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -26,30 +25,26 @@ INSTALL_TARGET= install_qmake install_mk BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -.include <bsd.port.pre.mk> - -# Needs bsd.port.pre.mk to override -dont-process from bsd.qt.mk. -CONFIGURE_ARGS+=-process - post-patch: # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure - @${RM} ${WRKSRC}/mkspecs/*/*.orig - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/mkspecs/common/freebsd.conf @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf -# Add mkspec for Clang. - @${CP} -a ${WRKSRC}/mkspecs/freebsd-g++ \ +# Add mkspec for Clang. For now, this means adjusting the existing +# unsupported/freebsd-clang mkspec while we get it into shape upstream. + @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \ ${WRKSRC}/mkspecs/freebsd-clang - @${REINPLACE_CMD} -e 's|g++|clang|g' \ - -e '/gcc-base-unix.conf/d' \ + @${REINPLACE_CMD} -e 's|(../|(|g' \ ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf + @${REINPLACE_CMD} -e 's|"../|"|g' \ + ${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h + @${RM} ${WRKSRC}/mkspecs/*/*.orig @${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46 post-build: @@ -62,4 +57,4 @@ post-build: @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \ ${WRKSRC}/mkspecs/qmodule.pri -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf ============================================================================== --- head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Wed Nov 5 09:39:21 2014 (r372179) @@ -1,6 +1,6 @@ --- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 +++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 -@@ -0,0 +1,38 @@ +@@ -0,0 +1,30 @@ +# +# qmake configuration for FreeBSD +# @@ -12,14 +12,6 @@ + +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + -+# Addon software goes into /usr/local on the BSDs, by default we will look there -+QMAKE_INCDIR = $$[QT_INSTALL_HEADERS] /usr/local/include -+QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] /usr/local/lib -+QMAKE_INCDIR_X11 = /usr/local/include -+QMAKE_LIBDIR_X11 = /usr/local/lib -+QMAKE_INCDIR_OPENGL = /usr/local/include -+QMAKE_LIBDIR_OPENGL = /usr/local/lib -+ +QMAKE_LFLAGS_THREAD = -pthread + +QMAKE_LIBS = Modified: head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf ============================================================================== --- head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf Wed Nov 5 09:39:21 2014 (r372179) @@ -1,11 +1,16 @@ +To setup a tool, qtPrepareTool() doesn't fallback anymore (compared to Qt4) to +the build directory (/get paths), but relies instead on QT_TOOL.* variables set +before in the configure stage, which our split configuration doesn't generate. +With this patch, it's back to the previous behavior (which, by the way, has no +effect on anything but Qt builds). --- ./mkspecs/features/qt_functions.prf.orig 2013-10-22 01:49:28.000000000 -0700 +++ ./mkspecs/features/qt_functions.prf 2013-11-04 07:50:44.835414343 -0800 @@ -193,7 +193,7 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) - isEmpty($$1) { -- $$1 = $$[QT_HOST_BINS]/$$2 -+ $$1 = $$[QT_HOST_BINS/get]/$$2 - exists($$eval($$1).pl) { - $$1 = perl -w $$eval($$1).pl + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$[QT_HOST_BINS/get]/$$2 + exists($${cmd}.pl) { + cmd = perl -w $$system_path($${cmd}.pl) } else: contains(QMAKE_HOST.os, Windows) { Modified: head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf ============================================================================== --- head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf Wed Nov 5 09:39:21 2014 (r372179) @@ -1,13 +1,12 @@ ---- ./mkspecs/freebsd-g++/qmake.conf.orig 2013-12-05 17:39:41.510199000 +0000 -+++ ./mkspecs/freebsd-g++/qmake.conf 2013-12-05 17:40:05.441200135 +0000 -@@ -2,36 +2,9 @@ +--- mkspecs/freebsd-g++/qmake.conf.orig ++++ mkspecs/freebsd-g++/qmake.conf +@@ -2,31 +2,7 @@ # qmake configuration for freebsd-g++ # -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - CONFIG += gdb_dwarf_index - +- -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -15,10 +14,6 @@ -# Addon software goes into /usr/local on the BSDs, by default we will look there -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -QMAKE_LFLAGS_THREAD = -pthread - Added: head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,37 @@ +--- mkspecs/unsupported/freebsd-clang/qmake.conf ++++ mkspecs/unsupported/freebsd-clang/qmake.conf +@@ -2,31 +2,6 @@ + # qmake configuration for freebsd-clang + # + +-MAKEFILE_GENERATOR = UNIX +-QMAKE_PLATFORM = freebsd bsd +- +-QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE +- +-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +- +-# Addon software goes into /usr/local on the BSDs, by default we will look there +-QMAKE_INCDIR = /usr/local/include +-QMAKE_LIBDIR = /usr/local/lib +- +-QMAKE_LFLAGS_THREAD = -pthread +- +-QMAKE_LIBS = +-QMAKE_LIBS_DYNLOAD = +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_OPENGL = -lGL +-QMAKE_LIBS_THREAD = +- +-QMAKE_AR = ar cqs +-QMAKE_OBJCOPY = objcopy +-QMAKE_NM = nm -P +-QMAKE_RANLIB = +- +-include(../../common/unix.conf) +-include(../../common/gcc-base-unix.conf) +-include(../../common/g++-unix.conf) +-include(../../common/clang.conf) ++include(../../common/freebsd.conf) ++include(../../common/gcc-base-unix.conf) ++include(../../common/clang.conf) Modified: head/devel/qmake5/pkg-plist ============================================================================== --- head/devel/qmake5/pkg-plist Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qmake5/pkg-plist Wed Nov 5 09:39:21 2014 (r372179) @@ -20,7 +20,6 @@ %%QT_MKSPECDIR%%/common/armcc.conf %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf -%%QT_MKSPECDIR%%/common/clang-unix.conf %%QT_MKSPECDIR%%/common/clang.conf %%QT_MKSPECDIR%%/common/freebsd.conf %%QT_MKSPECDIR%%/common/g++-base.conf @@ -54,7 +53,22 @@ %%QT_MKSPECDIR%%/common/unix.conf %%QT_MKSPECDIR%%/common/wince/qmake.conf %%QT_MKSPECDIR%%/common/wince/qplatformdefs.h +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_44x44.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_480x800.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_71x71.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_large.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_medium.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_small.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_splash.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_store.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_medium.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_small.png +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in %%QT_MKSPECDIR%%/common/winrt_winphone/qmake.conf +%%QT_MKSPECDIR%%/common/winrt_winphone/qplatformdefs.h %%QT_MKSPECDIR%%/cygwin-g++/qmake.conf %%QT_MKSPECDIR%%/cygwin-g++/qplatformdefs.h %%QT_MKSPECDIR%%/darwin-g++/qmake.conf @@ -73,6 +87,9 @@ %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qeglfshooks_hix5hd2.cpp +%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qmake.conf @@ -140,8 +157,9 @@ %%QT_MKSPECDIR%%/features/mac/sdk.prf %%QT_MKSPECDIR%%/features/moc.prf %%QT_MKSPECDIR%%/features/no_debug_info.prf -%%QT_MKSPECDIR%%/features/opengles1.prf +%%QT_MKSPECDIR%%/features/precompile_header.prf %%QT_MKSPECDIR%%/features/qfeatures.prf +%%QT_MKSPECDIR%%/features/qlalr.prf %%QT_MKSPECDIR%%/features/qml1_module.prf %%QT_MKSPECDIR%%/features/qml1_plugin.prf %%QT_MKSPECDIR%%/features/qml_debug.prf @@ -162,6 +180,7 @@ %%QT_MKSPECDIR%%/features/qt_example_installs.prf %%QT_MKSPECDIR%%/features/qt_functions.prf %%QT_MKSPECDIR%%/features/qt_headersclean.prf +%%QT_MKSPECDIR%%/features/qt_helper_lib.prf %%QT_MKSPECDIR%%/features/qt_installs.prf %%QT_MKSPECDIR%%/features/qt_module.prf %%QT_MKSPECDIR%%/features/qt_module_headers.prf @@ -184,7 +203,6 @@ %%QT_MKSPECDIR%%/features/uic.prf %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf %%QT_MKSPECDIR%%/features/unix/dylib.prf -%%QT_MKSPECDIR%%/features/unix/gdb_dwarf_index.prf %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf %%QT_MKSPECDIR%%/features/unix/largefile.prf %%QT_MKSPECDIR%%/features/unix/opengl.prf @@ -208,12 +226,17 @@ %%QT_MKSPECDIR%%/features/win32/msvc_mp.prf %%QT_MKSPECDIR%%/features/win32/opengl.prf %%QT_MKSPECDIR%%/features/win32/openvg.prf +%%QT_MKSPECDIR%%/features/win32/qt_config.prf %%QT_MKSPECDIR%%/features/win32/qt_dll.prf %%QT_MKSPECDIR%%/features/win32/rtti.prf %%QT_MKSPECDIR%%/features/win32/rtti_off.prf %%QT_MKSPECDIR%%/features/win32/stl.prf %%QT_MKSPECDIR%%/features/win32/stl_off.prf +%%QT_MKSPECDIR%%/features/win32/windeployqt.prf %%QT_MKSPECDIR%%/features/win32/windows.prf +%%QT_MKSPECDIR%%/features/winrt/console.prf +%%QT_MKSPECDIR%%/features/winrt/font_deployment.prf +%%QT_MKSPECDIR%%/features/winrt/package_manifest.prf %%QT_MKSPECDIR%%/features/yacc.prf %%QT_MKSPECDIR%%/freebsd-clang/qmake.conf %%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h @@ -314,6 +337,7 @@ %%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_config.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/qt_parts.prf %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh @@ -331,6 +355,8 @@ %%QT_MKSPECDIR%%/qdevice.pri %%QT_MKSPECDIR%%/qfeatures.pri %%QT_MKSPECDIR%%/qmodule.pri +%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf +%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-armv7le-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-armv7le-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf @@ -368,6 +394,8 @@ %%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/unsupported/linux-libc++-clang/qmake.conf +%%QT_MKSPECDIR%%/unsupported/linux-libc++-clang/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/nacl-g++/qmake.conf @@ -410,11 +438,21 @@ %%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qplatformdefs.h %%QT_MKSPECDIR%%/winphone-arm-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winphone-arm-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winphone-arm-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winphone-arm-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winphone-x86-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winphone-x86-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winphone-x86-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winphone-x86-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-arm-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winrt-arm-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-arm-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winrt-arm-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x64-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winrt-x64-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x64-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winrt-x64-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x86-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winrt-x86-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x86-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winrt-x86-msvc2013/qplatformdefs.h Modified: head/devel/qt5-assistant/Makefile ============================================================================== --- head/devel/qt5-assistant/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-assistant/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= assistant DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -19,10 +18,8 @@ DESKTOP_ENTRIES="Qt 5 Assistant" "" \ "${PREFIX}/${QT_BINDIR_REL}/assistant" \ "Development;Qt;" true -# Run qmake also in help/ subdirectory to generate qt_lib_help.pri. -WRKSRC_SUBDIR= src/${PORTNAME} -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -INSTALL_WRKSRC= ${BUILD_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/images/assistant-128.png \ Added: head/devel/qt5-assistant/files/patch-src__src.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-assistant/files/patch-src__src.pro Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = assistant Modified: head/devel/qt5-buildtools/Makefile ============================================================================== --- head/devel/qt5-buildtools/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-buildtools/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qt5-concurrent/Makefile ============================================================================== --- head/devel/qt5-concurrent/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-concurrent/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= concurrent DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-core/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qt5-core/pkg-plist ============================================================================== --- head/devel/qt5-core/pkg-plist Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-core/pkg-plist Wed Nov 5 09:39:21 2014 (r372179) @@ -48,6 +48,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_win_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_winrt_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventloop_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventtransition_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfactoryloader_p.h @@ -59,6 +60,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystementry_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemmetadata_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_fsevents_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_inotify_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_kqueue_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_p.h @@ -115,6 +117,10 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpodlist_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattribute_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattributeprivate_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsobject_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsobjectprivate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qprocess_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpropertyanimation_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qreadwritelock_p.h @@ -133,6 +139,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsjiscodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstatemachine_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h @@ -179,6 +186,7 @@ %%QT_INCDIR%%/QtCore/QArrayDataPointerRef %%QT_INCDIR%%/QtCore/QAssociativeIterable %%QT_INCDIR%%/QtCore/QAtomicInt +%%QT_INCDIR%%/QtCore/QAtomicInteger %%QT_INCDIR%%/QtCore/QAtomicPointer %%QT_INCDIR%%/QtCore/QBBSystemLocaleData %%QT_INCDIR%%/QtCore/QBasicMutex @@ -288,6 +296,7 @@ %%QT_INCDIR%%/QtCore/QMapNode %%QT_INCDIR%%/QtCore/QMapNodeBase %%QT_INCDIR%%/QtCore/QMargins +%%QT_INCDIR%%/QtCore/QMarginsF %%QT_INCDIR%%/QtCore/QMessageAuthenticationCode %%QT_INCDIR%%/QtCore/QMessageLogContext %%QT_INCDIR%%/QtCore/QMessageLogger @@ -365,6 +374,7 @@ %%QT_INCDIR%%/QtCore/QSharedDataPointer %%QT_INCDIR%%/QtCore/QSharedMemory %%QT_INCDIR%%/QtCore/QSharedPointer +%%QT_INCDIR%%/QtCore/QSignalBlocker %%QT_INCDIR%%/QtCore/QSignalMapper %%QT_INCDIR%%/QtCore/QSignalTransition %%QT_INCDIR%%/QtCore/QSize @@ -474,24 +484,16 @@ %%QT_INCDIR%%/QtCore/qarraydataops.h %%QT_INCDIR%%/QtCore/qarraydatapointer.h %%QT_INCDIR%%/QtCore/qatomic.h -%%QT_INCDIR%%/QtCore/qatomic_alpha.h %%QT_INCDIR%%/QtCore/qatomic_armv5.h %%QT_INCDIR%%/QtCore/qatomic_armv6.h %%QT_INCDIR%%/QtCore/qatomic_armv7.h -%%QT_INCDIR%%/QtCore/qatomic_bfin.h %%QT_INCDIR%%/QtCore/qatomic_bootstrap.h %%QT_INCDIR%%/QtCore/qatomic_cxx11.h %%QT_INCDIR%%/QtCore/qatomic_gcc.h %%QT_INCDIR%%/QtCore/qatomic_ia64.h -%%QT_INCDIR%%/QtCore/qatomic_integrity.h %%QT_INCDIR%%/QtCore/qatomic_mips.h %%QT_INCDIR%%/QtCore/qatomic_msvc.h -%%QT_INCDIR%%/QtCore/qatomic_power.h -%%QT_INCDIR%%/QtCore/qatomic_s390.h -%%QT_INCDIR%%/QtCore/qatomic_sh4a.h -%%QT_INCDIR%%/QtCore/qatomic_sparc.h %%QT_INCDIR%%/QtCore/qatomic_unix.h -%%QT_INCDIR%%/QtCore/qatomic_vxworks.h %%QT_INCDIR%%/QtCore/qatomic_x86.h %%QT_INCDIR%%/QtCore/qbasicatomic.h %%QT_INCDIR%%/QtCore/qbasictimer.h @@ -540,6 +542,7 @@ %%QT_INCDIR%%/QtCore/qfunctions_nacl.h %%QT_INCDIR%%/QtCore/qfunctions_vxworks.h %%QT_INCDIR%%/QtCore/qfunctions_wince.h +%%QT_INCDIR%%/QtCore/qfunctions_winrt.h %%QT_INCDIR%%/QtCore/qfuture.h %%QT_INCDIR%%/QtCore/qfutureinterface.h %%QT_INCDIR%%/QtCore/qfuturesynchronizer.h @@ -585,7 +588,6 @@ %%QT_INCDIR%%/QtCore/qobjectcleanuphandler.h %%QT_INCDIR%%/QtCore/qobjectdefs.h %%QT_INCDIR%%/QtCore/qobjectdefs_impl.h -%%QT_INCDIR%%/QtCore/qoldbasicatomic.h %%QT_INCDIR%%/QtCore/qpair.h %%QT_INCDIR%%/QtCore/qparallelanimationgroup.h %%QT_INCDIR%%/QtCore/qpauseanimation.h Modified: head/devel/qt5-designer/Makefile ============================================================================== --- head/devel/qt5-designer/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-designer/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -20,14 +19,15 @@ DESKTOP_ENTRIES="Qt 5 Designer" "" \ "${PREFIX}/${QT_BINDIR_REL}/designer" \ "Development;Qt;" true -WRKSRC_SUBDIR= src/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} post-patch: @${REINPLACE_CMD} -e '/uitools/ d' \ - ${WRKSRC}/src/src.pro + ${WRKSRC}/src/${PORTNAME}/src/src.pro post-install: - ${INSTALL_DATA} ${WRKSRC}/src/designer/images/designer.png \ + ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/src/designer/images/designer.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt5.png .include <bsd.port.mk> Added: head/devel/qt5-designer/files/patch-src__src.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-designer/files/patch-src__src.pro Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = designer Modified: head/devel/qt5-designer/pkg-plist ============================================================================== --- head/devel/qt5-designer/pkg-plist Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-designer/pkg-plist Wed Nov 5 09:39:21 2014 (r372179) @@ -176,6 +176,8 @@ %%QT_INCDIR%%/QtDesignerComponents/qtdesignercomponentsversion.h %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake %%QT_LIBDIR%%/libQt5Designer.prl %%QT_LIBDIR%%/libQt5Designer.so %%QT_LIBDIR%%/libQt5Designer.so.5 @@ -194,6 +196,8 @@ %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri %%QT_PLUGINDIR%%/designer/libqwebview.so %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug +%%QT_PLUGINDIR%%/designer/libqquickwidget.so +%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidget.so.debug libdata/pkgconfig/Qt5Designer.pc libdata/pkgconfig/Qt5DesignerComponents.pc share/pixmaps/designer-qt5.png Modified: head/devel/qt5-help/Makefile ============================================================================== --- head/devel/qt5-help/Makefile Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-help/Makefile Wed Nov 5 09:39:21 2014 (r372179) @@ -2,7 +2,6 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,10 +13,7 @@ QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -WRKSRC_SUBDIR= src/assistant - -post-patch: - @${REINPLACE_CMD} -Ee 's,(clucene|assistant),,' \ - ${WRKSRC}/assistant.pro +BUILD_WRKSRC= ${WRKSRC}/src/assistant +INSTALL_WRKSRC= ${WRKSRC}/src/assistant .include <bsd.port.mk> Added: head/devel/qt5-help/files/patch-src__assistant__assistant.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-help/files/patch-src__assistant__assistant.pro Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,30 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +clucene/ is built in textproc/clucene-qt5, assistant/ is built in +devel/qt5-assistant. + +--- src/assistant/assistant.pro ++++ src/assistant/assistant.pro +@@ -1,20 +1,15 @@ + TEMPLATE = subdirs + +-SUBDIRS += clucene \ +- help \ +- assistant \ ++SUBDIRS += help \ + qhelpgenerator \ + qcollectiongenerator \ + qhelpconverter + +-help.depends = clucene +-assistant.depends = help + qhelpgenerator.depends = help + qcollectiongenerator.depends = help + qhelpconverter.depends = help + + qtNomakeTools( \ +- assistant \ + qhelpgenerator \ + qcollectiongenerator \ + qhelpconverter \ Added: head/devel/qt5-help/files/patch-src__src.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-help/files/patch-src__src.pro Wed Nov 5 09:39:21 2014 (r372179) @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = assistant Modified: head/devel/qt5-help/pkg-plist ============================================================================== --- head/devel/qt5-help/pkg-plist Wed Nov 5 09:25:04 2014 (r372178) +++ head/devel/qt5-help/pkg-plist Wed Nov 5 09:39:21 2014 (r372179) @@ -36,6 +36,7 @@ %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h %%QT_INCDIR%%/QtHelp/qthelpversion.h %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigExtras.cmake %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigVersion.cmake *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411050939.sA59dMYd063176>