Index: head/Mk/Uses/qt-dist.mk =================================================================== --- head/Mk/Uses/qt-dist.mk (revision 482033) +++ head/Mk/Uses/qt-dist.mk (revision 482034) @@ -1,377 +1,390 @@ # $FreeBSD$ # # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk # - qt-dist: The port is a port for an part of Qt4 or Qt5 # - auto inclues qt.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # # Usage # qt-dist:[,yes|modulename] .if !defined(_QT_DIST_MK_INCLUDED) _QT_DIST_MK_INCLUDED= qt-dist.mk # Suck in qt.mk and qmake.mk qt_ARGS?= # empty .include "${USESDIR}/qt.mk" qmake_ARGS?= # empty .include "${USESDIR}/qmake.mk" # Supported distribution arguments _QT4_DISTS= yes _QT5_DISTS= 3d activeqt androidextras base canvas3d charts connectivity \ datavis3d declarative doc gamepad graphicaleffects imageformats \ location macextras multimedia networkauth purchasing \ quickcontrols2 quickcontrols remoteobjects script scxml sensors \ serialbus serialport speech svg tools translations \ virtualkeyboard wayland webchannel webengine websockets webview \ winextras x11extras xmlpatterns _QT_DISTS= ${_QT${_QT_VER}_DISTS} # We only accept one item as an argument. The fetch target further below works # around this. _QT_DIST= # empty . for dist in ${_QT_DISTS:O:u} . if ${qt-dist_ARGS:M${dist}} . if empty(_QT_DIST) _QT_DIST= ${dist} . else IGNORE= cannot be installed: different Qt dists specified via qt-dist:[${qt-dist_ARGS:S/ /,/g}] . endif . endif . endfor # Fall back to sensible defaults for _QT_DIST . if empty(_QT_DIST) . if ${_QT_VER:M4} _QT_DIST= yes # don't force qt-dist to be set for Qt4 ports which all have 'yes'. . endif . if ${_QT_VER:M5} _QT_DIST= ${PORTNAME} # don't force qt-dist to be set for Qt5 ports which 75% of time are ${PORTNAME} . endif . endif # Check validitiy . if empty(_QT_DISTS:M${_QT_DIST}) IGNORE= Unsupported qt-dist ${_QT_DIST} for qt:${_QT_VER} . endif ################################################################################ # Set standard bsd.port.mk variables MASTER_SITES= ${MASTER_SITE_QT} DISTINFO_FILE?= ${PORTSDIR}/devel/${_QT_RELNAME}/distinfo LICENSE?= LGPL21 . if !exists(${PKGDIR}/pkg-descr) DESCR?= ${PORTSDIR}/devel/${_QT_RELNAME}/pkg-descr . endif # Stage support. DESTDIRNAME= INSTALL_ROOT . if ${_QT_VER:M4} MASTER_SITE_SUBDIR?= archive/qt/${_QT_VERSION:R}/${_QT_VERSION}/ DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION} DIST_SUBDIR= KDE . else MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ # www/qt5-webengine hackery: The tarballs of 5.9.5 had a different naming scheme. . if ${QT5_VERSION} == "5.9.5" DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},} . else DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},} . endif DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} DIST_SUBDIR= KDE/Qt/${_QT_VERSION} # Qt (at least when used with qmake) has a tendency to overlink: some libraries # have dependencies on others in the mkspec configurations and the latter are # always passed to the linker even if they are not actually used. By passing # --as-needed to the linker by default when building the Qt ports we do not # have to declare a lot of unnecessary dependencies in USE_QT5. # This could arguably work for Qt4 too, but since it is maintenance mode it is # better not to fix what is not explicitly broken there. LDFLAGS+= -Wl,--as-needed . if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \ defined(DISABLE_SIZE) && defined(NO_CHECKSUM) # Ensure that the "makesum" target (with its inner "fetch" one) uses # devel/qt*/distinfo for every port. . if ${DISTINFO_FILE:H} == ${PORTSDIR}/devel/${_QT_RELNAME} _QT_DIST= ${_QT5_DISTS} . endif . endif # Qt5's tarballs are xz compressed. . if empty(USES:Mtar) EXTRACT_SUFX?= .tar.xz . endif . if ${_QT_DIST} == "base" && ${PORTNAME} != "qmake" # Qt configure requires pkg-config to detect dependencies. .include "${USESDIR}/pkgconfig.mk" . endif # -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_VER:M4} CONFIGURE_ENV+= MAKE="${MAKE:T}" CONFIGURE_ARGS+= -opensource -confirm-license \ -no-pch \ -prefix ${PREFIX} \ -bindir ${PREFIX}/${QT_BINDIR_REL} \ -headerdir ${PREFIX}/${QT_INCDIR_REL} \ -libdir ${PREFIX}/${QT_LIBDIR_REL} \ -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \ -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \ -datadir ${PREFIX}/${QT_DATADIR_REL} \ -docdir ${PREFIX}/${QT_DOCDIR_REL} \ -translationdir ${PREFIX}/${QT_L10NDIR_REL} \ -sysconfdir ${PREFIX}/${QT_ETCDIR_REL} . if ${_QT_VER:M4} CONFIGURE_ARGS+= -fast \ -platform ${QMAKESPEC} \ -system-libjpeg -system-libpng \ -system-libmng -system-libtiff -system-zlib \ -no-phonon-backend \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else CONFIGURE_ARGS+= -nomake examples -nomake tests \ -platform ${QMAKESPECNAME} \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \ -testsdir ${PREFIX}/${QT_TESTDIR_REL} . if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2) CONFIGURE_ARGS+= -no-sse2 . endif # Work around a bug in current binutils, where the gold linker creates # duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports. CONFIGURE_ARGS+= -no-use-gold-linker # Pass -recheck-all so that multiple calls to the configure script really # re-run all checks. CONFIGURE_ARGS+= -recheck-all . endif # ${_QT_VER:M4} . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) WITH_DEBUG= yes STRIP= # It's done prior to bsd.qt.mk inclusion. CONFIGURE_ARGS+= -debug -separate-debug-info # Override configuration in global qconfig.pri. QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \ QT_CONFIG-="release" . else CONFIGURE_ARGS+= -release -no-separate-debug-info QMAKE_ARGS+= QT_CONFIG+="release" \ QT_CONFIG-="debug separate_debug_info" . endif # defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) . if defined(WANT_QT_VERBOSE_CONFIGURE) CONFIGURE_ARGS+= -verbose . endif . if ${_QT_DIST} == "base" || ${_QT_VER:M4} . if ${_QT_VER:M4} _EXTRA_PATCHES_QT4= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test # Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html _EXTRA_PATCHES_QT4+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-armv6 _EXTRA_PATCHES_QT4+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-aarch64 . else _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf +. if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 +_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ + ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf +USE_GCC= yes +. endif . endif EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} . endif # ${_QT_DIST} == "base" || ${_QT_VER:M4} # Override settings installed in qconfig.h and *.pri files. The flags will be # installed along with the port, but have to be passed as arguments while # building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups") # are needed to disable some features. . if !defined(${QT_MODNAME}) || empty(${QT_MODNAME}) # Used for both qconfig-*.h and qt_config_*.pri; it can't be empty. QT_MODNAME= ${PORTNAME} . endif QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix). QT_CONFIG?= # For *.pri files QT_CONFIG flags. . if ${QT_DEFINES} QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}" . if ${QT_DEFINES:N-*} # Use a script to cleanup qconfig-modules.h (see qt-post-install). PKGDEINSTALL= ${WRKDIR}/pkg-deinstall . endif . endif # ${QT_DEFINES} . if ${QT_CONFIG:N-*} QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}" . endif . if ${QT_CONFIG:M-*} 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/-.*//} # Handle additional PLIST directories, which should only be used for Qt-dist ports. . for dir in CMAKE ETC # Export QT_CMAKEDIR and QT_ETCDIR. PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endfor . if ! ${_QT_VER:M4} . if ${_QT_DIST} == "base" # qtbase requires some tools to be symlinked to the build directory. _QT_TOOLS= # empty . if ${PORTNAME} != "qmake" _QT_TOOLS+= ${QMAKE} . endif . if ${PORTNAME} != "buildtools" _QT_TOOLS+= ${MOC} ${RCC} . endif . if ${PORTNAME} != "qdoc" _QT_TOOLS+= qdoc . endif . if ${PORTNAME} != "dbus" _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp . endif . if ${PORTNAME} != "widgets" _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 + +.if ${_QT_VER:M5} +post-patch: gcc-post-patch +gcc-post-patch: + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mkspecs/common/gcc-base.conf + ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' ${WRKSRC}/mkspecs/common/gcc-base.conf \ + ${WRKSRC}/mkspecs/common/g++-base.conf +.endif pre-configure: qtbase-pre-configure qtbase-pre-configure: . for tool in ${_QT_TOOLS} @${TEST} -e ${QT_BINDIR}/${tool:T} && \ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \ ${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 ! empty(USE_QT: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 # 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= ${CONFIGURE_WRKSRC}/bin/qmake . endif . endif pre-configure: qt5-pre-configure qt5-pre-configure: # 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). ${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 # would end up being picked up instead of those built in ${WRKSRC}/lib. Since # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # latter to get the linker path order right. qmake is smart enough to strip # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache post-install: qt-post-install qt-post-install: . if ${QT_DEFINES:N-*} # We can't use SUB_FILES with a shared pkg-deinstall.in. # We need it to be a script instead of a group of @unexecs, otherwise # qconfig-modules.h cleanup will be run in pre-deinstall stage, which is # useless. This will probably be replaced by a Keywords/ script in the future. @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \ -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \ ${PORTSDIR}/devel/${_QT_RELNAME}/${FILESDIR:T}/${PKGDEINSTALL:T}.in > \ ${PKGDEINSTALL} @${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules @${ECHO_CMD} -n \ > ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . for def in ${QT_DEFINES:N-*:O:u:C/=.*$//} @${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h ${ECHO_CMD} "# define QT_${def}" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h @${ECHO_CMD} "#endif" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h @${ECHO_CMD} \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . endfor @${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \ >> ${TMPPLIST} @${ECHO_CMD} "@exec echo '#include ' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \ >> ${TMPPLIST} . endif # ${QT_DEFINES:N-*} . if ${QT_CONFIG:N-*} @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \ > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri @${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \ >> ${TMPPLIST} . endif # ${QT_CONFIG:N-*} . endif # M4 .endif # defined(_QT_DIST_MK_INCLUDED) Index: head/accessibility/qt5-speech/Makefile =================================================================== --- head/accessibility/qt5-speech/Makefile (revision 482033) +++ head/accessibility/qt5-speech/Makefile (revision 482034) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= speech DISTVERSION= ${QT5_VERSION} CATEGORIES= accessibility PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Accessibilty features for Qt5 LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USES= pkgconfig qmake:outsource qt-dist:5,speech +USES= compiler:c++11-lang pkgconfig qmake:outsource qt-dist:5,speech USE_QT= core gui buildtools_build qmake_build .include Index: head/comms/qt5-sensors/Makefile =================================================================== --- head/comms/qt5-sensors/Makefile (revision 482033) +++ head/comms/qt5-sensors/Makefile (revision 482034) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= sensors DISTVERSION= ${QT5_VERSION} CATEGORIES= comms PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt sensors module USE_QT= core qml quick buildtools_build -USES= qmake:norecursive qt-dist:5,sensors +USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/comms/qt5-serialport/Makefile =================================================================== --- head/comms/qt5-serialport/Makefile (revision 482033) +++ head/comms/qt5-serialport/Makefile (revision 482034) @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= serialport DISTVERSION= ${QT5_VERSION} CATEGORIES= comms PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access serial ports USE_QT= core buildtools_build -USES= qmake qt-dist:5,serialport +USES= compiler:c++11-lang libtool qmake qt-dist:5,serialport USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/databases/qt5-sql/Makefile =================================================================== --- head/databases/qt5-sql/Makefile (revision 482033) +++ head/databases/qt5-sql/Makefile (revision 482034) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= sql DISTVERSION= ${QT5_VERSION} CATEGORIES= databases PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQL database integration module -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} post-configure: .for d in src/sql ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor .include Index: head/devel/qt5/Makefile.sqldrivers =================================================================== --- head/devel/qt5/Makefile.sqldrivers (revision 482033) +++ head/devel/qt5/Makefile.sqldrivers (revision 482034) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME?= ${DB:tl} DISTVERSION?= ${QT5_VERSION} CATEGORIES?= databases PKGNAMEPREFIX?= qt5-sqldrivers- MAINTAINER?= kde@FreeBSD.org COMMENT?= Qt ${DB_DESC} database plugin -USES+= qmake:no_env qt-dist:5,base +USES+= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT+= core sql qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS+=-no-gui -no-xcb BUILD_WRKSRC?= ${WRKSRC}/src/plugins/sqldrivers/${DB:tl} INSTALL_WRKSRC?=${BUILD_WRKSRC} PLIST_FILES+= ${QT_CMAKEDIR_REL}/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \ ${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \ %%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so.debug post-configure: .for d in src/plugins/sqldrivers/${DB:tl} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor .include Index: head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf =================================================================== --- head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf (nonexistent) +++ head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf (revision 482034) @@ -0,0 +1,20 @@ +--- mkspecs/common/g++-base.conf.orig 2018-09-21 12:02:35 UTC ++++ mkspecs/common/g++-base.conf +@@ -8,14 +8,14 @@ + # you can use the manual test in tests/manual/mkspecs. + # + +-QMAKE_COMPILER = gcc ++QMAKE_COMPILER = gcc%%GCC_DEFAULT%% + +-QMAKE_CC = gcc ++QMAKE_CC = gcc%%GCC_DEFAULT%% + + QMAKE_LINK_C = $$QMAKE_CC + QMAKE_LINK_C_SHLIB = $$QMAKE_CC + +-QMAKE_CXX = g++ ++QMAKE_CXX = g++%%GCC_DEFAULT%% + + QMAKE_LINK = $$QMAKE_CXX + QMAKE_LINK_SHLIB = $$QMAKE_CXX Property changes on: head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/qt5/files/extra-patch-mkspecs_common_gcc-base.conf =================================================================== --- head/devel/qt5/files/extra-patch-mkspecs_common_gcc-base.conf (nonexistent) +++ head/devel/qt5/files/extra-patch-mkspecs_common_gcc-base.conf (revision 482034) @@ -0,0 +1,11 @@ +--- mkspecs/common/gcc-base.conf.orig 2018-09-21 12:20:28 UTC ++++ mkspecs/common/gcc-base.conf +@@ -73,7 +73,7 @@ QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG + QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS + QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG + +-QMAKE_LFLAGS += ++QMAKE_LFLAGS += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%% + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += + QMAKE_LFLAGS_RELEASE += Property changes on: head/devel/qt5/files/extra-patch-mkspecs_common_gcc-base.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/qt5-assistant/Makefile =================================================================== --- head/devel/qt5-assistant/Makefile (revision 482033) +++ head/devel/qt5-assistant/Makefile (revision 482034) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= assistant DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation browser USE_QT= core gui help network printsupport sql widgets \ buildtools_build sql-sqlite3_run -USES= qmake qt-dist:5,tools +USES= compiler:c++11-lang qmake qt-dist:5,tools DESKTOP_ENTRIES="Qt 5 Assistant" "" \ "${PREFIX}/share/pixmaps/assistant-qt5.png" \ "${PREFIX}/${QT_BINDIR_REL}/assistant" \ "Development;Qt;" true BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/images/assistant-128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/assistant-qt5.png .include Index: head/devel/qt5-buildtools/Makefile =================================================================== --- head/devel/qt5-buildtools/Makefile (revision 482033) +++ head/devel/qt5-buildtools/Makefile (revision 482034) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt build tools -USES= perl5 qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang libtool perl5 qmake:no_env qt-dist:5,base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/tools/bootstrap INSTALL_WRKSRC= ${BUILD_WRKSRC} MORE_WRKSRCS= src/tools/moc \ src/tools/rcc post-configure: .for d in src/tools/bootstrap ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor ${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \ ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl .include Index: head/devel/qt5-concurrent/Makefile =================================================================== --- head/devel/qt5-concurrent/Makefile (revision 482033) +++ head/devel/qt5-concurrent/Makefile (revision 482034) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= concurrent DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt multi-threading module -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= CONCURRENT QT_CONFIG= concurrent post-configure: .for d in src/concurrent ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor .include Index: head/devel/qt5-core/Makefile =================================================================== --- head/devel/qt5-core/Makefile (revision 482033) +++ head/devel/qt5-core/Makefile (revision 482034) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= core DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:devel/icu \ libpcre2-posix.so:devel/pcre2 -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang gnome qmake:no_env qt-dist:5,base USE_GNOME= glib20 USE_QT= qmake_build buildtools_build HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. # -no-feature-* adds QT_NO_* (for features which have no switch or # that need to be detected). CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-opengl \ -no-egl -no-evdev \ -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ -no-libudev -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \ -no-xkbcommon -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= GLIB QT_CONFIG= glib icu .include post-configure: .for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: # Allow qconfig.h to be customized by single ports. ${AWK} 'BEGIN{print "#include "}{print}' \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h # Cleanup qconfig.h and remove stray '#define QT_NO_FOO' ${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include Index: head/devel/qt5-dbus/Makefile =================================================================== --- head/devel/qt5-dbus/Makefile (revision 482033) +++ head/devel/qt5-dbus/Makefile (revision 482034) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= dbus DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt D-Bus inter-process communication module LIB_DEPENDS= libdbus-1.so:devel/dbus -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} TOOLS= qdbuscpp2xml qdbusxml2cpp QT_DEFINES= DBUS QT_CONFIG= dbus post-configure: .for d in src/dbus src/tools/qdbuscpp2xml src/tools/qdbusxml2cpp ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor post-build: .for t in ${TOOLS} @cd ${WRKSRC}/src/tools/${t} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for t in ${TOOLS} @cd ${WRKSRC}/src/tools/${t} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .include Index: head/devel/qt5-designer/Makefile =================================================================== --- head/devel/qt5-designer/Makefile (revision 482033) +++ head/devel/qt5-designer/Makefile (revision 482034) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= designer DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical user interface designer USE_QT= assistant_run core gui network printsupport quick uiplugin \ widgets xml buildtools_build -USES= qmake qt-dist:5,tools +USES= compiler:c++11-lang qmake qt-dist:5,tools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} DESKTOP_ENTRIES="Qt 5 Designer" "" \ "${PREFIX}/share/pixmaps/designer-qt5.png" \ "${PREFIX}/${QT_BINDIR_REL}/designer" \ "Development;Qt;" true BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} OPTIONS_DEFINE= WEBKIT OPTIONS_SUB= yes WEBKIT_DESC= Build WebKit-based WebView widget WEBKIT_QMAKE_ON= CONFIG+=use_webkit WEBKIT_USES= qt-dist:5,tools WEBKIT_USE= QT=webkit post-patch: # uiplugin is built in x11-toolkits/qt5-uiplugin. # uitools is built in devel/qt5-uitools. ${REINPLACE_CMD} -e '/uiplugin/ d' -e '/uitools/ d' \ ${WRKSRC}/src/${PORTNAME}/src/src.pro post-install: ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/src/designer/images/designer.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt5.png # The generated .pc file refers to a nonexistent other .pc file ${REINPLACE_CMD} -e '/^Requires/s/Qt5UiPlugin//' \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/Qt5Designer.pc .include Index: head/devel/qt5-help/Makefile =================================================================== --- head/devel/qt5-help/Makefile (revision 482033) +++ head/devel/qt5-help/Makefile (revision 482034) @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= help DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module USE_QT= core gui network sql widgets \ buildtools_build sql-sqlite3_run -USES= qmake qt-dist:5,tools +USES= compiler:c++11-lang qmake qt-dist:5,tools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/assistant INSTALL_WRKSRC= ${WRKSRC}/src/assistant .include Index: head/devel/qt5-linguisttools/Makefile =================================================================== --- head/devel/qt5-linguisttools/Makefile (revision 482033) +++ head/devel/qt5-linguisttools/Makefile (revision 482034) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= linguisttools DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt localization tools USE_QT= core xml buildtools_build qml_build -USES= qmake qt-dist:5,tools +USES= compiler:c++11-lang qmake qt-dist:5,tools BUILD_WRKSRC= ${WRKSRC}/src/linguist INSTALL_WRKSRC= ${WRKSRC}/src/linguist post-patch: @${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \ ${WRKSRC}/src/linguist/linguist.pro post-install: .for f in lrelease lupdate ${INSTALL_MAN} ${WRKSRC}/src/linguist/${f}/${f}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 .endfor .include Index: head/devel/qt5-location/Makefile =================================================================== --- head/devel/qt5-location/Makefile (revision 482033) +++ head/devel/qt5-location/Makefile (revision 482034) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= location DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt location module USE_QT= concurrent core dbus gui network qml quick buildtools_build -USES= qmake:norecursive qt-dist:5,location +USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/devel/qt5-qdbus/Makefile =================================================================== --- head/devel/qt5-qdbus/Makefile (revision 482033) +++ head/devel/qt5-qdbus/Makefile (revision 482034) @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= qdbus DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt command-line interface to D-Bus -USES= qmake qt-dist:5,tools +USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core dbus xml buildtools_build BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} .include Index: head/devel/qt5-qmake/Makefile =================================================================== --- head/devel/qt5-qmake/Makefile (revision 482033) +++ head/devel/qt5-qmake/Makefile (revision 482034) @@ -1,48 +1,46 @@ # $FreeBSD$ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator USES= compiler:c++11-lib gmake pkgconfig \ python:build qmake:no_env qt-dist:5,base shebangfix SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ util/unicode/x11/makeencodings \ src/3rdparty/freetype/src/tools/afblue.pl \ mkspecs/features/data/mac/objc_namespace.sh \ mkspecs/features/uikit/devices.py \ mkspecs/features/uikit/device_destinations.sh REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes # Disable everything to install minimal qconfig.pri. CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \ -no-iconv -no-icu -no-dbus -no-xcb -no-opengl \ -no-glib -no-fontconfig \ -no-gtk -no-xinput2 \ -no-evdev -no-xkbcommon \ -no-freetype -no-gif -no-harfbuzz -no-libjpeg \ -no-libpng -no-widgets QMAKESPEC= freebsd-${QMAKE_COMPILER} INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs -BROKEN_powerpc64= fails to compile: error: unrecognized command line option -std=c++11 - BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} post-patch: # Clean up files created by patching @${RM} ${WRKSRC}/mkspecs/*/*.orig post-build: # Complete configure stage to generate *.pri files. cd ${WRKSRC} && \ ${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \ ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} .include Index: head/devel/qt5-script/Makefile =================================================================== --- head/devel/qt5-script/Makefile (revision 482033) +++ head/devel/qt5-script/Makefile (revision 482034) @@ -1,24 +1,22 @@ # $FreeBSD$ PORTNAME= script DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4-compatible scripting module -BROKEN_powerpc64= Does not build - USE_QT= core buildtools_build -USES= qmake qt-dist:5,script +USES= compiler:c++11-lang qmake qt-dist:5,script # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). MAKE_ENV= MAKEOBJDIR=. USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} post-patch: @${REINPLACE_CMD} -e '/scripttools/ d' \ ${WRKSRC}/src/src.pro .include Index: head/devel/qt5-scripttools/Makefile =================================================================== --- head/devel/qt5-scripttools/Makefile (revision 482033) +++ head/devel/qt5-scripttools/Makefile (revision 482034) @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= scripttools DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Script additional components USE_QT= core gui script widgets buildtools_build -USES= qmake qt-dist:5,script +USES= compiler:c++11-lang qmake qt-dist:5,script USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} .include Index: head/devel/qt5-testlib/Makefile =================================================================== --- head/devel/qt5-testlib/Makefile (revision 482033) +++ head/devel/qt5-testlib/Makefile (revision 482034) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= testlib DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} post-configure: .for d in src/testlib ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor .include Index: head/devel/qt5-uitools/Makefile =================================================================== --- head/devel/qt5-uitools/Makefile (revision 482033) +++ head/devel/qt5-uitools/Makefile (revision 482034) @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= uitools DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Designer UI forms support module USE_QT= core gui uiplugin widgets buildtools_build -USES= qmake qt-dist:5,tools +USES= compiler:c++11-lang qmake qt-dist:5,tools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} .include Index: head/graphics/qt5-imageformats/Makefile =================================================================== --- head/graphics/qt5-imageformats/Makefile (revision 482033) +++ head/graphics/qt5-imageformats/Makefile (revision 482034) @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= imageformats DISTVERSION= ${QT5_VERSION} CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt plugins for additional image formats LIB_DEPENDS= libjasper.so:graphics/jasper \ libmng.so:graphics/libmng \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp USE_QT= core gui buildtools_build -USES= localbase qmake qt-dist:5,imageformats +USES= compiler:c++11-lang localbase qmake qt-dist:5,imageformats .include Index: head/graphics/qt5-opengl/Makefile =================================================================== --- head/graphics/qt5-opengl/Makefile (revision 482033) +++ head/graphics/qt5-opengl/Makefile (revision 482034) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= opengl DISTVERSION= ${QT5_VERSION} CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5-compatible OpenGL support module -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang gl qmake:no_env qt-dist:5,base USE_GL= gl USE_QT= core gui widgets qmake_build buildtools_build HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= OPENGL QT_CONFIG= opengl post-configure: .for d in src/opengl ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor .include Index: head/graphics/qt5-svg/Makefile =================================================================== --- head/graphics/qt5-svg/Makefile (revision 482033) +++ head/graphics/qt5-svg/Makefile (revision 482034) @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= svg DISTVERSION= ${QT5_VERSION} CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG support module USE_QT= core gui widgets buildtools_build -USES= qmake qt-dist:5,svg +USES= compiler:c++11-lang qmake qt-dist:5,svg USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/lang/qt5-qml/Makefile =================================================================== --- head/lang/qt5-qml/Makefile (revision 482033) +++ head/lang/qt5-qml/Makefile (revision 482034) @@ -1,31 +1,29 @@ # $FreeBSD$ PORTNAME= qml DISTVERSION= ${QT5_VERSION} CATEGORIES= lang PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt QML and JavaScript language module -BROKEN_powerpc64= Does not build - USE_QT= core network buildtools_build -USES= python:build qmake qt-dist:5,declarative +USES= compiler:c++11-lang python:build qmake qt-dist:5,declarative USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src post-patch: # tools/tools.pro will be processed automatically unless it does not exist. ${RM} -r ${WRKSRC}/tools ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \ ${WRKSRC}/src/3rdparty/masm/masm.pri # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD ${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \ ${WRKSRC}/qtdeclarative.pro .include Index: head/multimedia/qt5-multimedia/Makefile =================================================================== --- head/multimedia/qt5-multimedia/Makefile (revision 482033) +++ head/multimedia/qt5-multimedia/Makefile (revision 482034) @@ -1,57 +1,58 @@ # $FreeBSD$ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module # LICENSE set via USES_QT5 (bsd.qt.mk) -USES= pkgconfig qmake:norecursive qt-dist:5,multimedia +USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \ + qt-dist:5,multimedia USE_GL= gl USE_GNOME= glib20 USE_QT= core gui network opengl qml quick widgets \ buildtools_build USE_XORG= x11 xext xv USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_CONFIG= xlib # TODO: Bug 225100: the machinery in bsd.qt.mk's qt-post-install target does # not seem to account for the case of a module no longer defining QT_DEFINES: # the lines in qconfig-modules.h including said module's qconfig-.h # will remain. We're setting it below to avoid build errors, but this needs to # be fixed properly later. QT_DEFINES= _QTMULTIMEDIA_DUMMY OPTIONS_DEFINE= GSTREAMER OPENAL OPTIONS_DEFAULT= ALSA GSTREAMER OPTIONS_RADIO= AUDIOPLUGIN OPTIONS_RADIO_AUDIOPLUGIN= ALSA PULSEAUDIO OPTIONS_SUB= yes AUDIOPLUGIN_DESC= Audio plugins to build OPENAL_DESC= 3D positional spatialized sound support ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_VARS= QT_CONFIG+=alsa ALSA_VARS_OFF= QT_CONFIG+=-alsa \ QMAKE_CONFIGURE_ARGS+=-no-alsa GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat GSTREAMER_USE= GSTREAMER1=bad GSTREAMER_VARS= QT_CONFIG+=gstreamer-1.0 \ QMAKE_CONFIGURE_ARGS+=-gstreamer 1.0 GSTREAMER_VARS_OFF= QT_CONFIG+=-gstreamer-1.0 \ QMAKE_CONFIGURE_ARGS+=-no-gstreamer OPENAL_USES= openal OPENAL_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-openal PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= QT_CONFIG+=pulseaudio PULSEAUDIO_VARS_OFF= QT_CONFIG+=-pulseaudio \ QMAKE_CONFIGURE_ARGS+=-no-pulseaudio .include Index: head/net/qt5-network/Makefile =================================================================== --- head/net/qt5-network/Makefile (revision 482033) +++ head/net/qt5-network/Makefile (revision 482034) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= network DISTVERSION= ${QT5_VERSION} CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt network module BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= error: member access into incomplete type 'X509' (aka 'x509_st') RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USES= qmake:no_env qt-dist:5,base ssl +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base ssl USE_QT= core buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= OPENSSL SSL QT_CONFIG= openssl post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp @${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \ ${BUILD_WRKSRC}/ssl/qsslsocket_openssl_symbols.cpp post-configure: .for d in src/network src/plugins/bearer/generic ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor post-build: @cd ${WRKSRC}/src/plugins/bearer/generic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} post-install: @cd ${WRKSRC}/src/plugins/bearer/generic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .include Index: head/print/qt5-printsupport/Makefile =================================================================== --- head/print/qt5-printsupport/Makefile (revision 482033) +++ head/print/qt5-printsupport/Makefile (revision 482034) @@ -1,58 +1,58 @@ # $FreeBSD$ PORTNAME= printsupport DISTVERSION= ${QT5_VERSION} CATEGORIES= print PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt print support module -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core gui widgets qmake_build buildtools_build HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT=CUPS OPTIONS_SUB= yes CUPS_CONFIGURE_ON= -cups CUPS_CONFIGURE_OFF= -no-cups CUPS_LIB_DEPENDS= libcups.so:print/cups .include .if ${PORT_OPTIONS:MCUPS} QT_DEFINES+= CUPS QT_CONFIG+= cups MORE_WRKSRCS+= src/plugins/printsupport .else QT_DEFINES+= -CUPS QT_CONFIG+= -cups .endif post-configure: .for d in src/printsupport ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor post-build: .if ${PORT_OPTIONS:MCUPS} @cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endif post-install: .if ${PORT_OPTIONS:MCUPS} @cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endif .include Index: head/sysutils/qt5-qtpaths/Makefile =================================================================== --- head/sysutils/qt5-qtpaths/Makefile (revision 482033) +++ head/sysutils/qt5-qtpaths/Makefile (revision 482034) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= qtpaths DISTVERSION= ${QT5_VERSION} CATEGORIES= sysutils PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Command line client to QStandardPaths -USES= qmake:outsource qt-dist:5,tools +USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools USE_QT= core PLIST_FILES= ${QT_BINDIR}/qtpaths # Similarly to x11/qt5-qev, it makes more sense to just run the build system # from the qtpaths directory. If we run it from the top of the source tree, it # will look for a lot more dependencies for other tools such as lupdate, which # we do not really have to depend on. WRKSRC_SUBDIR= src/${PORTNAME} post-patch: ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} .include Index: head/textproc/qt5-xml/Makefile =================================================================== --- head/textproc/qt5-xml/Makefile (revision 482033) +++ head/textproc/qt5-xml/Makefile (revision 482034) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= xml DISTVERSION= ${QT5_VERSION} CATEGORIES= textproc PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SAX and DOM implementations -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} post-configure: .for d in src/xml ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor .include Index: head/textproc/qt5-xmlpatterns/Makefile =================================================================== --- head/textproc/qt5-xmlpatterns/Makefile (revision 482033) +++ head/textproc/qt5-xmlpatterns/Makefile (revision 482034) @@ -1,17 +1,15 @@ # $FreeBSD$ PORTNAME= xmlpatterns DISTVERSION= ${QT5_VERSION} CATEGORIES= textproc PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema -BROKEN_powerpc64= Does not build - USE_QT= core network buildtools_build -USES= qmake:norecursive qt-dist:5,xmlpatterns +USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/www/qt5-webchannel/Makefile =================================================================== --- head/www/qt5-webchannel/Makefile (revision 482033) +++ head/www/qt5-webchannel/Makefile (revision 482034) @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= webchannel DISTVERSION= ${QT5_VERSION} CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients USE_QT= buildtools_build core qml quick -USES= qmake:norecursive qt-dist:5,webchannel +USES= compiler:c++11-lang qmake:norecursive qt-dist:5,webchannel USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted # tarball, which we need during the build. EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions .include Index: head/x11/qt5-x11extras/Makefile =================================================================== --- head/x11/qt5-x11extras/Makefile (revision 482033) +++ head/x11/qt5-x11extras/Makefile (revision 482034) @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= x11extras DISTVERSION= ${QT5_VERSION} CATEGORIES= x11 PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt platform-specific features for X11-based systems USE_QT= core gui -USES= qmake qt-dist:5,x11extras +USES= compiler:c++11-lang qmake qt-dist:5,x11extras USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/x11-toolkits/qt5-gui/Makefile =================================================================== --- head/x11-toolkits/qt5-gui/Makefile (revision 482033) +++ head/x11-toolkits/qt5-gui/Makefile (revision 482034) @@ -1,103 +1,103 @@ # $FreeBSD$ PORTNAME= gui DISTVERSION= ${QT5_VERSION} CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface module BUILD_DEPENDS= at-spi2-core>=0:accessibility/at-spi2-core LIB_DEPENDS= libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libpng.so:graphics/png \ libxcb.so:x11/libxcb \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= jpeg localbase qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang jpeg localbase qmake:no_env qt-dist:5,base USE_GL= gl egl USE_GNOME= glib20 USE_QT= core dbus network qmake_build buildtools_build USE_XORG= ice sm x11 xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ -no-evdev \ -system-harfbuzz # Explicitely set to c++14 as to net get c++17/c++1z, as libX11's headers # are using the obsolete 'register' key word. CONFIGURE_ARGS+= -c++std c++14 USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} # Build and install QtPlatformSupport and default QPA plugins (XCB, # minimal and offscreen). QtGui won't work without (one of) them, but # they depend on QtGui itself, so they can't be added as dependencies. # QtPlatformSupport doesn't need to be installed (it's a static # library), but might be needed by people porting Qt on new platforms. MORE_WRKSRCS= src/platformheaders \ src/platformsupport \ src/plugins/platforms \ src/plugins/generic # Image formats are split through different tarballs, these are the # main ones; input contexts require no additional dependency. MORE_WRKSRCS+= src/plugins/imageformats \ src/plugins/platforminputcontexts # openglextensions is the static library to use for further things like qtcanvas3d MORE_WRKSRCS+= src/openglextensions QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \ IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ fontconfig glib opengl png system-freetype \ system-jpeg system-png xcb xcb-glx xcb-render \ xcb-xlib xinput2 xlib xrender # Inherited from Qt 4. .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= ${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \ xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype .endif CFLAGS_powerpc64= -mminimal-toc post-configure: .for d in src/tools/qvkgen src/gui ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in src/tools/qvkgen @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in src/tools/qvkgen ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .include Index: head/x11-toolkits/qt5-quick/Makefile =================================================================== --- head/x11-toolkits/qt5-quick/Makefile (revision 482033) +++ head/x11-toolkits/qt5-quick/Makefile (revision 482034) @@ -1,47 +1,48 @@ # $FreeBSD$ PORTNAME= quick DISTVERSION= ${QT5_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces USE_GL= gl USE_QT= core gui network qml sql testlib \ widgets xmlpatterns buildtools_build -USES= python:build qmake:norecursive qt-dist:5,declarative +USES= compiler:c++11-lang gl python:build qmake:norecursive \ + qt-dist:5,declarative USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CONFLICTS= qt5-declarative-render2d-* QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge # libQt5Qml.so and libQt5QmlDevTools.a come from lang/qt5-qml, so we do not # want to build them again here. On the other hand, if we just remove qml/ and # qmldevtools/ from src/src.pro the versions installed in ${LOCALBASE} will be # picked up and their .pri files will make -Wl,-rpath-link,${LOCALBASE}/lib be # used when building targets such as tools/qmltestrunner. This causes problems # when building the port with an older version installed (bug 194870). # Instead, we let the .pri modules be created in ${WRKSRC}/mkspecs but symlink # the existing libraries and trick the existing Makefiles into doing nothing # (it is more future-proof than whitelisting the other directories). post-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/lib ${LN} -s ${QT_LIBDIR}/libQt5Qml.so \ ${CONFIGURE_WRKSRC}/lib/libQt5Qml.so ${LN} -s ${QT_LIBDIR}/libQt5QmlDevTools.a \ ${CONFIGURE_WRKSRC}/lib/libQt5QmlDevTools.a ${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \ > ${CONFIGURE_WRKSRC}/src/qml/Makefile ${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \ > ${CONFIGURE_WRKSRC}/src/qmldevtools/Makefile post-patch: # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD ${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \ ${WRKSRC}/qtdeclarative.pro .include Index: head/x11-toolkits/qt5-quickcontrols/Makefile =================================================================== --- head/x11-toolkits/qt5-quickcontrols/Makefile (revision 482033) +++ head/x11-toolkits/qt5-quickcontrols/Makefile (revision 482034) @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= quickcontrols DISTVERSION= ${QT5_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick BROKEN_armv6= fails to install: pkg-static: Unable to access file ApplicationWindow.qmlc: No such file or directory -USES= qmake qt-dist:5,quickcontrols +USES= compiler:c++11-lang qmake qt-dist:5,quickcontrols USE_QT= core gui qml quick widgets \ buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/x11-toolkits/qt5-quickcontrols2/Makefile =================================================================== --- head/x11-toolkits/qt5-quickcontrols2/Makefile (revision 482033) +++ head/x11-toolkits/qt5-quickcontrols2/Makefile (revision 482034) @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= quickcontrols2 DISTVERSION= ${QT5_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick BROKEN_armv6= fails to install: pkg-static: Unable to access file DayOfWeekRow.qmlc: No such file or directory -USES= qmake:norecursive qt-dist:5 +USES= compiler:c++11-lang qmake:norecursive qt-dist:5 USE_QT= core gui qml quick widgets \ buildtools_build QT_DIST= ${PORTNAME} USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/x11-toolkits/qt5-virtualkeyboard/Makefile =================================================================== --- head/x11-toolkits/qt5-virtualkeyboard/Makefile (revision 482033) +++ head/x11-toolkits/qt5-virtualkeyboard/Makefile (revision 482034) @@ -1,22 +1,22 @@ # $FreeBSD$ PORTNAME= virtualkeyboard DISTVERSION= ${QT5_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 Virtual Keyboard Module LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell -USES= qmake qt-dist:5,virtualkeyboard +USES= compiler:c++11-lang qmake qt-dist:5,virtualkeyboard USE_QT= core network gui widgets svg qml quick buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # Disable the builtin layouts -- otherwise we need to pull in a lot of other # stuff. QMAKE_ARGS= CONFIG+=disable-layouts .include Index: head/x11-toolkits/qt5-widgets/Makefile =================================================================== --- head/x11-toolkits/qt5-widgets/Makefile (revision 482033) +++ head/x11-toolkits/qt5-widgets/Makefile (revision 482034) @@ -1,71 +1,71 @@ # $FreeBSD$ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt C++ widgets module -USES= qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core gui qmake_build buildtools_build USE_XORG= x11 HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} MORE_WRKSRCS= src/tools/uic QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC QT_CONFIG= accessibility accessibility-atspi-bridge xlib OPTIONS_DEFINE= GTK3 OPTIONS_SUB= YES GTK3_DESC= GTK+-based Qt theme GTK3_USE= GNOME=gtk30 QT=dbus GTK3_CONFIGURE_ON= -gtk GTK3_CONFIGURE_OFF= -no-gtk .include .if ${PORT_OPTIONS:MGTK3} QT_DEFINES+= STYLE_GTK QT_CONFIG+= gtk MORE_WRKSRCS+= src/plugins/platformthemes .else QT_DEFINES+= -STYLE_GTK QT_CONFIG+= -gtk .endif post-configure: .for d in src/tools/uic src/widgets ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: cd ${WRKSRC}/src/tools/uic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in src/tools/uic ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qt5logo.png .include