Index: head/Mk/Uses/qt-dist.mk =================================================================== --- head/Mk/Uses/qt-dist.mk (revision 524128) +++ head/Mk/Uses/qt-dist.mk (revision 524129) @@ -1,387 +1,398 @@ # $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 Qt5 # - auto inclues qt.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # # Usage # qt-dist:[,yes|modulename] # # MAINTAINER: kde@FreeBSD.org .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 _QT5_DISTS= 3d activeqt androidextras base charts connectivity datavis3d \ declarative doc gamepad graphicaleffects imageformats location \ lottie macextras multimedia networkauth purchasing quickcontrols \ quickcontrols2 remoteobjects script scxml sensors serialbus \ serialport speech svg tools translations virtualkeyboard wayland \ webchannel webengine webglplugin 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: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:M5} 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. 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 ,} \ --no-same-owner --no-same-permissions . endif # ! ${_QT_VER:M5} 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:M5} 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:M5} . 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" _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 \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf . if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${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 \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf USE_GCC= yes . endif EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${_EXTRA_PATCHES_QT5} . endif # ${_QT_DIST} == "base" # 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${_QT_VER}/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:M5} . 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 _QT5_ADDITIONAL_LINK?= # Ensure definition .if ${_QT_VER:M5} post-patch: gcc-post-patch gcc-post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mkspecs/common/gcc-base.conf \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ ${WRKSRC}/mkspecs/common/gcc-base.conf \ ${WRKSRC}/mkspecs/common/g++-base.conf \ ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.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 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf . 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 ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache # Allow linking of further libraries to the configure directory. . if !empty(_QT5_ADDITIONAL_LINK) . for dep in ${_QT5_ADDITIONAL_LINK} ${MKDIR} ${CONFIGURE_WRKSRC}/lib . if ! empty(USE_QT:M${dep}) ${LN} -sf ${QT_LIBDIR}/${qt-${dep}_LIB} ${CONFIGURE_WRKSRC}/lib . endif . endfor . endif 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 # M5 +# Handle misc/qtchooser wrapper installation and deinstallation +# If a port installs Qt version-specific binaries (e.g. "designer" which existed as a Qt4 application +# and exists as a Qt5 application and will probably be a Qt6 application) which should have a +# qtchooser-based wrapper, the port should set `QT_BINARIES=yes`. +# +# When QT_BINARIES is set to yes, compatibility symlinks (designer -> qtchooser, so that +# qtchooser can run designer-qt5 or whatever is the selected Qt version) are installed by the port. +. if defined(QT_BINARIES) + ${ECHO_CMD} '@postexec if type update-qtchooser-wrapper >/dev/null 2>&1; then update-qtchooser-wrapper; fi' >> ${TMPPLIST} + ${ECHO_CMD} '@postunexec if type update-qtchooser-wrapper >/dev/null 2>&1; then update-qtchooser-wrapper; fi' >> ${TMPPLIST} +. endif .endif # defined(_QT_DIST_MK_INCLUDED) Index: head/comms/qt5-serialbus/Makefile =================================================================== --- head/comms/qt5-serialbus/Makefile (revision 524128) +++ head/comms/qt5-serialbus/Makefile (revision 524129) @@ -1,15 +1,17 @@ # $FreeBSD$ PORTNAME= serialbus DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access industrial bus systems USES= compiler:c++11-lib qmake qt-dist:5,serialbus USE_QT= core network serialport buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} +QT_BINARIES= yes .include Index: head/devel/qt5-assistant/Makefile =================================================================== --- head/devel/qt5-assistant/Makefile (revision 524128) +++ head/devel/qt5-assistant/Makefile (revision 524129) @@ -1,30 +1,32 @@ # $FreeBSD$ PORTNAME= assistant DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation browser USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core gui help network printsupport sql widgets \ buildtools_build sql-sqlite3_run +QT_BINARIES= yes 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} # Link in QtHelp port _QT5_ADDITIONAL_LINK= help 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 524128) +++ head/devel/qt5-buildtools/Makefile (revision 524129) @@ -1,44 +1,46 @@ # $FreeBSD$ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt build tools 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} +QT_BINARIES= yes 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-core/Makefile =================================================================== --- head/devel/qt5-core/Makefile (revision 524128) +++ head/devel/qt5-core/Makefile (revision 524129) @@ -1,74 +1,76 @@ # $FreeBSD$ PORTNAME= core DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 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= 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-xkb -no-xcb-xlib \ -no-xkbcommon -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} +QT_BINARIES= yes QT_DEFINES= GLIB QT_CONFIG= glib icu MORE_WRKSRCS= src/tools/bootstrap src/tools/qfloat16-tables src/corelib src/tools/qlalr .include # FreeBSD base gained /etc/os-release in r354922, which # corresponds to __FreeBSD_version 1300060 .if ${OSVERSION} < 1300060 RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release post-patch: ${REINPLACE_CMD} -e '/readEtcFile/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ ${WRKSRC}/src/corelib/global/qglobal.cpp .endif post-configure: .for d in ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in ${MORE_WRKSRCS} ${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 # Manually install qlalr cd ${WRKSRC}/src/tools/qlalr && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} # 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 524128) +++ head/devel/qt5-dbus/Makefile (revision 524129) @@ -1,47 +1,49 @@ # $FreeBSD$ PORTNAME= dbus DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt D-Bus inter-process communication module LIB_DEPENDS= libdbus-1.so:devel/dbus 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_BINARIES= yes 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 524128) +++ head/devel/qt5-designer/Makefile (revision 524129) @@ -1,44 +1,47 @@ # $FreeBSD$ PORTNAME= designer DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical user interface designer USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= assistant_run core declarative gui network printsupport uiplugin \ widgets xml buildtools_build 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} + +QT_BINARIES= yes 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 524128) +++ head/devel/qt5-help/Makefile (revision 524129) @@ -1,19 +1,22 @@ # $FreeBSD$ PORTNAME= help DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core gui network sql widgets \ buildtools_build sql-sqlite3_run USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/assistant INSTALL_WRKSRC= ${WRKSRC}/src/assistant + +QT_BINARIES= yes .include Index: head/devel/qt5-linguist/Makefile =================================================================== --- head/devel/qt5-linguist/Makefile (revision 524128) +++ head/devel/qt5-linguist/Makefile (revision 524129) @@ -1,28 +1,31 @@ # $FreeBSD$ PORTNAME= linguist DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 translation tool USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core gui printsupport widgets xml \ assistant_run linguisttools_run \ buildtools_build designer_build uitools_build DESKTOP_ENTRIES="Qt 5 Linguist" "" \ "${PREFIX}/share/pixmaps/linguist-qt5.png" \ "${PREFIX}/${QT_BINDIR_REL}/linguist" \ "Development;Qt;" true BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} + +QT_BINARIES= yes post-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/images/icons/linguist-128-32.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt5.png .include Index: head/devel/qt5-linguisttools/Makefile =================================================================== --- head/devel/qt5-linguisttools/Makefile (revision 524128) +++ head/devel/qt5-linguisttools/Makefile (revision 524129) @@ -1,27 +1,30 @@ # $FreeBSD$ PORTNAME= linguisttools DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt localization tools USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core xml buildtools_build declarative_build BUILD_WRKSRC= ${WRKSRC}/src/linguist INSTALL_WRKSRC= ${WRKSRC}/src/linguist + +QT_BINARIES= yes 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-qdbus/Makefile =================================================================== --- head/devel/qt5-qdbus/Makefile (revision 524128) +++ head/devel/qt5-qdbus/Makefile (revision 524129) @@ -1,17 +1,20 @@ # $FreeBSD$ PORTNAME= qdbus DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt command-line interface to D-Bus 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} + +QT_BINARIES= yes .include Index: head/devel/qt5-qdbusviewer/Makefile =================================================================== --- head/devel/qt5-qdbusviewer/Makefile (revision 524128) +++ head/devel/qt5-qdbusviewer/Makefile (revision 524129) @@ -1,26 +1,29 @@ # $FreeBSD$ PORTNAME= qdbusviewer DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical interface to D-Bus USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core dbus gui widgets xml buildtools_build DESKTOP_ENTRIES="Qt 5 D-Bus Viewer" "" \ "${PREFIX}/share/pixmaps/qdbusviewer-qt5.png" \ "${PREFIX}/${QT_BINDIR_REL}/qdbusviewer" \ "Development;Qt;" true BUILD_WRKSRC= ${WRKSRC}/src/qdbus/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} + +QT_BINARIES= yes post-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt5.png .include Index: head/devel/qt5-qdoc/Makefile =================================================================== --- head/devel/qt5-qdoc/Makefile (revision 524128) +++ head/devel/qt5-qdoc/Makefile (revision 524129) @@ -1,24 +1,27 @@ # $FreeBSD$ PORTNAME= qdoc DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator BUILD_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} RUN_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core declarative buildtools_build qdoc-data_run BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT} + +QT_BINARIES= yes .include Index: head/devel/qt5-qmake/Makefile =================================================================== --- head/devel/qt5-qmake/Makefile (revision 524128) +++ head/devel/qt5-qmake/Makefile (revision 524129) @@ -1,47 +1,49 @@ # $FreeBSD$ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 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-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 BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} + +QT_BINARIES= yes 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-remoteobjects/Makefile =================================================================== --- head/devel/qt5-remoteobjects/Makefile (revision 524128) +++ head/devel/qt5-remoteobjects/Makefile (revision 524129) @@ -1,17 +1,20 @@ # $FreeBSD$ PORTNAME= remoteobjects DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 SXCML module USES= compiler:c++11-lang gl qmake qt-dist:5 USE_GL= gl USE_QT= core declarative network \ buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +QT_BINARIES= yes .include Index: head/devel/qt5-scxml/Makefile =================================================================== --- head/devel/qt5-scxml/Makefile (revision 524128) +++ head/devel/qt5-scxml/Makefile (revision 524129) @@ -1,15 +1,18 @@ # $FreeBSD$ PORTNAME= scxml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 SXCML module USES= compiler:c++11-lang qmake qt-dist:5,scxml USE_QT= core declarative network buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +QT_BINARIES= yes .include Index: head/graphics/qt5-3d/Makefile =================================================================== --- head/graphics/qt5-3d/Makefile (revision 524128) +++ head/graphics/qt5-3d/Makefile (revision 524129) @@ -1,18 +1,21 @@ # $FreeBSD$ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt3D module LIB_DEPENDS= libassimp.so:multimedia/assimp USES= compiler:c++11-lang pkgconfig qmake:norecursive qt-dist:5,3d USE_QT= concurrent core declarative gui network buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +QT_BINARIES= yes .include Index: head/graphics/qt5-pixeltool/Makefile =================================================================== --- head/graphics/qt5-pixeltool/Makefile (revision 524128) +++ head/graphics/qt5-pixeltool/Makefile (revision 524129) @@ -1,23 +1,26 @@ # $FreeBSD$ PORTNAME= pixeltool DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 screen magnifier USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core gui widgets buildtools_build # qt5logo.png is installed by qt5-widgets. DESKTOP_ENTRIES="Qt 5 PixelTool" "" \ "${PREFIX}/share/pixmaps/qt5logo.png" \ "${PREFIX}/${QT_BINDIR_REL}/pixeltool" \ "Graphics;Qt;" true BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} + +QT_BINARIES= yes .include Index: head/graphics/qt5-wayland/Makefile =================================================================== --- head/graphics/qt5-wayland/Makefile (revision 524128) +++ head/graphics/qt5-wayland/Makefile (revision 524129) @@ -1,26 +1,29 @@ # $FreeBSD$ PORTNAME= wayland DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 wrapper for Wayland LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \ qt-dist:5,wayland xorg USE_GL= egl gl USE_GNOME= glib20 USE_QT= core dbus gui declarative \ buildtools_build qmake_build USE_XORG= x11 xcomposite USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +QT_BINARIES= yes .include Index: head/misc/qtchooser/Makefile =================================================================== --- head/misc/qtchooser/Makefile (revision 524128) +++ head/misc/qtchooser/Makefile (revision 524129) @@ -1,48 +1,56 @@ # $FreeBSD$ PORTNAME= qtchooser PORTVERSION= 66 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= QT/official_releases/${PORTNAME} DIST_SUBDIR= KDE/Qt/qtchooser MAINTAINER= kde@FreeBSD.org COMMENT= Qt tool wrapper LICENSE= GPLv3 LGPL21 LICENSE_COMB= dual USES= gmake tar:xz DESTDIRNAME= INSTALL_ROOT MAKE_ARGS= prefix=${PREFIX} +SUB_FILES= update-qtchooser-wrapper +# Keep this synchronized with qt.mk +SUB_LIST= QT_SUPPORTED="5" + # bin/linguist CONFLICTS_INSTALL= rubygem-github-linguist rubygem-github-linguist47 rubygem-gitlab-linguist QT_QTCHOOSERDIR=${PREFIX}/etc/xdg/qtchooser post-patch: @${REINPLACE_CMD} -e 's,/etc/xdg,${LOCALBASE}/etc/xdg,' \ ${WRKSRC}/src/${PORTNAME}/main.cpp post-install: # Install qtchooser config file. Note this is not optimal. # -> we could install the qtchooser config files via devel/qmake[45]. # Unfortunately they will be missing for ports that only use say "rcc" # without qmake. # So it is easier to install the config files in qtchooser. # -> As we cannot include bsd.qt.mk at the moment without specifying # a version, we also do not have the variables needed to sub the variables # properly (this will probably change with qt.mk). # Always make sure the following is in sync with bsd.qt.mk for now. ${MKDIR} ${STAGEDIR}${QT_QTCHOOSERDIR} .for qt_version in 4 5 ${ECHO} ${PREFIX}/lib/qt${qt_version}/bin > ${STAGEDIR}${QT_QTCHOOSERDIR}/qt${qt_version}.conf ${ECHO} ${PREFIX}/lib/qt${qt_version} >> ${STAGEDIR}${QT_QTCHOOSERDIR}/qt${qt_version}.conf .endfor # Install man page. ${INSTALL_DATA} ${WRKSRC}/doc/qtchooser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 # Create the default profile. cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf + ${INSTALL_SCRIPT} ${WRKDIR}/update-qtchooser-wrapper \ + ${STAGEDIR}${PREFIX}/bin/update-qtchooser-wrapper + .include Index: head/misc/qtchooser/files/patch-Makefile =================================================================== --- head/misc/qtchooser/files/patch-Makefile (revision 524128) +++ head/misc/qtchooser/files/patch-Makefile (revision 524129) @@ -1,13 +1,17 @@ ---- Makefile.orig 2018-10-08 18:18:42 UTC +--- Makefile.orig 2018-05-04 07:41:32 UTC +++ Makefile -@@ -70,8 +70,8 @@ install: +@@ -66,12 +66,11 @@ distclean: + + install: + cd src/qtchooser && $(MAKE) install +- for tool in $(TOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done case `uname -s` in Darwin) \ for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \ ;; esac - $(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1 - install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1 + $(MKDIR) $(INSTALL_ROOT)$(prefix)/man/man1 + install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/man/man1 uninstall: cd src/qtchooser && $(MAKE) uninstall Index: head/misc/qtchooser/files/update-qtchooser-wrapper.in =================================================================== --- head/misc/qtchooser/files/update-qtchooser-wrapper.in (nonexistent) +++ head/misc/qtchooser/files/update-qtchooser-wrapper.in (revision 524129) @@ -0,0 +1,70 @@ +#!/bin/sh + +# $FreeBSD$ + +# If a port installs Qt version-specific binaries (e.g. "designer" which existed as a Qt4 application +# and exists as a Qt5 application and will probably be a Qt6 application) which should have a +# qtchooser-based wrapper, the port should set `QT_BINARIES=yes`. +# +# When QT_BINARIES is set to yes, compatibility symlinks (designer -> qtchooser, so that +# qtchooser can run designer-qt5 or whatever is the selected Qt version) are installed by the port. + +PREFIX=%%PREFIX%% +BINDIR=${PREFIX}/bin +QTCHOOSER=${BINDIR}/qtchooser +VERSIONS=%%QT_SUPPORTED%% + +if [ ! -d ${BINDIR} ] ; then + echo "Binary directory '${BINDIR}' missing." >&2 + exit 1 +fi + +if [ ! -x ${QTCHOOSER} ] ; then + echo "Qtchooser binary '${QTCHOOSER}' missing." >&2 + exit 2 +fi + +remove_links() { + echo "Removing qtchooser links" + for file in $(find -L ${BINDIR} -maxdepth 1 -samefile ${QTCHOOSER}) ; do + if [ ! -L ${file} ] ; then + continue + fi + # If at least one versioned executable is found for this name, keep the + # qtchooser compatibility symlink for this name; otherwise, remove it. + local found=0 + for version in ${VERSIONS} ; do + version_bin_dir=${PREFIX}/lib/qt${version}/bin + target=${version_bin_dir}/$(basename ${file}) + if [ -x ${target} ] ; then + found=1 + break + fi + done + if [ ${found} -eq 0 ] ; then + echo " ${file}" + rm ${file} + fi + done + echo "done" +} + +create_links() { + echo "Creating qtchooser links" + for version in ${VERSIONS} ; do + version_bin_dir=${PREFIX}/lib/qt${version}/bin + if [ -d ${version_bin_dir} ] ; then + for file in $(find ${version_bin_dir} -type f -maxdepth 1) ; do + target=${BINDIR}/$(basename ${file}) + if [ ! -L ${target} -a ! -f ${target} ] ; then + echo " ${target}" + ln -s ${QTCHOOSER} ${target} + fi + done + fi + done + echo "done" +} + +remove_links +create_links Property changes on: head/misc/qtchooser/files/update-qtchooser-wrapper.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/qtchooser/pkg-plist =================================================================== --- head/misc/qtchooser/pkg-plist (revision 524128) +++ head/misc/qtchooser/pkg-plist (revision 524129) @@ -1,51 +1,6 @@ -bin/assistant -bin/designer -bin/lconvert -bin/linguist -bin/lrelease -bin/lupdate -bin/moc -bin/pixeltool -bin/qcollectiongenerator -bin/qdbus -bin/qdbuscpp2xml -bin/qdbusviewer -bin/qdbusxml2cpp -bin/qdoc -bin/qdoc3 -bin/qgltf -bin/qhelpconverter -bin/qhelpgenerator -bin/qlalr -bin/qmake -bin/qml -bin/qml1plugindump -bin/qmlbundle -bin/qmlcachegen -bin/qmleasing -bin/qmlimportscanner -bin/qmljs -bin/qmllint -bin/qmlmin -bin/qmlplugindump -bin/qmlprofiler -bin/qmlscene -bin/qmltestrunner -bin/qmlviewer -bin/qtattributionsscanner bin/qtchooser -bin/qtconfig -bin/qtdiag -bin/qtpaths -bin/qtplugininfo -bin/qvkgen -bin/rcc -bin/repc -bin/uic -bin/uic3 -bin/xmlpatterns -bin/xmlpatternsvalidator +bin/update-qtchooser-wrapper etc/xdg/qtchooser/default.conf etc/xdg/qtchooser/qt4.conf etc/xdg/qtchooser/qt5.conf man/man1/qtchooser.1.gz Index: head/sysutils/qt5-qtdiag/Makefile =================================================================== --- head/sysutils/qt5-qtdiag/Makefile (revision 524128) +++ head/sysutils/qt5-qtdiag/Makefile (revision 524129) @@ -1,25 +1,28 @@ # $FreeBSD$ PORTNAME= qtdiag DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Tool for reporting diagnostic information about Qt and its environment USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools USE_QT= core gui PLIST_FILES= ${QT_BINDIR}/qtdiag # Similarly to x11/qt5-qev, it makes more sense to just run the build system # from the qtdiag 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} + +QT_BINARIES= yes post-patch: ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} .include Index: head/sysutils/qt5-qtpaths/Makefile =================================================================== --- head/sysutils/qt5-qtpaths/Makefile (revision 524128) +++ head/sysutils/qt5-qtpaths/Makefile (revision 524129) @@ -1,25 +1,28 @@ # $FreeBSD$ PORTNAME= qtpaths DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Command line client to QStandardPaths 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} + +QT_BINARIES= yes post-patch: ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} .include Index: head/sysutils/qt5-qtplugininfo/Makefile =================================================================== --- head/sysutils/qt5-qtplugininfo/Makefile (revision 524128) +++ head/sysutils/qt5-qtplugininfo/Makefile (revision 524129) @@ -1,25 +1,28 @@ # $FreeBSD$ PORTNAME= qtplugininfo DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 plugin metadata dumper USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools USE_QT= core PLIST_FILES= ${QT_BINDIR}/qtplugininfo # Similarly to x11/qt5-qev, it makes more sense to just run the build system # from the qtplugininfo 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} + +QT_BINARIES= yes post-patch: ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} .include Index: head/textproc/qt5-xmlpatterns/Makefile =================================================================== --- head/textproc/qt5-xmlpatterns/Makefile (revision 524128) +++ head/textproc/qt5-xmlpatterns/Makefile (revision 524129) @@ -1,15 +1,18 @@ # $FreeBSD$ PORTNAME= xmlpatterns DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns USE_QT= core network buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +QT_BINARIES= yes .include Index: head/www/qt5-webengine/Makefile =================================================================== --- head/www/qt5-webengine/Makefile (revision 524128) +++ head/www/qt5-webengine/Makefile (revision 524129) @@ -1,150 +1,152 @@ # $FreeBSD$ # QtWebEngine itself is a very thin layer of Qt code on top of a large part of # Chromium (everything up to the content/ layer). As such, most of the work in # this port revolves around taming Chromium and getting it to build on FreeBSD. # While it does build at the moment, there are several items that should be # investigated or improved: # - We are using several stub files, especially in Chromium's base/ and net/ # layers. We should look at implementing the missing bits instead. # - We are currently not using any sandboxing mechanism. # - We need to see if more "use_system_" flags can be passed. # - The process of porting QtWebEngine needs to be documented so we can move to # newer releases more easily. # # Also note that, due to the insane amount of patches this port needs, it tends # to lag behind the rest of the official Qt5 ones, which is why we set # QT5_VERSION and DISTINFO_FILE here. PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 library to render web content BUILD_DEPENDS= bison:devel/bison \ ninja:devel/ninja \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjsoncpp.so:devel/jsoncpp \ liblcms2.so:graphics/lcms2 \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo QT5_VERSION= 5.13.2 OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend # Need the alsa plugins to get sound at runtime, otherwise messages # that the pcm_oss plugin can't be opened. ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_VARS= QMAKE_CONFIGURE_ARGS+=-alsa ALSA_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-alsa PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= QMAKE_CONFIGURE_ARGS+=-pulseaudio PULSEAUDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-pulseaudio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= QMAKE_CONFIGURE_ARGS+=-sndio SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks # whether webenginewidgets is available, which fails when qmake processes all # .pro files at once. USES= gl gnome gperf jpeg python:2.7,build pkgconfig \ qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg USE_GL= gl USE_GNOME= glib20 libxml2 libxslt USE_QT= core declarative designer gui location network webchannel \ widgets buildtools_build qmake_build printsupport USE_XORG= x11 xcb xcomposite xcursor xext xi xorgproto \ xrandr xrender xscrnsaver xtst USE_LDCONFIG= ${QT_LIBDIR} QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg # We could just set it to an empty string as well. "all" does not account for # dependencies correctly in the generated Makefiles, use the right target here. ALL_TARGET= first # We need ar(1) from ports because the Chromium code uses the @file syntax. # We then need to ensure ld(1) from ports is used because of the archives ar(1) # generated. USE_BINUTILS= yes CC+= "-B${LOCALBASE}/bin" CXX+= "-B${LOCALBASE}/bin" # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are # read by some Chromium code to determine which compiler to invoke when running # some configuration tests. # Since we use USES=qmake:norecursive, we also need to pass some variables to # MAKE_ENV because part of the configuration process happens during the build. CONFIGURE_ENV+= NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \ NINJA_PATH="${LOCALBASE}/bin/ninja" \ PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH} MAKE_ENV+= CC="${CC}" CXX="${CXX}" \ C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include \ ${CONFIGURE_ENV} + +QT_BINARIES= yes .include .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 PLIST_SUB+= BE="" LE="@comment " .else PLIST_SUB+= BE="@comment " LE="" .endif post-extract: # Install FreeBSD's freebsd.pri file. ${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/core/config/freebsd.pri post-extract-SNDIO-on: @cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd @${CP} ${FILESDIR}/sndio_*put.* \ ${WRKSRC}/src/3rdparty/chromium/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* \ ${WRKSRC}/src/3rdparty/chromium/media/audio/openbsd .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 post-patch: @${REINPLACE_CMD} -e 's/icudtl.dat/icudtb.dat/' \ ${WRKSRC}/src/core/core_module.pro .endif pre-configure: # Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python' # in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x. ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python # Unbundle a few dependencies. ${PYTHON_CMD} ${WRKSRC}/src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py \ --system-libraries libwebp libxml libxslt yasm # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} .include Index: head/x11/qt5-qev/Makefile =================================================================== --- head/x11/qt5-qev/Makefile (revision 524128) +++ head/x11/qt5-qev/Makefile (revision 524129) @@ -1,23 +1,26 @@ # $FreeBSD$ PORTNAME= qev DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt QWidget events introspection tool USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core widgets WRKSRC_SUBDIR= src/${PORTNAME} + +QT_BINARIES= yes # qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools # and set {BUILD,INSTALL}_WRKSRC. # Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to # it for all required variables to be set (MODULE_VERSION etc). post-patch: ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} .include Index: head/x11-toolkits/qt5-declarative/Makefile =================================================================== --- head/x11-toolkits/qt5-declarative/Makefile (revision 524128) +++ head/x11-toolkits/qt5-declarative/Makefile (revision 524129) @@ -1,30 +1,32 @@ # $FreeBSD$ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces USES= compiler:c++11-lang gl python:build qmake:norecursive \ qt-dist:5 USE_GL= gl USE_QT= core gui network sql testlib \ widgets xmlpatterns buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick +QT_BINARIES= yes QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge 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 ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \ ${WRKSRC}/src/3rdparty/masm/masm.pri .include Index: head/x11-toolkits/qt5-gui/Makefile =================================================================== --- head/x11-toolkits/qt5-gui/Makefile (revision 524128) +++ head/x11-toolkits/qt5-gui/Makefile (revision 524129) @@ -1,108 +1,109 @@ # $FreeBSD$ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 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 \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers LIB_DEPENDS= libdbus-1.so:devel/dbus \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libinput.so:x11/libinput \ 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 \ ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers USES= compiler:c++11-lang gl gnome jpeg localbase qmake:no_env \ qt-dist:5,base xorg 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-libudev \ -system-harfbuzz # Explicitly set to c++14 to avoid c++17/c++1z, since libX11's headers # are using the obsolete 'register' keyword. 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_BINARIES= yes 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 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-widgets/Makefile =================================================================== --- head/x11-toolkits/qt5-widgets/Makefile (revision 524128) +++ head/x11-toolkits/qt5-widgets/Makefile (revision 524129) @@ -1,72 +1,74 @@ # $FreeBSD$ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt C++ widgets module USES= compiler:c++11-lang qmake:no_env qt-dist:5,base xorg 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_BINARIES= yes 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_USES= gnome 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