Index: CHANGES =================================================================== --- CHANGES +++ CHANGES @@ -10,6 +10,43 @@ All ports committers are allowed to commit to this file. +20161224: +AUTHOR: tcberner@FreeBSD.org + bsd.qt.mk and qmake.mk have been dropped and replaced by qt.mk. + USE_QT[45] have been renamed to USE_QT + + Before: + USES= qmake + USE_QT4= + or + USE_QT5= + + After: + USES= qt:4 + or + USES= qt:5 + USE_QT= qmake_build + + + Ports that require 'qmake' to build can add 'qmake_build' to the USE_QT + list. Ports with 'qmake_build' that do not want 'qmake' as Makefile + generator can opt out with the qt.mk option 'qmake_dummy'. + As 'qmake' is default a BUILD_DEPENDS only, instead of adding 'qmake_dummy' + the port can also simply use 'USE_QT=qmake' instead of 'USE_QT=qmake_build'. + + The arguments previously to qmake.mk can be passed to qt.mk: + + Before: + USES= qmake:norecursive + or + USES= qmake:outsource + + After: + USES= qt:5,qmake_norecursive + or + USES= qt:5,qmake_outsource + + 20161218: AUTHOR: tcberner@FreeBSD.org Index: Mk/Uses/qmake.mk =================================================================== --- Mk/Uses/qmake.mk +++ Mk/Uses/qmake.mk @@ -1,114 +0,0 @@ -# $FreeBSD$ -# -# Provide support for qmake-based projects -# -# Feature: qmake -# Usage: USES=qmake or USES=qmake:ARGS -# Must be used along with 'USE_QT*=#' -# Valid ARGS: norecursive outsource -# ARGS description: -# norecursive Don't pass -recursive argument to qmake binary -# outsource Perform an out-of-source build -# -# -# Variables for ports: -# QMAKE_ENV - Environment passed to qmake. -# Default: ${CONFIGURE_ENV} -# QMAKE_ARGS - Arguments passed to qmake. -# Default: see below -# QMAKE_SOURCE_PATH - Path to qmake project files. -# Default: ${WRKSRC} if out-of-source build is -# requested, empty otherwise. -# -# User defined variables: -# QMAKE_VERBOSE - Enable verbose configure output. -# -# MAINTAINER: kde@FreeBSD.org - -.if !defined(_INCLUDE_USES_QMAKE_MK) -_INCLUDE_USES_QMAKE_MK= yes - -# _QT_VERSION is defined in bsd.qt.mk, only if a correct Qt version was selected -# via USE_QT*. -.if empty(_QT_VERSION) -IGNORE= 'USES+= qmake' must be accompanied with 'USE_QT[${_QT_SUPPORTED:S/ //g}]= #' -.endif - -# _env is a private argument used only by bsd.qt.mk to get variables and custom -# targets (currently, only qmake-configure), without qmake being added to the -# configure stage. -_VALID_ARGS= norecursive outsource _env - -.for arg in ${qmake_ARGS} -. if empty(_VALID_ARGS:M${arg}) -IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized -. endif -.endfor - -.if ! ${qmake_ARGS:M_env} -USE_QT${_QT_VERSION:R:R}+= qmake_build -.endif - -# QMAKESPEC belongs to bsd.qt.mk. -QMAKE_ENV?= ${CONFIGURE_ENV} -QMAKE_ARGS+= -spec ${QMAKESPEC} \ - QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ - QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \ - QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LFLAGS="${LDFLAGS}" \ - QMAKE_LIBS="${LIBS}" \ - QMAKE_CFLAGS_DEBUG="" \ - QMAKE_CFLAGS_RELEASE="" \ - QMAKE_CXXFLAGS_DEBUG="" \ - QMAKE_CXXFLAGS_RELEASE="" \ - PREFIX="${PREFIX}" - -.if defined(WITH_DEBUG) -QMAKE_ARGS+= CONFIG+="debug" \ - CONFIG-="release" -.else -QMAKE_ARGS+= CONFIG+="release" \ - CONFIG-="debug separate_debug_info" -.endif # defined(WITH_DEBUG) - -# We set -recursive by default to keep qmake from running in the build stage. -.if ! ${qmake_ARGS:Mnorecursive} -QMAKE_ARGS+= -recursive -.endif - -.if defined(QMAKE_VERBOSE) -QMAKE_ARGS+= -d -.endif - -# _QMAKE_WRKSRC (and _QMAKE, below) are needed to abstract the qmake target and -# use it for both qtbase and USES=qmake ports. They are private, not supposed to -# be used anywhere else. -_QMAKE_WRKSRC?= ${CONFIGURE_WRKSRC} -.if ${qmake_ARGS:Moutsource} -CONFIGURE_WRKSRC= ${WRKDIR}/.build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${BUILD_WRKSRC} -TEST_WRKSRC= ${BUILD_WRKSRC} -QMAKE_SOURCE_PATH?= ${WRKSRC} -.else -QMAKE_SOURCE_PATH?= # empty -.endif - -.if ! ${qmake_ARGS:M_env} -DESTDIRNAME= INSTALL_ROOT -.endif - -# Define a custom target to make it usable by bsd.qt.mk for internal Qt -# configuration. -qmake-configure: - @${MKDIR} ${_QMAKE_WRKSRC} - @cd ${_QMAKE_WRKSRC} && \ - ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} - -.if !target(do-configure) && ! ${qmake_ARGS:M_env} -_USES_configure+= 450:qmake-configure -.endif - -.endif # !defined(_INCLUDE_USES_QMAKE_MK) Index: Mk/Uses/qt.mk =================================================================== --- Mk/Uses/qt.mk +++ Mk/Uses/qt.mk @@ -0,0 +1,859 @@ +#-*- tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# +# Provides support for Qt based, and qmake using ports. +# +# Feature: qt +# Valid ARGS: 4 5 qmake_dummy qmake_norecursive qmake_outsource +# +# Required exactly one of: +# 4: Depend on Qt4 components and variables. +# 5: Depend on Qt5 components and variables. +# Optional (when using qmake): +# qmake_dummy: Build depend on qmake, but do not use it as configure program +# qmake_norecursive: Don't pass -recursive argument to qmake binary +# qmake_outsource: Perform an out-of-source build +# +# Variables that can be set by a port: +# +# USE_QT - List of Qt modules to depend on, with optional '_build' +# and '_run' suffixes. Define it empty to include this file +# without depending on Qt ports. +# +# *** A Special note has to be given to the component 'qmake': +# Adding qmake_build to the list makes qmake the +# build processor (replaces Mk/Uses/qmake.mk). +# If this is not desired, it is possible to over- +# ride this by passing 'qmake_dummy' to qt.mk +# +# +# QT_DIST - The port belongs to the Qt distribution. Set to 'yes' for +# Qt 4, or to the distribution name(s) for newer versions. +# QT_NONSTANDARD - Suppress modification of configure and make environment. +# +# Global switches (for inclusion into /etc/make.conf): +# QT4_OPTIONS - A list of (Qt 4-only) global options; can be CUPS, NAS +# and/or QGTKSTYLE. If set, Qt will be built with support +# for: +# * Common UNIX Printing System (CUPS); +# * Network Audio System (NAS); +# * GTK+-based Qt theme (QGTKSTYLE). + +.if ! defined(_INCLUDE_USES_QT_MK) +_INCLUDE_USES_QT_MK= qt.mk +_USES_POST+= qt + +#===== Qt versions currently supported by the framework ======================== +QT4_VERSION= 4.8.7 +QT5_VERSION= 5.6.2 +#=============================================================================== + +#===== Parse qt.mk arguments =================================================== +_QT_SUPPORTED= 4 5 +_QT_VERSION= # empty +. for ver in ${_QT_SUPPORTED} +. if ${qt_ARGS:M${ver}} +. if empty(_QT_VERSION) +_QT_VERSION= ${QT${ver}_VERSION} +. else +IGNORE?= can't be installed: different Qt versions specified via qt:[${_QT_SUPPORTED:S/ //g}] #' +. endif +. endif +. endfor +# Make sure qt.mk was called with a version argument. +. if empty(_QT_VERSION) +IGNORE?= can't be installed: a Qt version has to be specified via qt:[${_QT_SUPPORTED:S/ //g}] #' +. endif + +. if !empty(qt_ARGS:Mqmake_dummy) +_QMAKE_DUMMY_MODE= yes +. endif +. if !empty(qt_ARGS:M*qmake_norecursive) +_QMAKE_NORECURSIVE= yes +. endif +. if !empty(qt_ARGS:Mqmake_outsource) +_QMAKE_OUTSOURCE= yes +. endif +#=============================================================================== + +#===== Set variables for internal use ========================================== +_QT_RELNAME= qt${_QT_VERSION:R:R} +_QT_SHVER= ${_QT_VERSION:R:R} +#=============================================================================== + +#====== qmake setup ============================================================ +QMAKE_ENV?= ${CONFIGURE_ENV} +QMAKE_ARGS+= -spec ${QMAKESPEC} \ + QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ + QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \ + QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LIBS="${LIBS}" \ + QMAKE_CFLAGS_DEBUG="" \ + QMAKE_CFLAGS_RELEASE="" \ + QMAKE_CXXFLAGS_DEBUG="" \ + QMAKE_CXXFLAGS_RELEASE="" \ + PREFIX="${PREFIX}" + +. if defined(WITH_DEBUG) +QMAKE_ARGS+= CONFIG+="debug" \ + CONFIG-="release" +. else +QMAKE_ARGS+= CONFIG+="release" \ + CONFIG-="debug separate_debug_info" +. endif # defined(WITH_DEBUG) + +# We set -recursive by default to keep qmake from running in the build stage. +. if empty(_QMAKE_NORECURSIVE) +QMAKE_ARGS+= -recursive +. endif + +. if defined(QMAKE_VERBOSE) +QMAKE_ARGS+= -d +. endif + +# _QMAKE_WRKSRC (and _QMAKE, below) are needed to abstract the qmake target and +# use it for both qtbase and USES=qmake ports. They are private, not supposed to +# be used anywhere else. +_QMAKE_WRKSRC?= ${CONFIGURE_WRKSRC} +. if defined(_QMAKE_OUTSOURCE) +CONFIGURE_WRKSRC?= ${WRKDIR}/.build +BUILD_WRKSRC?= ${CONFIGURE_WRKSRC} +INSTALL_WRKSRC?= ${BUILD_WRKSRC} +TEST_WRKSRC?= ${BUILD_WRKSRC} +QMAKE_SOURCE_PATH?= ${WRKSRC} +. else +QMAKE_SOURCE_PATH?= # empty +. endif + +# Stage support. +# For QT4 && Qt5 distribution ports: +. if defined(QT_DIST) +DESTDIRNAME= INSTALL_ROOT +. endif + +# For other Qmake using ports +. if (empty(_QMAKE_DUMMY_MODE) && !empty(USE_QT:Mqmake_build) && empty(QT_NONSTANDARD)) +# TODO: this cmake condition is hacky -- and the above condition seems somewhat too complicated. +# Also also waf,scons&co? -- seems somewhat flakey +. if empty(USES:Mcmake*) && ( empty(HAS_CONFIGURE) && empty(GNU_CONFIGURE) ) +DESTDIRNAME= INSTALL_ROOT +. endif +. endif +#=============================================================================== + +#===== Do setup for ports that are part of the Qt-distribution ================= +. if !empty(QT_DIST) +QT_NONSTANDARD= yes +USE_LDCONFIG+= ${QT_LIBDIR} + +MASTER_SITES= ${MASTER_SITE_QT} +DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo + +LICENSE?= LGPL21 + +. if !exists(${PKGDIR}/pkg-descr) +DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr +. endif + +. if ${_QT_VERSION:M4*} +MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/ +DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION} +DIST_SUBDIR= KDE +. else # ${_QT_VERSION:M4*} +MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ +DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},} +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} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} +QT_DIST= 3d base canvas3d connectivity declarative \ + graphicaleffects imageformats location \ + multimedia quickcontrols quickcontrols2 script \ + sensors serialbus serialport svg tools \ + translations webchannel webkit websockets \ + x11extras xmlpatterns +. endif +. endif + +. if !empty(QT_DIST:Mbase) +# Qt configure requires pkg-config to detect dependencies. +. if empty(USES:M*pkgconfig*) +pkgconfig_ARGS= build +.include "${USESDIR}/pkgconfig.mk" +. endif + +# Set QMAKESPEC when building qtbase so that qmake (called by the configure +# script) can find the mkspecs we create ourselves in devel/qmake5. +CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" +MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" +. endif + +# -nomake is only used by qtbase's configure script. +# Other ports from other Qt modules will automatically build examples and +# tests if the directories exist because of mkspecs/features/qt_parts.prf. +EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ + ${DISTNAME:S,$,/tests,:S,^,--exclude ,} +. endif # ! ${_QT_VERSION:M4*} + +# Qt ports are built using qmake at the moment, so append it to USE_QT +. if empty(_QMAKE_DUMMY_MODE) && empty(PORTNAME:M*qmake) && empty(_QT_VERSION:M4*) +. if empty(USE_QT:M*qmake_build*) +USE_QT:= ${USE_QT} qmake_build +. endif +. endif + +CONFIGURE_ENV+= MAKE="${MAKE:T}" + +CONFIGURE_ARGS+= -opensource -confirm-license \ + -platform ${QMAKESPEC} \ + -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_VERSION:M4*} +CONFIGURE_ARGS+= -fast \ + -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 \ + -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 +. endif + +. 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" +PLIST_SUB+= DEBUG="" +. else +CONFIGURE_ARGS+= -release -no-separate-debug-info +QMAKE_ARGS+= QT_CONFIG+="release" \ + QT_CONFIG-="debug separate_debug_info" +PLIST_SUB+= DEBUG="@comment " +. endif + +. if defined(WANT_QT_VERBOSE_CONFIGURE) +CONFIGURE_ARGS+= -verbose +. endif + +. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} +. if ${_QT_VERSION:M4*} +_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h +# . else +# _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf +. endif +EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ + ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} +. endif + +# 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 +. 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 + +PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ + FULLVER=${_QT_VERSION:C/-.*//} +. endif # !empty(QT_DIST) + +. if ${_QT_VERSION:M4*} +QT_BINDIR_REL?= bin +QT_LIBDIR_REL?= lib/${_QT_RELNAME} +QT_PLUGINDIR_REL?= ${QT_LIBDIR_REL}/plugins +QT_IMPORTDIR_REL?= ${QT_LIBDIR_REL}/imports +. endif + +QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin +QT_INCDIR_REL?= include/${_QT_RELNAME} +QT_LIBDIR_REL?= lib +QT_ARCHDIR_REL?= ${QT_LIBDIR_REL}/${_QT_RELNAME} +QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins +QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME} +QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports +QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml +QT_DATADIR_REL?= share/${_QT_RELNAME} +QT_DOCDIR_REL?= share/doc/${_QT_RELNAME} +QT_L10NDIR_REL?= ${QT_DATADIR_REL}/translations +QT_ETCDIR_REL?= etc/xdg +QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} +QT_TESTDIR_REL?= ${QT_DATADIR_REL}/tests + +# Not customizable. +. if ${_QT_VERSION:M4*} +QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs + +_QT_LIBVER= # empty +_QT_BINSUFX= -${_QT_RELNAME} +. else +QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs + +_QT_LIBVER= ${_QT_VERSION:R:R} +_QT_BINSUFX= # empty +. endif + +LRELEASE?= ${QT_BINDIR}/lrelease${_QT_BINSUFX} +LUPDATE?= ${QT_BINDIR}/lupdate${_QT_BINSUFX} +MOC?= ${QT_BINDIR}/moc${_QT_BINSUFX} +RCC?= ${QT_BINDIR}/rcc +UIC?= ${QT_BINDIR}/uic${_QT_BINSUFX} +QMAKE?= ${QT_BINDIR}/qmake${_QT_BINSUFX} +# Needed to redefine the qmake target for internal Qt configuration. +_QMAKE?= ${QMAKE} +QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER} + +# The whole Qt distribution should be built with the same compiler, but it's +# better to support custom settings. Dereferencing the detection allows to +# avoid forking a shell on each inclusion of this file, and to catch any CXX +# customization (via USE_GCC, etc.). +QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac) + +. for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT QML DATA DOC L10N ETC \ + EXAMPLE TEST MKSPEC CMAKE QTCHOOSER +QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} +PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" +. endfor + +# Pass the chosen qt version to the environment for qtchooser +CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} +MAKE_ENV+= QT_SELECT=${_QT_RELNAME} + +.endif # defined(_INCLUDE_USES_QT_MK) + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_QT_POST_MK) +_INCLUDE_USES_QT_POST_MK= qt.mk + +. if !defined(QT_NONSTANDARD) +CONFIGURE_ENV+= QTDIR="${QT_LIBDIR}" QMAKE="${QMAKE}" \ + MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \ + QMAKESPEC="${QMAKESPEC}" +CONFIGURE_ARGS+= --with-qt-includes=${QT_INCDIR} \ + --with-qt-libraries=${QT_LIBDIR} \ + --with-extra-includes=${LOCALBASE}/include \ + --with-extra-libs=${LOCALBASE}/lib +. endif # !defined(QT_NONSTANDARD) + +_USE_QT_ALL= assistant dbus declarative designer doc gui \ + help imageformats l10n linguist linguisttools \ + multimedia network opengl pixeltool \ + qdbusviewer qmake script scripttools sql \ + sql-ibase sql-mysql sql-odbc sql-pgsql \ + sql-sqlite2 sql-sqlite3 svg testlib webkit \ + xml xmlpatterns + +_USE_QT4_ONLY= accessible assistant-adp assistantclient \ + clucene codecs-cn codecs-jp codecs-kr \ + codecs-tw corelib demo graphicssystems-opengl \ + help-tools iconengines inputmethods makeqpf \ + moc phonon phonon-gst porting qdoc3 qmlviewer \ + qt3support qtconfig qtestlib qvfb rcc uic uic3 \ + xmlpatterns-tool + +_USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity \ + core examples graphicaleffects location \ + paths phonon4 printsupport qdbus qdoc \ + qdoc-data qev qml quick quickcontrols \ + quickcontrols2 sensors serialbus serialport \ + sql-tds uiplugin uitools webchannel \ + websockets widgets x11extras + +#Components: +# comp_PORT port directory +# comp_LIB library used to check existance (added as LIB_DEPENDS) +# alternatively: +# comp_PATH file used to check existence, should be the "defining" +# library/binary of the port (BUILD_/RUN_DEPENDS) + +3d_PORT= graphics/${_QT_RELNAME}-3d +3d_LIB= libQt${_QT_LIBVER}3DCore.so + +accessible_PORT= accessibility/${_QT_RELNAME}-accessible +accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so + +assistant_PORT= devel/${_QT_RELNAME}-assistant +assistant_PATH= ${QT_BINDIR}/assistant${_QT_BINSUFX} + +assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp +assistant-adp_PATH= ${QT_BINDIR}/assistant_adp + +assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient +assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so + +buildtools_PORT= devel/${_QT_RELNAME}-buildtools +buildtools_PATH= ${MOC} + +canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d +canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir + +clucene_PORT= textproc/clucene-${_QT_RELNAME} +clucene_LIB= libQt${_QT_LIBVER}CLucene.so + +codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn +codecs-cn_PATH= ${QT_PLUGINDIR}/codecs/libqcncodecs.so + +codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp +codecs-jp_PATH= ${QT_PLUGINDIR}/codecs/libqjpcodecs.so + +codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr +codecs-kr_PATH= ${QT_PLUGINDIR}/codecs/libqkrcodecs.so + +codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw +codecs-tw_PATH= ${QT_PLUGINDIR}/codecs/libqtwcodecs.so + +concurrent_PORT= devel/${_QT_RELNAME}-concurrent +concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so + +connectivity_PORT= comms/${_QT_RELNAME}-connectivity +connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so + +core_PORT= devel/${_QT_RELNAME}-core +core_LIB= libQt${_QT_LIBVER}Core.so + +corelib_PORT= devel/${_QT_RELNAME}-corelib +corelib_LIB= ${core_LIB} + +dbus_PORT= devel/dbus-${_QT_RELNAME} +dbus_LIB= libQt${_QT_LIBVER}DBus.so + +declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative +declarative_LIB= libQt${_QT_LIBVER}Declarative.so + +demo_PORT= misc/${_QT_RELNAME}-qtdemo +demo_PATH= ${QT_BINDIR}/qtdemo + +designer_PORT= devel/${_QT_RELNAME}-designer +designer_PATH= ${QT_BINDIR}/designer${_QT_BINSUFX} + +doc_PORT= misc/${_QT_RELNAME}-doc +doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R} + +examples_PORT= misc/${_QT_RELNAME}-examples +examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R} + +graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects +graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir + +graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl +graphicssystems-opengl_PATH= ${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so + +gui_PORT= x11-toolkits/${_QT_RELNAME}-gui +gui_LIB= libQt${_QT_LIBVER}Gui.so + +help_PORT= devel/${_QT_RELNAME}-help +help_LIB= libQt${_QT_LIBVER}Help.so + +help-tools_PORT= devel/${_QT_RELNAME}-help-tools +help-tools_PATH= ${QT_BINDIR}/qhelpgenerator + +iconengines_PORT= graphics/${_QT_RELNAME}-iconengines +iconengines_PATH= ${QT_PLUGINDIR}/iconengines/libqsvgicon.so + +imageformats_PORT= graphics/${_QT_RELNAME}-imageformats +imageformats_PATH= ${QT_PLUGINDIR}/imageformats/libqtiff.so + +inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods +inputmethods_PATH= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so + +linguist_PORT= devel/${_QT_RELNAME}-linguist +linguist_PATH= ${QT_BINDIR}/linguist${_QT_BINSUFX} + +linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools +linguisttools_PATH= ${LRELEASE} + +location_PORT= devel/${_QT_RELNAME}-location +location_LIB= libQt${_QT_LIBVER}Location.so + +l10n_PORT= misc/${_QT_RELNAME}-l10n +l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R} + +makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf +makeqpf_PATH= ${QT_BINDIR}/makeqpf${_QT_BINSUFX} + +moc_PORT= devel/${_QT_RELNAME}-moc +moc_PATH= ${MOC} + +multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia +multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so + +network_PORT= net/${_QT_RELNAME}-network +network_LIB= libQt${_QT_LIBVER}Network.so + +opengl_PORT= graphics/${_QT_RELNAME}-opengl +opengl_LIB= libQt${_QT_LIBVER}OpenGL.so + +paths_PORT= sysutils/${_QT_RELNAME}-qtpaths +paths_PATH= ${QT_BINDIR}/qtpaths + +pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool +pixeltool_PATH= ${QT_BINDIR}/pixeltool + +phonon_PORT= multimedia/phonon +phonon_LIB= libphonon.so + +phonon4_PORT= multimedia/${_QT_RELNAME}-phonon4 +phonon4_LIB= libphonon4${_QT_RELNAME}.so + +phonon-gst_PORT= multimedia/phonon-gstreamer +phonon-gst_PATH= ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so + +porting_PORT= devel/${_QT_RELNAME}-porting +porting_PATH= ${QT_BINDIR}/qt3to4 + +printsupport_PORT= print/${_QT_RELNAME}-printsupport +printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so + +qdbus_PORT= devel/${_QT_RELNAME}-qdbus +qdbus_PATH= ${QT_BINDIR}/qdbus + +qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer +qdbusviewer_PATH= ${QT_BINDIR}/qdbusviewer + +qdoc_PORT= devel/${_QT_RELNAME}-qdoc +qdoc_PATH= ${QT_BINDIR}/qdoc + +qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3 +qdoc3_PATH= ${QT_BINDIR}/qdoc3 + +qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data +qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf + +qev_PORT= x11/${_QT_RELNAME}-qev +qev_PATH= ${QT_BINDIR}/qev + +qmake_PORT= devel/qmake${_QT_VERSION:R:R} +qmake_PATH= ${QMAKE} +qmake_TYPE= build + +qml_PORT= lang/${_QT_RELNAME}-qml +qml_LIB= libQt${_QT_LIBVER}Qml.so + +qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer +qmlviewer_PATH= ${QT_BINDIR}/qmlviewer + +qt3support_PORT= devel/${_QT_RELNAME}-qt3support +qt3support_LIB= libQt${_QT_LIBVER}3Support.so + +qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig +qtconfig_PATH= ${QT_BINDIR}/qtconfig${_QT_BINSUFX} + +qtestlib_PORT= ${testlib_PORT} +qtestlib_LIB= ${testlib_LIB} + +quick_PORT= x11-toolkits/${_QT_RELNAME}-quick +quick_LIB= libQt${_QT_LIBVER}Quick.so + +quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols +quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir + +quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2 +quickcontrols2_LIB= libQt${_QT_LIBVER}LabsTemplates.so + +qvfb_PORT= devel/${_QT_RELNAME}-qvfb +qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX} + +rcc_PORT= devel/${_QT_RELNAME}-rcc +rcc_PATH= ${RCC} + +sensors_PORT= comms/${_QT_RELNAME}-sensors +sensors_LIB= libQt${_QT_LIBVER}Sensors.so + +script_PORT= devel/${_QT_RELNAME}-script +script_LIB= libQt${_QT_LIBVER}Script.so + +scripttools_PORT= devel/${_QT_RELNAME}-scripttools +scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so + +serialbus_PORT= comms/${_QT_RELNAME}-serialbus +serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so + +serialport_PORT= comms/${_QT_RELNAME}-serialport +serialport_LIB= libQt${_QT_LIBVER}SerialPort.so + +sql_PORT= databases/${_QT_RELNAME}-sql +sql_LIB= libQt${_QT_LIBVER}Sql.so + +sql-pgsql_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so + +. if ${_QT_VERSION:M4*} +sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin +. endif + +sql-sqlite3_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlite.so + +. for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds +. if ${_QT_VERSION:M4*} +sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin +. else +sql-${db}_PORT?= databases/${_QT_RELNAME}-sqldrivers-${db} +. endif +sql-${db}_PATH?= ${QT_PLUGINDIR}/sqldrivers/libqsql${db:C/^sql//}.so +. endfor + +svg_PORT= graphics/${_QT_RELNAME}-svg +svg_LIB= libQt${_QT_LIBVER}Svg.so + +testlib_PORT= devel/${_QT_RELNAME}-testlib +testlib_LIB= libQt${_QT_LIBVER}Test.so + +uic_PORT= devel/${_QT_RELNAME}-uic +uic_PATH= ${UIC} + +uic3_PORT= devel/${_QT_RELNAME}-uic3 +uic3_PATH= ${QT_BINDIR}/uic3 + +uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin +uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/QtUiPlugin + +uitools_PORT= devel/${_QT_RELNAME}-uitools +uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a + +webchannel_PORT= www/${_QT_RELNAME}-webchannel +webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so + +websockets_PORT= www/${_QT_RELNAME}-websockets +websockets_LIB= libQt${_QT_LIBVER}WebSockets.so + +webkit_PORT= www/webkit-${_QT_RELNAME} +webkit_LIB= libQt${_QT_LIBVER}WebKit.so + +widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets +widgets_LIB= libQt${_QT_LIBVER}Widgets.so + +x11extras_PORT= x11/${_QT_RELNAME}-x11extras +x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so + +xml_PORT= textproc/${_QT_RELNAME}-xml +xml_LIB= libQt${_QT_LIBVER}Xml.so + +xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns +xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so + +xmlpatterns-tool_PORT= textproc/${_QT_RELNAME}-xmlpatterns-tool +xmlpatterns-tool_PATH= ${QT_BINDIR}/xmlpatterns +#=============================================================================== + +# #===== Component type lists ==================================================== +_USE_QT_ALL+= ${_USE_QT${_QT_VERSION:R:R}_ONLY} +# Iterate through components deprived of suffix. +. for component in ${USE_QT:O:u:C/_.+//} + # Check that the component is valid. +. if ${_USE_QT_ALL:M${component}} != "" + # Skip meta-components (currently none). +. if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB)) + # Check if a dependency type is explicitly requested. +. if ${USE_QT:M${component}_*} != "" && ${USE_QT:M${component}} == "" +${component}_TYPE= # empty +. if ${USE_QT:M${component}_build} != "" +${component}_TYPE+= build +. endif +. if ${USE_QT:M${component}_run} != "" +${component}_TYPE+= run +. endif +. endif # ${USE_QT:M${component}_*} != "" && ${USE_QT:M${component}} == "" + # If no dependency type is set, default to full dependency. +. if !defined(${component}_TYPE) +${component}_TYPE= build run +. endif + # Set real dependencies. +. if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} +LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT} +. else +${component}_PATH?= ${QT_LIBDIR}/${${component}_LIB} +${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} +. if ${${component}_TYPE:Mbuild} != "" +BUILD_DEPENDS+= ${${component}_DEPENDS} +. endif +. if ${${component}_TYPE:Mrun} != "" +RUN_DEPENDS+= ${${component}_DEPENDS} +. endif +. endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} +. endif # defined(${component}_PORT) && defined(${component}_PATH) +. else # ! ${_USE_QT_ALL:M${component}} != "" +IGNORE= cannot be installed: unknown USE_QT component '${component}' +. endif # ${_USE_QT_ALL:M${component}} != "" +. endfor +#=============================================================================== + +#===== Link tools into the buildtree =========================================== +. if !empty(QT_DIST) && ! ${_QT_VERSION:M4*} +. if !empty(QT_DIST:Mbase) +# 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 + +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 +_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake + +# 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 +. endif # !empty(QT_DIST:Mbase) +#=============================================================================== + + +. if empty(_QMAKE_DUMMY_MODE) && empty(PORTNAME:Mqmake) +post-configure: qmake-configure +. 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 +# 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 + +pre-install: qt-pre-install +qt-pre-install: +# Search both in CONFIGURE_WRKSRC and WRKSRC, as the former is not +# a subdirectory of the latter for out-of-source builds. + @${FIND} ${WRKSRC} ${CONFIGURE_WRKSRC} -name "Makefile*" -type f | \ + ${XARGS} ${REINPLACE_CMD} -e 's,${PREFIX}/${QT_LIBDIR_REL}/pkgconfig,${PREFIX}/libdata/pkgconfig,g' + +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' \ + ${.CURDIR:H:H}/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 # defined(QT_DIST) && ! ${_QT_VERSION:M4*} + +qmake-configure: + @${MKDIR} ${_QMAKE_WRKSRC} + @cd ${_QMAKE_WRKSRC} && \ + ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} + +# If a port has USES_QT=qmake_build, and wants qmake to configure it, then add +# the qmake-configure target. +. if !target(do-configure) && empty(_QMAKE_DUMMY_MODE) && !empty(USE_QT:Mqmake_build) +# TODO: this seems rather ugly... +. if ( empty(QT_DIST) || !empty(_QT_VERSION:M4*) ) && ( empty(HAS_CONFIGURE) && empty(GNU_CONFIGURE) ) +_USES_configure+= 450:qmake-configure +. endif +. endif + +.endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_QT_POST_MK) Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -399,16 +399,6 @@ # components. See bsd.wx.mk for more details. ## # -# USE_QT4 - A list of the Qt 4 dependencies the port has (e.g, -# corelib, webkit). Implies that the port needs Qt. -# Implies the inclusion of bsd.qt.mk. See bsd.qt.mk -# for more details. -# -# USE_QT5 - A list of the Qt 5 dependencies the port has (e.g, -# core, webkit). Implies that the port needs Qt. -# Implies the inclusion of bsd.qt.mk. See bsd.qt.mk -# for more details. -## # USE_LINUX_PREFIX # - Controls the action of PREFIX (see above). Only use this # if the port is a Linux infrastructure port (e.g. contains libs @@ -1345,10 +1335,6 @@ .include "${PORTSDIR}/Mk/bsd.apache.mk" .endif -.if defined(USE_QT4) || defined(USE_QT5) -.include "${PORTSDIR}/Mk/bsd.qt.mk" -.endif - .if defined(USE_TEX) .include "${PORTSDIR}/Mk/bsd.tex.mk" .endif @@ -1831,10 +1817,6 @@ .include "${PORTSDIR}/Mk/bsd.ocaml.mk" .endif -.if defined(USE_QT4) || defined(USE_QT5) -.include "${PORTSDIR}/Mk/bsd.qt.mk" -.endif - .if defined(USE_SDL) .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif Index: Mk/bsd.qt.mk =================================================================== --- Mk/bsd.qt.mk +++ Mk/bsd.qt.mk @@ -1,731 +0,0 @@ -#-*- tab-width: 4; -*- -# ex:ts=4 -# -# $FreeBSD$ -# -# Port variables: -# USE_QT* - List of Qt modules to depend on, with optional '_build' -# and '_run' suffixes. Define it empty to include this file -# without depending on Qt ports. -# QT_DIST - The port belongs to the Qt distribution. Set to 'yes' for -# Qt 4, or to the distribution name(s) for newer versions. -# QT_NONSTANDARD - Suppress modification of configure and make environment. -# -# Global switches (for inclusion into /etc/make.conf): -# QT4_OPTIONS - A list of (Qt 4-only) global options; can be CUPS, NAS -# and/or QGTKSTYLE. If set, Qt will be built with support -# for: -# * Common UNIX Printing System (CUPS); -# * Network Audio System (NAS); -# * GTK+-based Qt theme (QGTKSTYLE). - -.if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) - -Qt_Include_MAINTAINER= kde@FreeBSD.org -Qt_Pre_Include= bsd.qt.mk - -# Qt versions currently supported by the framework. -_QT_SUPPORTED?= 4 5 -QT4_VERSION?= 4.8.7 -QT5_VERSION?= 5.6.2 - -_QT_RELNAME= qt${_QT_VERSION:R:R} -_QT_VERSION= # empty -.for ver in ${_QT_SUPPORTED} -. if defined(USE_QT${ver}) -. if empty(_QT_VERSION) -_QT_VERSION= ${QT${ver}_VERSION} -. else -# Reject different USE_QT*. -IGNORE?= can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #' -. endif -. endif -.endfor - -.if empty(_QT_VERSION) -# The file was included without USE_QT*. -IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #' -.endif - -.if defined(QT_DIST) -QT_NONSTANDARD= yes - -MASTER_SITES= ${MASTER_SITE_QT} -# Useless, as it must be defined before including bsd.port.pre.mk (at least -# because of bsd.options.mk). -#PKGNAMEPREFIX?= ${_QT_RELNAME}- -DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo - -LICENSE?= LGPL21 - -. if !exists(${PKGDIR}/pkg-descr) -DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr -. endif - -# Stage support. -DESTDIRNAME= INSTALL_ROOT - -. if ${_QT_VERSION:M4*} -MASTER_SITE_SUBDIR?= official_releases/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/ -DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},} -DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} -DIST_SUBDIR= KDE/Qt/${_QT_VERSION} - -USES+= tar:xz - -# 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} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} -QT_DIST= 3d base canvas3d connectivity declarative graphicaleffects imageformats \ - location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \ - translations webchannel websockets x11extras xmlpatterns -. endif -. endif - -. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake" -# Qt configure requires pkg-config to detect dependencies. -USES+= pkgconfig - -# Set QMAKESPEC when building qtbase so that qmake (called by the configure -# script) can find the mkspecs we create ourselves in devel/qmake5. -CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" -MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" -. endif - -# -nomake is only used by qtbase's configure script. -# Other ports from other Qt modules will automatically build examples and -# tests if the directories exist because of mkspecs/features/qt_parts.prf. -EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ - ${DISTNAME:S,$,/tests,:S,^,--exclude ,} -. endif # ! ${_QT_VERSION:M4*} - -CONFIGURE_ENV+= MAKE="${MAKE:T}" - -CONFIGURE_ARGS+=-opensource -confirm-license \ - -platform ${QMAKESPEC} \ - -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_VERSION:M4*} -CONFIGURE_ARGS+=-fast \ - -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 \ - -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 -. endif - -. 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" -PLIST_SUB+= DEBUG="" -. else -CONFIGURE_ARGS+=-release -no-separate-debug-info -QMAKE_ARGS+= QT_CONFIG+="release" \ - QT_CONFIG-="debug separate_debug_info" -PLIST_SUB+= DEBUG="@comment " -. endif - -. if defined(WANT_QT_VERBOSE_CONFIGURE) -CONFIGURE_ARGS+=-verbose -. endif - -. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} -. if ${_QT_VERSION:M4*} -_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h -. else -_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h -. endif -EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ - ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} -. endif - -# 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 -. 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 - -PLIST_SUB+= SHORTVER=${DISTVERSION:R} \ - FULLVER=${DISTVERSION:C/-.*//} -.endif # defined(QT_DIST) - -.if ${_QT_VERSION:M4*} -QT_BINDIR_REL?= bin -QT_LIBDIR_REL?= lib/${_QT_RELNAME} -QT_PLUGINDIR_REL?= ${QT_LIBDIR_REL}/plugins -QT_IMPORTDIR_REL?= ${QT_LIBDIR_REL}/imports -.endif - -# A wrapper (qtchooser) is used to invoke binaries. -QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin -QT_INCDIR_REL?= include/${_QT_RELNAME} -QT_LIBDIR_REL?= lib -QT_ARCHDIR_REL?=${QT_LIBDIR_REL}/${_QT_RELNAME} -QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins -QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME} -QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports -QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml -QT_DATADIR_REL?=share/${_QT_RELNAME} -QT_DOCDIR_REL?= share/doc/${_QT_RELNAME} -QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations -QT_ETCDIR_REL?= etc/xdg -QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} -QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests - -# Not customizable. -.if ${_QT_VERSION:M4*} -QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs - -_QT_LIBVER= # empty -_QT_BINSUFX= -${_QT_RELNAME} -.else -QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs - -_QT_LIBVER= ${_QT_VERSION:R:R} -_QT_BINSUFX= # empty -.endif - -LRELEASE?= ${QT_BINDIR}/lrelease${_QT_BINSUFX} -LUPDATE?= ${QT_BINDIR}/lupdate${_QT_BINSUFX} -MOC?= ${QT_BINDIR}/moc${_QT_BINSUFX} -RCC?= ${QT_BINDIR}/rcc -UIC?= ${QT_BINDIR}/uic${_QT_BINSUFX} -QMAKE?= ${QT_BINDIR}/qmake${_QT_BINSUFX} -# Needed to redefine the qmake target for internal Qt configuration. -_QMAKE?= ${QMAKE} -QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER} - -# The whole Qt distribution should be built with the same compiler, but it's -# better to support custom settings. Dereferencing the detection allows to -# avoid forking a shell on each inclusion of this file, and to catch any CXX -# customization (via USE_GCC, etc.). -QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac) - -# Import QMAKE_ENV and QMAKE_ARGS definitions. -USES+= qmake:_env - -.for dir in INC ARCH PLUGIN LIBEXEC IMPORT \ - QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC -QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} -PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" -.endfor - -.for dir in BIN LIB -QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} -. if defined(QT_DIST) -PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" -. endif -.endfor - -.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) - -.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) - -Qt_Post_Include= bsd.qt.mk - -.if !defined(QT_NONSTANDARD) -CONFIGURE_ENV+= QTDIR="${PREFIX}" QMAKE="${QMAKE}" \ - MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \ - QMAKESPEC="${QMAKESPEC}" -CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \ - --with-qt-libraries=${QT_LIBDIR} \ - --with-extra-includes=${LOCALBASE}/include \ - --with-extra-libs=${LOCALBASE}/lib -.endif # !defined(QT_NONSTANDARD) - -_USE_QT_ALL= assistant dbus declarative designer doc gui help \ - imageformats l10n linguist linguisttools multimedia \ - network opengl pixeltool qdbusviewer qmake script \ - scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ - sql-sqlite2 sql-sqlite3 svg testlib webkit \ - xml xmlpatterns - -_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \ - codecs-kr codecs-tw corelib demo graphicssystems-opengl \ - help-tools iconengines inputmethods makeqpf moc phonon \ - phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \ - qtestlib qvfb rcc uic uic3 xmlpatterns-tool - -_USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity core \ - examples graphicaleffects location paths phonon4 \ - printsupport qdbus qdoc qdoc-data qev qml quick quickcontrols \ - quickcontrols2 sensors serialbus serialport sql-tds \ - uiplugin uitools webchannel websockets widgets x11extras - -3d_PORT= graphics/${_QT_RELNAME}-3d -3d_LIB= libQt${_QT_LIBVER}3DCore.so - -accessible_PORT= accessibility/${_QT_RELNAME}-accessible -accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so - -assistant_PORT= devel/${_QT_RELNAME}-assistant -assistant_PATH= ${QT_BINDIR}/assistant${_QT_BINSUFX} - -assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp -assistant-adp_PATH= ${QT_BINDIR}/assistant_adp - -assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient -assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so - -buildtools_PORT= devel/${_QT_RELNAME}-buildtools -buildtools_PATH= ${MOC} - -canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d -canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir - -clucene_PORT= textproc/clucene-${_QT_RELNAME} -clucene_LIB= libQt${_QT_LIBVER}CLucene.so - -codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn -codecs-cn_PATH= ${QT_PLUGINDIR}/codecs/libqcncodecs.so - -codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp -codecs-jp_PATH= ${QT_PLUGINDIR}/codecs/libqjpcodecs.so - -codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr -codecs-kr_PATH= ${QT_PLUGINDIR}/codecs/libqkrcodecs.so - -codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw -codecs-tw_PATH= ${QT_PLUGINDIR}/codecs/libqtwcodecs.so - -concurrent_PORT= devel/${_QT_RELNAME}-concurrent -concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so - -connectivity_PORT= comms/${_QT_RELNAME}-connectivity -connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so - -core_PORT= devel/${_QT_RELNAME}-core -core_LIB= libQt${_QT_LIBVER}Core.so - -corelib_PORT= devel/${_QT_RELNAME}-corelib -corelib_LIB= ${core_LIB} - -dbus_PORT= devel/dbus-${_QT_RELNAME} -dbus_LIB= libQt${_QT_LIBVER}DBus.so - -declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative -declarative_LIB= libQt${_QT_LIBVER}Declarative.so - -demo_PORT= misc/${_QT_RELNAME}-qtdemo -demo_PATH= ${QT_BINDIR}/qtdemo - -designer_PORT= devel/${_QT_RELNAME}-designer -designer_PATH= ${QT_BINDIR}/designer${_QT_BINSUFX} - -doc_PORT= misc/${_QT_RELNAME}-doc -doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R} - -examples_PORT= misc/${_QT_RELNAME}-examples -examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R} - -graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects -graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir - -graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl -graphicssystems-opengl_PATH= ${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so - -gui_PORT= x11-toolkits/${_QT_RELNAME}-gui -gui_LIB= libQt${_QT_LIBVER}Gui.so - -help_PORT= devel/${_QT_RELNAME}-help -help_LIB= libQt${_QT_LIBVER}Help.so - -help-tools_PORT= devel/${_QT_RELNAME}-help-tools -help-tools_PATH= ${QT_BINDIR}/qhelpgenerator - -iconengines_PORT= graphics/${_QT_RELNAME}-iconengines -iconengines_PATH= ${QT_PLUGINDIR}/iconengines/libqsvgicon.so - -imageformats_PORT= graphics/${_QT_RELNAME}-imageformats -imageformats_PATH= ${QT_PLUGINDIR}/imageformats/libqtiff.so - -inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods -inputmethods_PATH= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so - -linguist_PORT= devel/${_QT_RELNAME}-linguist -linguist_PATH= ${QT_BINDIR}/linguist${_QT_BINSUFX} - -linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools -linguisttools_PATH= ${LRELEASE} - -location_PORT= devel/${_QT_RELNAME}-location -location_LIB= libQt${_QT_LIBVER}Location.so - -l10n_PORT= misc/${_QT_RELNAME}-l10n -l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R} - -makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf -makeqpf_PATH= ${QT_BINDIR}/makeqpf${_QT_BINSUFX} - -moc_PORT= devel/${_QT_RELNAME}-moc -moc_PATH= ${MOC} - -multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia -multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so - -network_PORT= net/${_QT_RELNAME}-network -network_LIB= libQt${_QT_LIBVER}Network.so - -opengl_PORT= graphics/${_QT_RELNAME}-opengl -opengl_LIB= libQt${_QT_LIBVER}OpenGL.so - -paths_PORT= sysutils/${_QT_RELNAME}-qtpaths -paths_PATH= ${QT_BINDIR}/qtpaths - -pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool -pixeltool_PATH= ${QT_BINDIR}/pixeltool - -phonon_PORT= multimedia/phonon -phonon_LIB= libphonon.so - -phonon4_PORT= multimedia/${_QT_RELNAME}-phonon4 -phonon4_LIB= libphonon4${_QT_RELNAME}.so - -phonon-gst_PORT= multimedia/phonon-gstreamer -phonon-gst_PATH= ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so - -porting_PORT= devel/${_QT_RELNAME}-porting -porting_PATH= ${QT_BINDIR}/qt3to4 - -printsupport_PORT= print/${_QT_RELNAME}-printsupport -printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so - -qdbus_PORT= devel/${_QT_RELNAME}-qdbus -qdbus_PATH= ${QT_BINDIR}/qdbus - -qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer -qdbusviewer_PATH= ${QT_BINDIR}/qdbusviewer - -qdoc_PORT= devel/${_QT_RELNAME}-qdoc -qdoc_PATH= ${QT_BINDIR}/qdoc - -qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data -qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf - -qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3 -qdoc3_PATH= ${QT_BINDIR}/qdoc3 - -qev_PORT= x11/${_QT_RELNAME}-qev -qev_PATH= ${QT_BINDIR}/qev - -qmake_PORT= devel/qmake${_QT_VERSION:R:R} -qmake_PATH= ${QMAKE} - -qml_PORT= lang/${_QT_RELNAME}-qml -qml_LIB= libQt${_QT_LIBVER}Qml.so - -qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer -qmlviewer_PATH= ${QT_BINDIR}/qmlviewer - -qt3support_PORT= devel/${_QT_RELNAME}-qt3support -qt3support_LIB= libQt${_QT_LIBVER}3Support.so - -qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig -qtconfig_PATH= ${QT_BINDIR}/qtconfig${_QT_BINSUFX} - -qtestlib_PORT= ${testlib_PORT} -qtestlib_LIB= ${testlib_LIB} - -quick_PORT= x11-toolkits/${_QT_RELNAME}-quick -quick_LIB= libQt${_QT_LIBVER}Quick.so - -quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols -quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir - -quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2 -quickcontrols2_LIB= libQt${_QT_LIBVER}LabsTemplates.so - -qvfb_PORT= devel/${_QT_RELNAME}-qvfb -qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX} - -rcc_PORT= devel/${_QT_RELNAME}-rcc -rcc_PATH= ${RCC} - -sensors_PORT= comms/${_QT_RELNAME}-sensors -sensors_LIB= libQt${_QT_LIBVER}Sensors.so - -script_PORT= devel/${_QT_RELNAME}-script -script_LIB= libQt${_QT_LIBVER}Script.so - -scripttools_PORT= devel/${_QT_RELNAME}-scripttools -scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so - -serialbus_PORT= comms/${_QT_RELNAME}-serialbus -serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so - -serialport_PORT= comms/${_QT_RELNAME}-serialport -serialport_LIB= libQt${_QT_LIBVER}SerialPort.so - -sql_PORT= databases/${_QT_RELNAME}-sql -sql_LIB= libQt${_QT_LIBVER}Sql.so - -sql-pgsql_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so - -. if ${_QT_VERSION:M4*} -sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin -. endif - -sql-sqlite3_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlite.so - -. for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds -. if ${_QT_VERSION:M4*} -sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin -. else -sql-${db}_PORT?= databases/${_QT_RELNAME}-sqldrivers-${db} -. endif -sql-${db}_PATH?= ${QT_PLUGINDIR}/sqldrivers/libqsql${db:C/^sql//}.so -. endfor - -svg_PORT= graphics/${_QT_RELNAME}-svg -svg_LIB= libQt${_QT_LIBVER}Svg.so - -testlib_PORT= devel/${_QT_RELNAME}-testlib -testlib_LIB= libQt${_QT_LIBVER}Test.so - -uic_PORT= devel/${_QT_RELNAME}-uic -uic_PATH= ${UIC} - -uic3_PORT= devel/${_QT_RELNAME}-uic3 -uic3_PATH= ${QT_BINDIR}/uic3 - -uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin -uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/QtUiPlugin - -uitools_PORT= devel/${_QT_RELNAME}-uitools -uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a - -webchannel_PORT= www/${_QT_RELNAME}-webchannel -webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so - -websockets_PORT= www/${_QT_RELNAME}-websockets -websockets_LIB= libQt${_QT_LIBVER}WebSockets.so - -webkit_PORT= www/webkit-${_QT_RELNAME} -webkit_LIB= libQt${_QT_LIBVER}WebKit.so - -widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets -widgets_LIB= libQt${_QT_LIBVER}Widgets.so - -x11extras_PORT= x11/${_QT_RELNAME}-x11extras -x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so - -xml_PORT= textproc/${_QT_RELNAME}-xml -xml_LIB= libQt${_QT_LIBVER}Xml.so - -xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns -xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so - -xmlpatterns-tool_PORT= textproc/${_QT_RELNAME}-xmlpatterns-tool -xmlpatterns-tool_PATH= ${QT_BINDIR}/xmlpatterns - -_USE_QT= ${USE_QT${_QT_VERSION:R:R}} -_USE_QT_ALL+= ${_USE_QT${_QT_VERSION:R:R}_ONLY} -# Iterate through components deprived of suffix. -. for component in ${_USE_QT:O:u:C/_.+//} - # Check that the component is valid. -. if ${_USE_QT_ALL:M${component}} != "" - # Skip meta-components (currently none). -. if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB)) - # Check if a dependency type is explicitly requested. -. if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" -${component}_TYPE= # empty -. if ${_USE_QT:M${component}_build} != "" -${component}_TYPE+= build -. endif -. if ${_USE_QT:M${component}_run} != "" -${component}_TYPE+= run -. endif -. endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" - # If no dependency type is set, default to full dependency. -. if !defined(${component}_TYPE) -${component}_TYPE= build run -. endif - # Set real dependencies. -. if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} -LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT} -. else -${component}_PATH?= ${QT_LIBDIR}/${${component}_LIB} -${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} -. if ${${component}_TYPE:Mbuild} != "" -BUILD_DEPENDS+= ${${component}_DEPENDS} -. endif -. if ${${component}_TYPE:Mrun} != "" -RUN_DEPENDS+= ${${component}_DEPENDS} -. endif -. endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} -. endif # defined(${component}_PORT) && defined(${component}_PATH) -. else # ! ${_USE_QT_ALL:M${component}} != "" -IGNORE= cannot be installed: unknown USE_QT component '${component}' -. endif # ${_USE_QT_ALL:M${component}} != "" -. endfor - -.if defined(QT_DIST) && ! ${_QT_VERSION: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 - -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 - -# 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 - -post-configure: qmake-configure -. endif -. endif # ${QT_DIST} == "base" - -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 -# 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 - -pre-install: qt-pre-install -qt-pre-install: -# Search both in CONFIGURE_WRKSRC and WRKSRC, as the former is not -# a subdirectory of the latter for out-of-source builds. - @${FIND} ${WRKSRC} ${CONFIGURE_WRKSRC} -name "Makefile*" -type f | \ - ${XARGS} ${REINPLACE_CMD} -e 's,${PREFIX}/${QT_LIBDIR_REL}/pkgconfig,${PREFIX}/libdata/pkgconfig,g' - -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' \ - ${.CURDIR:H:H}/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 # defined(QT_DIST) && ! ${_QT_VERSION:M4*} - -.endif # defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) Index: accessibility/jovie/Makefile =================================================================== --- accessibility/jovie/Makefile +++ accessibility/jovie/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= xml qmake_build moc_build uic_build rcc_build +USE_QT= xml qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes .include Index: accessibility/kaccessible/Makefile =================================================================== --- accessibility/kaccessible/Makefile +++ accessibility/kaccessible/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib dbus gui xml \ +USE_QT= corelib dbus gui xml \ qmake_build moc_build rcc_build uic_build .include Index: accessibility/kmag/Makefile =================================================================== --- accessibility/kmag/Makefile +++ accessibility/kmag/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Screen magnifier -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build # Somebody has to create port for libkdeaccessibilityclient first CMAKE_ARGS+= -DWITH_QAccessibilityClient=off Index: accessibility/kmousetool/Makefile =================================================================== --- accessibility/kmousetool/Makefile +++ accessibility/kmousetool/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Automatic mouse click tool for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build USE_XORG= xtst .include Index: accessibility/kmouth/Makefile =================================================================== --- accessibility/kmouth/Makefile +++ accessibility/kmouth/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Speech synthesizer frontend for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: accessibility/qt4-accessible/Makefile =================================================================== --- accessibility/qt4-accessible/Makefile +++ accessibility/qt4-accessible/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt accessibility widgets -USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml +USES= qt:4 +USE_QT= qmake_build moc_build qt3support corelib gui network sql xml QT_DIST= yes HAS_CONFIGURE= yes Index: archivers/ark/Makefile =================================================================== --- archivers/ark/Makefile +++ archivers/ark/Makefile @@ -11,10 +11,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource kde:4 libarchive cpe tar:xz +USES= cmake:outsource kde:4 libarchive cpe qt:4 tar:xz USE_KDE= automoc4 kdelibs libkonq CPE_VENDOR= kde -USE_QT4= qtestlib qmake_build moc_build rcc_build uic_build +USE_QT= qtestlib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= 7ZIP RAR ZIP Index: archivers/kf5-karchive/Makefile =================================================================== --- archivers/kf5-karchive/Makefile +++ archivers/kf5-karchive/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library that provides classes for handling archive formats -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include Index: archivers/peazip/Makefile =================================================================== --- archivers/peazip/Makefile +++ archivers/peazip/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus \ fpcres:lang/fpc-utils -USES= dos2unix zip +USES= dos2unix zip qt:4 USE_FPC= cairo fcl-base fcl-image pasjpeg rtl-objpas x11 USE_GNOME= # Index: archivers/quazip/Makefile =================================================================== --- archivers/quazip/Makefile +++ archivers/quazip/Makefile @@ -16,10 +16,12 @@ USE_LDCONFIG= yes . if empty(PKGNAMESUFFIX) -USE_QT4= corelib moc_build network_build qmake_build rcc_build uic_build +USES+= qt:4 +USE_QT= corelib moc_build network_build qmake_build rcc_build uic_build CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=TRUE . else -USE_QT5= core buildtools_build qmake_build +USES+= qt:5 +USE_QT= core buildtools_build qmake_build CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE QTVER_SUFFIX= 5 . endif Index: astro/gpsbabel/Makefile =================================================================== --- astro/gpsbabel/Makefile +++ astro/gpsbabel/Makefile @@ -19,17 +19,17 @@ CONFLICTS= gpsbabel14-[0-9]* -USE_QT4= corelib qmake_build +USE_QT= corelib qmake_build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib=system -USES= localbase +USES= localbase qt:4 OPTIONS_DEFINE= GUI OPTIONS_SUB= GUI GUI_ALL_TARGET= gui -GUI_USE= QT4=gui,xml,network,webkit -GUI_USE+= QT4=linguisttools_build,moc_build,rcc_build,uic_build +GUI_USE= QT=gui,xml,network,webkit +GUI_USE+= QT=linguisttools_build,moc_build,rcc_build,uic_build GUI_VARS= MAKE_JOBS_UNSAFE=yes post-patch: Index: astro/gpsd/Makefile =================================================================== --- astro/gpsd/Makefile +++ astro/gpsd/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt -USES= cpe pathfix pkgconfig python scons +USES= cpe pathfix pkgconfig python scons qt:4 CPE_VENDOR= gpsd_project USE_RC_SUBR= gpsd @@ -128,7 +128,8 @@ # Client-side options NCURSES_MAKE_ARGS_OFF= ncurses=no NCURSES_USES= ncurses -QTBIND_USE= QT4=network +QTBIND_USE= QT=network + QTBIND_MAKE_ARGS= qt=yes QTBIND_MAKE_ARGS_OFF= qt=no QTBIND_PLIST_SUB= QTBIND="" Index: astro/kstars/Makefile =================================================================== --- astro/kstars/Makefile +++ astro/kstars/Makefile @@ -14,9 +14,9 @@ xplanet:astro/xplanet RUN_DEPENDS= xplanet:astro/xplanet -USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= opengl qmake_build moc_build rcc_build uic_build +USE_QT= opengl qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= PYKDE Index: astro/libkgeomap/Makefile =================================================================== --- astro/libkgeomap/Makefile +++ astro/libkgeomap/Makefile @@ -15,9 +15,9 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs -USES= cmake:outsource kde:4 pathfix tar:xz +USES= cmake:outsource kde:4 pathfix qt:4 tar:xz USE_KDE= kdelibs automoc4 marble USE_LDCONFIG= yes -USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build +USE_QT= network phonon xml moc_build qmake_build rcc_build uic_build .include Index: astro/marble/Makefile =================================================================== --- astro/marble/Makefile +++ astro/marble/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libquazip.so:archivers/quazip -USES= cmake:outsource gmake kde:4 shared-mime-info tar:xz +USES= cmake:outsource gmake kde:4 shared-mime-info qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib dbus declarative designer_build gui network phonon \ +USE_QT= corelib dbus declarative designer_build gui network phonon \ qtestlib script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Index: astro/merkaartor/Makefile =================================================================== --- astro/merkaartor/Makefile +++ astro/merkaartor/Makefile @@ -19,11 +19,11 @@ USE_GITHUB= yes GH_ACCOUNT= openstreetmap GH_PROJECT= ${PORTNAME} -USES= pkgconfig sqlite:3 qmake +USES= pkgconfig sqlite:3 qt:5 USE_LDCONFIG= yes QMAKE_ARGS= SYSTEM_QUAZIP=1 -USE_QT5= buildtools_build \ +USE_QT= buildtools_build qmake_build \ concurrent core gui imageformats network printsupport svg \ webkit widgets xml @@ -46,7 +46,7 @@ DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1 -NLS_USE= QT5=linguisttools_build +NLS_USE= QT=linguisttools_build INSTALLS_ICONS= yes Index: astro/qlandkartegt/Makefile =================================================================== --- astro/qlandkartegt/Makefile +++ astro/qlandkartegt/Makefile @@ -15,8 +15,8 @@ libproj.so:graphics/proj \ libgps.so:astro/gpsd -USES= cmake desktop-file-utils -USE_QT4= dbus gui opengl network sql xml linguist_build \ +USES= cmake desktop-file-utils qt:4 +USE_QT= dbus gui opengl network sql xml linguist_build \ moc_build uic_build rcc_build qmake_build USE_GL= glu Index: astro/qmapshack/Makefile =================================================================== --- astro/qmapshack/Makefile +++ astro/qmapshack/Makefile @@ -17,8 +17,8 @@ libroutino.so:astro/routino RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks -USES= cmake compiler:c++11-lib desktop-file-utils -USE_QT5= buildtools core dbus gui linguisttools network printsupport \ - qmake script sql sql-sqlite3 webkit widgets xml +USES= cmake compiler:c++11-lib desktop-file-utils qt:5 +USE_QT= buildtools core dbus gui linguisttools network printsupport \ + qmake_build script sql sql-sqlite3 webkit widgets xml .include Index: astro/stellarium-qt4/Makefile =================================================================== --- astro/stellarium-qt4/Makefile +++ astro/stellarium-qt4/Makefile @@ -17,8 +17,8 @@ CONFLICTS_INSTALL= ${PORTNAME}-0.13.* PORTSCOUT= limit:^0\.12\. # track only 0.12.x (legacy) -USES= cmake gettext iconv -USE_QT4= moc_build rcc_build uic_build qmake_build \ +USES= cmake gettext iconv qt:4 +USE_QT= moc_build rcc_build uic_build qmake_build \ corelib gui network opengl PORTDOCS= AUTHORS ChangeLog README @@ -53,13 +53,13 @@ .endif .if ${PORT_OPTIONS:MMULTIMEDIA} -USE_QT4+= phonon +USE_QT+= phonon .else CMAKE_ARGS+= -DENABLE_SOUND:BOOL=OFF .endif .if ${PORT_OPTIONS:MSCRIPTING} -USE_QT4+= script +USE_QT+= script PLIST_SUB+= SCRIPTS="" .else CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF Index: astro/stellarium/Makefile =================================================================== --- astro/stellarium/Makefile +++ astro/stellarium/Makefile @@ -16,8 +16,8 @@ CONFLICTS_INSTALL= ${PORTNAME}-qt4-0.12.* -USES= cmake gettext -USE_QT5= qmake_build buildtools_build linguisttools_build \ +USES= cmake gettext qt:5 +USE_QT= qmake_build buildtools_build linguisttools_build \ concurrent core gui network opengl printsupport widgets PORTDOCS= AUTHORS ChangeLog README stellarium_user_guide-0.15.0-1.pdf @@ -38,10 +38,10 @@ TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx TEXTURES_DISTFILES= textures-1K.zip:gfx -MULTIMEDIA_USE= QT5=multimedia +MULTIMEDIA_USE= QT=multimedia MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF -TELESCOPE_USE= QT5=serialport +TELESCOPE_USE= QT=serialport TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF .include @@ -59,7 +59,7 @@ .endif .if ${PORT_OPTIONS:MSCRIPTING} -USE_QT5+= script +USE_QT+= script PLIST_SUB+= SCRIPTS="" .else CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF Index: astro/xglobe/Makefile =================================================================== --- astro/xglobe/Makefile +++ astro/xglobe/Makefile @@ -10,8 +10,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Displays a view of the Earth (like xearth) with a rendered photo map -USES= gmake -USE_QT4= corelib gui qt3support moc_build +USES= gmake qt:4 +USE_QT= corelib gui qt3support moc_build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Index: audio/acoustid-fingerprinter/Makefile =================================================================== --- audio/acoustid-fingerprinter/Makefile +++ audio/acoustid-fingerprinter/Makefile @@ -14,8 +14,8 @@ libtag.so:audio/taglib \ libavcodec.so:multimedia/ffmpeg -USES= cmake desktop-file-utils -USE_QT4= corelib gui network \ +USES= cmake desktop-file-utils qt:4 +USE_QT= corelib gui network \ qmake_build moc_build rcc_build uic_build USE_GITHUB= yes GH_ACCOUNT= acoustid Index: audio/amarok-kde4/Makefile =================================================================== --- audio/amarok-kde4/Makefile +++ audio/amarok-kde4/Makefile @@ -23,11 +23,12 @@ ${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms USES= cmake:outsource kde:4 mysql pkgconfig \ - shared-mime-info shebangfix tar:bzip2 + shared-mime-info shebangfix qt:4 tar:bzip2 USE_GL= gl USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \ - nepomuk-core runtime soprano strigi -USE_QT4= corelib dbus designer gui network opengl \ + nepomuk-core runtime automoc4 strigi + +USE_QT= corelib dbus designer gui network opengl \ phonon script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= ice sm x11 xau xdmcp xext xft xpm Index: audio/audex/Makefile =================================================================== --- audio/audex/Makefile +++ audio/audex/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia -USES= tar:xz cmake kde:4 +USES= tar:xz cmake kde:4 qt:4 USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc -USE_QT4= gui dbus network svg xml \ +USE_QT= gui dbus network svg xml \ qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= NLS EYED3 FAAC FLAC LAME VORBIS Index: audio/cantata/Makefile =================================================================== --- audio/cantata/Makefile +++ audio/cantata/Makefile @@ -15,13 +15,13 @@ USE_GITHUB= yes GH_ACCOUNT= CDrummond -USE_QT5= buildtools_build concurrent core dbus gui network \ +USE_QT= buildtools_build concurrent core dbus gui network \ qmake_build sql sql-sqlite3_run svg widgets xml CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \ -DENABLE_KDE:BOOL=FALSE -USES= cmake:outsource cpe pkgconfig shebangfix tar:bzip2 +USES= cmake:outsource cpe pkgconfig shebangfix tar:bzip2 qt:5 SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake CPE_VENDOR= craig_drummond USE_LDCONFIG= yes @@ -76,7 +76,7 @@ MUSICBRAINZ_CMAKE_ON= -DENABLE_MUSICBRAINZ:BOOL=TRUE MUSICBRAINZ_CMAKE_OFF= -DENABLE_MUSICBRAINZ:BOOL=FALSE -NLS_USE= QT5=linguisttools_build +NLS_USE= QT=linguisttools_build NLS_CMAKE_ON= -DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \ -DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \ @@ -85,7 +85,7 @@ PROXY_CMAKE_ON= -DENABLE_PROXY_CONFIG:BOOL=TRUE PROXY_CMAKE_OFF= -DENABLE_PROXY_CONFIG:BOOL=FALSE -QT5_USE= QT5=multimedia +QT5_USE= QT=multimedia TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib \ libtag-extras.so:audio/taglib-extras Index: audio/clementine-player/Makefile =================================================================== --- audio/clementine-player/Makefile +++ audio/clementine-player/Makefile @@ -34,12 +34,13 @@ execinfo \ gettext-tools \ pkgconfig \ + qt:4 \ sqlite USE_GL= glew CONFLICTS_BUILD= qt-3.* -USE_QT4= corelib \ +USE_QT= corelib \ dbus \ gui \ imageformats \ Index: audio/creox/Makefile =================================================================== --- audio/creox/Makefile +++ audio/creox/Makefile @@ -17,9 +17,9 @@ GH_ACCOUNT= laudrup GH_PROJECT= Creox4 -USES= cmake:outsource kde:4 +USES= cmake:outsource kde:4 qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_XORG= xft xpm post-patch: Index: audio/cueplayer/Makefile =================================================================== --- audio/cueplayer/Makefile +++ audio/cueplayer/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libnotify.so:devel/libnotify -USES= pkgconfig qmake -USE_QT4= gui xml uic_build moc_build rcc_build network +USES= pkgconfig qt:4 +USE_QT= gui xml uic_build moc_build qmake_build rcc_build network USE_GSTREAMER= flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack USE_XORG= x11 Index: audio/dream/Makefile =================================================================== --- audio/dream/Makefile +++ audio/dream/Makefile @@ -16,8 +16,9 @@ libqwt.so:x11-toolkits/qwt5\ libfftw3.so:math/fftw3 -USES= gmake pkgconfig qmake -USE_QT4= qmake_build moc_build uic_build corelib gui network rcc webkit +USES= gmake pkgconfig qt:4 +USE_QT= corelib gui network rcc webkit \ + moc_build qmake_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= SNDFILE OGG VORBIS FLAC OPUS SPEEX FAAD FAAC Index: audio/dssi/Makefile =================================================================== --- audio/dssi/Makefile +++ audio/dssi/Makefile @@ -20,7 +20,7 @@ libjack.so:audio/jack RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa -USES= gmake pathfix pkgconfig libtool +USES= gmake pathfix pkgconfig libtool qt:4 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -45,7 +45,7 @@ .include .if ${PORT_OPTIONS:MQT4} -USE_QT4= corelib gui moc_build +USE_QT= corelib gui moc_build QT_NONSTANDARD= yes .endif Index: audio/esperanza/Makefile =================================================================== --- audio/esperanza/Makefile +++ audio/esperanza/Makefile @@ -17,10 +17,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E} -USE_QT4= gui xml network imageformats_run \ +USE_QT= gui xml network imageformats_run \ qmake_build moc_build rcc_build uic_build QT_NONSTANDARD= yes -USES= gmake pkgconfig tar:bzip2 +USES= gmake pkgconfig qt:4 tar:bzip2 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --disable-growl MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}" Index: audio/flacon/Makefile =================================================================== --- audio/flacon/Makefile +++ audio/flacon/Makefile @@ -22,8 +22,11 @@ QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON # :ts, would be handy here but is not available in fmake(1) -QT5_USE= QT5=${_QT5_DEPS},${_QT5_BDEPS:C/,/_build&/g:%=_build} -QT5_USE_OFF= QT4=${_QT4_DEPS},${_QT4_BDEPS:C/,/_build&/g:%=_build} +QT5_USE= QT=${_QT5_DEPS},${_QT5_BDEPS:C/,/_build&/g:%=_build} +QT5_USE_OFF= QT=${_QT4_DEPS},${_QT4_BDEPS:C/,/_build&/g:%=_build} + +QT5_USES_OFF= qt:4 +QT5_USES= qt:5 _QT4_DEPS= corelib,gui,network _QT4_BDEPS= linguisttools,moc,qmake,rcc,uic Index: audio/fmit/Makefile =================================================================== --- audio/fmit/Makefile +++ audio/fmit/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 USE_XORG= xmu -USE_QT4= corelib gui opengl \ +USE_QT= corelib gui opengl \ linguist_build moc_build qmake_build rcc_build uic_build USE_GL= glut -USES= cmake pkgconfig tar:bzip2 +USES= cmake pkgconfig qt:4 tar:bzip2 INSTALLS_ICONS= yes OPTIONS_DEFINE= ALSA JACK OSS PORTAUDIO Index: audio/hydrogen-devel/Makefile =================================================================== --- audio/hydrogen-devel/Makefile +++ audio/hydrogen-devel/Makefile @@ -20,9 +20,9 @@ GH_ACCOUNT= hydrogen-music GH_TAGNAME= 718b2652fb -USE_QT4= qmake_build moc_build rcc_build uic_build gui \ +USE_QT= qmake_build moc_build rcc_build uic_build gui \ corelib network xml xmlpatterns -USES= cmake desktop-file-utils pkgconfig +USES= cmake desktop-file-utils pkgconfig qt:4 OPTIONS_SINGLE= EXPORT OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR Index: audio/hydrogen/Makefile =================================================================== --- audio/hydrogen/Makefile +++ audio/hydrogen/Makefile @@ -18,9 +18,9 @@ USE_GITHUB= yes GH_ACCOUNT= hydrogen-music -USE_QT4= qmake_build moc_build rcc_build uic_build gui \ +USE_QT= qmake_build moc_build rcc_build uic_build gui \ network xml xmlpatterns -USES= cmake desktop-file-utils pkgconfig +USES= cmake desktop-file-utils pkgconfig qt:4 OPTIONS_SINGLE= EXPORT OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR Index: audio/juk/Makefile =================================================================== --- audio/juk/Makefile +++ audio/juk/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libtag.so:audio/taglib -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF Index: audio/kaudiocreator/Makefile =================================================================== --- audio/kaudiocreator/Makefile +++ audio/kaudiocreator/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS+= lame:audio/lame .endif -USES= cmake kde:4 tar:bzip2 -USE_QT4= moc_build qmake_build rcc_build uic_build +USES= cmake kde:4 qt:4 tar:bzip2 +USE_QT= moc_build qmake_build rcc_build uic_build USE_KDE= automoc4 libkcddb libkcompactdisc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: audio/kid3-kde4/Makefile =================================================================== --- audio/kid3-kde4/Makefile +++ audio/kid3-kde4/Makefile @@ -36,7 +36,8 @@ # Qt 5 only CONFLICTS_INSTALL= kid3-3.* kid3-qt4-3.* -USE_QT5= core dbus gui multimedia network testlib xml widgets \ +USES+= qt:5 +USE_QT= core dbus gui multimedia network testlib xml widgets \ buildtools_build linguisttools_build qmake_build CMAKE_ARGS+= -DWITH_QT5=true OPTIONS_EXCLUDE=PHONON @@ -44,15 +45,16 @@ # Qt 4 only CONFLICTS_INSTALL= kid3-3.* kid3-qt5-3.* -USE_QT4= corelib dbus gui network xml \ +USES+= qt:4 +USE_QT= corelib dbus gui network xml \ qmake_build moc_build rcc_build uic_build \ linguisttools_build . endif .else # KDE 4 only CONFLICTS_INSTALL= kid3-qt4-3.* kid3-qt5-3.* - -USE_QT4= corelib dbus gui network svg xml \ +USES+= qt:4 +USE_QT= corelib dbus gui network svg xml \ qmake_build moc_build rcc_build uic_build \ linguisttools_build USE_KDE= kdelibs automoc4 @@ -87,7 +89,7 @@ PHONON_CMAKE_ON= -DWITH_PHONON=ON PHONON_CMAKE_OFF= -DWITH_PHONON=OFF -PHONON_USE= QT4=phonon +PHONON_USE= QT=phonon TAGLIB_DESC= Various audio formats support via Taglib TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib Index: audio/kio-audiocd/Makefile =================================================================== --- audio/kio-audiocd/Makefile +++ audio/kio-audiocd/Makefile @@ -16,10 +16,10 @@ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkcddb libkcompactdisc \ automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= LAME Index: audio/kmix/Makefile =================================================================== --- audio/kmix/Makefile +++ audio/kmix/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= gui phonon xml \ +USE_QT= gui phonon xml \ moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= ALSA PULSEAUDIO Index: audio/kscd/Makefile =================================================================== --- audio/kscd/Makefile +++ audio/kscd/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libmusicbrainz3.so:audio/libmusicbrainz3 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= phonon moc_build qmake_build rcc_build uic_build +USE_QT= phonon moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= ALSA Index: audio/kstreamripper/Makefile =================================================================== --- audio/kstreamripper/Makefile +++ audio/kstreamripper/Makefile @@ -11,9 +11,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:audio/streamripper -USES= cmake gettext-tools kde:4 tar:bzip2 +USES= cmake gettext-tools kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME} Index: audio/last.fm/Makefile =================================================================== --- audio/last.fm/Makefile +++ audio/last.fm/Makefile @@ -21,10 +21,10 @@ WRKSRC= ${WRKDIR}/last.fm-${PORTVERSION} -USES= cpe dos2unix qmake:norecursive tar:bzip2 +USES= cpe dos2unix qt:4,qmake_norecursive tar:bzip2 CPE_VENDOR= last DOS2UNIX_GLOB= *.h *.cpp -USE_QT4= moc_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ gui network sql xml imageformats_run LDFLAGS+= -lz -L${LOCALBASE}/lib -lX11 QMAKE_SOURCE_PATH= ${WRKSRC}/LastFM.pro Index: audio/lastfm-desktop/Makefile =================================================================== --- audio/lastfm-desktop/Makefile +++ audio/lastfm-desktop/Makefile @@ -20,9 +20,9 @@ USE_GITHUB= yes GH_ACCOUNT= lastfm -USES= gettext pkgconfig qmake tar:bzip2 gmake -USE_QT4= corelib gui linguist_build moc_build network phonon \ - rcc_build sql uic_build webkit xml +USES= gettext pkgconfig tar:bzip2 gmake qt:4 +USE_QT= corelib gui linguist_build moc_build network phonon \ + qmake_build rcc_build sql uic_build webkit xml SUB_FILES= lastfm-desktop.sh DESKTOP_ENTRIES="Last.fm Scrobbler" \ @@ -36,7 +36,7 @@ OPTIONS_SINGLE_PHONON= GSTREAMER VLC OPTIONS_DEFAULT= VLC GSTREAMER_DESC= Multimedia via Phonon-GStreamer -GSTREAMER_USE= QT4=dbus,phonon-gst_run GNOME=gdkpixbuf2,glib20 +GSTREAMER_USE= QT=dbus,phonon-gst_run GNOME=gdkpixbuf2,glib20 VLC_DESC= Multimedia via Phonon-VLC VLC_RUN_DEPENDS= phonon-vlc>=0.6.1:multimedia/phonon-vlc Index: audio/libechonest/Makefile =================================================================== --- audio/libechonest/Makefile +++ audio/libechonest/Makefile @@ -20,11 +20,11 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} TEST_CMAKE_OFF= -DECHONEST_BUILD_TESTS:BOOL=OFF -TEST_USE= qt4=qtestlib_build +TEST_USE= qt=qtestlib_build -USES= cmake pkgconfig +USES= cmake pkgconfig qt:4 USE_GITHUB= yes USE_LDCONFIG= yes -USE_QT4= qmake_build moc_build network rcc_build +USE_QT= qmake_build moc_build network rcc_build .include Index: audio/libkcddb/Makefile =================================================================== --- audio/libkcddb/Makefile +++ audio/libkcddb/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qtestlib moc_build qmake_build rcc_build uic_build +USE_QT= qtestlib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: audio/libkcompactdisc/Makefile =================================================================== --- audio/libkcompactdisc/Makefile +++ audio/libkcompactdisc/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE library for interfacing with audio CDs -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= phonon moc_build qmake_build rcc_build uic_build +USE_QT= phonon moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= ALSA Index: audio/liblastfm/Makefile =================================================================== --- audio/liblastfm/Makefile +++ audio/liblastfm/Makefile @@ -17,10 +17,10 @@ GH_ACCOUNT= lastfm -USES= cmake pkgconfig +USES= cmake pkgconfig qt:4 USE_GITHUB= yes USE_LDCONFIG= yes -USE_QT4= dbus network qtestlib sql xml \ +USE_QT= dbus network qtestlib sql xml \ moc_build qmake_build rcc_build CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=ON Index: audio/lmms/Makefile =================================================================== --- audio/lmms/Makefile +++ audio/lmms/Makefile @@ -31,11 +31,11 @@ USE_LDCONFIG= yes USE_XORG= xft -USE_QT4= corelib gui xml moc_build uic_build rcc_build \ +USE_QT= corelib gui xml moc_build uic_build rcc_build \ qmake_build USE_GITHUB= yes GH_ACCOUNT= LMMS -USES= cmake desktop-file-utils dos2unix pkgconfig shared-mime-info +USES= cmake desktop-file-utils dos2unix pkgconfig shared-mime-info qt:4 CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \ -DWANT_CALF:BOOL=OFF \ -DWANT_CAPS:BOOL=OFF \ Index: audio/mehdiaplayer/Makefile =================================================================== --- audio/mehdiaplayer/Makefile +++ audio/mehdiaplayer/Makefile @@ -12,9 +12,9 @@ BROKEN= Unfetchable (google code has gone away) -USES= tar:bzip2 qmake -USE_QT4= gui xml uic_build moc_build \ - rcc_build phonon +USES= qt:4 tar:bzip2 +USE_QT= gui xml uic_build moc_build \ + qmake_build rcc_build phonon WRKSRC= ${WRKDIR}/dev Index: audio/midipp/Makefile =================================================================== --- audio/midipp/Makefile +++ audio/midipp/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= libumidi>=2.0.13:audio/libumidi LIB_DEPENDS= libumidi20.so:audio/libumidi -USES= qmake tar:bzip2 -USE_QT4= gui moc_build rcc_build network +USES= qt:4 tar:bzip2 +USE_QT= gui moc_build qmake_build rcc_build network .include Index: audio/minitunes/Makefile =================================================================== --- audio/minitunes/Makefile +++ audio/minitunes/Makefile @@ -12,8 +12,8 @@ LIB_DEPENDS= libtag.so:audio/taglib -USES= qmake -USE_QT4= dbus gui moc_build network phonon rcc_build \ +USES= qt:4 +USE_QT= dbus gui moc_build qmake_build network phonon rcc_build \ sql uic_build xml INSTALLS_ICONS= yes Index: audio/mixxx/Makefile =================================================================== --- audio/mixxx/Makefile +++ audio/mixxx/Makefile @@ -25,9 +25,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= scons iconv -USE_QT4= corelib gui network opengl script sql svg xml \ - linguisttools_build moc_build qmake_build rcc_build uic_build +USES= scons iconv qt:4,qmake_dummy +USE_QT= corelib gui network opengl script sql svg xml \ + linguisttools_build moc_build qmake_build \ + rcc_build uic_build USE_GL= glu MAKE_ARGS= qtdir="${PREFIX}" optimize=0 LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR} Index: audio/mous/Makefile =================================================================== --- audio/mous/Makefile +++ audio/mous/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= cmake +USES= cmake qt:4 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= bsdelf @@ -84,8 +84,8 @@ OSS_CMAKE_OFF= -DWithPluginOssRenderer=0 QT4_DESC= QT4 frontend -QT4_USE= QT4=corelib,gui,linguisttools_build -QT4_USE+= QT4=qmake_build,moc_build,rcc_build,uic_build +QT4_USE= QT=corelib,gui,linguisttools_build +QT4_USE+= QT=qmake_build,moc_build,rcc_build,uic_build QT4_CMAKE_ON= -DWithFrontendQt=1 QT4_CMAKE_OFF= -DWithFrontendQt=0 Index: audio/mumble/Makefile =================================================================== --- audio/mumble/Makefile +++ audio/mumble/Makefile @@ -22,10 +22,10 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}" -USES= compiler cpe gmake pkgconfig qmake +USES= compiler cpe gmake pkgconfig qt:4 USE_LDCONFIG= yes -USE_QT4= gui svg iconengines_run xml sql network l10n \ - linguist_build moc_build rcc_build uic_build \ +USE_QT= gui svg iconengines_run xml sql network l10n \ + linguist_build moc_build qmake_build rcc_build uic_build \ opengl sql-sqlite3_run USE_XORG= ice @@ -46,7 +46,7 @@ .if ! ${PORT_OPTIONS:MDBUS} CONFIG+= no-dbus .else -USE_QT4+= dbus +USE_QT+= dbus .endif .if ! ${PORT_OPTIONS:MBONJOUR} Index: audio/murmur/Makefile =================================================================== --- audio/murmur/Makefile +++ audio/murmur/Makefile @@ -16,8 +16,8 @@ USERS= murmur GROUPS= murmur -USES= compiler:c++11-lang qmake pkgconfig -USE_QT4= moc_build corelib network xml sql sql-sqlite3_run +USES= compiler:c++11-lang pkgconfig qt:4 +USE_QT= moc_build qmake_build corelib network xml sql sql-sqlite3_run USE_OPENSSL= YES @@ -45,7 +45,7 @@ .endif .if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus +USE_QT+= dbus .else CONFIG+= no-dbus .endif Index: audio/musescore/Makefile =================================================================== --- audio/musescore/Makefile +++ audio/musescore/Makefile @@ -18,8 +18,8 @@ libvorbis.so:audio/libvorbis USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - pkgconfig shared-mime-info zip -USE_QT5= concurrent declarative designer help network scripttools svg \ + pkgconfig qt:5 shared-mime-info zip +USE_QT= concurrent declarative designer help network scripttools svg \ webkit xml xmlpatterns \ buildtools_build linguisttools_build qmake_build uitools_build ALL_TARGET= lrelease manpages all Index: audio/mythplugin-mythmusic/Makefile =================================================================== --- audio/mythplugin-mythmusic/Makefile +++ audio/mythplugin-mythmusic/Makefile @@ -27,7 +27,8 @@ WRKSRC_SUBDIR= mythplugins -USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build +USES= qt:4 +USE_QT= linguist_build moc_build qmake_build rcc_build uic_build HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/mythtv/plugins DESTDIRNAME= INSTALL_ROOT Index: audio/openal-soft/Makefile =================================================================== --- audio/openal-soft/Makefile +++ audio/openal-soft/Makefile @@ -13,7 +13,7 @@ CONFLICTS= openal-200[0-9]* -USES= tar:bzip2 cmake compiler:c11 +USES= tar:bzip2 cmake compiler:c11 qt:4 USE_LDCONFIG= yes CMAKE_ARGS+= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \ -DALSOFT_REQUIRE_JACK:BOOL=OFF \ @@ -35,7 +35,7 @@ #ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib CONFIG_CMAKE_ON= -DALSOFT_NO_CONFIG_UTIL:BOOL=OFF CONFIG_CMAKE_OFF= -DALSOFT_NO_CONFIG_UTIL:BOOL=ON -CONFIG_USE= QT4=corelib,gui,qmake_build,moc_build,rcc_build,uic_build +CONFIG_USE= QT=corelib,gui,qmake_build,moc_build,rcc_build,uic_build FLUIDSYNTH_CMAKE_ON= -DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON FLUIDSYNTH_CMAKE_OFF= -DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth Index: audio/qjackctl/Makefile =================================================================== --- audio/qjackctl/Makefile +++ audio/qjackctl/Makefile @@ -43,13 +43,16 @@ SYSTRAY_DESC= System tray icon support SYSTRAY_CONFIGURE_ENABLE= system-tray -QT4_USE= QT4=corelib,dbus,gui,xml \ - QT4=linguisttools_build \ - QT4=moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,dbus,gui,xml \ + qt=linguisttools_build \ + qt=moc_build,qmake_build,rcc_build,uic_build QT4_CONFIGURE_ENABLE= qt4 -QT5_USE= QT5=core,dbus,gui,widgets,x11extras,xml \ - QT5=buildtools_build,linguisttools_build,qmake_build \ - GL=gl +QT5_USES= qt:5 +QT5_USE= qt=core,dbus,gui,widgets,x11extras,xml \ + qt=buildtools_build,linguisttools_build,qmake_build +QT5_CONFIGURE_ENABLE= qt5 + post-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \ Index: audio/qmpdclient/Makefile =================================================================== --- audio/qmpdclient/Makefile +++ audio/qmpdclient/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:bzip2 -USE_QT4= moc_build rcc_build uic_build \ +USES= qt:4 tar:bzip2 +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib gui network xml xmlpatterns INSTALLS_ICONS= yes @@ -25,10 +25,10 @@ OPTIONS_SUB= NLS -NLS_USE= QT4=linguisttools_build +NLS_USE= QT=linguisttools_build DBUS_QMAKE_ON= CONFIG+=qdbus -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus DEBUG_QMAKE_ON= CONFIG+=debug Index: audio/qsampler/Makefile =================================================================== --- audio/qsampler/Makefile +++ audio/qsampler/Makefile @@ -31,12 +31,14 @@ OPTIONS_SINGLE_TOOLKIT= QT4 QT5 OPTIONS_DEFAULT= QT4 -QT4_USE= qt4=corelib,gui \ - qt4=linguisttools_build \ - qt4=moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui \ + qt=linguisttools_build \ + qt=moc_build,qmake_build,rcc_build,uic_build QT4_CONFIGURE_ENABLE= qt4 -QT5_USE= qt5=core,gui,widgets,x11extras \ - qt5=buildtools_build,linguisttools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,widgets,x11extras \ + qt=buildtools_build,linguisttools_build,qmake_build QT5_CONFIGURE_ENABLE= qt5 TOOLKIT_DESC= Qt toolkit Index: audio/qsynth/Makefile =================================================================== --- audio/qsynth/Makefile +++ audio/qsynth/Makefile @@ -32,12 +32,14 @@ GRADIENT_DESC= Gradient eye-candy GRADIENT_CONFIGURE_ENABLE= gradient -QT4_USE= qt4=corelib,gui \ - qt4=linguisttools_build \ - qt4=moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui \ + qt=linguisttools_build \ + qt=moc_build,qmake_build,rcc_build,uic_build QT4_CONFIGURE_ENABLE= qt4 -QT5_USE= qt5=core,gui,widgets,x11extras \ - qt5=buildtools_build,linguisttools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,widgets,x11extras \ + qt=buildtools_build,linguisttools_build,qmake_build QT5_CONFIGURE_ENABLE= qt5 SYSTEM_TRAY_DESC= System-tray icon support SYSTEM_TRAY_CONFIGURE_ENABLE= system-tray Index: audio/quimup/Makefile =================================================================== --- audio/quimup/Makefile +++ audio/quimup/Makefile @@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}\ ${PORTVERSION} -USES= pkgconfig qmake -USE_QT5= core gui network widgets buildtools_build +USES= pkgconfig qt:5 +USE_QT= core gui network widgets buildtools_build qmake_build USE_GL= gl PLIST_FILES= bin/quimup \ Index: audio/rosegarden/Makefile =================================================================== --- audio/rosegarden/Makefile +++ audio/rosegarden/Makefile @@ -36,13 +36,14 @@ LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CMAKE_ON= -DENABLE_LIRC:BOOL=ON -QT4_USE= qt4=gui,network,testlib,xml \ - qt4=linguisttools_build,moc_build,qmake_build \ - qt4=rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=gui,network,testlib,xml \ + qt=linguisttools_build,moc_build,qmake_build \ + qt=rcc_build,uic_build QT4_CMAKE_ON= -DUSE_QT4:BOOL=ON -QT5_USES= compiler:c++11-lib -QT5_USE= qt5=network,printsupport,testlib,widgets,xml \ - qt5=buildtools_build,linguisttools_build,qmake_build +QT5_USES= compiler:c++11-lib qt:5 +QT5_USE= qt=network,printsupport,testlib,widgets,xml \ + qt=buildtools_build,linguisttools_build,qmake_build QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON TOOLKIT_DESC= Qt toolkit Index: audio/sayonara/Makefile =================================================================== --- audio/sayonara/Makefile +++ audio/sayonara/Makefile @@ -17,9 +17,11 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libmtp.so:multimedia/libmtp -USES= cmake compiler:c++11-lib execinfo pkgconfig +USES= cmake compiler:c++11-lib execinfo pkgconfig qt:5 + USE_GSTREAMER1= flac mpg123 ogg opus vorbis # XXX: likely incomplete -USE_QT5= dbus core gui network sql sql-sqlite3_run widgets xml \ +USE_QT= dbus core gui network sql sql-sqlite3_run widgets xml \ + buildtools_build qmake_build linguisttools_build INSTALLS_ICONS= yes Index: audio/simon/Makefile =================================================================== --- audio/simon/Makefile +++ audio/simon/Makefile @@ -17,9 +17,9 @@ libsphinxad.so:audio/sphinxbase \ libqwt6.so:x11-toolkits/qwt6 -USES= cmake:outsource gettext kde:4 tar:bz2 +USES= cmake:outsource gettext kde:4 tar:bz2 qt:4 USE_KDE= kdelibs automoc4 pimlibs -USE_QT4= accessible corelib dbus gui network script sql svg testlib xml \ +USE_QT= accessible corelib dbus gui network script sql svg testlib xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xtst Index: audio/skype-call-recorder/Makefile =================================================================== --- audio/skype-call-recorder/Makefile +++ audio/skype-call-recorder/Makefile @@ -15,8 +15,8 @@ libid3.so:audio/id3lib \ libvorbisenc.so:audio/libvorbis -USES= cmake -USE_QT4= corelib dbus gui network \ +USES= cmake qt:4 +USE_QT= corelib dbus gui network \ qmake_build moc_build rcc_build uic_build PLIST_FILES= bin/skype-call-recorder \ Index: audio/soundkonverter/Makefile =================================================================== --- audio/soundkonverter/Makefile +++ audio/soundkonverter/Makefile @@ -17,9 +17,9 @@ libphonon.so:multimedia/phonon GH_ACCOUNT= HessiJames -USES= cmake compiler:c++11-lang kde:4 +USES= cmake compiler:c++11-lang kde:4 qt:4 USE_GITHUB= yes -USE_QT4= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml +USE_QT= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml USE_KDE= automoc4 kdelibs libkcddb WRKSRC_SUBDIR= src Index: audio/tomahawk/Makefile =================================================================== --- audio/tomahawk/Makefile +++ audio/tomahawk/Makefile @@ -47,10 +47,10 @@ PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} \ PORTVERSION=${PORTVERSION} -USES= cmake compiler:c++11-lib desktop-file-utils pkgconfig +USES= cmake compiler:c++11-lib desktop-file-utils pkgconfig qt:4 USE_GITHUB= yes USE_LDCONFIG= yes -USE_QT4= dbus designer gui linguist_build moc_build \ +USE_QT= dbus designer gui linguist_build moc_build \ network phonon qmake_build qtestlib rcc_build \ sql-sqlite2 svg uic_build xml Index: audio/virtual_oss_ctl/Makefile =================================================================== --- audio/virtual_oss_ctl/Makefile +++ audio/virtual_oss_ctl/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= virtual_oss:audio/virtual_oss -USES= qmake tar:bzip2 -USE_QT4= corelib gui qmake_build moc_build rcc_build +USES= qt:4 tar:bzip2 +USE_QT= corelib gui qmake_build moc_build qmake_build rcc_build .include Index: biology/ugene/Makefile =================================================================== --- biology/ugene/Makefile +++ biology/ugene/Makefile @@ -20,9 +20,9 @@ BROKEN_aarch64= Fails to build: invokes x86 asm -USES= desktop-file-utils execinfo qmake +USES= desktop-file-utils execinfo qt:5 USE_GL= glu -USE_QT5= buildtools_build linguisttools_build scripttools_build \ +USE_QT= buildtools_build linguisttools_build qmake_build scripttools_build \ gui network printsupport script sql svg webkit widgets xml \ imageformats_run Index: cad/freecad/Makefile =================================================================== --- cad/freecad/Makefile +++ cad/freecad/Makefile @@ -35,10 +35,10 @@ USE_GITHUB= yes GH_TAGNAME= 0ea7373 -USES= compiler:c++11-lib cmake:outsource jpeg python localbase +USES= compiler:c++11-lib cmake:outsource jpeg python localbase qt:4 USE_XORG= ice sm x11 xext xt USE_GL= gl glu -USE_QT4= qmake_build corelib gui moc_build network opengl rcc_build \ +USE_QT= qmake_build corelib gui moc_build network opengl rcc_build \ uic_build svg xml webkit USE_LDCONFIG= yes CMAKE_ARGS= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ Index: cad/fritzing/Makefile =================================================================== --- cad/fritzing/Makefile +++ cad/fritzing/Makefile @@ -19,8 +19,9 @@ WRKSRC= ${WRKDIR}/fritzing-app-${PORTVERSION}b -USES= dos2unix gmake python qmake tar:bzip2 -USE_QT5= buildtools concurrent core dbus gui imageformats network printsupport qmake serialport sql-sqlite3 svg xml +USES= dos2unix gmake python tar:bzip2 qt:5 +USE_QT= buildtools_build concurrent core dbus gui imageformats \ + network printsupport qmake_build serialport sql-sqlite3 svg xml DOS2UNIX_REGEX= .*pro INSTALLS_ICONS= yes Index: cad/klayout/Makefile =================================================================== --- cad/klayout/Makefile +++ cad/klayout/Makefile @@ -10,9 +10,10 @@ LICENSE= GPLv2 -USES= compiler:c++0x execinfo gmake python:build +USES= compiler:c++0x execinfo gmake python:build qt:4 + USE_RUBY= yes -USE_QT4= corelib designer gui network moc_build sql uic_build \ +USE_QT= corelib designer gui network moc_build sql uic_build \ rcc_build qt3support xml USE_LDCONFIG= yes PLIST_FILES= bin/klayout \ Index: cad/layouteditor/Makefile =================================================================== --- cad/layouteditor/Makefile +++ cad/layouteditor/Makefile @@ -13,8 +13,8 @@ LIB_DEPENDS= libttf.so:print/freetype -USES= qmake zip -USE_QT4= corelib gui network moc_build sql uic_build \ +USES= zip qt:4 +USE_QT= corelib gui network moc_build qmake_build sql uic_build \ rcc_build qt3support xml WRKSRC= ${WRKDIR}/layout PLIST_FILES= bin/layout Index: cad/leocad/Makefile =================================================================== --- cad/leocad/Makefile +++ cad/leocad/Makefile @@ -19,8 +19,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= desktop-file-utils gmake jpeg pkgconfig qmake shared-mime-info -USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ +USES= desktop-file-utils gmake jpeg pkgconfig shared-mime-info qt:4 +USE_QT= moc_build qmake_build rcc_build uic_build \ + iconengines_run imageformats_run \ corelib gui network opengl USE_GL= glut USE_GNOME= gtk20 Index: cad/librecad/Makefile =================================================================== --- cad/librecad/Makefile +++ cad/librecad/Makefile @@ -15,9 +15,9 @@ GH_ACCOUNT= LibreCAD GH_PROJECT= LibreCAD -USE_QT4= gui help network sql svg help-tools_build \ - linguisttools_build moc_build rcc_build uic_build -USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake +USE_QT= gui help network sql svg help-tools_build \ + linguisttools_build moc_build qmake_build rcc_build uic_build +USES= compiler:c++11-lib desktop-file-utils pkgconfig qt:4 # Unhide std::to_string() to fix build with GCC (ports/193528) CFLAGS+= -D_GLIBCXX_USE_C99 Index: cad/meshlab/Makefile =================================================================== --- cad/meshlab/Makefile +++ cad/meshlab/Makefile @@ -19,10 +19,10 @@ BROKEN_aarch64= Fails to compile: constant expression evaluates to -1 which cannot be narrowed to type char -USES= dos2unix qmake compiler:c++11-lib tar:tgz +USES= dos2unix compiler:c++11-lib qt:4 tar:tgz USE_CXXSTD= c++11 USE_GL= glew glu -USE_QT4= moc_build rcc_build uic_build corelib gui xml \ +USE_QT= moc_build qmake_build rcc_build uic_build corelib gui xml \ xmlpatterns opengl network script USE_LDCONFIG= yes DOS2UNIX_FILES= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \ Index: cad/openscad/Makefile =================================================================== --- cad/openscad/Makefile +++ cad/openscad/Makefile @@ -24,10 +24,10 @@ libharfbuzz.so:print/harfbuzz \ libopencsg.so:graphics/opencsg -USES= bison compiler:c++11-lang desktop-file-utils gettext-tools pkgconfig qmake shebangfix +USES= bison compiler:c++11-lang desktop-file-utils gettext-tools pkgconfig shebangfix qt:4 SHEBANG_FILES= libraries/MCAD/get_submodules.py USE_GL= glu glew -USE_QT4= corelib gui opengl moc_build uic_build rcc_build +USE_QT= corelib gui opengl moc_build qmake_build uic_build rcc_build PLIST_SUB= PORTVERSION=${PORTVERSION} QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3 QMAKE_ARGS+= VERSION=${PORTVERSION} \ Index: cad/qcad/Makefile =================================================================== --- cad/qcad/Makefile +++ cad/qcad/Makefile @@ -19,10 +19,10 @@ MAKE_JOBS_UNSAFE=yes -USES= execinfo gmake qmake +USES= execinfo gmake qt:4 USE_GITHUB= yes USE_LDCONFIG= yes -USE_QT4= qmake_build codecs-cn codecs-jp codecs-kr codecs-tw corelib \ +USE_QT= qmake_build codecs-cn codecs-jp codecs-kr codecs-tw corelib \ designer gui help imageformats moc_build network opengl rcc_build script \ scripttools sql svg uic_build xml xmlpatterns webkit USE_GL= glu Index: cad/qcad/pkg-plist =================================================================== --- cad/qcad/pkg-plist +++ cad/qcad/pkg-plist @@ -24,7 +24,6 @@ lib/libspatialindexnavel.so lib/libspatialindexnavel.so.0 lib/libstemmer.a -share/applications/usr_local_bin_qcadbin.desktop %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.dxf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.dxf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example00.dxf Index: cad/qelectrotech/Makefile =================================================================== --- cad/qelectrotech/Makefile +++ cad/qelectrotech/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler:c++11-lib desktop-file-utils qmake shared-mime-info -USE_QT5= buildtools_build gui network printsupport \ - sql-sqlite3 svg xml +USES= compiler:c++11-lib desktop-file-utils shared-mime-info qt:5 +USE_QT= buildtools_build qmake_build \ + gui network printsupport sql-sqlite3 svg xml OPTIONS_DEFINE= DEBUG Index: cad/qfsm/Makefile =================================================================== --- cad/qfsm/Makefile +++ cad/qfsm/Makefile @@ -15,9 +15,9 @@ OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES USE_XORG= xi -USE_QT4= corelib gui qt3support svg xml \ +USE_QT= corelib gui qt3support svg xml \ moc_build qmake_build rcc_build uic_build -USES= tar:bzip2 cmake desktop-file-utils +USES= tar:bzip2 cmake desktop-file-utils qt:4 INSTALLS_ICONS= yes GRAPHVIZ_BUILD_DEPENDS= graphviz>=2.22:graphics/graphviz Index: cad/qucs/Makefile =================================================================== --- cad/qucs/Makefile +++ cad/qucs/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USE_QT4= moc_build uic_build rcc_build linguisttools_build \ +USE_QT= moc_build uic_build rcc_build linguisttools_build \ corelib gui xml svg script qt3support -USES= bison gmake libtool shebangfix +USES= bison gmake libtool shebangfix qt:4 SHEBANG_FILES= contrib/ps2sp GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Index: chinese/fcitx-libpinyin/Makefile =================================================================== --- chinese/fcitx-libpinyin/Makefile +++ chinese/fcitx-libpinyin/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libfcitx-config.so:chinese/fcitx \ libpinyin.so:chinese/libpinyin -USES= tar:xz cmake gettext pkgconfig +USES= tar:xz cmake gettext pkgconfig qt:4 INSTALLS_ICONS= yes _MODEL_VER= 20130308 @@ -31,7 +31,7 @@ .include .if ${PORT_OPTIONS:MQT4} -USE_QT4= qmake_build moc_build rcc_build uic_build gui webkit +USE_QT= qmake_build moc_build rcc_build uic_build gui webkit USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt PLIST_SUB+= QT4="" .else Index: chinese/fcitx/Makefile =================================================================== --- chinese/fcitx/Makefile +++ chinese/fcitx/Makefile @@ -41,7 +41,7 @@ USE_LDCONFIG= yes USES= tar:xz cmake desktop-file-utils execinfo \ gettext-tools:build,run gettext-runtime iconv:wchar_t \ - kde:5 pkgconfig shared-mime-info + kde:5 pkgconfig qt:4 shared-mime-info INSTALLS_ICONS= yes OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC DOCS @@ -87,7 +87,7 @@ .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods corelib +USE_QT+= moc_build qmake_build rcc_build uic_build dbus gui inputmethods corelib USE_LDCONFIG+= ${PREFIX}/lib/fcitx/qt PLIST_SUB+= QT4="" .else Index: chinese/fqterm/Makefile =================================================================== --- chinese/fqterm/Makefile +++ chinese/fqterm/Makefile @@ -13,9 +13,9 @@ BROKEN= Unfetchable (google code has gone away) -USES= cmake:outsource dos2unix zip +USES= cmake:outsource dos2unix zip qt:4 USE_XORG= x11 ice xext xt xaw xpm xi xproto xextproto -USE_QT4= gui network script qt3support imageformats \ +USE_QT= gui network script qt3support imageformats \ codecs-cn codecs-tw codecs-jp codecs-kr \ qmake_build moc_build rcc_build uic_build linguist_build Index: chinese/gcin/Makefile =================================================================== --- chinese/gcin/Makefile +++ chinese/gcin/Makefile @@ -16,7 +16,7 @@ HAS_CONFIGURE= YES CONFIGURE_ARGS+= --use_gtk3=N --use_qt3=N USE_GNOME= gtk20 -USES= gmake pkgconfig tar:xz +USES= gmake pkgconfig qt:4 tar:xz USE_XORG= x11 xtst xext INSTALLS_ICONS= YES USE_LDCONFIG= YES @@ -26,7 +26,7 @@ ANTHY_DESC= Japanese anthy IM module QT_IM_MODULE_DESC= QT IM module -QT_IM_MODULE_USE= QT4=inputmethods,qmake_build,moc_build,corelib,gui +QT_IM_MODULE_USE= QT=inputmethods,qmake_build,moc_build,corelib,gui QT_IM_MODULE_LIB_DEPENDS= libmng.so:graphics/libmng QT_IM_MODULE_CONFIGURE_OFF= --use_qt4=N Index: chinese/qt4-codecs-cn/Makefile =================================================================== --- chinese/qt4-codecs-cn/Makefile +++ chinese/qt4-codecs-cn/Makefile @@ -10,7 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt GB 18030 codec plugin -USE_QT4= qmake_build corelib +USES= qt:4 +USE_QT= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes Index: chinese/qt4-codecs-tw/Makefile =================================================================== --- chinese/qt4-codecs-tw/Makefile +++ chinese/qt4-codecs-tw/Makefile @@ -10,7 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Big-5 codec plugin -USE_QT4= qmake_build corelib +USES= qt:4 +USE_QT= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes Index: chinese/qterm/Makefile =================================================================== --- chinese/qterm/Makefile +++ chinese/qterm/Makefile @@ -10,9 +10,9 @@ MAINTAINER= kaiwang27@gmail.com COMMENT= BBS client for BSD/Linux -USES= tar:bzip2 cmake perl5 +USES= tar:bzip2 cmake perl5 qt:4 USE_PERL5= build -USE_QT4= codecs-cn_run codecs-tw_run gui help-tools_build \ +USE_QT= codecs-cn_run codecs-tw_run gui help-tools_build \ linguist_build moc_build network qt3support_build \ qmake_build rcc_build uic_build xml USE_XORG= x11 ice @@ -31,15 +31,15 @@ OPENSSL_CMAKE_ON= -DQTERM_ENABLE_SSH:BOOL=TRUE OPENSSL_CMAKE_OFF= -DQTERM_ENABLE_SSH:BOOL=FALSE -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus DBUS_CMAKE_ON= -DQTERM_ENABLE_DBUS:BOOL=TRUE DBUS_CMAKE_OFF= -DQTERM_ENABLE_DBUS:BOOL=FALSE -PHONON_USE= QT4=phonon +PHONON_USE= QT=phonon PHONON_CMAKE_ON= -DQTERM_ENABLE_PHONON:BOOL=TRUE PHONON_CMAKE_OFF= -DQTERM_ENABLE_PHONON:BOOL=FALSE -QTSCRIPT_USE= QT4=script +QTSCRIPT_USE= QT=script QTSCRIPT_RUN_DEPENDS= ${QT_PLUGINDIR}/script/libqtscript_core.so:devel/qtscriptgenerator QTSCRIPT_CMAKE_ON= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE QTSCRIPT_CMAKE_OFF= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE Index: comms/cqrlog/Makefile =================================================================== --- comms/cqrlog/Makefile +++ comms/cqrlog/Makefile @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= ok2cqr -USES= shebangfix +USES= shebangfix qt:4 SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh Index: comms/cutecom/Makefile =================================================================== --- comms/cutecom/Makefile +++ comms/cutecom/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= lsz:comms/lrzsz -USE_QT4= qt3support qmake_build moc_build rcc_build uic_build -USES= cmake +USE_QT= qt3support qmake_build moc_build rcc_build uic_build +USES= cmake qt:4 .include Index: comms/dabstick-radio/Makefile =================================================================== --- comms/dabstick-radio/Makefile +++ comms/dabstick-radio/Makefile @@ -21,8 +21,8 @@ libfftw3.so:math/fftw3 \ libfaad.so:audio/faad -USES= tar:tgz -USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build +USES= qt:4 tar:tgz +USE_QT= gui qt3support qmake_build moc_build rcc_build uic_build PORTDOCS= * PLIST_FILES+= bin/dabreceiver bin/fmreceiver bin/spectrum-viewer Index: comms/gnuradio/Makefile =================================================================== --- comms/gnuradio/Makefile +++ comms/gnuradio/Makefile @@ -41,7 +41,7 @@ # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow': # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm' # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints -USES= cmake:outsource compiler:c11 iconv perl5 python:2.7 shebangfix +USES= cmake:outsource compiler:c11 iconv perl5 python:2.7 shebangfix qt:4 SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\ -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ @@ -54,7 +54,7 @@ DOCSDIR= share/doc/${PORTNAME}-${MAJOR_SUB_VER} USE_GNOME= pygtk2 USE_WX= 3.0+ -USE_QT4= corelib gui xml qmake moc rcc uic +USE_QT= corelib gui xml qmake moc rcc uic WX_COMPS= wx wx:build wx:run python:build python:run USE_LDCONFIG= yes PLIST_SUB+= MAJOR_VERSION="3" Index: comms/gqrx/Makefile =================================================================== --- comms/gqrx/Makefile +++ comms/gqrx/Makefile @@ -32,10 +32,10 @@ USE_GITHUB= yes GH_ACCOUNT= csete -USES= pkgconfig qmake +USES= pkgconfig qt:5 USE_GL= gl -USE_QT5= buildtools_build core gui svg network widgets +USE_QT= buildtools_build core gui qmake_build svg network widgets PLIST_FILES= bin/gqrx share/applications/gqrx.desktop Index: comms/hamfax/Makefile =================================================================== --- comms/hamfax/Makefile +++ comms/hamfax/Makefile @@ -12,10 +12,10 @@ LIB_DEPENDS= libaudiofile.so:audio/libaudiofile -USE_QT4= gui moc_build +USE_QT= gui moc_build GNU_CONFIGURE= yes CONFIGURE_ARGS+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USES= gmake pkgconfig tar:bzip2 +USES= gmake pkgconfig qt:4 tar:bzip2 .include Index: comms/jsdr/Makefile =================================================================== --- comms/jsdr/Makefile +++ comms/jsdr/Makefile @@ -19,8 +19,9 @@ libsndfile.so:audio/libsndfile \ libfftw3.so:math/fftw3 -USES= qmake tar:tgz -USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build +USES= qt:4 tar:tgz +USE_QT= gui qt3support qmake_build moc_build rcc_build uic_build + PORTDOCS= * PLIST_FILES+= bin/swreceiver bin/spectrum-viewer \ Index: comms/klog/Makefile =================================================================== --- comms/klog/Makefile +++ comms/klog/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake -USE_QT5= buildtools_build core gui linguisttools_build network \ - printsupport sql sql-sqlite3_run widgets +USES= qt:5 +USE_QT= buildtools_build core gui linguisttools_build network \ + printsupport qmake_build sql sql-sqlite3_run widgets DESKTOP_ENTRIES= "KLog" "Simple Amateur Radio Logging Program" \ "" "klog" "Network;HamRadio;" \ true Index: comms/kremotecontrol/Makefile =================================================================== --- comms/kremotecontrol/Makefile +++ comms/kremotecontrol/Makefile @@ -9,9 +9,9 @@ RUN_DEPENDS= lircd:comms/lirc -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= corelib script xmlpatterns \ +USE_QT= corelib script xmlpatterns \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Index: comms/libsdr-gui/Makefile =================================================================== --- comms/libsdr-gui/Makefile +++ comms/libsdr-gui/Makefile @@ -19,8 +19,8 @@ USE_GITHUB= yes GH_ACCOUNT= hmatuschek -USE_QT5= core buildtools_build qmake widgets -USES= cmake pkgconfig +USE_QT= core buildtools_build qmake_build widgets +USES= cmake pkgconfig qt:5 USE_LDCONFIG= yes .include Index: comms/linpsk/Makefile =================================================================== --- comms/linpsk/Makefile +++ comms/linpsk/Makefile @@ -11,8 +11,8 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libasound.so:audio/alsa-lib -USES= qmake tar:tgz -USE_QT4= gui network corelib moc_build uic_build rcc_build qmake_build +USES= qt:4 tar:tgz +USE_QT= gui network corelib moc_build uic_build rcc_build qmake_build DESKTOP_ENTRIES="LinPsk" "${COMMENT}" \ "${DATADIR}/linpsk.png" "linpsk" "Audio;HamRadio;" \ false Index: comms/py-qt5-serialport/Makefile =================================================================== --- comms/py-qt5-serialport/Makefile +++ comms/py-qt5-serialport/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtSerialPort PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run -USE_QT5= core gui serialport qmake_build +USE_QT= core gui serialport qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: comms/qsstv/Makefile =================================================================== --- comms/qsstv/Makefile +++ comms/qsstv/Makefile @@ -21,8 +21,8 @@ libv4l2.so:multimedia/libv4l BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat -USES= qmake -USE_QT5= buildtools core gui network widgets xml +USES= qt:5 +USE_QT= buildtools_build core gui network qmake_build widgets xml USE_GL+= gl OPTIONS_DEFINE= DOCS Index: comms/qt5-connectivity/Makefile =================================================================== --- comms/qt5-connectivity/Makefile +++ comms/qt5-connectivity/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt connectivity (Bluetooth/NFC) module -USE_QT5= concurrent core qml quick buildtools_build +USES= qt:5 tar:xz +USE_QT= concurrent core qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: comms/qt5-sensors/Makefile =================================================================== --- comms/qt5-sensors/Makefile +++ comms/qt5-sensors/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt sensors module -USE_QT5= core qml quick buildtools_build +USES= qt:5 tar:xz +USE_QT= core qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: comms/qt5-serialbus/Makefile =================================================================== --- comms/qt5-serialbus/Makefile +++ comms/qt5-serialbus/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access industrial bus systems -USE_QT5= core network serialport buildtools_build +USES= compiler:c++11-lib qt:5 tar:xz +USE_QT= core network serialport buildtools_build QT_DIST= serialbus -USES= compiler:c++11-lib qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/serialbus INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: comms/qt5-serialport/Makefile =================================================================== --- comms/qt5-serialport/Makefile +++ comms/qt5-serialport/Makefile @@ -8,9 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access serial ports -USE_QT5= core buildtools_build +USES= qt:5 tar:xz +USE_QT= core buildtools_build QT_DIST= serialport -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: comms/qtel/Makefile =================================================================== --- comms/qtel/Makefile +++ comms/qtel/Makefile @@ -12,7 +12,10 @@ LIB_DEPENDS= libecholib.so:comms/svxlink MASTERDIR= ${.CURDIR}/../svxlink -USE_QT4= corelib gui network qmake_build linguist_build moc_build rcc_build uic_build + +USES= qt:4 +USE_QT= corelib gui network \ + linguist_build moc_build qmake_build rcc_build uic_build PKGDIR= ${.CURDIR} CMAKE_ARGS+= -DUSE_QT:BOOL=YES \ -DQT_ONLY:BOOL=YES Index: comms/sdr-wspr/Makefile =================================================================== --- comms/sdr-wspr/Makefile +++ comms/sdr-wspr/Makefile @@ -16,8 +16,8 @@ USE_GITHUB= yes GH_ACCOUNT= hmatuschek -USE_QT5= core buildtools_build qmake webkit widgets -USES= cmake:outsource compiler:gcc-c++11-lib fortran pkgconfig +USES= cmake:outsource compiler:gcc-c++11-lib fortran pkgconfig qt:5 +USE_QT= core buildtools_build qmake_build webkit widgets PLIST_FILES= bin/sdr-wspr share/applications/sdr-wspr.desktop \ share/icons/sdr-wspr.svg Index: comms/svxlink/Makefile =================================================================== --- comms/svxlink/Makefile +++ comms/svxlink/Makefile @@ -24,7 +24,7 @@ GH_ACCOUNT= sm0svx GH_PROJECT= svxlink -USES= cmake tcl +USES+= cmake tcl CMAKE_SOURCE_PATH= ${WRKSRC}/src CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \ -DLOCAL_STATE_DIR=/var Index: comms/wsjtx/Makefile =================================================================== --- comms/wsjtx/Makefile +++ comms/wsjtx/Makefile @@ -22,8 +22,8 @@ MAKE_JOBS_UNSAFE= yes USE_GL= yes -USE_QT5= gui buildtools qmake_build widgets multimedia concurrent serialport -USES= cmake compiler:c++11-lib dos2unix fortran pkgconfig tar:tgz +USE_QT= gui buildtools qmake_build widgets multimedia concurrent serialport +USES= cmake compiler:c++11-lib dos2unix fortran pkgconfig tar:tgz qt:5 CMAKE_ARGS+= -DPORT_BUILDING::STRING="ON" \ -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib WRKSRC= ${WRKDIR}/${PORTNAME} Index: comms/xcwcp/Makefile =================================================================== --- comms/xcwcp/Makefile +++ comms/xcwcp/Makefile @@ -12,8 +12,8 @@ MASTERDIR= ${.CURDIR}/../unixcw PLIST= ${.CURDIR}/pkg-plist -USE_QT5= buildtools gui widgets qmake_build -USES= gettext +USE_QT= buildtools gui widgets qmake_build +USES= gettext qt:5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-xcwcp XCWCP= yes Index: databases/akonadi-googledata/Makefile =================================================================== --- databases/akonadi-googledata/Makefile +++ databases/akonadi-googledata/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libgcal.so:deskutils/libgcal -USES= cmake gettext kde:4 tar:bzip2 -USE_QT4= qmake_build rcc_build moc_build uic_build dbus +USES= cmake gettext kde:4 qt:4 tar:bzip2 +USE_QT= qmake_build rcc_build moc_build uic_build dbus USE_KDE= kdelibs pimlibs automoc4 akonadi .include Index: databases/akonadi/Makefile =================================================================== --- databases/akonadi/Makefile +++ databases/akonadi/Makefile @@ -18,9 +18,9 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt USES= cmake:outsource execinfo kde:4 shared-mime-info \ - compiler:c++11-lang pathfix tar:bzip2 + compiler:c++11-lang pathfix qt:4 tar:bzip2 USE_KDE= automoc4 soprano -USE_QT4= corelib dbus gui network qtestlib_build sql xml \ +USE_QT= corelib dbus gui network qtestlib_build sql xml \ moc_build qmake_build rcc_build uic_build CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL=FALSE \ -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \ @@ -32,7 +32,7 @@ OPTIONS_SUB= yes # SQLITE MYSQL_DESC= Install MySQL Qt plugin and server -MYSQL_USE= QT4=sql-mysql_run +MYSQL_USE= QT=sql-mysql_run MYSQL_USES= mysql:server PGSQL_DESC= Install PostgreSQL Qt plugin @@ -40,7 +40,7 @@ # it over MySQL might like to use some advanced configuration, like a # remote server. #PGSQL_USE= PGSQL=server -PGSQL_USE= QT4=sql-pgsql_run +PGSQL_USE= QT=sql-pgsql_run SQLITE_DESC= Enable SQLite backend SQLITE_USES= sqlite:3 Index: databases/kbibtex/Makefile =================================================================== --- databases/kbibtex/Makefile +++ databases/kbibtex/Makefile @@ -14,10 +14,10 @@ libqca.so:devel/qca \ libqoauth.so:net/qoauth -USES= cmake iconv kde:4 shared-mime-info tar:xz +USES= cmake iconv kde:4 shared-mime-info qt:4 tar:xz USE_GNOME= libxml2 libxslt USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build \ +USE_QT= qmake_build moc_build uic_build rcc_build \ webkit USE_LDCONFIG= yes Index: databases/pgmodeler/Makefile =================================================================== --- databases/pgmodeler/Makefile +++ databases/pgmodeler/Makefile @@ -13,9 +13,10 @@ USE_GITHUB= yes -USES= compiler:c++11-lib execinfo pgsql qmake pkgconfig gmake +USES= compiler:c++11-lib execinfo pgsql pkgconfig gmake qt:5 USE_GNOME= libxml2 -USE_QT5= gui network sql svg printsupport widgets core buildtools_build uitools testlib +USE_QT= gui network sql svg printsupport widgets core uitools testlib \ + buildtools_build qmake_build USE_GL+= gl USE_XORG= x11 xext Index: databases/py-qt4-sql/Makefile =================================================================== --- databases/py-qt4-sql/Makefile +++ databases/py-qt4-sql/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtSql PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui sql \ +USE_QT= corelib gui sql \ moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: databases/py-qt5-sql/Makefile =================================================================== --- databases/py-qt5-sql/Makefile +++ databases/py-qt5-sql/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtSql PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run -USE_QT5= core gui sql widgets buildtools_build qmake_build +USE_QT= core gui sql widgets buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: databases/qt4-sql/Makefile =================================================================== --- databases/qt4-sql/Makefile +++ databases/qt4-sql/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQL database integration module -USE_QT4= qmake_build moc_build corelib +USES= qt:4 +USE_QT= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: databases/qt5-sql/Makefile =================================================================== --- databases/qt5-sql/Makefile +++ databases/qt5-sql/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQL database integration module -USE_QT5= core qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: databases/sqlitebrowser/Makefile =================================================================== --- databases/sqlitebrowser/Makefile +++ databases/sqlitebrowser/Makefile @@ -22,11 +22,13 @@ .if empty(PKGNAMESUFFIX) CMAKE_ARGS+= -DUSE_QT5:BOOL=FALSE -USE_QT4= corelib network gui qmake_build linguisttools_build \ +USES+= qt:4 +USE_QT= corelib network gui qmake_build linguisttools_build \ moc_build uic_build rcc_build .else CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE -USE_QT5= core gui network printsupport testlib widgets \ +USES+= qt:5 +USE_QT= core gui network printsupport testlib widgets \ buildtools_build linguisttools_build qmake_build .endif Index: databases/sqliteman/Makefile =================================================================== --- databases/sqliteman/Makefile +++ databases/sqliteman/Makefile @@ -12,8 +12,8 @@ LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 -USES= cmake sqlite -USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql +USES= cmake sqlite qt:4 +USE_QT= qmake_build gui moc_build rcc_build uic_build xml sql GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: databases/sqlitestudio/Makefile =================================================================== --- databases/sqlitestudio/Makefile +++ databases/sqlitestudio/Makefile @@ -37,10 +37,10 @@ WRKSRC= ${WRKDIR}/SQLiteStudio3 -USES= compiler:c++11-lib gmake ncurses qmake readline sqlite +USES= compiler:c++11-lib gmake ncurses readline sqlite qt:5 USE_CXXSTD= c++11 -USE_QT5= core gui svg sql xml network sql-sqlite3_run widgets script \ - concurrent uitools buildtools_build linguisttools_build +USE_QT= core gui svg sql xml network sql-sqlite3_run widgets script \ + concurrent uitools buildtools_build linguisttools_build qmake_build USE_GL= gl USE_LDCONFIG= yes @@ -79,7 +79,7 @@ .endif .if ${PORT_OPTIONS:MPLUGIN_PRINTING} PLUGIN_DIRS += Printing -USE_QT5+= printsupport +USE_QT+= printsupport .endif .if ${PORT_OPTIONS:MPLUGIN_REGEXP_IMPORT} PLUGIN_DIRS += RegExpImport Index: databases/tora/Makefile =================================================================== --- databases/tora/Makefile +++ databases/tora/Makefile @@ -21,8 +21,8 @@ OPTIONS_DEFINE_i386= ORACLE OPTIONS_DEFAULT= PGSQL MYSQL -USE_QT4= corelib gui sql xml network moc_build uic_build rcc_build -USES= autoreconf gmake libtool makeinfo +USE_QT= corelib gui sql xml network moc_build uic_build rcc_build +USES= autoreconf gmake libtool makeinfo qt:4 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pcre=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib Index: deskutils/basket/Makefile =================================================================== --- deskutils/basket/Makefile +++ deskutils/basket/Makefile @@ -14,10 +14,10 @@ LIB_DEPENDS= libgpgme.so:security/gpgme -USES= cmake gettext-tools kde:4 tar:bzip2 +USES= cmake gettext-tools kde:4 qt:4 tar:bzip2 USE_XORG= xft xpm USE_KDE= automoc4 pimlibs qimageblitz -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: deskutils/cairo-dock-plugins/Makefile =================================================================== --- deskutils/cairo-dock-plugins/Makefile +++ deskutils/cairo-dock-plugins/Makefile @@ -25,7 +25,7 @@ USE_GNOME= glib20 gtk30 librsvg2 libxml2 USE_LDCONFIG= yes USE_XORG= xrender -USES= cmake gettext pkgconfig python +USES= cmake gettext pkgconfig python qt:4 LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= PYVER="${PYTHON_VERSION:S/thon//}" CMAKE_ARGS= -DROOT_PREFIX:PATH=${STAGEDIR} @@ -93,7 +93,7 @@ IMPULSE_CMAKE_OFF= -Denable-impulse:BOOL=FALSE #KDE_INTEGRATION_LIB_DEPENDS= -KDE_INTEGRATION_USE_QT4= corelib +KDE_INTEGRATION_USE_QT= corelib KDE_INTEGRATION_USES= kde:4 KDE_INTEGRATION_USE= KDE=kdelibs KDE_INTEGRATION_CMAKE_ON= -Denable-kde-integration:BOOL=TRUE Index: deskutils/calibre/Makefile =================================================================== --- deskutils/calibre/Makefile +++ deskutils/calibre/Makefile @@ -45,13 +45,15 @@ EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \ - python:2 pyqt:5 shared-mime-info shebangfix ssl tar:xz + python:2 pyqt:5 qt:5 shared-mime-info shebangfix ssl tar:xz + SHEBANG_FILES= resources/calibre-portable.sh \ src/calibre/ebooks/metadata/odt.py \ src/calibre/utils/*.py \ src/odf/*.py USE_PYQT= core gui network sip svg webkit widgets webkitwidgets xmlpatterns -USE_QT5= buildtools_build core dbus gui qmake_build widgets +USE_QT= buildtools_build core dbus gui qmake_build widgets + USE_GL= egl gl USE_GNOME= glib20 USE_XORG= xrender xext x11 Index: deskutils/cdcat/Makefile =================================================================== --- deskutils/cdcat/Makefile +++ deskutils/cdcat/Makefile @@ -22,8 +22,9 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -USES= libtool qmake:norecursive tar:bzip2 -USE_QT4= corelib gui xml linguisttools_build moc_build uic_build +USES= libtool qt:4,qmake_norecursiv tar:bzip2 +USE_QT= corelib gui xml \ + linguisttools_build moc_build qmake_build uic_build QMAKE_ARGS= LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ DEFINES+="MEDIAINFO_STATIC" \ Index: deskutils/charmtimetracker/Makefile =================================================================== --- deskutils/charmtimetracker/Makefile +++ deskutils/charmtimetracker/Makefile @@ -15,9 +15,9 @@ GH_ACCOUNT= KDAB GH_PROJECT= Charm -USES= cmake +USES= cmake qt:4 CMAKE_ARGS+= -DCharm_VERSION:STRING=${PORTVERSION} -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \ +USE_QT= qmake_build moc_build rcc_build uic_build corelib gui network \ qtestlib sql sql-sqlite3 xml USE_XORG= ice x11 xext xscrnsaver INSTALLS_ICONS= yes Index: deskutils/copyq/Makefile =================================================================== --- deskutils/copyq/Makefile +++ deskutils/copyq/Makefile @@ -12,10 +12,10 @@ BROKEN_FreeBSD_9= does not build -USES= qmake +USES= qt:5 USE_XORG= x11 xfixes xtst -USE_QT5= core gui network svg multimedia imageformats \ - buildtools_build x11extras concurrent widgets xml \ +USE_QT= core gui network svg multimedia imageformats \ + buildtools_build qmake_build x11extras concurrent widgets xml \ script USE_GL= gl Index: deskutils/epoch/Makefile =================================================================== --- deskutils/epoch/Makefile +++ deskutils/epoch/Makefile @@ -16,8 +16,8 @@ BROKEN= Unfetchable (google code has gone away) -USES= qmake zip -USE_QT4= gui moc_build rcc_build +USES= zip qt:4 +USE_QT= gui moc_build qmake_build rcc_build PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.png Index: deskutils/fbreader/Makefile =================================================================== --- deskutils/fbreader/Makefile +++ deskutils/fbreader/Makefile @@ -27,7 +27,7 @@ STATUS= release .endif -USES= compiler gmake iconv localbase pkgconfig sqlite tar:tgz +USES= compiler gmake iconv localbase pkgconfig sqlite qt:4 tar:tgz USE_LDCONFIG= yes INSTALL_TARGET= do_install @@ -45,7 +45,7 @@ GTK2_USE= gnome=gtk20 GTK2_MAKE_ENV= UI_TYPE=gtk -QT4_USE= qt4=gui,corelib,imageformats,network,moc_build +QT4_USE= qt=gui,corelib,imageformats,network,moc_build QT4_LIBS= -L${QT_LIBDIR} QT4_MAKE_ENV= UI_TYPE=qt4 Index: deskutils/fet/Makefile =================================================================== --- deskutils/fet/Makefile +++ deskutils/fet/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:bzip2 +USES= tar:bzip2 PORTEXAMPLES= * @@ -34,8 +34,10 @@ OPTIONS_SUB= yes -QT4_USE= QT4=corelib,moc_build,rcc_build,uic_build,xml -QT5_USE= QT5=buildtools_build,core,xml GL=gl +QT4_USES= qt:4 +QT4_USE= QT=corelib,moc_build,qmake_build,rcc_build,uic_build,xml +QT5_USES= qt:5 +QT5_USE= QT=buildtools_build,qmake_build,core,xml GL=gl .include @@ -45,9 +47,9 @@ .else INSTALL_TARGET+= ${WRKSRC}/fet .if ${PORT_OPTIONS:MQT4} -USE_QT4+=gui network +USE_QT+=gui network .else -USE_QT5+=gui network printsupport widgets +USE_QT+=gui network printsupport widgets .endif .endif Index: deskutils/homerun/Makefile =================================================================== --- deskutils/homerun/Makefile +++ deskutils/homerun/Makefile @@ -9,9 +9,9 @@ MAINTAINER= yurkis@gmail.com COMMENT= Fullscreen launcher with content organized in tabs -USES= cmake:outsource compiler:c++0x gettext kde:4 tar:bzip2 +USES= cmake:outsource compiler:c++0x gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 workspace -USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui +USE_QT= moc_build qmake_build rcc_build uic_build corelib gui USE_XORG= x11 USE_LDCONFIG= yes Index: deskutils/kcharselect/Makefile =================================================================== --- deskutils/kcharselect/Makefile +++ deskutils/kcharselect/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Character selector for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: deskutils/kchmviewer-kde4/Makefile =================================================================== --- deskutils/kchmviewer-kde4/Makefile +++ deskutils/kchmviewer-kde4/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libchm.so:misc/chmlib \ libzip.so:archivers/libzip -USES= cmake:outsource gettext-tools kde:4 +USES= cmake:outsource gettext-tools kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= webkit qmake_build moc_build rcc_build uic_build +USE_QT= webkit qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} Index: deskutils/kdeconnect/Makefile =================================================================== --- deskutils/kdeconnect/Makefile +++ deskutils/kdeconnect/Makefile @@ -9,9 +9,9 @@ MAINTAINER= yurkis@gmail.com COMMENT= Support for KDE to interface between your phone and your computer -USES= cmake compiler:c++0x gettext kde:4 tar:xz +USES= cmake compiler:c++0x gettext kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 workspace runtime -USE_QT4= corelib gui moc_build qmake_build uic_build rcc_build +USE_QT= corelib gui moc_build qmake_build uic_build rcc_build USE_LDCONFIG= yes .include Index: deskutils/kdepim4-runtime/Makefile =================================================================== --- deskutils/kdepim4-runtime/Makefile +++ deskutils/kdepim4-runtime/Makefile @@ -20,11 +20,11 @@ CONFLICTS_INSTALL= kdepim-runtime44-4.* -USES= cmake:outsource kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info qt:4 tar:xz USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs \ akonadi automoc4 -USE_QT4= corelib dbus declarative designer_build gui network qtestlib \ +USE_QT= corelib dbus declarative designer_build gui network qtestlib \ script xml xmlpatterns \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Index: deskutils/kdepim4/Makefile =================================================================== --- deskutils/kdepim4/Makefile +++ deskutils/kdepim4/Makefile @@ -24,12 +24,12 @@ USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs kactivities \ akonadi automoc4 soprano nepomuk-widgets baloo -USES= cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix tar:xz +USES= cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix qt:4 tar:xz SHEBANG_FILES= agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \ kalarm/*.pl kmail/kconf_update/*.pl \ libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl USE_OPENLDAP= yes -USE_QT4= corelib dbus declarative designer_build gui network opengl \ +USE_QT= corelib dbus declarative designer_build gui network opengl \ qt3support script sql webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xscrnsaver Index: deskutils/kdepimlibs4/Makefile =================================================================== --- deskutils/kdepimlibs4/Makefile +++ deskutils/kdepimlibs4/Makefile @@ -20,12 +20,12 @@ libprison.so:graphics/prison \ libqjson.so:devel/qjson -USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz +USES= cmake:outsource kde:4 shared-mime-info shebangfix qt:4 tar:xz USE_KDE= kdelibs akonadi \ automoc4 ontologies soprano SHEBANG_FILES= mailtransport/kconf_update/migrate-transports.pl USE_OPENLDAP= yes -USE_QT4= corelib dbus declarative designer_build gui network sql xml \ +USE_QT= corelib dbus declarative designer_build gui network sql xml \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Index: deskutils/kdeplasma-addons/Makefile =================================================================== --- deskutils/kdeplasma-addons/Makefile +++ deskutils/kdeplasma-addons/Makefile @@ -17,10 +17,10 @@ CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].* -USES= cmake:outsource kde:4 pkgconfig shared-mime-info tar:xz +USES= cmake:outsource kde:4 pkgconfig shared-mime-info qt:4 tar:xz USE_KDE= kdelibs libkexiv2 pimlibs workspace \ akonadi attica automoc4 qimageblitz soprano -USE_QT4= corelib dbus declarative gui network script sql webkit \ +USE_QT= corelib dbus declarative gui network script sql webkit \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xrender xtst USE_LDCONFIG= yes Index: deskutils/kruler/Makefile =================================================================== --- deskutils/kruler/Makefile +++ deskutils/kruler/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 screen ruler -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_XORG= x11 .include Index: deskutils/ksshaskpass/Makefile =================================================================== --- deskutils/ksshaskpass/Makefile +++ deskutils/ksshaskpass/Makefile @@ -12,9 +12,9 @@ COMMENT= KDE 4 version of ssh-askpass with KWallet support WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build uic_build qmake_build rcc_build +USE_QT= moc_build uic_build qmake_build rcc_build SUB_FILES= pkg-message Index: deskutils/launchy/Makefile =================================================================== --- deskutils/launchy/Makefile +++ deskutils/launchy/Makefile @@ -16,9 +16,9 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:devel/xdg-utils -USES= dos2unix qmake +USES= dos2unix qt:4 DOS2UNIX_FILES= readme.lyx readme.txt -USE_QT4= moc_build rcc_build uic_build gui network +USE_QT= moc_build qmake_build rcc_build uic_build gui network LDFLAGS+= -lX11 PORTDOCS= * Index: deskutils/nagaina/Makefile =================================================================== --- deskutils/nagaina/Makefile +++ deskutils/nagaina/Makefile @@ -26,9 +26,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= gettext iconv qmake +USES= gettext iconv qt:4 USE_GNOME= glib20 -USE_QT4= corelib gui xml moc_build rcc_build uic_build +USE_QT= corelib gui xml moc_build qmake_build rcc_build uic_build USE_XORG= ice sm x11 xau xcb xdmcp xext xrender PORTDOCS= CHANGELOG TODO Index: deskutils/owncloudclient/Makefile =================================================================== --- deskutils/owncloudclient/Makefile +++ deskutils/owncloudclient/Makefile @@ -15,8 +15,8 @@ libqt5keychain.so:security/qtkeychain-qt5 USES= cmake:outsource compiler:c++11-lib gmake iconv \ - localbase:ldflags pkgconfig sqlite ssl -USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \ + localbase:ldflags pkgconfig qt:5 sqlite ssl +USE_QT= buildtools_build concurrent core dbus gui linguist_build network \ qmake_build sql webkit widgets xml CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ Index: deskutils/plasma-applet-cwp/Makefile =================================================================== --- deskutils/plasma-applet-cwp/Makefile +++ deskutils/plasma-applet-cwp/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl svg phonon webkit xml \ +USE_QT= gui dbus network opengl svg phonon webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: deskutils/plasma-applet-daisy/Makefile =================================================================== --- deskutils/plasma-applet-daisy/Makefile +++ deskutils/plasma-applet-daisy/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 -USES= cmake gettext kde:4 +USES= cmake gettext kde:4 qt:4 USE_KDE= automoc4 kdelibs workspace -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: deskutils/plasma-applet-fancytasks/Makefile =================================================================== --- deskutils/plasma-applet-fancytasks/Makefile +++ deskutils/plasma-applet-fancytasks/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs workspace qimageblitz -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: deskutils/plasma-applet-panelspacer/Makefile =================================================================== --- deskutils/plasma-applet-panelspacer/Makefile +++ deskutils/plasma-applet-panelspacer/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 workspace -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/Panelspacer_from_svn_pour_kdelook-tmp Index: deskutils/plasma-applet-playwolf/Makefile =================================================================== --- deskutils/plasma-applet-playwolf/Makefile +++ deskutils/plasma-applet-playwolf/Makefile @@ -15,9 +15,9 @@ BROKEN= Unfetchable (google code has gone away) -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl phonon svg webkit xml xmlpatterns \ +USE_QT= gui dbus network opengl phonon svg webkit xml xmlpatterns \ qmake_build moc_build rcc_build uic_build PLIST_FILES= lib/kde4/plasma_applet_playwolf.so \ Index: deskutils/plasma-applet-qstardict/Makefile =================================================================== --- deskutils/plasma-applet-qstardict/Makefile +++ deskutils/plasma-applet-qstardict/Makefile @@ -12,8 +12,8 @@ RUN_DEPENDS= ${QSTARDICT_PLUGIN_PATH}/libstardict.so:textproc/qstardict -USES= cmake kde:4 tar:bzip2 -USE_QT4= qmake_build uic_build moc_build rcc_build +USES= cmake kde:4 qt:4 tar:bzip2 +USE_QT= qmake_build uic_build moc_build rcc_build USE_KDE= automoc4 kdelibs CMAKE_SOURCE_PATH= ${WRKSRC}/kdeplasma Index: deskutils/plasma-applet-serverstatuswidget/Makefile =================================================================== --- deskutils/plasma-applet-serverstatuswidget/Makefile +++ deskutils/plasma-applet-serverstatuswidget/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 workspace -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: deskutils/plasma-applet-simpleweatherforecast/Makefile =================================================================== --- deskutils/plasma-applet-simpleweatherforecast/Makefile +++ deskutils/plasma-applet-simpleweatherforecast/Makefile @@ -14,9 +14,9 @@ RUN_DEPENDS= wget:ftp/wget -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/plasma-${PORTNAME}-${PORTVERSION}-kde-4.3.80 Index: deskutils/plasma-applet-teacooker/Makefile =================================================================== --- deskutils/plasma-applet-teacooker/Makefile +++ deskutils/plasma-applet-teacooker/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/TeaCooker Index: deskutils/plasma-applet-yawp/Makefile =================================================================== --- deskutils/plasma-applet-yawp/Makefile +++ deskutils/plasma-applet-yawp/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 workspace -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: deskutils/qorganizer/Makefile =================================================================== --- deskutils/qorganizer/Makefile +++ deskutils/qorganizer/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING -USES= qmake -USE_QT4= corelib gui network moc_build rcc_build sql +USES= qt:4 +USE_QT= corelib gui network moc_build qmake_build rcc_build sql WRKSRC= ${WRKDIR}/qOrganizer/src PLIST_FILES= bin/qOrganizer share/pixmaps/qOrganizer.png Index: deskutils/qrfcview/Makefile =================================================================== --- deskutils/qrfcview/Makefile +++ deskutils/qrfcview/Makefile @@ -10,8 +10,8 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Graphical RFC viewer -USES= qmake tar:tgz -USE_QT4= gui network corelib uic_build moc_build rcc_build +USES= qt:4 tar:tgz +USE_QT= gui network corelib uic_build moc_build qmake_build rcc_build PLIST_FILES= bin/qRFCView PORTDOCS= * Index: deskutils/qtm/Makefile =================================================================== --- deskutils/qtm/Makefile +++ deskutils/qtm/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake tar:bzip2 -USE_QT4= corelib dbus gui network xml \ +USES= cmake qt:4 tar:bzip2 +USE_QT= corelib dbus gui network xml \ moc_build qmake_build rcc_build uic_build USE_OPENSSL= yes CMAKE_ARGS= -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \ Index: deskutils/recoll/Makefile =================================================================== --- deskutils/recoll/Makefile +++ deskutils/recoll/Makefile @@ -19,7 +19,7 @@ wpd2html:textproc/libwpd010 \ unrtf:textproc/unrtf -USES= bison gmake iconv shebangfix +USES= bison gmake iconv shebangfix qt:4 SHEBANG_FILES= filters/rclimg filters/rclpdf desktop/hotrecoll.py USE_GNOME= libxslt:run GNU_CONFIGURE= yes @@ -52,9 +52,9 @@ PYTHON_PLIST_SUB= PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" PYTHON_VARS= PYDISTUTILS_PKGNAME=Recoll \ PYDISTUTILS_PKGVERSION=1.0 -QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \ - qt4=iconengines_run,imageformats_run \ - qt4=corelib,gui,xml,webkit +QT4_USE= qt=moc_build,qmake_build,rcc_build,uic_build \ + qt=iconengines_run,imageformats_run \ + qt=corelib,gui,xml,webkit QT4_CONFIGURE_ENABLE= qtgui QT4_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ QTDIR="${PREFIX}" Index: deskutils/semantik/Makefile =================================================================== --- deskutils/semantik/Makefile +++ deskutils/semantik/Makefile @@ -11,12 +11,12 @@ LICENSE= GPLv3 -USES= kde:4 pkgconfig python:2 shebangfix tar:bzip2 waf \ - shared-mime-info +USES= kde:4 pkgconfig python:2 qt:4,qmake_dummy shared-mime-info \ + shebangfix tar:bzip2 waf USE_KDE= kdelibs USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes -USE_QT4= corelib gui linguist_build svg webkit xml \ +USE_QT= corelib gui linguist_build svg webkit xml \ moc_build qmake_build uic_build QT_NONSTANDARD= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" \ Index: deskutils/silence/Makefile =================================================================== --- deskutils/silence/Makefile +++ deskutils/silence/Makefile @@ -16,9 +16,9 @@ RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build linguisttools_build +USE_QT= qmake_build moc_build rcc_build uic_build linguisttools_build WRKSRC= ${WRKDIR}/${PORTNAME} Index: deskutils/strigiclient/Makefile =================================================================== --- deskutils/strigiclient/Makefile +++ deskutils/strigiclient/Makefile @@ -12,7 +12,9 @@ libstreamanalyzer.so:deskutils/libstreamanalyzer \ libsearchclient.so:deskutils/strigidaemon -USE_QT4= corelib gui dbus moc_build uic_build qmake_build rcc_build +USES= qt:4 +USE_QT= corelib gui dbus \ + moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include <${.CURDIR}/../strigi/Makefile.common> Index: deskutils/superkaramba/Makefile =================================================================== --- deskutils/superkaramba/Makefile +++ deskutils/superkaramba/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Widget framework for KDE -USES= cmake:outsource kde:4 python:2 tar:xz +USES= cmake:outsource kde:4 python:2 qt:4 tar:xz USE_KDE= kdelibs automoc4 qimageblitz -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes .include Index: deskutils/tuxcards/Makefile =================================================================== --- deskutils/tuxcards/Makefile +++ deskutils/tuxcards/Makefile @@ -11,8 +11,8 @@ COMMENT= Tool for managing notes within a hierarchical tree WRKSRC= ${WRKDIR}/${PORTNAME} -USES= qmake -USE_QT4= gui xml moc_build uic_build rcc_build +USES= qt:4 +USE_QT= gui xml moc_build qmake_build uic_build rcc_build PLIST_FILES= bin/tuxcards Index: deskutils/vym/Makefile =================================================================== --- deskutils/vym/Makefile +++ deskutils/vym/Makefile @@ -10,9 +10,9 @@ MAINTAINER= lichray@gmail.com COMMENT= VYM is a tool to generate and manipulate mind maps -USES= qmake shebangfix tar:bzip2 +USES= shebangfix qt:4 tar:bzip2 SHEBANG_FILES= scripts/makedist-vym scripts/vivym -USE_QT4= uic_build moc_build qt3support_build \ +USE_QT= uic_build moc_build qmake_build qt3support_build \ network xml dbus svg QMAKE_ARGS= DATADIR=${DATADIR:C,/vym$,,} \ DOCDIR=${DOCSDIR} @@ -28,7 +28,7 @@ OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes -NLS_USE= QT4=linguist_build +NLS_USE= QT=linguist_build .include Index: deskutils/znotes/Makefile =================================================================== --- deskutils/znotes/Makefile +++ deskutils/znotes/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= qmake -USE_QT4= corelib gui network xml uic_build moc_build rcc_build \ +USES= qt:4 +USE_QT= corelib gui network xml uic_build moc_build qmake_build rcc_build \ linguisttools_build QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} Index: devel/ace/Makefile =================================================================== --- devel/ace/Makefile +++ devel/ace/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/ACE_wrappers -USES= gmake perl5 pkgconfig shebangfix tar:bzip2 +USES= gmake perl5 pkgconfig shebangfix qt:4 tar:bzip2 USE_PERL5= build SHEBANG_FILES= bin/*.pl MPC/*.pl MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \ @@ -45,7 +45,7 @@ FLTK_DESC= FLTK GUI toolkit FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk FLTK_MAKE_ENV= fl=1 -QT4_USE= QT4=corelib,gui,moc_build +QT4_USE= QT=corelib,gui,moc_build QT4_MAKE_ENV= qt=1 qt4=1 QTDIR="${PREFIX}" QT4_CPPFLAGS= -I${QT_INCDIR} QT4_LDFLAGS= -L${QT_LIBDIR} Index: devel/alabastra/Makefile =================================================================== --- devel/alabastra/Makefile +++ devel/alabastra/Makefile @@ -15,9 +15,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME} -USES= qmake gmake tar:tgz -USE_QT4= gui xml \ - moc_build rcc_build uic_build \ +USES= gmake qt:4 tar:tgz +USE_QT= gui xml \ + moc_build qmake_build rcc_build uic_build \ iconengines_run ALL_TARGET= Alabastra Index: devel/apiextractor/Makefile =================================================================== --- devel/apiextractor/Makefile +++ devel/apiextractor/Makefile @@ -17,9 +17,9 @@ GH_ACCOUNT= PySide GH_PROJECT= Apiextractor -USES= cmake +USES= cmake qt:4 USE_GNOME= libxml2 libxslt -USE_QT4= gui moc_build qmake_build qtestlib_build \ +USE_QT= gui moc_build qmake_build qtestlib_build \ rcc_build uic_build xml xmlpatterns USE_LDCONFIG= yes Index: devel/automoc4/Makefile =================================================================== --- devel/automoc4/Makefile +++ devel/automoc4/Makefile @@ -11,7 +11,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Automatic moc for Qt 4 packages -USE_QT4= corelib moc qmake_build rcc_build uic_build -USES= cmake tar:bzip2 +USE_QT= corelib moc qmake_build rcc_build uic_build +USES= cmake qt:4 tar:bzip2 .include Index: devel/cervisia/Makefile =================================================================== --- devel/cervisia/Makefile +++ devel/cervisia/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= CVS Frontend for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: devel/cmake-doc/Makefile =================================================================== --- devel/cmake-doc/Makefile +++ devel/cmake-doc/Makefile @@ -17,8 +17,8 @@ BUILD_DEPENDS= sphinx-build:textproc/py-sphinx NO_ARCH= yes -USES= cmake:outsource -USE_QT5= help_build +USES= cmake:outsource qt:5 +USE_QT= help_build CMAKE_ARGS= -DSPHINX_MAN:BOOL=OFF \ -DSPHINX_HTML:BOOL=ON \ Index: devel/cmake-gui/Makefile =================================================================== --- devel/cmake-gui/Makefile +++ devel/cmake-gui/Makefile @@ -17,9 +17,9 @@ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp -USE_QT5= core gui widgets buildtools_build qmake_build USES= cmake:run desktop-file-utils execinfo libarchive \ - shared-mime-info + qt:5 shared-mime-info +USE_QT= core gui widgets buildtools_build qmake_build CMAKE_ARGS= -DBUILD_QtDialog:bool=on \ -DBUILD_CursesDialog:BOOL=OFF \ -DSPHINX_MAN:BOOL=ON \ Index: devel/dbus-qt4/Makefile =================================================================== --- devel/dbus-qt4/Makefile +++ devel/dbus-qt4/Makefile @@ -13,13 +13,12 @@ BROKEN_sparc64= fails to compile: invalid conversion -USES= pkgconfig -USE_QT4= qmake_build moc_build rcc_build corelib xml +USES= pkgconfig qt:4 +USE_QT= qmake_build moc_build rcc_build corelib xml QT_DIST= yes MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/dbus-qt5/Makefile =================================================================== --- devel/dbus-qt5/Makefile +++ devel/dbus-qt5/Makefile @@ -10,11 +10,11 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus -USE_QT5= core qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/dolphin-plugins/Makefile =================================================================== --- devel/dolphin-plugins/Makefile +++ devel/dolphin-plugins/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plugins for Dolphin file manager -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkonq automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: devel/doxygen/Makefile =================================================================== --- devel/doxygen/Makefile +++ devel/doxygen/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison cmake:outsource iconv python:2 shebangfix +USES= bison cmake:outsource iconv python:2 shebangfix qt:4 ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} REINPLACE_ARGS= -i '' @@ -36,7 +36,7 @@ LATEX_USE= TEX=base,dvipsk,pdftex -QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build +QT4_USE= QT=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build QT4_CMAKE_ON= -Dbuild_wizard:BOOLEAN=ON QT4_CMAKE_OFF= -Dbuild_wizard:BOOLEAN=OFF QT4_PLIST_FILES= bin/doxywizard Index: devel/edb/Makefile =================================================================== --- devel/edb/Makefile +++ devel/edb/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= qmake tar:tgz -USE_QT4= gui network xml moc_build rcc_build uic_build +USES= qt:4 tar:tgz +USE_QT= gui network xml moc_build qmake_build rcc_build uic_build QMAKE_ARGS= DEFAULT_PLUGIN_PATH="${PREFIX}/libexec/${PORTNAME}" WRKSRC= ${WRKDIR}/debugger Index: devel/fuel/Makefile =================================================================== --- devel/fuel/Makefile +++ devel/fuel/Makefile @@ -15,9 +15,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/fossil:devel/fossil -USES= qmake -USE_QT4= corelib gui \ - moc_build rcc_build uic_build +USES= qt:4 +USE_QT= corelib gui \ + moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/Fuel Index: devel/gecode/Makefile =================================================================== --- devel/gecode/Makefile +++ devel/gecode/Makefile @@ -17,7 +17,7 @@ BROKEN_aarch64= Fails to build: error Boost.Numeric.Interval: Please specify rounding control mechanism BROKEN_mips64= Fails to build: error Boost.Numeric.Interval: Please specify rounding control mechanism -USES= bison gmake perl5 +USES= bison gmake perl5 qt:5 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static \ @@ -44,7 +44,7 @@ OPTIONS_SUB= yes GIST_DESC= Interactive Search Tool (requires Qt) -GIST_USE= QT4=corelib,gui,moc_build,qmake_build +GIST_USE= QT=corelib,gui,moc_build,qmake_build GIST_CONFIGURE_ON= --enable-gist --enable-qt GIST_CONFIGURE_OFF= --disable-gist --disable-qt Index: devel/generatorrunner/Makefile =================================================================== --- devel/generatorrunner/Makefile +++ devel/generatorrunner/Makefile @@ -16,9 +16,9 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_QT4= gui qmake_build qtestlib moc_build rcc_build uic_build xml +USE_QT= gui qmake_build qtestlib moc_build rcc_build uic_build xml -USES= cmake +USES= cmake qt:4 USE_GITHUB= yes USE_LDCONFIG= yes Index: devel/grantlee/Makefile =================================================================== --- devel/grantlee/Makefile +++ devel/grantlee/Makefile @@ -15,9 +15,9 @@ PORTSCOUT= limit:^0\. -USE_QT4= corelib gui qtestlib_build script \ +USE_QT= corelib gui qtestlib_build script \ qmake_build moc_build rcc_build uic_build -USES= cmake:outsource grantlee:4,selfbuild +USES= cmake:outsource grantlee:4,selfbuild qt:4 CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE USE_LDCONFIG= yes Index: devel/grantlee5/Makefile =================================================================== --- devel/grantlee5/Makefile +++ devel/grantlee5/Makefile @@ -14,8 +14,8 @@ PORTSCOUT= limit:^5\. -USE_QT5= buildtools_build core gui qmake_build script -USES= cmake:outsource compiler:c++11-lib grantlee:5,selfbuild +USE_QT= buildtools_build core gui qmake_build script +USES= cmake:outsource compiler:c++11-lib grantlee:5,selfbuild qt:5 CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE USE_LDCONFIG= yes Index: devel/gwenhywfar/Makefile =================================================================== --- devel/gwenhywfar/Makefile +++ devel/gwenhywfar/Makefile @@ -57,7 +57,8 @@ libfontconfig.so:x11-fonts/fontconfig USE_GNOME+= cairo gdkpixbuf2 gtk20 . elif ${SLAVEPORT}=="qt4" -USE_QT4= corelib gui moc_build uic_build +USES+= qt:4 +USE_QT= corelib gui moc_build uic_build QT_NONSTANDARD= yes CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \ --with-qt4-libs=${QT_LIBDIR} \ @@ -65,7 +66,8 @@ --with-qt4-uic=${UIC} . elif ${SLAVEPORT}=="qt5" USE_GL= gl -USE_QT5= core dbus gui network printsupport qml testlib widgets xml \ +USES+= qt:5 +USE_QT= core dbus gui network printsupport qml testlib widgets xml \ buildtools_build linguisttools_build qmake_build QT_NONSTANDARD= yes CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \ Index: devel/injeqt/Makefile =================================================================== --- devel/injeqt/Makefile +++ devel/injeqt/Makefile @@ -13,8 +13,8 @@ USE_GITHUB= yes GH_ACCOUNT= vogel -USES= cmake compiler:c++11-lib -USE_QT5= buildtools_build core qmake_build +USES= cmake compiler:c++11-lib qt:5 +USE_QT= buildtools_build core qmake_build USE_LDCONFIG= yes CMAKE_ARGS= -DDISABLE_EXAMPLES:BOOL=ON \ Index: devel/kapptemplate/Makefile =================================================================== --- devel/kapptemplate/Makefile +++ devel/kapptemplate/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE template generator -USES= cmake:outsource gmake kde:4 tar:xz +USES= cmake:outsource gmake kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib dbus declarative .include Index: devel/kaptain/Makefile =================================================================== --- devel/kaptain/Makefile +++ devel/kaptain/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:tgz -USE_QT4= qt3support moc_build +USES= qt:4 tar:tgz +USE_QT= qt3support moc_build qmake_build INFO= kaptain PORTDOCS= * Index: devel/kcachegrind/Makefile =================================================================== --- devel/kcachegrind/Makefile +++ devel/kcachegrind/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Profiler frontend for KDE -USES= cmake:outsource kde:4 tar:xz shebangfix +USES= cmake:outsource kde:4 tar:xz shebangfix qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib dbus gui SHEBANG_FILES= converters/op2calltree converters/dprof2calltree \ converters/memprof2calltree Index: devel/kdbg/Makefile =================================================================== --- devel/kdbg/Makefile +++ devel/kdbg/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes OPTIONS_DEFINE= NLS Index: devel/kde-dev-scripts/Makefile =================================================================== --- devel/kde-dev-scripts/Makefile +++ devel/kde-dev-scripts/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE development scripts -USES= cmake:outsource kde:4 shebangfix tar:xz +USES= cmake:outsource kde:4 shebangfix qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build SHEBANG_FILES= cxxmetric \ draw_lib_dependencies \ Index: devel/kde-dev-utils/Makefile =================================================================== --- devel/kde-dev-utils/Makefile +++ devel/kde-dev-utils/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE development utilities -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib designer gui qt3support xml .include Index: devel/kdesdk4-kioslaves/Makefile =================================================================== --- devel/kdesdk4-kioslaves/Makefile +++ devel/kdesdk4-kioslaves/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion -USES= cmake:outsource kde:4 perl5 shebangfix tar:xz +USES= cmake:outsource kde:4 perl5 shebangfix qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build SHEBANG_FILES= perldoc/pod2html.pl Index: devel/kdesdk4-strigi-analyzers/Makefile =================================================================== --- devel/kdesdk4-strigi-analyzers/Makefile +++ devel/kdesdk4-strigi-analyzers/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Strigi analyzers for SDK related file formats -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 strigi -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: devel/kdesdk4-thumbnailers/Makefile =================================================================== --- devel/kdesdk4-thumbnailers/Makefile +++ devel/kdesdk4-thumbnailers/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE thumbnail generator for gettext po files -USES= cmake:outsource gettext kde:4 tar:xz +USES= cmake:outsource gettext kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: devel/kdesvn-kde4/Makefile =================================================================== --- devel/kdesvn-kde4/Makefile +++ devel/kdesvn-kde4/Makefile @@ -19,10 +19,10 @@ CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \ -DMAN_INSTALL_DIR=${MANPREFIX}/man -USES= cmake:outsource compiler:c11 kde:4 tar:xz +USES= cmake:outsource compiler:c11 kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 USE_LDCONFIG= yes -USE_QT4= corelib gui xml network dbus svg sql \ +USE_QT= corelib gui xml network dbus svg sql \ qmake_build moc_build rcc_build uic_build linguist_build OPTIONS_DEFINE= DOCS NLS Index: devel/kdevelop-kde4/Makefile =================================================================== --- devel/kdevelop-kde4/Makefile +++ devel/kdevelop-kde4/Makefile @@ -14,9 +14,9 @@ RUN_DEPENDS= gmake:devel/gmake USES= cmake:outsource compiler:c++11-lib gmake kde:4 \ - shared-mime-info tar:bz2 + qt:4 shared-mime-info tar:bz2 USE_KDE= kdelibs workspace automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build \ +USE_QT= qmake_build moc_build uic_build rcc_build \ corelib declarative gui help script webkit xml OPTIONS_DEFINE= OKTETA PHP NLS Index: devel/kdevelop-pg-qt/Makefile =================================================================== --- devel/kdevelop-pg-qt/Makefile +++ devel/kdevelop-pg-qt/Makefile @@ -12,8 +12,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cmake:outsource compiler:c++11-lib kde:4 tar:bzip2 +USES= bison cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build .include Index: devel/kdevelop-php-docs/Makefile =================================================================== --- devel/kdevelop-php-docs/Makefile +++ devel/kdevelop-php-docs/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform -USES= cmake:outsource compiler:c++11-lib kde:4 tar:bz2 +USES= cmake:outsource compiler:c++11-lib kde:4 tar:bz2 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= NLS OPTIONS_SUB= yes Index: devel/kdevelop-php/Makefile =================================================================== --- devel/kdevelop-php/Makefile +++ devel/kdevelop-php/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt -USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:bz2 +USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:bz2 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= PHPDOCS NLS Index: devel/kdevplatform/Makefile =================================================================== --- devel/kdevplatform/Makefile +++ devel/kdevplatform/Makefile @@ -15,10 +15,10 @@ libboost_thread.so:devel/boost-libs \ libqjson.so:devel/qjson -USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 shebangfix \ - tar:bz2 +USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 qt:4 \ + shebangfix tar:bz2 USE_KDE= kate_run kdelibs automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build \ +USE_QT= qmake_build moc_build uic_build rcc_build \ corelib designer_build gui webkit USE_LDCONFIG= yes Index: devel/kf5-extra-cmake-modules/Makefile =================================================================== --- devel/kf5-extra-cmake-modules/Makefile +++ devel/kf5-extra-cmake-modules/Makefile @@ -11,11 +11,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS -USES= cmake:outsource kde:5 tar:xz -USE_QT5= # +USES= cmake:outsource kde:5 qt:5 tar:xz -DOCS_USE= QT5=help -TEST_USE= QT5=buildtools_build,linguisttools_build,qmake_build +DOCS_USE= QT=help +TEST_USE= QT=buildtools_build,linguisttools_build,qmake_build NO_ARCH= yes ## options Index: devel/kf5-kapidox/Makefile =================================================================== --- devel/kf5-kapidox/Makefile +++ devel/kf5-kapidox/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 API Documentation Tools -USES= cmake:outsource kde:5 python tar:xz +USES= cmake:outsource kde:5 python qt:5 tar:xz USE_KDE= archive ecm -USE_QT5= buildtools_build qmake_build +USE_QT= buildtools_build qmake_build NO_ARCH= yes Index: devel/kf5-kauth/Makefile =================================================================== --- devel/kf5-kauth/Makefile +++ devel/kf5-kauth/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt5 -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm -USE_QT5= buildtools_build core dbus gui linguisttools qmake_build \ +USE_QT= buildtools_build core dbus gui linguisttools qmake_build \ widgets .include Index: devel/kf5-kbookmarks/Makefile =================================================================== --- devel/kf5-kbookmarks/Makefile +++ devel/kf5-kbookmarks/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for bookmarks and the XBEL format -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm \ iconthemes widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui linguisttools \ +USE_QT= buildtools_build core dbus gui linguisttools \ qmake_build widgets xml .include Index: devel/kf5-kcmutils/Makefile =================================================================== --- devel/kf5-kcmutils/Makefile +++ devel/kf5-kcmutils/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 utilities for working with KCModules -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \ iconthemes itemviews kdeclarative package service \ widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ qml quick widgets xml .include Index: devel/kf5-kconfig/Makefile =================================================================== --- devel/kf5-kconfig/Makefile +++ devel/kf5-kconfig/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 widgets for configuration dialogs -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build concurrent core gui linguisttools \ +USE_QT= buildtools_build concurrent core gui linguisttools \ qmake_build testlib xml .include Index: devel/kf5-kcoreaddons/Makefile =================================================================== --- devel/kf5-kcoreaddons/Makefile +++ devel/kf5-kcoreaddons/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtCore -USES= cmake:outsource compiler:c++11-lib kde:5 shared-mime-info tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 shared-mime-info qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core linguisttools qmake_build +USE_QT= buildtools_build core linguisttools qmake_build OPTIONS_DEFINE= FAM INOTIFY OPTIONS_DEFAULT= INOTIFY Index: devel/kf5-kcrash/Makefile =================================================================== --- devel/kf5-kcrash/Makefile +++ devel/kf5-kcrash/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library to handle crash analysis and bug report from apps -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm windowsystem -USE_QT5= buildtools_build core gui qmake_build widgets x11extras +USE_QT= buildtools_build core gui qmake_build widgets x11extras USE_XORG= ice sm x11 xext .include Index: devel/kf5-kdbusaddons/Makefile =================================================================== --- devel/kf5-kdbusaddons/Makefile +++ devel/kf5-kdbusaddons/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtDBus -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core dbus gui linguisttools \ +USE_QT= buildtools_build core dbus gui linguisttools \ qmake_build testlib x11extras .include Index: devel/kf5-kdeclarative/Makefile =================================================================== --- devel/kf5-kdeclarative/Makefile +++ devel/kf5-kdeclarative/Makefile @@ -11,11 +11,11 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ - tar:xz + qt:5 tar:xz USE_KDE= completion config coreaddons globalaccel guiaddons i18n \ iconthemes jobwidgets kio package service widgetsaddons \ windowsystem -USE_QT5= buildtools_build core dbus gui network qmake_build qml \ +USE_QT= buildtools_build core dbus gui network qmake_build qml \ quick testlib widgets xml .include Index: devel/kf5-kdoctools/Makefile =================================================================== --- devel/kf5-kdoctools/Makefile +++ devel/kf5-kdoctools/Makefile @@ -14,9 +14,9 @@ RUN_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_GNOME= libxml2 libxslt USE_KDE= archive ecm i18n -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include Index: devel/kf5-kfilemetadata/Makefile =================================================================== --- devel/kf5-kfilemetadata/Makefile +++ devel/kf5-kfilemetadata/Makefile @@ -17,8 +17,8 @@ # TODO: maybe depend on textproc/catdoc USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ - tar:xz + qt:5 tar:xz USE_KDE= archive ecm i18n -USE_QT5= buildtools_build core qmake_build xml +USE_QT= buildtools_build core qmake_build xml .include Index: devel/kf5-ki18n/Makefile =================================================================== --- devel/kf5-ki18n/Makefile +++ devel/kf5-ki18n/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 advanced internationalization framework -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build concurrent core qmake_build qml script testlib +USE_QT= buildtools_build concurrent core qmake_build qml script testlib .include Index: devel/kf5-kidletime/Makefile =================================================================== --- devel/kf5-kidletime/Makefile +++ devel/kf5-kidletime/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for monitoring user activity -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core dbus gui qmake_build widgets x11extras +USE_QT= buildtools_build core dbus gui qmake_build widgets x11extras USE_XORG= ice sm x11 xext xcb xscrnsaver .include Index: devel/kf5-kio/Makefile =================================================================== --- devel/kf5-kio/Makefile +++ devel/kf5-kio/Makefile @@ -9,14 +9,14 @@ COMMENT= KF5 resource and network access abstraction USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - gettext kde:5 ssl tar:xz + gettext kde:5 qt:5 ssl tar:xz USE_GNOME= libxml2 libxslt USE_KDE= archive auth bookmarks codecs completion config \ configwidgets coreaddons dbusaddons doctools ecm \ i18n iconthemes itemviews jobwidgets \ notifications service solid sonnet textwidgets wallet \ widgetsaddons windowsystem xmlgui -USE_QT5= buildtools_build concurrent core dbus gui network \ +USE_QT= buildtools_build concurrent core dbus gui network \ qmake_build script widgets x11extras xml .include Index: devel/kf5-kitemmodels/Makefile =================================================================== --- devel/kf5-kitemmodels/Makefile +++ devel/kf5-kitemmodels/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 models for Qt Model/View system -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include Index: devel/kf5-knewstuff/Makefile =================================================================== --- devel/kf5-knewstuff/Makefile +++ devel/kf5-knewstuff/Makefile @@ -8,12 +8,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for downloading application assets from the network -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive attica5 auth codecs completion config \ configwidgets coreaddons ecm i18n iconthemes itemviews \ jobwidgets kio service sonnet textwidgets widgetsaddons \ xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ widgets xml .include Index: devel/kf5-knotifications/Makefile =================================================================== --- devel/kf5-knotifications/Makefile +++ devel/kf5-knotifications/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt5 -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= codecs config coreaddons ecm windowsystem -USE_QT5= buildtools_build core dbus gui linguisttools phonon4 \ +USE_QT= buildtools_build core dbus gui linguisttools phonon4 \ qmake_build widgets x11extras USE_XORG= x11 Index: devel/kf5-knotifyconfig/Makefile =================================================================== --- devel/kf5-knotifyconfig/Makefile +++ devel/kf5-knotifyconfig/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 configuration system for KNotify -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= completion config coreaddons ecm i18n jobwidgets kio \ service widgetsaddons -USE_QT5= buildtools_build core dbus gui network phonon4 \ +USE_QT= buildtools_build core dbus gui network phonon4 \ qmake_build widgets .include Index: devel/kf5-kpackage/Makefile =================================================================== --- devel/kf5-kpackage/Makefile +++ devel/kf5-kpackage/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library to load and install packages -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive config coreaddons doctools ecm i18n -USE_QT5= buildtools_build core qmake_build xml +USE_QT= buildtools_build core qmake_build xml .include Index: devel/kf5-kparts/Makefile =================================================================== --- devel/kf5-kparts/Makefile +++ devel/kf5-kparts/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 document centric plugin system -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons \ i18n iconthemes jobwidgets kio notifications service \ sonnet textwidgets widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build widgets \ +USE_QT= buildtools_build core dbus gui network qmake_build widgets \ xml .include Index: devel/kf5-kpeople/Makefile =================================================================== --- devel/kf5-kpeople/Makefile +++ devel/kf5-kpeople/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library providing access to contacts -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= config coreaddons ecm i18n itemviews service widgetsaddons -USE_QT5= buildtools_build core dbus gui network qmake_build qml \ +USE_QT= buildtools_build core dbus gui network qmake_build qml \ sql widgets .include Index: devel/kf5-kpty/Makefile =================================================================== --- devel/kf5-kpty/Makefile +++ devel/kf5-kpty/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 pty abstraction -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm i18n -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include Index: devel/kf5-kservice/Makefile =================================================================== --- devel/kf5-kservice/Makefile +++ devel/kf5-kservice/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 advanced plugin and service introspection -USES= bison cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= bison cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive config coreaddons crash dbusaddons \ doctools ecm i18n -USE_QT5= buildtools_build core dbus gui qmake_build xml +USE_QT= buildtools_build core dbus gui qmake_build xml .include # Flex on FreeBSD 9 and older 10 is too old Index: devel/kf5-ktexteditor/Makefile =================================================================== --- devel/kf5-ktexteditor/Makefile +++ devel/kf5-ktexteditor/Makefile @@ -10,12 +10,12 @@ LIB_DEPENDS= libgit2.so:devel/libgit2 -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz USE_KDE= archive auth codecs completion config configwidgets \ coreaddons ecm guiaddons i18n iconthemes itemviews \ jobwidgets kio parts service sonnet textwidgets \ widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network printsupport \ +USE_QT= buildtools_build core dbus gui network printsupport \ qmake_build script widgets xml xmlpatterns .include Index: devel/kf5-kunitconversion/Makefile =================================================================== --- devel/kf5-kunitconversion/Makefile +++ devel/kf5-kunitconversion/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for unit conversion -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm i18n -USE_QT5= buildtools_build core network qmake_build xml +USE_QT= buildtools_build core network qmake_build xml .include Index: devel/kf5-solid/Makefile =================================================================== --- devel/kf5-solid/Makefile +++ devel/kf5-solid/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 hardware integration and detection -USES= bison cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= bison cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build concurrent core dbus gui linguisttools \ +USE_QT= buildtools_build concurrent core dbus gui linguisttools \ network qmake_build qml testlib widgets xml .include Index: devel/kf5-threadweaver/Makefile =================================================================== --- devel/kf5-threadweaver/Makefile +++ devel/kf5-threadweaver/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtDBus -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core network qmake_build testlib widgets xml +USE_QT= buildtools_build core network qmake_build testlib widgets xml .include Index: devel/libdbusmenu-qt/Makefile =================================================================== --- devel/libdbusmenu-qt/Makefile +++ devel/libdbusmenu-qt/Makefile @@ -18,16 +18,18 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${MAJOR_VER}+${SNAPSHOT_VER} +USES= compiler:c++11-lib cmake:outsource + .if empty(PKGNAMESUFFIX) -USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build +USES+= qt:4 +USE_QT= corelib dbus gui moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DUSE_QT4:BOOL=TRUE -DUSE_QT5:BOOL=FALSE .else -USE_QT5= buildtools_build core dbus gui qmake_build widgets +USES+= qt:5 +USE_QT= buildtools_build core dbus gui qmake_build widgets CMAKE_ARGS= -DUSE_QT4:BOOL=FALSE -DUSE_QT5:BOOL=TRUE .endif -USES= compiler:c++11-lib cmake:outsource - USE_LDCONFIG= yes OPTIONS_DEFINE= DOXYGEN Index: devel/libkgapi/Makefile =================================================================== --- devel/libkgapi/Makefile +++ devel/libkgapi/Makefile @@ -14,10 +14,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource kde:4 tar:bzip2 +USES= cmake:outsource kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes -USE_QT4= corelib network webkit xml \ +USE_QT= corelib network webkit xml \ qmake_build moc_build rcc_build uic_build PLIST_SUB+= PORTVERSION=${PORTVERSION} Index: devel/libkolab/Makefile =================================================================== --- devel/libkolab/Makefile +++ devel/libkolab/Makefile @@ -25,10 +25,10 @@ -DPHP_BINDINGS:BOOL=OFF \ -DPYTHON_BINDINGS:BOOL=OFF \ -DUSE_LIBCALENDARING:BOOL=OFF -USES= cmake:outsource kde:4 +USES= cmake:outsource kde:4 qt:4 USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ moc_build qmake_build rcc_build uic_build # Fix build of desktuils/kdepim4-runtime: CXXFLAGS+= -DMAKE_KOLAB_LIB Index: devel/liblxqt-l10n/Makefile =================================================================== --- devel/liblxqt-l10n/Makefile +++ devel/liblxqt-l10n/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ -USES= cmake:outsource lxqt tar:xz -USE_QT5= buildtools_build qmake_build +USES= cmake:outsource lxqt qt:5 tar:xz +USE_QT= buildtools_build qmake_build USE_LXQT= lxqt CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \ Index: devel/liblxqt/Makefile =================================================================== --- devel/liblxqt/Makefile +++ devel/liblxqt/Makefile @@ -12,8 +12,8 @@ LICENSE= LGPL21+ USES= cmake:outsource compiler:c++11-lib gettext kde:5 lxqt \ - pkgconfig tar:xz -USE_QT5= buildtools_build qmake_build dbus core gui linguisttools \ + pkgconfig qt:5 tar:xz +USE_QT= buildtools_build qmake_build dbus core gui linguisttools \ svg widgets x11extras xml USE_KDE= windowsystem USE_LXQT= qtxdg Index: devel/libqtxdg/Makefile =================================================================== --- devel/libqtxdg/Makefile +++ devel/libqtxdg/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ -USES= cmake:outsource compiler:c++11-lib lxqt pkgconfig tar:xz -USE_QT5= buildtools_build qmake_build core dbus gui svg widgets \ - xml +USES= cmake:outsource compiler:c++11-lib lxqt pkgconfig qt:5 tar:xz +USE_QT= buildtools_build qmake_build core dbus gui svg widgets \ + xml .include Index: devel/liteide/Makefile =================================================================== --- devel/liteide/Makefile +++ devel/liteide/Makefile @@ -14,7 +14,6 @@ WRKSRC_SUBDIR= liteidex -USES= qmake USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_GITHUB= yes GH_ACCOUNT= visualfc @@ -33,8 +32,10 @@ DEBUG_CONFIGURE_ENABLE= debug -QT4_USE= QT4=corelib,gui,network,webkit,xml,moc_build,rcc_build,uic_build -QT5_USE= QT5=core,gui,network,printsupport,widgets,xml,buildtools_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,network,webkit,xml,moc_build,qmake_build,rcc_build,uic_build +QT5_USES= qt:5 +QT5_USE= QT=core,gui,network,printsupport,widgets,xml,buildtools_build,qmake_build post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications Index: devel/lokalize/Makefile =================================================================== --- devel/lokalize/Makefile +++ devel/lokalize/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ sql .include Index: devel/okteta/Makefile =================================================================== --- devel/okteta/Makefile +++ devel/okteta/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libqca.so:devel/qca -USES= cmake:outsource kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib designer gui script scripttools xml USE_LDCONFIG= yes Index: devel/p5-perlkde/Makefile =================================================================== --- devel/p5-perlkde/Makefile +++ devel/p5-perlkde/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Perl bindings for KDE -USES= cmake:outsource compiler:c++11-lib kde:4 perl5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 perl5 qt:4 tar:xz USE_KDE= perlqt smokekde automoc4 -USE_QT4= network opengl sql svg xml \ +USE_QT= network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build # Respect PREFIX Index: devel/p5-perlqt/Makefile =================================================================== --- devel/p5-perlqt/Makefile +++ devel/p5-perlqt/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 -USES= cmake:outsource kde:4 perl5 tar:xz +USES= cmake:outsource kde:4 perl5 qt:4 tar:xz USE_KDE= smokeqt qimageblitz -USE_QT4= corelib dbus gui network xml \ +USE_QT= corelib dbus gui network xml \ qmake_build moc_build uic_build rcc_build # Respect PREFIX Index: devel/piklab/Makefile =================================================================== --- devel/piklab/Makefile +++ devel/piklab/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2+ DOS2UNIX_FILES= cmake/Piklab.cmake -USE_QT4= corelib gui qt3support qtestlib xml \ +USE_QT= corelib gui qt3support qtestlib xml \ moc_build qmake_build rcc_build uic_build -USES= cmake gettext readline dos2unix tar:bzip2 +USES= cmake gettext readline dos2unix qt:4 tar:bzip2 OPTIONS_DEFINE= KDE4 OPTIONS_DEFAULT= KDE4 Index: devel/poxml/Makefile =================================================================== --- devel/poxml/Makefile +++ devel/poxml/Makefile @@ -9,9 +9,9 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:devel/antlr -USES= cmake:outsource gettext-tools:build,run kde:4 tar:xz +USES= cmake:outsource gettext-tools:build,run kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib xml .include Index: devel/py-krosspython/Makefile =================================================================== --- devel/py-krosspython/Makefile +++ devel/py-krosspython/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Kross Python scripting library -USES= cmake:outsource kde:4 python:2 tar:xz +USES= cmake:outsource kde:4 python:2 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build +USE_QT= corelib gui qmake_build moc_build uic_build rcc_build CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \ -DBUILD_ruby:BOOL=FALSE \ -DBUILD_java:BOOL=FALSE Index: devel/py-pykde4/Makefile =================================================================== --- devel/py-pykde4/Makefile +++ devel/py-pykde4/Makefile @@ -11,13 +11,13 @@ LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 -USES= cmake:outsource kde:4 python:2 pyqt:4 tar:xz +USES= cmake:outsource kde:4 python:2 pyqt:4 qt:4 tar:xz USE_KDE= kdelibs nepomuk-core okular pimlibs \ akonadi automoc4 soprano USE_PYQT= declarative designer gui network opengl phonon script sip \ sql svg webkit xml \ dbussupport_run -USE_QT4= corelib dbus designer_build gui network xml \ +USE_QT= corelib dbus designer_build gui network xml \ qmake_build moc_build uic_build rcc_build CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE \ Index: devel/py-pykdeuic4/Makefile =================================================================== --- devel/py-pykdeuic4/Makefile +++ devel/py-pykdeuic4/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Enhanced version of pyuic4 -USES= cmake:outsource python:2 kde:4 tar:xz +USES= cmake:outsource python:2 kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 pykde4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build DISTINFO_FILE= ${.CURDIR:H:H}/devel/py-pykde4/distinfo WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} Index: devel/py-qt4-assistant/Makefile =================================================================== --- devel/py-qt4-assistant/Makefile +++ devel/py-qt4-assistant/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtAssistant PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run -USE_QT4= assistantclient corelib gui network \ +USE_QT= assistantclient corelib gui network \ moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-core/Makefile =================================================================== --- devel/py-qt4-core/Makefile +++ devel/py-qt4-core/Makefile @@ -11,10 +11,10 @@ CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYTHON= py3kplist USE_PYQT= sip -USE_QT4= corelib qmake_build moc_build +USE_QT= corelib qmake_build moc_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4-dbus/Makefile =================================================================== --- devel/py-qt4-dbus/Makefile +++ devel/py-qt4-dbus/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtDBus PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run -USE_QT4= corelib dbus moc_build qmake_build +USE_QT= corelib dbus moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4-dbussupport/Makefile =================================================================== --- devel/py-qt4-dbussupport/Makefile +++ devel/py-qt4-dbussupport/Makefile @@ -13,9 +13,9 @@ CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= pkgconfig python pyqt:4 +USES= pkgconfig python pyqt:4 qt:4 USE_PYQT= sip_build -USE_QT4= corelib qmake_build moc_build +USE_QT= corelib qmake_build moc_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace Index: devel/py-qt4-declarative/Makefile =================================================================== --- devel/py-qt4-declarative/Makefile +++ devel/py-qt4-declarative/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtDeclarative PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run network_run -USE_QT4= corelib declarative gui network script sql svg xmlpatterns \ +USE_QT= corelib declarative gui network script sql svg xmlpatterns \ qmake_build moc_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-designer/Makefile =================================================================== --- devel/py-qt4-designer/Makefile +++ devel/py-qt4-designer/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib designer gui moc_build qmake_build +USE_QT= corelib designer gui moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4-designerplugin/Makefile =================================================================== --- devel/py-qt4-designerplugin/Makefile +++ devel/py-qt4-designerplugin/Makefile @@ -15,9 +15,9 @@ CONFIGURE_ARGS= --enable QtDesigner PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build -USE_QT4= corelib designer gui script xml moc_build qmake_build +USE_QT= corelib designer gui script xml moc_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace Index: devel/py-qt4-help/Makefile =================================================================== --- devel/py-qt4-help/Makefile +++ devel/py-qt4-help/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtHelp PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui help network sql moc_build qmake_build +USE_QT= corelib gui help network sql moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4-qscintilla2/Makefile =================================================================== --- devel/py-qt4-qscintilla2/Makefile +++ devel/py-qt4-qscintilla2/Makefile @@ -20,9 +20,9 @@ HAS_CONFIGURE= yes QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip core gui -USE_QT4= corelib gui moc_build qmake_build +USE_QT= corelib gui moc_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace Index: devel/py-qt4-script/Makefile =================================================================== --- devel/py-qt4-script/Makefile +++ devel/py-qt4-script/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtScript PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run -USE_QT4= corelib script moc_build qmake_build +USE_QT= corelib script moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4-scripttools/Makefile =================================================================== --- devel/py-qt4-scripttools/Makefile +++ devel/py-qt4-scripttools/Makefile @@ -10,9 +10,9 @@ CONFIGURE_ARGS= --enable QtScriptTools PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run script_run -USE_QT4= corelib gui script scripttools moc_build qmake_build +USE_QT= corelib gui script scripttools moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4-test/Makefile =================================================================== --- devel/py-qt4-test/Makefile +++ devel/py-qt4-test/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtTest PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui qtestlib moc_build qmake_build +USE_QT= corelib gui qtestlib moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt4/Makefile =================================================================== --- devel/py-qt4/Makefile +++ devel/py-qt4/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt 4 toolkit (meta port) -USES= metaport python pyqt:4 +USES= metaport python pyqt:4 qt:4 OPTIONS_DEFINE= assistant core dbus dbussupport declarative \ demo designer designerplugin doc gui help \ Index: devel/py-qt5-core/Makefile =================================================================== --- devel/py-qt5-core/Makefile +++ devel/py-qt5-core/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYTHON= py3kplist USE_PYQT= sip_build -USE_QT5= core qmake_build +USE_QT= core qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt5-dbus/Makefile =================================================================== --- devel/py-qt5-dbus/Makefile +++ devel/py-qt5-dbus/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtDBus PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= sip_build core_run -USE_QT5= core dbus qmake_build +USE_QT= core dbus qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt5-dbussupport/Makefile =================================================================== --- devel/py-qt5-dbussupport/Makefile +++ devel/py-qt5-dbussupport/Makefile @@ -12,9 +12,9 @@ CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= pkgconfig python pyqt:5 +USES= pkgconfig python pyqt:5 qt:5 USE_PYQT= sip_build -USE_QT5= core buildtools_build qmake_build +USE_QT= core buildtools_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace Index: devel/py-qt5-designer/Makefile =================================================================== --- devel/py-qt5-designer/Makefile +++ devel/py-qt5-designer/Makefile @@ -10,10 +10,10 @@ CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= yes USE_PYQT= sip_build core_run widgets_run -USE_QT5= core gui designer widgets xml \ +USE_QT= core gui designer widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt5-designerplugin/Makefile =================================================================== --- devel/py-qt5-designerplugin/Makefile +++ devel/py-qt5-designerplugin/Makefile @@ -13,10 +13,10 @@ CONFIGURE_ARGS= --enable QtDesigner PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build -USE_QT5= core designer gui xml widgets \ +USE_QT= core designer gui xml widgets \ buildtools_build qmake_build OPTIONS_DEFINE= DEBUG Index: devel/py-qt5-help/Makefile =================================================================== --- devel/py-qt5-help/Makefile +++ devel/py-qt5-help/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtHelp PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run -USE_QT5= core gui widgets help network sql buildtools_build qmake_build xml +USE_QT= core gui widgets help network sql buildtools_build qmake_build xml OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt5-qscintilla2/Makefile =================================================================== --- devel/py-qt5-qscintilla2/Makefile +++ devel/py-qt5-qscintilla2/Makefile @@ -18,10 +18,10 @@ HAS_CONFIGURE= yes QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip core gui printsupport widgets -USE_QT5= core gui printsupport widgets buildtools_build qmake_build +USE_QT= core gui printsupport widgets buildtools_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace Index: devel/py-qt5-test/Makefile =================================================================== --- devel/py-qt5-test/Makefile +++ devel/py-qt5-test/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtTest PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run -USE_QT5= core gui testlib widgets \ +USE_QT= core gui testlib widgets \ buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt5/Makefile =================================================================== --- devel/py-qt5/Makefile +++ devel/py-qt5/Makefile @@ -8,7 +8,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt 5 toolkit (meta port) -USES= metaport python pyqt:5 +USES= metaport python pyqt:5 qt:5 OPTIONS_DEFINE= core dbus dbussupport demo designer \ designerplugin doc gui multimedia multimediawidgets \ Index: devel/pyside-tools/Makefile =================================================================== --- devel/pyside-tools/Makefile +++ devel/pyside-tools/Makefile @@ -21,8 +21,8 @@ GH_PROJECT= Tools NO_ARCH= yes -USES= cmake python:2 shebangfix +USES= cmake python:2 shebangfix qt:4 SHEBANG_FILES= pyside-uic pysideuic/icon_cache.py -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: devel/pyside/Makefile =================================================================== --- devel/pyside/Makefile +++ devel/pyside/Makefile @@ -21,7 +21,7 @@ CMAKE_ARGS+= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \ -DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include" -USE_QT4= declarative designer gui help qmake_build \ +USE_QT= declarative designer gui help qmake_build \ moc_build multimedia network opengl \ phonon rcc_build script scripttools \ svg uic_build webkit @@ -29,7 +29,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \ PYTHON_VERSION=${PYTHON_VERSION} -USES= cmake python:2 tar:bzip2 +USES= cmake python:2 qt:4 tar:bzip2 USE_LDCONFIG= yes .include Index: devel/qbs/Makefile =================================================================== --- devel/qbs/Makefile +++ devel/qbs/Makefile @@ -13,16 +13,16 @@ LICENSE= GPLv3 LGPL21 LICENSE_COMB= dual -USES= compiler:c++11-lib qmake:outsource +USES= compiler:c++11-lib qt:5,qmake_outsource USE_GL= gl USE_LDCONFIG= yes -USE_QT5= buildtools_build core concurrent gui network script testlib \ - widgets xml +USE_QT= buildtools_build qmake_build \ + core concurrent gui network script testlib widgets xml QMAKE_SOURCE_PATH= ${WRKSRC}/qbs.pro OPTIONS_DEFINE= DOCS -DOCS_USE= QT5=help_build,qdoc_build,sql-sqlite3_build +DOCS_USE= QT=help_build,qdoc_build,sql-sqlite3_build OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all Index: devel/qbzr/Makefile =================================================================== --- devel/qbzr/Makefile +++ devel/qbzr/Makefile @@ -22,8 +22,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_PYTHON= distutils autoplist -USE_QT4= # empty -USES= gettext python +USE_QT= # empty +USES= gettext python qt:4 INSTALLS_ICONS= yes .include Index: devel/qca/Makefile =================================================================== --- devel/qca/Makefile +++ devel/qca/Makefile @@ -22,10 +22,12 @@ USE_LDCONFIG= yes .if defined(PKGNAMESUFFIX) +USES+= qt:5 +USE_QT= core buildtools_build qmake_build CMAKE_ARGS+= -DQCA_SUFFIX=qt5 -USE_QT5= core buildtools_build qmake_build .else -USE_QT4= corelib moc_build qmake_build rcc_build +USES+= qt:4 +USE_QT= corelib moc_build qmake_build rcc_build CMAKE_ARGS+= -DQT4_BUILD=yes .endif Index: devel/qconf/Makefile =================================================================== --- devel/qconf/Makefile +++ devel/qconf/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 -USE_QT4= corelib xml moc_build qmake_build +USES= qt:4 tar:bzip2 +USE_QT= corelib xml moc_build qmake_build HAS_CONFIGURE= yes QT_NONSTANDARD= yes MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}" Index: devel/qdevelop/Makefile =================================================================== --- devel/qdevelop/Makefile +++ devel/qdevelop/Makefile @@ -13,9 +13,9 @@ RUN_DEPENDS= exctags:devel/ctags -USE_QT4= gui sql network xml designer sql-sqlite3_run \ - moc_build uic_build rcc_build -USES= qmake +USES= qt:4 +USE_QT= gui sql network xml designer sql-sqlite3_run \ + moc_build qmake_build uic_build rcc_build DESKTOP_ENTRIES= "QDevelop" \ "Qt 4 development environment" \ @@ -27,9 +27,9 @@ OPTIONS_DEFINE= TOOLS DOCS NLS OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} OPTIONS_SUB= yes -NLS_USE= QT4=linguisttools_build +NLS_USE= QT=linguisttools_build TOOLS_DESC= Install Qt 4 development tools (qmake, moc, etc.) -TOOLS_USE= ${_TOOLS:C|.*|QT4=&_run|} +TOOLS_USE= ${_TOOLS:C|.*|QT=&_run|} _TOOLS= assistant linguisttools moc qmake rcc uic post-patch: Index: devel/qgit/Makefile =================================================================== --- devel/qgit/Makefile +++ devel/qgit/Makefile @@ -11,8 +11,8 @@ MAINTAINER= itetcu@FreeBSD.org COMMENT= Graphical interface to git repositories -USES= qmake tar:bzip2 -USE_QT4= corelib gui moc_build rcc_build uic_build +USES= qt:4 tar:bzip2 +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} Index: devel/qjson/Makefile =================================================================== --- devel/qjson/Makefile +++ devel/qjson/Makefile @@ -10,8 +10,8 @@ LICENSE= LGPL21 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake pathfix tar:bzip2 +USE_QT= corelib moc_build qmake_build rcc_build uic_build +USES= cmake pathfix qt:4 tar:bzip2 USE_LDCONFIG= yes PORTDOCS= * Index: devel/qmake4/Makefile =================================================================== --- devel/qmake4/Makefile +++ devel/qmake4/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator -USE_QT4= # empty +USES= qt:4 QT_DIST= yes REINPLACE_ARGS= -i "" WRKSRC_SUBDIR= ${PORTNAME} Index: devel/qmake5/Makefile =================================================================== --- devel/qmake5/Makefile +++ devel/qmake5/Makefile @@ -8,8 +8,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator -USE_QT5= # empty -USES= pkgconfig shebangfix +USES= pkgconfig qt:5 shebangfix tar:xz SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ util/unicode/x11/makeencodings \ src/3rdparty/freetype/src/tools/afblue.pl Index: devel/qprog/Makefile =================================================================== --- devel/qprog/Makefile +++ devel/qprog/Makefile @@ -11,8 +11,8 @@ MAINTAINER= bfoz@bfoz.net COMMENT= Cross-platform software for the DIY line of PIC programmers -USES= qmake tar:tgz -USE_QT4= moc_build gui network +USES= qt:4 tar:tgz +USE_QT= moc_build qmake_build gui network WRKSRC= ${WRKDIR}/QProg Index: devel/qross/Makefile =================================================================== --- devel/qross/Makefile +++ devel/qross/Makefile @@ -9,9 +9,9 @@ MAINTAINER= vg@FreeBSD.org COMMENT= Qt-only fork of Kross, the KDE scripting framework -USES= cmake tar:bzip2 +USES= cmake qt:4 tar:bzip2 USE_LDCONFIG= yes -USE_QT4= designer gui network xml qmake_build uic_build moc_build \ +USE_QT= designer gui network xml qmake_build uic_build moc_build \ rcc_build script testlib USE_GITHUB= yes GH_ACCOUNT= 0xd34df00d Index: devel/qscintilla2-designerplugin-qt5/Makefile =================================================================== --- devel/qscintilla2-designerplugin-qt5/Makefile +++ devel/qscintilla2-designerplugin-qt5/Makefile @@ -14,8 +14,8 @@ DISTINFO_FILE= ${.CURDIR:H}/qscintilla2-qt5/distinfo USE_GL= gl -USES= qmake pyqt:5 -USE_QT5= core designer printsupport gui widgets xml \ +USES= pyqt:5 qt:5 +USE_QT= core designer printsupport gui widgets xml \ buildtools_build qmake_build WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 Index: devel/qscintilla2-designerplugin/Makefile =================================================================== --- devel/qscintilla2-designerplugin/Makefile +++ devel/qscintilla2-designerplugin/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo -USES= qmake pyqt:4 -USE_QT4= qmake_build moc_build gui xml designer +USES= pyqt:4 qt:4 +USE_QT= qmake_build moc_build gui xml designer WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 Index: devel/qscintilla2-qt5/Makefile =================================================================== --- devel/qscintilla2-qt5/Makefile +++ devel/qscintilla2-qt5/Makefile @@ -9,10 +9,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 port of the Scintilla C++ editor class -USES= qmake pyqt:5 +USES= pyqt:5 qt:5 USE_GL= gl USE_PYQT= # -USE_QT5= buildtools_build gui printsupport widgets +USE_QT= buildtools_build qmake_build gui printsupport widgets USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5 Index: devel/qscintilla2/Makefile =================================================================== --- devel/qscintilla2/Makefile +++ devel/qscintilla2/Makefile @@ -11,9 +11,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 port of the Scintilla C++ editor class -USES= qmake pyqt:4 +USES= pyqt:4 qt:4 USE_PYQT= # -USE_QT4= moc_build gui xml designer +USE_QT= moc_build qmake_build gui xml designer USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5 Index: devel/qt-maybe/Makefile =================================================================== --- devel/qt-maybe/Makefile +++ devel/qt-maybe/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= robertknight GH_TAGNAME= 52b21af -USE_QT5= core +USE_QT= core NO_BUILD= yes PLIST_FILES= include/Either.h include/Maybe.h Index: devel/qt4-assistant-adp/Makefile =================================================================== --- devel/qt4-assistant-adp/Makefile +++ devel/qt4-assistant-adp/Makefile @@ -14,9 +14,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt *.adp-compatible documentation browser -USE_QT4= moc_build rcc_build uic_build corelib \ - gui network xml doc dbus -USES= qmake +USES= qt:4 +USE_QT= corelib gui network xml doc dbus \ + moc_build qmake_build rcc_build uic_build QMAKE_ARGS= QT_CONFIG+="dbus" QT_PRODUCT="OpenSource" ALL_TARGET= first Index: devel/qt4-assistant/Makefile =================================================================== --- devel/qt4-assistant/Makefile +++ devel/qt4-assistant/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 documentation browser -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build \ corelib gui help network sql webkit xml \ doc_run sql-sqlite3_run QT_DIST= yes Index: devel/qt4-corelib/Makefile =================================================================== --- devel/qt4-corelib/Makefile +++ devel/qt4-corelib/Makefile @@ -12,13 +12,12 @@ LIB_DEPENDS= libicui18n.so:devel/icu +USES= iconv pkgconfig qt:4 USE_GNOME= glib20 -USE_QT4= qmake_build moc_build +USE_QT= qmake_build moc_build QT_DIST= yes -USES= iconv pkgconfig HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-designer/Makefile =================================================================== --- devel/qt4-designer/Makefile +++ devel/qt4-designer/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 graphical user interface designer -USE_QT4= qmake_build moc_build rcc_build uic_build assistant_run \ +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build assistant_run \ qt3support corelib declarative gui network script sql xml \ webkit QT_DIST= yes @@ -17,7 +18,6 @@ HAS_CONFIGURE= yes # Try to fix linking when previous version is installed CONFIGURE_ARGS= -L${WRKSRC}/lib -no-phonon -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-help-tools/Makefile =================================================================== --- devel/qt4-help-tools/Makefile +++ devel/qt4-help-tools/Makefile @@ -10,7 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt utilities for generating documentation -USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build corelib \ gui sql xml doc help QT_DIST= yes Index: devel/qt4-help/Makefile =================================================================== --- devel/qt4-help/Makefile +++ devel/qt4-help/Makefile @@ -9,12 +9,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module -USE_QT4= qmake_build moc_build rcc_build corelib clucene \ +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build corelib clucene \ gui sql sql-sqlite3_run xml network QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-libqtassistantclient/Makefile =================================================================== --- devel/qt4-libqtassistantclient/Makefile +++ devel/qt4-libqtassistantclient/Makefile @@ -13,8 +13,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration module -USE_QT4= moc_build rcc_build corelib gui network -USES= qmake +USES= qt:4 +USE_QT= corelib gui network \ + moc_build qmake_build rcc_build QMAKE_ARGS= CONFIG+="create_prl link_prl" VERSION="${PORTVERSION}" USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} Index: devel/qt4-linguist/Makefile =================================================================== --- devel/qt4-linguist/Makefile +++ devel/qt4-linguist/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 localization tools -USE_QT4= qmake_build designer_build moc_build rcc_build uic_build \ +USES= qt:4 +USE_QT= qmake_build designer_build moc_build rcc_build uic_build \ assistant_run gui linguisttools_run network xml QT_DIST= yes Index: devel/qt4-linguisttools/Makefile =================================================================== --- devel/qt4-linguisttools/Makefile +++ devel/qt4-linguisttools/Makefile @@ -8,7 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 localization tools -USE_QT4= qmake_build xml +USES= qt:4 +USE_QT= qmake_build xml QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-makeqpf/Makefile =================================================================== --- devel/qt4-makeqpf/Makefile +++ devel/qt4-makeqpf/Makefile @@ -11,7 +11,8 @@ BROKEN_sparc64= does not compile -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-moc/Makefile =================================================================== --- devel/qt4-moc/Makefile +++ devel/qt4-moc/Makefile @@ -12,7 +12,8 @@ BROKEN_arm= does not compile -USE_QT4= qmake_build +USES= qt:4 +USE_QT= qmake_build QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-porting/Makefile =================================================================== --- devel/qt4-porting/Makefile +++ devel/qt4-porting/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting from Qt 3 to Qt 4 -USE_QT4= qmake_build moc_build rcc_build corelib xml +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build corelib xml QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-qdbusviewer/Makefile =================================================================== --- devel/qt4-qdbusviewer/Makefile +++ devel/qt4-qdbusviewer/Makefile @@ -11,8 +11,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus -USES= pkgconfig -USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \ +USES= pkgconfig qt:4 +USE_QT= qmake_build moc_build rcc_build corelib dbus gui xml \ clucene QT_DIST= yes Index: devel/qt4-qdoc3/Makefile =================================================================== --- devel/qt4-qdoc3/Makefile +++ devel/qt4-qdoc3/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -USE_QT4= qmake_build corelib gui xml +USES= qt:4 +USE_QT= qmake_build corelib gui xml QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-qmlviewer/Makefile =================================================================== --- devel/qt4-qmlviewer/Makefile +++ devel/qt4-qmlviewer/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 utility for QML application testing -USE_QT4= qmake_build moc_build rcc_build uic_build declarative script \ +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build declarative script \ svg xmlpatterns sql opengl network corelib QT_DIST= yes Index: devel/qt4-qt3support/Makefile =================================================================== --- devel/qt4-qt3support/Makefile +++ devel/qt4-qt3support/Makefile @@ -9,12 +9,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 3 compatibility module -USE_QT4= qmake_build moc_build corelib gui network sql xml +USES= qt:4 +USE_QT= qmake_build moc_build corelib gui network sql xml QT_DIST= yes -USES= pkgconfig +USES= pkgconfig qt:4 HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-qtsolutions-singleapplication/Makefile =================================================================== --- devel/qt4-qtsolutions-singleapplication/Makefile +++ devel/qt4-qtsolutions-singleapplication/Makefile @@ -12,8 +12,8 @@ MAINTAINER= yurkis@gmail.com COMMENT= Qt 4 Solutions Single Application Framework -USES= qmake -USE_QT4?= moc_build rcc_build uic_build gui network +USES= qt:4 +USE_QT?= moc_build rcc_build uic_build gui network qmake_build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/qt-solutions-qt-solutions/${SUB_PROJECT_NAME} Index: devel/qt4-qtsolutions-soap/Makefile =================================================================== --- devel/qt4-qtsolutions-soap/Makefile +++ devel/qt4-qtsolutions-soap/Makefile @@ -3,7 +3,7 @@ MASTERDIR= ${.CURDIR}/../qt4-qtsolutions-singleapplication -USE_QT4= qmake_build moc_build rcc_build uic_build network xml gui +USE_QT= qmake_build moc_build rcc_build uic_build network xml gui qmake_build .include "${MASTERDIR}/Makefile" Index: devel/qt4-qvfb/Makefile =================================================================== --- devel/qt4-qvfb/Makefile +++ devel/qt4-qvfb/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 virtual framebuffer utility -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui opengl +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build corelib gui opengl QT_DIST= yes USE_XORG= xtst Index: devel/qt4-rcc/Makefile =================================================================== --- devel/qt4-rcc/Makefile +++ devel/qt4-rcc/Makefile @@ -11,7 +11,8 @@ BROKEN_arm= does not compile -USE_QT4= qmake_build +USES= qt:4 +USE_QT= qmake_build QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-script/Makefile =================================================================== --- devel/qt4-script/Makefile +++ devel/qt4-script/Makefile @@ -9,12 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt scripting module -USES= pkgconfig -USE_QT4= qmake_build moc_build corelib +USES= pkgconfig qt:4 +USE_QT= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-scripttools/Makefile =================================================================== --- devel/qt4-scripttools/Makefile +++ devel/qt4-scripttools/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Script additional components -USE_QT4= qmake_build moc_build rcc_build gui script +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build gui script QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-testlib/Makefile =================================================================== --- devel/qt4-testlib/Makefile +++ devel/qt4-testlib/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module -USE_QT4= qmake_build moc_build corelib +USES= qt:4 +USE_QT= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: devel/qt4-uic/Makefile =================================================================== --- devel/qt4-uic/Makefile +++ devel/qt4-uic/Makefile @@ -11,7 +11,8 @@ BROKEN_arm= does not compile -USE_QT4= qmake_build +USES= qt:4 +USE_QT= qmake_build QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4-uic3/Makefile =================================================================== --- devel/qt4-uic3/Makefile +++ devel/qt4-uic3/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 3-compatible User Interface Compiler -USE_QT4= qmake_build qt3support corelib gui network sql xml porting +USES= qt:4 +USE_QT= qmake_build qt3support corelib gui network sql xml porting QT_DIST= yes HAS_CONFIGURE= yes Index: devel/qt4/Makefile =================================================================== --- devel/qt4/Makefile +++ devel/qt4/Makefile @@ -8,13 +8,13 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform application and UI framework (metaport) -USE_QT4= accessible clucene corelib dbus declarative designer \ +USE_QT= accessible clucene corelib dbus declarative designer \ graphicssystems-opengl gui help iconengines \ imageformats inputmethods multimedia network opengl \ phonon qt3support qtestlib script scripttools sql \ svg webkit xml xmlpatterns -USE_QT4:= ${USE_QT4:S/$/_run/} -USES= metaport +USE_QT:= ${USE_QT:S/$/_run/} +USES= metaport qt:4 OPTIONS_DEFINE= CODECS DOCS EXAMPLES GSTREAMER NLS SQL_PLUGINS TOOLS OPTIONS_DEFAULT=${OPTIONS_DEFINE} @@ -41,7 +41,7 @@ qvfb rcc uic uic3 xmlpatterns-tool .for opt in ${OPTIONS_DEFINE} -${opt}_USE:= ${${opt}_USE:S/^/QT4=/:S/$/_run/} +${opt}_USE:= ${${opt}_USE:S/^/QT=/:S/$/_run/} .endfor .include Index: devel/qt4/Makefile.sqldrivers =================================================================== --- devel/qt4/Makefile.sqldrivers +++ devel/qt4/Makefile.sqldrivers @@ -10,9 +10,9 @@ EXTRA_PATCHES= # empty -USE_QT4= corelib sql moc_build qmake_build +USES+= qt:4,qmake_outsource +USE_QT= corelib sql moc_build qmake_build QT_DIST= yes -USES+= qmake:outsource CXXFLAGS+= -I${WRKSRC}/include # For private QtSql headers. Index: devel/qt5-assistant/Makefile =================================================================== --- devel/qt5-assistant/Makefile +++ devel/qt5-assistant/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation browser -USE_QT5= core gui help network printsupport sql webkit widgets \ +USES= qt:5 tar:xz +USE_QT= core gui help network printsupport sql webkit widgets \ buildtools_build sql-sqlite3_run QT_DIST= tools -USES= qmake DESKTOP_ENTRIES="Qt 5 Assistant" "" \ "${PREFIX}/share/pixmaps/assistant-qt5.png" \ Index: devel/qt5-buildtools/Makefile =================================================================== --- devel/qt5-buildtools/Makefile +++ devel/qt5-buildtools/Makefile @@ -8,12 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt build tools -USE_QT5= qmake_build +USES= perl5 qt:5 tar:xz +USE_QT= qmake_build QT_DIST= base -USES= perl5 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} Index: devel/qt5-concurrent/Makefile =================================================================== --- devel/qt5-concurrent/Makefile +++ devel/qt5-concurrent/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt multi-threading module -USE_QT5= core qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/qt5-core/Makefile =================================================================== --- devel/qt5-core/Makefile +++ devel/qt5-core/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libicui18n.so:devel/icu \ libpcre.so:devel/pcre -USES= execinfo +USES= execinfo qt:5 tar:xz USE_GNOME= glib20 -USE_QT5= qmake_build buildtools_build +USE_QT= qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. @@ -27,7 +27,6 @@ -no-fontconfig -no-freetype -no-gtkstyle -no-harfbuzz \ -no-libudev -no-pulseaudio -no-xcb -no-xinput -no-xkb \ -no-xkbcommon -no-xrender -no-xshape -no-xsync -no-xvideo -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/qt5-designer/Makefile =================================================================== --- devel/qt5-designer/Makefile +++ devel/qt5-designer/Makefile @@ -8,11 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical user interface designer -USE_QT5= assistant_run core gui network printsupport quick uiplugin \ +USES= qt:5 tar:xz +USE_QT= assistant_run core gui network printsupport quick uiplugin \ webkit widgets xml buildtools_build QT_DIST= tools -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} DESKTOP_ENTRIES="Qt 5 Designer" "" \ "${PREFIX}/share/pixmaps/designer-qt5.png" \ Index: devel/qt5-help/Makefile =================================================================== --- devel/qt5-help/Makefile +++ devel/qt5-help/Makefile @@ -9,11 +9,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module -USE_QT5= core gui network sql widgets \ +USES= qt:5 tar:xz +USE_QT= core gui network sql widgets \ buildtools_build sql-sqlite3_run QT_DIST= tools -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/assistant INSTALL_WRKSRC= ${WRKSRC}/src/assistant Index: devel/qt5-linguist/Makefile =================================================================== --- devel/qt5-linguist/Makefile +++ devel/qt5-linguist/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 translation tool -USE_QT5= core gui printsupport widgets xml \ +USES= qt:5 tar:xz +USE_QT= core gui printsupport widgets xml \ assistant_run linguisttools_run \ - buildtools_build designer_build uitools_build + buildtools_build designer_build qmake_build uitools_build QT_DIST= tools -USES= qmake DESKTOP_ENTRIES="Qt 5 Linguist" "" \ "${PREFIX}/share/pixmaps/linguist-qt5.png" \ Index: devel/qt5-linguisttools/Makefile =================================================================== --- devel/qt5-linguisttools/Makefile +++ devel/qt5-linguisttools/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt localization tools -USE_QT5= core xml buildtools_build qml_build +USES= qt:5 tar:xz +USE_QT= core xml buildtools_build qml_build QT_DIST= tools -USES= qmake BUILD_WRKSRC= ${WRKSRC}/src/linguist INSTALL_WRKSRC= ${WRKSRC}/src/linguist Index: devel/qt5-location/Makefile =================================================================== --- devel/qt5-location/Makefile +++ devel/qt5-location/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt location module -USE_QT5= core dbus gui network qml quick buildtools_build +USES= qt:5 tar:xz +USE_QT= core dbus gui network qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: devel/qt5-qdbus/Makefile =================================================================== --- devel/qt5-qdbus/Makefile +++ devel/qt5-qdbus/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt command-line interface to D-Bus -USE_QT5= core dbus xml buildtools_build +USES= qt:5 tar:xz +USE_QT= core dbus xml buildtools_build QT_DIST= tools -USES= qmake BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/qt5-qdbusviewer/Makefile =================================================================== --- devel/qt5-qdbusviewer/Makefile +++ devel/qt5-qdbusviewer/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical interface to D-Bus -USE_QT5= core dbus gui widgets xml buildtools_build +USES= qt:5 tar:xz +USE_QT= core dbus gui widgets xml buildtools_build QT_DIST= tools -USES= qmake DESKTOP_ENTRIES="Qt 5 D-Bus Viewer" "" \ "${PREFIX}/share/pixmaps/qdbusviewer-qt5.png" \ Index: devel/qt5-qdoc-data/Makefile =================================================================== --- devel/qt5-qdoc-data/Makefile +++ devel/qt5-qdoc-data/Makefile @@ -18,8 +18,8 @@ LICENSE= GFDL LICENSE_FILE= ${WRKSRC}/LICENSE.FDL -USES= tar:xz -USE_QT5= # empty +USES= qt:5 tar:xz +USE_QT= # empty EXTRACT_AFTER_ARGS= --include ${DISTNAME}/LICENSE.FDL \ --include ${DISTNAME}/doc Index: devel/qt5-qdoc/Makefile =================================================================== --- devel/qt5-qdoc/Makefile +++ devel/qt5-qdoc/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -USE_QT5= core qml buildtools_build qdoc-data_run +USES= qt:5 tar:xz +USE_QT= core qml buildtools_build qdoc-data_run QT_DIST= tools -USES= qmake BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/qt5-script/Makefile =================================================================== --- devel/qt5-script/Makefile +++ devel/qt5-script/Makefile @@ -10,13 +10,12 @@ BROKEN_powerpc64= Does not build -USE_QT5= core buildtools_build +USES= qt:5 tar:xz +USE_QT= core buildtools_build QT_DIST= ${PORTNAME} -USES= qmake # 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' \ Index: devel/qt5-scripttools/Makefile =================================================================== --- devel/qt5-scripttools/Makefile +++ devel/qt5-scripttools/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Script additional components -USE_QT5= core gui script widgets buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui script widgets buildtools_build QT_DIST= script -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} Index: devel/qt5-testlib/Makefile =================================================================== --- devel/qt5-testlib/Makefile +++ devel/qt5-testlib/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module -USE_QT5= core qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/qt5-uitools/Makefile =================================================================== --- devel/qt5-uitools/Makefile +++ devel/qt5-uitools/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Designer UI forms support module -USE_QT5= core gui uiplugin widgets buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui uiplugin widgets buildtools_build QT_DIST= tools -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} Index: devel/qt5/Makefile =================================================================== --- devel/qt5/Makefile +++ devel/qt5/Makefile @@ -7,7 +7,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform application and UI framework (metaport) -USE_QT5= ${_USE_QT_ALL:Nphonon4:S/$/_run/} # phonon4 is not part of Qt itself. -USES= metaport +USES= metaport qt:5 +USE_QT= ${_USE_QT_ALL:Nphonon4:S/$/_run/} # phonon4 is not part of Qt itself. .include Index: devel/qt5/Makefile.sqldrivers =================================================================== --- devel/qt5/Makefile.sqldrivers +++ devel/qt5/Makefile.sqldrivers @@ -8,7 +8,8 @@ MAINTAINER?= kde@FreeBSD.org COMMENT?= Qt ${DB_DESC} database plugin -USE_QT5+= core sql qmake_build buildtools_build +USES+= qt:5 tar:xz +USE_QT+= core sql buildtools_build QT_DIST?= base HAS_CONFIGURE= yes CONFIGURE_ARGS+=-no-gui -no-xcb Index: devel/qtcreator/Makefile =================================================================== --- devel/qtcreator/Makefile +++ devel/qtcreator/Makefile @@ -15,11 +15,12 @@ LIB_DEPENDS= libqbscore.so:devel/qbs USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} -USES= qmake compiler:c++11-lib +USES= compiler:c++11-lib qt:5 USE_GL= gl -USE_QT5= buildtools concurrent core declarative designer gui help \ +USE_QT= buildtools concurrent core declarative designer gui help \ linguist network printsupport qdoc qml quick quickcontrols \ - script script sql svg webkit widgets xml xmlpatterns + script script sql svg webkit widgets xml xmlpatterns \ + qmake_build qmake_run # be paranoid and do not extract qbs (devel/qbs) copy from source tree EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/src/shared/qbs' @@ -41,9 +42,9 @@ OPTIONS_DEFINE= DOCS EXAMPLES DOCS_DESC= Install the Qt5 api documentation -DOCS_USE= QT5=doc_run +DOCS_USE= QT=doc_run EXAMPLES_DESC= Install the Qt5 example projects -EXAMPLES_USE= QT5=examples_run +EXAMPLES_USE= QT=examples_run OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all Index: devel/qtscriptgenerator/Makefile =================================================================== --- devel/qtscriptgenerator/Makefile +++ devel/qtscriptgenerator/Makefile @@ -17,19 +17,19 @@ PHONON_DESC= Build Phonon support OPTIONS_DEFAULT= PHONON -USES= gmake qmake -USE_QT4= corelib declarative designer doc help help-tools gui \ +USES= gmake qt:4 +USE_QT= corelib declarative designer doc help help-tools gui \ iconengines imageformats inputmethods linguist network \ opengl pixeltool porting qdbusviewer \ qt3support qtestlib qvfb script scripttools \ sql svg webkit xml xmlpatterns xmlpatterns-tool \ - moc_build rcc_build uic_build + moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include .if ${PORT_OPTIONS:MPHONON} -USE_QT4+= phonon +USE_QT+= phonon PLIST_SUB+= PHONON="" .else EXTRA_PATCHES= ${FILESDIR}/extra-patch-no_phonon Index: devel/ruby-korundum/Makefile =================================================================== --- devel/ruby-korundum/Makefile +++ devel/ruby-korundum/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kate kdelibs okular pimlibs \ qtruby smokegen smokekde smokeqt \ akonadi automoc4 soprano -USE_QT4= corelib network opengl sql svg xml \ +USE_QT= corelib network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes Index: devel/ruby-krossruby/Makefile =================================================================== --- devel/ruby-krossruby/Makefile +++ devel/ruby-krossruby/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for Qt/KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs pimlibs automoc4 -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build +USE_QT= corelib gui qmake_build moc_build uic_build rcc_build USE_RUBY= yes CMAKE_ARGS+= -DBUILD_python:BOOL=FALSE \ -DBUILD_falcon:BOOL=FALSE \ Index: devel/ruby-qtruby/Makefile =================================================================== --- devel/ruby-qtruby/Makefile +++ devel/ruby-qtruby/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 \ libqscintilla2.so:devel/qscintilla2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= smokeqt -USE_QT4= corelib dbus declarative gui network phonon script webkit xml \ +USE_QT= corelib dbus declarative gui network phonon script webkit xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_LDCONFIG= yes Index: devel/shiboken/Makefile =================================================================== --- devel/shiboken/Makefile +++ devel/shiboken/Makefile @@ -19,10 +19,10 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \ PYTHON_VERSION=${PYTHON_VERSION} -USE_QT4= corelib qmake_build qtestlib moc_build network \ +USE_QT= corelib qmake_build qtestlib moc_build network \ uic_build rcc_build xml xmlpatterns -USES= cmake python tar:bzip2 +USES= cmake python qt:4 tar:bzip2 USE_LDCONFIG= yes ALL_TARGET= all Index: devel/smokegen/Makefile =================================================================== --- devel/smokegen/Makefile +++ devel/smokegen/Makefile @@ -6,8 +6,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= SMOKE bindings for KDE -USES= cmake:outsource kde:4 tar:xz -USE_QT4= corelib xml qmake_build moc_build uic_build rcc_build +USES= cmake:outsource kde:4 qt:4 tar:xz +USE_QT= corelib xml qmake_build moc_build uic_build rcc_build CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke USE_LDCONFIG= yes Index: devel/smokekde/Makefile =================================================================== --- devel/smokekde/Makefile +++ devel/smokekde/Makefile @@ -7,10 +7,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= SMOKE bindings for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kate kdelibs okular pimlibs \ smokegen smokeqt akonadi automoc4 soprano -USE_QT4= corelib dbus designer_build gui network opengl sql svg xml \ +USE_QT= corelib dbus designer_build gui network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes Index: devel/smokeqt/Makefile =================================================================== --- devel/smokeqt/Makefile +++ devel/smokeqt/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= smokegen qimageblitz -USE_QT4= corelib dbus declarative designer_build gui help \ +USE_QT= corelib dbus declarative designer_build gui help \ multimedia network opengl phonon qtestlib script \ sql svg webkit xml xmlpatterns \ qmake_build moc_build uic_build rcc_build Index: devel/subcommander2/Makefile =================================================================== --- devel/subcommander2/Makefile +++ devel/subcommander2/Makefile @@ -20,9 +20,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E} -USES= autoreconf gmake dos2unix +USES= autoreconf gmake dos2unix qt:4 DOS2UNIX_GLOB= *.cpp *.h -USE_QT4= corelib gui network qt3support moc_build rcc_build uic_build +USE_QT= corelib gui network qt3support moc_build rcc_build uic_build QT_NONSTANDARD= yes USE_OPENSSL= yes GNU_CONFIGURE= yes Index: devel/svn2git/Makefile =================================================================== --- devel/svn2git/Makefile +++ devel/svn2git/Makefile @@ -15,9 +15,9 @@ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ p5-subversion>=0:devel/p5-subversion -USES= qmake tar:xz +USES= qt:4 tar:xz USE_GITHUB= yes -USE_QT4= corelib +USE_QT= corelib qmake_build GH_ACCOUNT= svn-all-fast-export GH_TAGNAME= d4ff0b2 Index: devel/thrift-cpp/Makefile =================================================================== --- devel/thrift-cpp/Makefile +++ devel/thrift-cpp/Makefile @@ -19,7 +19,7 @@ libevent.so:devel/libevent2 USES= autoreconf pkgconfig gmake compiler:c++11-lang \ - libtool pathfix ssl + libtool pathfix qt:4 ssl GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes @@ -27,7 +27,7 @@ OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 -QT4_USE= QT4=network,moc_build,qmake_build,rcc_build,uic_build +QT4_USE= QT=network,moc_build,qmake_build,rcc_build,uic_build OPTIONS_SUB= yes Index: devel/umbrello/Makefile =================================================================== --- devel/umbrello/Makefile +++ devel/umbrello/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 USE_GNOME= libxml2 libxslt -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: devel/universalindentgui/Makefile =================================================================== --- devel/universalindentgui/Makefile +++ devel/universalindentgui/Makefile @@ -1,4 +1,4 @@ -# Created by: Andriy Gapon + # Created by: Andriy Gapon # $FreeBSD$ PORTNAME= universalindentgui @@ -12,11 +12,11 @@ LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 -USES= dos2unix qmake shebangfix +USES= dos2unix shebangfix qt:4 SHEBANG_FILES= indenters/pindent.py \ indenters/rbeautify.rb \ indenters/ruby_formatter.rb -USE_QT4= moc_build uic_build rcc_build \ +USE_QT= moc_build qmake_build uic_build rcc_build \ linguist_build network script gui DESKTOP_ENTRIES="UniversalIndentGUI" "${COMMENT}" "" "${PORTNAME}" "" true Index: devel/zeal/Makefile =================================================================== --- devel/zeal/Makefile +++ devel/zeal/Makefile @@ -16,11 +16,11 @@ libxcb-keysyms.so:x11/xcb-util-keysyms USES= compiler:c++11-lib desktop-file-utils libarchive \ - pkgconfig qmake:outsource + pkgconfig qt:5,qmake_outsource USE_GL= gl # Dependency added by qt5-gui. USE_GITHUB= yes -USE_QT5= concurrent core gui network sql webkit widgets x11extras \ - buildtools_build sql-sqlite3_run +USE_QT= concurrent core gui network sql webkit widgets x11extras \ + buildtools_build qmake_build sql-sqlite3_run USE_XORG= x11 xcb GH_ACCOUNT= zealdocs Index: dns/kf5-kdnssd/Makefile =================================================================== --- dns/kf5-kdnssd/Makefile +++ dns/kf5-kdnssd/Makefile @@ -9,9 +9,9 @@ COMMENT= KF5 abstraction to system DNSSD features # TODO: options to depend on avahi and/or dnssd -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= core dbus linguisttools network \ +USE_QT= core dbus linguisttools network \ buildtools_build qmake_build .include Index: editors/calligra-l10n/files/bsd.l10n.mk =================================================================== --- editors/calligra-l10n/files/bsd.l10n.mk +++ editors/calligra-l10n/files/bsd.l10n.mk @@ -7,7 +7,7 @@ PLIST_SUB+= LANG=${CALLIGRA_L10N} USE_KDE= kdelibs automoc4 -USE_QT4= corelib xml moc_build qmake_build rcc_build uic_build +USE_QT= corelib xml moc_build qmake_build rcc_build uic_build USES+= cmake gettext kde:4 tar:xz NO_ARCH= yes .endif Index: editors/calligra/Makefile =================================================================== --- editors/calligra/Makefile +++ editors/calligra/Makefile @@ -35,15 +35,15 @@ pstoedit:graphics/pstoedit RUN_DEPENDS= pstoedit:graphics/pstoedit +USES= cmake:outsource cpe compiler:c++11-lang iconv:translit jpeg \ + kde:4 perl5 pkgconfig qt:4 shared-mime-info sqlite tar:xz USE_GL= glew USE_GNOME= glib20 libxml2 libxslt USE_KDE= kactivities kdelibs libkdcraw \ okular pimlibs attica automoc4 soprano -USE_QT4= corelib dbus designer_build gui opengl phonon \ +USE_QT= corelib dbus designer_build gui opengl phonon \ qtestlib_build script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build -USES= cmake:outsource cpe compiler:c++11-lang iconv:translit jpeg \ - kde:4 perl5 pkgconfig shared-mime-info sqlite tar:xz CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \ -DPRODUCTSET:STRING="DESKTOP" USE_LDCONFIG= yes Index: editors/focuswriter/Makefile =================================================================== --- editors/focuswriter/Makefile +++ editors/focuswriter/Makefile @@ -19,10 +19,11 @@ USE_GITHUB= yes GH_ACCOUNT= gottcode -USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake +USES= compiler:c++11-lib desktop-file-utils pkgconfig qt:5 USE_GL= gl -USE_QT5= concurrent core gui multimedia network printsupport widgets \ - buildtools_build linguisttools_build +USE_QT= concurrent core gui multimedia network printsupport widgets \ + buildtools_build linguisttools_build qmake_build + INSTALLS_ICONS= yes LIBS+= -lz Index: editors/kate-plugin-pate/Makefile =================================================================== --- editors/kate-plugin-pate/Makefile +++ editors/kate-plugin-pate/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Support for Python plugins in Kate -USES= cmake:outsource kde:4 python tar:xz +USES= cmake:outsource kde:4 python qt:4 tar:xz USE_KDE= kdelibs automoc4 kate \ pykde4_build pykde4_run -USE_QT4= gui webkit \ +USE_QT= gui webkit \ moc_build qmake_build rcc_build uic_build DISTINFO_FILE= ${.CURDIR:H:H}/editors/kate/distinfo Index: editors/kate/Makefile =================================================================== --- editors/kate/Makefile +++ editors/kate/Makefile @@ -11,10 +11,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource gettext kde:4 perl5 tar:xz +USES= cmake:outsource gettext kde:4 perl5 qt:4 tar:xz USE_KDE= kdelibs automoc4 kactivities USE_PERL5= build -USE_QT4= dbus gui script sql webkit xml \ +USE_QT= dbus gui script sql webkit xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: editors/kile-kde4/Makefile =================================================================== --- editors/kile-kde4/Makefile +++ editors/kile-kde4/Makefile @@ -12,8 +12,8 @@ RUN_DEPENDS= identify:graphics/ImageMagick -USES= cmake gettext-tools kde:4 shared-mime-info tar:bzip2 -USE_QT4= qmake_build moc_build rcc_build uic_build +USES= cmake gettext-tools kde:4 shared-mime-info qt:4 tar:bzip2 +USE_QT= qmake_build moc_build rcc_build uic_build USE_KDE= kdelibs automoc4 kate_run USE_TEX= latex Index: editors/klat4/Makefile =================================================================== --- editors/klat4/Makefile +++ editors/klat4/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2+ -USES= cmake gettext-tools kde:4 tar:bzip2 +USES= cmake gettext-tools kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kate kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: editors/lazarus/Makefile =================================================================== --- editors/lazarus/Makefile +++ editors/lazarus/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64 -USES= gmake +USES= gmake qt:4 USE_GNOME= # USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc rtl-extra \ Index: editors/lfhex/Makefile =================================================================== --- editors/lfhex/Makefile +++ editors/lfhex/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/../COPYING -USES= bison qmake -USE_QT4= corelib gui moc_build rcc_build +USES= bison qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build WRKSRC_SUBDIR= src Index: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -93,10 +93,9 @@ USE_GL= gl glew glu USE_OPENLDAP= yes USE_PERL5= build -USE_QT4= # empty but required USE_XORG= xaw xrandr -USES= autoreconf:build bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \ - python shared-mime-info tar:xz +USES= autoreconf:build bison compiler:c++11-lib cpe firebird gmake \ + jpeg perl5 pkgconfig python qt:4 shared-mime-info tar:xz WANT_GNOME= yes OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \ @@ -178,7 +177,7 @@ QT4INC="${QT_INCDIR}" \ QT4LIB="${QT_LIBDIR}" KDE4_USES= kde:4 -KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build +KDE4_USE= KDE=kdelibs QT=moc_build,qmake_build MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 MMEDIA_USE= GSTREAMER1=yes Index: editors/libreoffice4/Makefile =================================================================== --- editors/libreoffice4/Makefile +++ editors/libreoffice4/Makefile @@ -88,9 +88,9 @@ USE_GL= gl glew glu USE_OPENLDAP= yes USE_PERL5= build -USE_QT4= # empty but required +USE_QT= # empty but required USE_XORG= xaw xrandr -USES= bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig python shared-mime-info tar:xz +USES= bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig python shared-mime-info qt:4 tar:xz WANT_GNOME= yes LOVERSION= ${PORTVERSION}.${RCVER} @@ -264,7 +264,7 @@ JAVA_VARS= JAVA_BUILD=yes KDE4_USES= kde:4 -KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build +KDE4_USE= KDE=kdelibs QT=moc_build,qmake_build KDE4_CONFIGURE_ENABLE= kde4 KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ QT4DIR="${PREFIX}" \ Index: editors/mp/Makefile =================================================================== --- editors/mp/Makefile +++ editors/mp/Makefile @@ -31,7 +31,8 @@ GTK3_USE= gnome=gtk30 PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= pcre -QT4_USE= qt4=corelib,gui,moc_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui,moc_build QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}" QT4_CONFIGURE_WITH= qt4 Index: editors/plume-creator-devel/Makefile =================================================================== --- editors/plume-creator-devel/Makefile +++ editors/plume-creator-devel/Makefile @@ -12,8 +12,8 @@ DATE= 20150510 -USES= desktop-file-utils qmake shared-mime-info tar:xz -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build webkit +USES= desktop-file-utils shared-mime-info qt:4 tar:xz +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build webkit QMAKE_ARGS= ${WRKSRC}/plume-creator.pro .include Index: editors/tea/Makefile =================================================================== --- editors/tea/Makefile +++ editors/tea/Makefile @@ -17,9 +17,9 @@ OPTIONS_RADIO_SPELL= ASPELL HUNSPELL OPTIONS_DEFAULT= ASPELL -USES= pkgconfig:build qmake tar:bzip2 +USES= pkgconfig:build qt:4 tar:bzip2 USE_GL= gl -USE_QT4= corelib gui moc_build network rcc_build +USE_QT= corelib gui moc_build network qmake_build rcc_build LDFLAGS+= -lz MAKE_ENV+= LANG=en_US.UTF-8 Index: editors/texmacs/Makefile =================================================================== --- editors/texmacs/Makefile +++ editors/texmacs/Makefile @@ -51,8 +51,9 @@ PDF_CONFIGURE_ENABLE= pdf-renderer PDF_LDFLAGS= -lz PDF_IMPLIES= FREETYPE GHOSTSCRIPT -QT4_USE= qt4=accessible,corelib,gui,imageformats \ - qt4=moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=accessible,corelib,gui,imageformats \ + qt=moc_build,qmake_build,rcc_build,uic_build QT4_USE_OFF= xorg=xext QT4_CONFIGURE_ON= --with-qt=${PREFIX} --enable-qtpipes QT4_CONFIGURE_OFF= --disable-qt Index: editors/texmaker/Makefile =================================================================== --- editors/texmaker/Makefile +++ editors/texmaker/Makefile @@ -14,11 +14,11 @@ LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ libpoppler.so:graphics/poppler -USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2 +USES= desktop-file-utils ghostscript:x11,run pkgconfig tar:bzip2 _USE_QT4= gui network xml webkit \ - moc_build rcc_build uic_build + moc_build qmake_build rcc_build uic_build _USE_QT5= concurrent network printsupport script webkit widgets \ - xml buildtools_build + xml buildtools_build qmake_build USE_TEX= latex dvipsk EXTRACT_AFTER_ARGS= --exclude hunspell QMAKE_ARGS= ICONDIR=${PREFIX}/share/pixmaps \ @@ -29,9 +29,11 @@ OPTIONS_DEFAULT= QT5 TOOLKIT_DESC= Qt toolkit -QT4_USE= ${_USE_QT4:S/^/QT4=/} +QT4_USES= qt:4 +QT4_USE= ${_USE_QT4:S/^/QT=/} QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 -QT5_USE= ${_USE_QT5:S/^/QT5=/} +QT5_USES= qt:5 +QT5_USE= ${_USE_QT5:S/^/QT=/} QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 .include Index: editors/texstudio/Makefile =================================================================== --- editors/texstudio/Makefile +++ editors/texstudio/Makefile @@ -12,14 +12,13 @@ LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ libpoppler.so:graphics/poppler -USES= desktop-file-utils dos2unix execinfo ghostscript:run \ - pkgconfig qmake +USES= desktop-file-utils dos2unix execinfo ghostscript:run pkgconfig DOS2UNIX_FILES= ${PORTNAME}.pro _USE_QT4= corelib gui network script svg xml \ - iconengines_run designer_build moc_build rcc_build uic_build + iconengines_run designer_build moc_build qmake_build rcc_build uic_build _USE_QT5= core gui network script svg widgets xml \ - printsupport concurrent uitools buildtools_build + printsupport concurrent uitools buildtools_build qmake_build USE_XORG= x11 USE_GL= gl @@ -34,12 +33,14 @@ QMAKE_ARGS= USE_SYSTEM_HUNSPELL=true USE_SYSTEM_QUAZIP=true TOOLKIT_DESC= Qt toolkit -QT4_USE= ${_USE_QT4:S/^/QT4=/} +QT4_USES= qt:4,qmake_outsource +QT4_USE= ${_USE_QT4:S/^/QT=/} QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4 \ libquazip.so:archivers/quazip QT4_QMAKE_ON= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \ QUAZIP_LIB="-lquazip" -QT5_USE= ${_USE_QT5:S/^/QT5=/} +QT5_USES= qt:5,qmake_outsource +QT5_USE= ${_USE_QT5:S/^/QT=/} QT5_LIB_DEPENDS=libpoppler-qt5.so:graphics/poppler-qt5 \ libquazip5.so:archivers/quazip-qt5 QT5_QMAKE_ON= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \ Index: editors/textroom/Makefile =================================================================== --- editors/textroom/Makefile +++ editors/textroom/Makefile @@ -16,10 +16,10 @@ libhunspell-1.5.so:textproc/hunspell \ libxml++-2.6.so:textproc/libxml++26 -USES= desktop-file-utils pkgconfig qmake +USES= desktop-file-utils pkgconfig qt:4 USE_GL= gl USE_SDL= mixer -USE_QT4= moc_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib gui opengl qt3support svg xml post-patch: Index: editors/texworks/Makefile =================================================================== --- editors/texworks/Makefile +++ editors/texworks/Makefile @@ -15,10 +15,10 @@ BUILD_DEPENDS= hunspell:textproc/hunspell LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 -USES= pkgconfig qmake +USES= pkgconfig qt:4 USE_GITHUB= yes GH_ACCOUNT= TeXworks -USE_QT4= gui corelib rcc_build moc_build uic_build \ +USE_QT= gui corelib rcc_build moc_build qmake_build uic_build \ dbus xml scripttools designer_build QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \ DATA_DIR=${DATADIR} \ Index: editors/yzis/Makefile =================================================================== --- editors/yzis/Makefile +++ editors/yzis/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -USES= tar:bzip2 cmake gettext perl5 lua:51 +USES= tar:bzip2 cmake gettext perl5 lua:51 qt:4 USE_XORG= x11 xext ice -USE_QT4= qtestlib qmake_build rcc_build uic_build moc_build gui xml +USE_QT= qtestlib qmake_build rcc_build uic_build moc_build gui xml CMAKE_ARGS+= -DLOCALBASE:STRING="${LOCALBASE}" \ -DLUA_INCDIR:STRING="${LUA_INCDIR}" \ -DLUA_LIBDIR:STRING="${LUA_LIBDIR}" \ @@ -33,7 +33,7 @@ OPTIONS_SUB= yes KYZIS_DESC= Build kyzis and Yzis kpart KYZIS_USES= kde:4 -KYZIS_USE= KDE=kdeprefix,kdelibs,automoc4 QT4=phonon +KYZIS_USE= KDE=kdeprefix,kdelibs,automoc4 QT=phonon KYZIS_CMAKE_ON= -DENABLE_KYZIS:BOOL=ON -DENABLE_KPART_YZIS:BOOL=ON KYZIS_CMAKE_OFF= -DENABLE_KYZIS:BOOL=OFF -DENABLE_KPART_YZIS:BOOL=OFF NYZIS_DESC= Build nyzis (ncurses frontend) Index: emulators/aqemu/Makefile =================================================================== --- emulators/aqemu/Makefile +++ emulators/aqemu/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libvncclient.so:net/libvncserver -USE_QT4= corelib gui network qtestlib xml linguisttools_build \ +USE_QT= corelib gui network qtestlib xml linguisttools_build \ moc_build qmake_build rcc_build uic_build -USES= cmake tar:bzip2 +USES= cmake qt:4 tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.0$,,} .include Index: emulators/citra/Makefile =================================================================== --- emulators/citra/Makefile +++ emulators/citra/Makefile @@ -37,7 +37,7 @@ philsquared:Catch:v1.4.0:catch/externals/catch \ svn2github:inih:603729d:inih/externals/inih/inih -USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags +USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags qt:5 FAVORITE_COMPILER= ${COMPILER_TYPE} # c++14-lib CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 @@ -54,7 +54,7 @@ man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils shared-mime-info -QT5_USE= QT5=qmake_build,buildtools_build,core,gui,opengl,widgets +QT5_USE= QT=qmake_build,buildtools_build,core,gui,opengl,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES=bin/${PORTNAME}-qt \ man/man6/${PORTNAME}-qt.6.gz \ Index: emulators/dboxfe/Makefile =================================================================== --- emulators/dboxfe/Makefile +++ emulators/dboxfe/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= dosbox:emulators/dosbox -USE_QT4= corelib gui network xml uic_build moc_build qmake_build rcc_build -USES= qmake tar:bzip2 +USE_QT= corelib gui network xml uic_build moc_build qmake_build rcc_build +USES= qt:4 tar:bzip2 PLIST_FILES= bin/dboxfe \ bin/dboxfetray \ Index: emulators/higan/Makefile =================================================================== --- emulators/higan/Makefile +++ emulators/higan/Makefile @@ -12,7 +12,7 @@ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Nintendo multi-system emulator -USES= compiler:c++11-lib gmake pkgconfig tar:xz +USES= compiler:c++11-lib gmake pkgconfig qt:4 tar:xz USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 @@ -53,7 +53,7 @@ GTK2_USE= GNOME=gtk20 GTK2_MAKE_ENV= phoenix="gtk" -QT4_USE= QT4=gui,moc_build +QT4_USE= QT=gui,moc_build QT4_MAKE_ENV= phoenix="qt" GLX_USE= GL=gl Index: emulators/mame/Makefile =================================================================== --- emulators/mame/Makefile +++ emulators/mame/Makefile @@ -22,7 +22,7 @@ GH_PROJECT= mame # explicit (master port) GH_TAGNAME= mame${PORTVERSION:S/.//} -USES= compiler:c11 gmake jpeg pkgconfig python:2,build shebangfix +USES= compiler:c11 gmake jpeg pkgconfig python:2,build shebangfix qt:4 SHEBANG_FILES= src/devices/cpu/m6502/m6502make.py \ src/devices/cpu/m6809/m6809make.py \ src/devices/cpu/mcs96/mcs96make.py \ @@ -31,7 +31,7 @@ USE_XORG= x11 xext xi xinerama xrender USE_GL= gl USE_SDL= sdl2 ttf2 -USE_QT4= gui moc_build qmake_build +USE_QT= gui moc_build MTARGET?= mame MSUBTARGET?= mame CFLAGS+= -I${LOCALBASE}/include Index: emulators/ppsspp/Makefile =================================================================== --- emulators/ppsspp/Makefile +++ emulators/ppsspp/Makefile @@ -54,10 +54,10 @@ OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_SINGLE_GUI} -QT4_USES= qmake:outsource -QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl -QT5_USES= qmake:outsource -QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets +QT4_USES= qt:4,qmake_outsource +QT4_USE= QT=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl +QT5_USES= qt:5,qmake_outsource +QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets SDL_USES= cmake:outsource SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png Index: emulators/q4wine/Makefile =================================================================== --- emulators/q4wine/Makefile +++ emulators/q4wine/Makefile @@ -19,11 +19,11 @@ cabextract:archivers/cabextract \ icotool:graphics/icoutils -USES= cmake desktop-file-utils +USES= cmake desktop-file-utils qt:4 CMAKE_ARGS+= -DMANPAGE_ENTRY_PATH=${MANPREFIX}/man USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_QT4= qmake_build rcc_build moc_build uic_build \ +USE_QT= qmake_build rcc_build moc_build uic_build \ linguisttools_build corelib gui sql sql-sqlite3_run network ONLY_FOR_ARCHS= i386 amd64 @@ -36,7 +36,7 @@ DBUS_CMAKE_ON= -DWITH_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus .include Index: emulators/qmc2/Makefile =================================================================== --- emulators/qmc2/Makefile +++ emulators/qmc2/Makefile @@ -16,11 +16,11 @@ NO_WRKSUBDIR= yes -USES= gmake tar:bzip2 +USES= gmake qt:4 tar:bzip2 USE_XORG= x11 xmu USE_GL= gl glu -USE_QT4= corelib declarative gui moc_build \ - network opengl phonon qmake_build \ +USE_QT= corelib declarative gui moc_build \ + network opengl phonon qmake \ qtestlib rcc_build script scripttools \ sql svg uic_build webkit xml xmlpatterns USE_SDL= sdl Index: emulators/qtemu/Makefile =================================================================== --- emulators/qtemu/Makefile +++ emulators/qtemu/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:bzip2 -USE_QT4= gui xml uic_build moc_build rcc_build +USES= qt:4 tar:bzip2 +USE_QT= gui xml uic_build moc_build qmake_build rcc_build CONFIGURE_ENV= LOCALBASE=${LOCALBASE} DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \ @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_USE= QT4=linguisttools_build +NLS_USE= QT=linguisttools_build post-configure-NLS-on: (cd ${WRKSRC} && ${LRELEASE} qtemu.pro) Index: emulators/swine/Makefile =================================================================== --- emulators/swine/Makefile +++ emulators/swine/Makefile @@ -23,9 +23,9 @@ GH_ACCOUNT= dswd GH_PROJECT= Swine -USES= gmake python +USES= gmake python qt:4 NO_BUILD= yes -USE_QT4= linguist_build +USE_QT= linguist_build ONLY_FOR_ARCHS= i386 amd64 PORTDOCS= README Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile +++ emulators/virtualbox-ose/Makefile @@ -170,12 +170,14 @@ VBOX_WITH_QT= 1 .if ${PORT_OPTIONS:MQT4} CONFIGURE_ARGS+= --enable-qt4 -USE_QT4= corelib gui linguist_build moc_build network opengl -USE_QT4+= rcc_build uic_build +USES+= qt:4 +USE_QT= corelib gui linguist_build moc_build network opengl +USE_QT+= rcc_build uic_build .else CONFIGURE_ARGS+= --enable-qt5 -USE_QT5= buildtools_build core dbus gui linguist_build opengl -USE_QT5+= printsupport widgets x11extras +USES+= qt:5 +USE_QT= buildtools_build core dbus gui linguist_build opengl +USE_QT+= printsupport widgets x11extras .endif .else CONFIGURE_ARGS+= --disable-qt Index: emulators/yabause/Makefile =================================================================== --- emulators/yabause/Makefile +++ emulators/yabause/Makefile @@ -30,11 +30,13 @@ GTK2_USE= gnome=gtk20 GTK2_CMAKE_ON= -DYAB_PORTS:STRING=gtk GTK2_CMAKE_OFF= -DYAB_PORTS:STRING=qt -QT4_USE= qt4=corelib,gui,opengl \ - qt4=moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui,opengl \ + qt=moc_build,qmake_build,rcc_build,uic_build QT4_CMAKE_ON= -DQt5_FOUND:BOOL=OFF -QT5_USE= qt5=core,gui,opengl \ - qt5=buildtools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,opengl \ + qt=buildtools_build,qmake_build SDL2_DESC= SDL2 libraries support SDL2_USE= sdl=sdl2 SDL2_USE_OFF= sdl=sdl Index: finance/bitcoin-armory/Makefile =================================================================== --- finance/bitcoin-armory/Makefile +++ finance/bitcoin-armory/Makefile @@ -24,7 +24,7 @@ USE_GITHUB= yes GH_ACCOUNT= etotheipi -USES= compiler:c++11-lang compiler:c++11-lib gmake python:2 shebangfix +USES= compiler:c++11-lang compiler:c++11-lib gmake python:2 shebangfix qt:4 SHEBANG_FILES= extras/extractKeysFromWallet.py CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: finance/kmymoney-kde4/Makefile =================================================================== --- finance/kmymoney-kde4/Makefile +++ finance/kmymoney-kde4/Makefile @@ -19,8 +19,8 @@ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error -USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:xz -USE_QT4= corelib gui dbus declarative network phonon script sql svg xml \ +USES= cmake kde:4 pkgconfig shared-mime-info shebangfix qt:4 tar:xz +USE_QT= corelib gui dbus declarative network phonon script sql svg xml \ qmake_build moc_build rcc_build uic_build USE_KDE= automoc4 kdelibs pimlibs soprano USE_LDCONFIG= yes Index: finance/libalkimia/Makefile =================================================================== --- finance/libalkimia/Makefile +++ finance/libalkimia/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libgmp.so:math/gmp -USES= cmake:outsource kde:4 pathfix tar:xz +USES= cmake:outsource kde:4 pathfix qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes post-patch: Index: finance/qhacc/Makefile =================================================================== --- finance/qhacc/Makefile +++ finance/qhacc/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libqwt6.so:x11-toolkits/qwt6 -USES= compiler:c++11-lib qmake:norecursive tar:tgz -USE_QT4= corelib gui sql moc_build rcc_build uic_build +USES= compiler:c++11-lib qt:4 tar:tgz,qmake_norecursiv +USE_QT= corelib gui sql moc_build qmake_build rcc_build uic_build USE_CXXSTD= c++11 USE_LDCONFIG= yes Index: finance/skrooge/Makefile =================================================================== --- finance/skrooge/Makefile +++ finance/skrooge/Makefile @@ -16,9 +16,9 @@ libqca.so:devel/qca \ libkactivities.so:x11/kactivities -USES= cmake:outsource gettext grantlee:4 kde:4 shared-mime-info \ +USES= cmake:outsource gettext grantlee:4 kde:4 qt:4 shared-mime-info \ sqlite:3 tar:xz -USE_QT4= qmake_build moc_build uic_build rcc_build designer_build \ +USE_QT= qmake_build moc_build uic_build rcc_build designer_build \ corelib dbus gui script sql webkit xml sql-sqlite3_run USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes Index: french/eficas/Makefile =================================================================== --- french/eficas/Makefile +++ french/eficas/Makefile @@ -16,7 +16,7 @@ bash:shells/bash \ ${PYNUMPY} -USES= python shebangfix +USES= python shebangfix qt:4 #USE_GCC= yes # To be removed - Needed as a work-around for numpy, see PR ports/188114 SHEBANG_FILES= eficas eficasQt REINPLACE_ARGS= -i "" Index: ftp/plasma-applet-ftpmonitor/Makefile =================================================================== --- ftp/plasma-applet-ftpmonitor/Makefile +++ ftp/plasma-applet-ftpmonitor/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ Index: ftp/scythia/Makefile =================================================================== --- ftp/scythia/Makefile +++ ftp/scythia/Makefile @@ -12,8 +12,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Small ftp client unpretentious based on Qt4 -USES= qmake -USE_QT4= gui network corelib uic_build moc_build rcc_build +USES= qt:4 +USE_QT= gui network corelib uic_build moc_build qmake_build rcc_build INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/${PORTNAME} Index: games/2048-qt/Makefile =================================================================== --- games/2048-qt/Makefile +++ games/2048-qt/Makefile @@ -15,8 +15,9 @@ GH_ACCOUNT= xiaoyong GH_PROJECT= 2048-Qt -USES= gmake pkgconfig qmake -USE_QT5= core gui network widgets qml quick buildtools_build quickcontrols +USES= gmake pkgconfig qt:5 +USE_QT= core gui network widgets qml quick quickcontrols \ + buildtools_build qmake_build PLIST_FILES= bin/2048-qt ${DESKTOPDIR}/${PORTNAME}.desktop \ share/pixmaps/${PORTNAME}.png Index: games/allacrost/Makefile =================================================================== --- games/allacrost/Makefile +++ games/allacrost/Makefile @@ -20,7 +20,7 @@ libboost_thread.so:devel/boost-libs GNU_CONFIGURE= yes -USES= gettext gmake iconv jpeg lua:51 openal:al +USES= gettext gmake iconv jpeg lua:51 openal:al qt:4 USE_SDL= sdl ttf net USE_GL= yes USE_GCC= any # problems in luabind @@ -40,7 +40,7 @@ EDITOR_DESC= Enable editor -EDITOR_USE= QT4=corelib,gui,moc_build,opengl,qt3support +EDITOR_USE= QT=corelib,gui,moc_build,opengl,qt3support EDITOR_CONFIGURE_ON= --enable-editor=yes EDITOR_CONFIGURE_OFF= --enable-editor=no Index: games/anki/Makefile =================================================================== --- games/anki/Makefile +++ games/anki/Makefile @@ -24,9 +24,9 @@ ${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.4:www/py-qt4-webkit \ ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash -USES= desktop-file-utils python:2 shared-mime-info shebangfix tar:tgz +USES= desktop-file-utils python:2 shared-mime-info shebangfix qt:4 tar:tgz SHEBANG_FILES= tools/build_ui.sh tools/tests.sh -USE_QT4= network_run webkit_run +USE_QT= network_run webkit_run OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime gettext-tools Index: games/arx-libertatis/Makefile =================================================================== --- games/arx-libertatis/Makefile +++ games/arx-libertatis/Makefile @@ -29,10 +29,11 @@ OPTIONS_DEFINE= CRASHREPORTER DOCS OPTIONS_SUB= yes -CRASHREPORTER_DESC= Build crash reporter (requires Qt4) -CRASHREPORTER_USE= QT4=corelib,gui,network \ - QT4=rcc_build,moc_build,uic_build,qmake_build -CRASHREPORTER_CMAKE_ON= -DBUILD_CRASHREPORTER=ON -DUSE_QT5=OFF +CRASHREPORTER_DESC= Build crash reporter (requires Qt4)$ +CRASHREPORTER_USES= qt:4 +CRASHREPORTER_USE= QT=corelib,gui,network \ + QT=rcc_build,moc_build,uic_build,qmake_build +CRASHREPORTER_CMAKE_ON= -DBUILD_CRASHREPORTER=ON -DUSE_QT=OFF CRASHREPORTER_CMAKE_OFF=-DBUILD_CRASHREPORTER=OFF .include Index: games/blinken/Makefile =================================================================== --- games/blinken/Makefile +++ games/blinken/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Memory enhancement game for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: games/bomber/Makefile =================================================================== --- games/bomber/Makefile +++ games/bomber/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/bovo/Makefile =================================================================== --- games/bovo/Makefile +++ games/bovo/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/bubble-chains/Makefile =================================================================== --- games/bubble-chains/Makefile +++ games/bubble-chains/Makefile @@ -16,12 +16,13 @@ USE_GITHUB= yes GH_ACCOUNT= SanskritFritz -USES= dos2unix qmake +USES= dos2unix qt:4 DOS2UNIX_GLOB= *.pro *.cpp *.h *.ui *.rc *.htm *.dat *.css USE_SDL= mixer sdl USE_GL= gl USE_XORG= xrandr -USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ +USE_QT= moc_build qmake_build rcc_build uic_build \ + iconengines_run imageformats_run \ corelib svg xml opengl network QMAKE_SOURCE_PATH= ${WRKSRC}/Game.pro Index: games/capicity/Makefile =================================================================== --- games/capicity/Makefile +++ games/capicity/Makefile @@ -23,9 +23,10 @@ WRKSRC= ${WRKDIR}/CapiCity_${PORTVERSION} -USES= iconv qmake +USES= iconv qt:4 USE_XORG= ice sm x11 xau xcb xdmcp xext xrender -USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ +USE_QT= moc_build qmake_build rcc_build uic_build \ + iconengines_run imageformats_run \ corelib gui network script xml PORTDOCS= README changelog Index: games/capitalism/Makefile =================================================================== --- games/capitalism/Makefile +++ games/capitalism/Makefile @@ -23,9 +23,10 @@ WRKSRC= ${WRKDIR}/Capitalism-${PORTVERSION} -USES= iconv qmake +USES= iconv qt:4 USE_XORG= ice sm x11 xau xcb xdmcp xext xrender -USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ +USE_QT= moc_build qmake_build rcc_build uic_build \ + iconengines_run imageformats_run \ corelib gui network script xml PORTDOCS= README changelog readme.txt Index: games/chessx/Makefile =================================================================== --- games/chessx/Makefile +++ games/chessx/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= desktop-file-utils qmake shared-mime-info tar:tgz -USE_QT4= corelib gui svg network linguisttools_build \ +USES= desktop-file-utils shared-mime-info qt:4 tar:tgz +USE_QT= corelib gui svg network linguisttools_build \ moc_build qmake_build rcc_build uic_build QMAKE_ARGS+= QMAKE_LRELEASE=${LRELEASE} Index: games/cockatrice/Makefile =================================================================== --- games/cockatrice/Makefile +++ games/cockatrice/Makefile @@ -16,9 +16,9 @@ USE_GITHUB= yes GH_TAGNAME= 2016-10-30-Release -USES= cmake compiler:c++11-lib -USE_QT5= buildtools concurrent core multimedia network printsupport \ - qmake svg linguisttools widgets gui +USES= cmake compiler:c++11-lib qt:5 +USE_QT= buildtools_build concurrent core multimedia network printsupport \ + qmake_build svg linguisttools widgets gui INSTALLS_ICONS= yes DATADIR= ${PREFIX}/share/${PORTNAME:tl} Index: games/colorcode/Makefile =================================================================== --- games/colorcode/Makefile +++ games/colorcode/Makefile @@ -9,8 +9,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Advanced MasterMind game and solver -USE_QT5= gui widgets buildtools_build -USES= qmake +USES= qt:5 +USE_QT= gui widgets buildtools_build qmake_build WRKSRC= ${WRKDIR}/ColorCode-${PORTVERSION} DESKTOP_ENTRIES= ColorCode "" \ Index: games/connectagram/Makefile =================================================================== --- games/connectagram/Makefile +++ games/connectagram/Makefile @@ -15,8 +15,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= compiler:c++11-lib qmake tar:bzip2 -USE_QT5= buildtools_build core gui linguisttools_build network widgets +USES= compiler:c++11-lib tar:bzip2 qt:5 +USE_QT= buildtools_build core gui linguisttools_build qmake_build network widgets INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS Index: games/cutemaze/Makefile =================================================================== --- games/cutemaze/Makefile +++ games/cutemaze/Makefile @@ -14,8 +14,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= qmake tar:bzip2 -USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ +USES= qt:4 tar:bzip2 +USE_QT= moc_build qmake_build rcc_build uic_build \ + iconengines_run imageformats_run \ corelib gui svg INSTALLS_ICONS= yes Index: games/doomsday/Makefile =================================================================== --- games/doomsday/Makefile +++ games/doomsday/Makefile @@ -22,8 +22,8 @@ USE_LDCONFIG= yes USE_SDL= sdl2 mixer2 net2 USE_XORG= x11 -USES= compiler:c++11-lib execinfo pkgconfig python:build qmake:outsource -USE_QT4= corelib network opengl moc_build +USES= compiler:c++11-lib execinfo pkgconfig python:build qt:4,qmake_outsource +USE_QT= corelib network opengl moc_build qmake_build QMAKE_SOURCE_PATH= ${WRKSRC}/doomsday QMAKE_ARGS+= QMAKE_LFLAGS+="-Wl,--export-dynamic" \ CONFIG+="deng_notools deng_nosnowberry" \ Index: games/dustrac/Makefile =================================================================== --- games/dustrac/Makefile +++ games/dustrac/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libvorbisfile.so:audio/libvorbis -USES= compiler:c++11-lib cmake:outsource openal pkgconfig +USES= compiler:c++11-lib cmake:outsource openal pkgconfig qt:5 USE_GL= glu -USE_QT5= core opengl xml widgets \ +USE_QT= core opengl xml widgets \ buildtools_build linguisttools_build qmake_build CMAKE_ARGS= -DReleaseBuild=on \ -DDATA_PATH=${DATADIR} \ Index: games/flightgear/Makefile =================================================================== --- games/flightgear/Makefile +++ games/flightgear/Makefile @@ -46,7 +46,7 @@ DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF -QT5_USE= QT5=core,buildtools,gui,qmake,widgets +QT5_USE= QT=core,buildtools,gui,qmake,widgets .include Index: games/flukz/Makefile =================================================================== --- games/flukz/Makefile +++ games/flukz/Makefile @@ -9,8 +9,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Vertically scrolling shoot'em up -USES= qmake -USE_QT4= multimedia network moc_build rcc_build +USES= qt:4 +USE_QT= multimedia network moc_build qmake_build rcc_build DESKTOP_ENTRIES= Flukz "" ${PORTNAME} \ ${PORTNAME} "Game;ArcadeGame;" true Index: games/goldencheetah/Makefile =================================================================== --- games/goldencheetah/Makefile +++ games/goldencheetah/Makefile @@ -28,10 +28,10 @@ "Education;Sports;" \ false -USES= bison gmake qmake +USES= bison gmake qt:4 USE_GL= gl glu -USE_QT4= corelib gui linguist moc_build network opengl \ - qmake rcc script sql svg uic webkit xml +USE_QT= corelib gui linguist moc_build network opengl \ + qmake_build rcc script sql svg uic webkit xml INFO= GC3-FAQ GC3-Release GC31-Release post-extract: Index: games/gottet/Makefile =================================================================== --- games/gottet/Makefile +++ games/gottet/Makefile @@ -15,8 +15,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= compiler:c++11-lib qmake tar:bzip2 -USE_QT5= buildtools_build widgets +USES= compiler:c++11-lib tar:bzip2 qt:5 +USE_QT= buildtools_build qmake_build widgets INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS Index: games/granatier/Makefile =================================================================== --- games/granatier/Makefile +++ games/granatier/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui xml \ +USE_QT= corelib gui xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/hedgewars/Makefile =================================================================== --- games/hedgewars/Makefile +++ games/hedgewars/Makefile @@ -17,10 +17,10 @@ LIB_DEPENDS= libphysfs.so:devel/physfs -USES= cmake desktop-file-utils lua:51 tar:bzip2 +USES= cmake desktop-file-utils lua:51 qt:4 tar:bzip2 USE_SDL= sdl mixer image ttf net USE_FPC= opengl libpng rtl-objpas -USE_QT4= corelib gui moc_build network \ +USE_QT= corelib gui moc_build network \ qmake_build rcc_build svg xml \ uic_build linguisttools_build CMAKE_ARGS= -DNOVIDEOREC=1 Index: games/hexalate/Makefile =================================================================== --- games/hexalate/Makefile +++ games/hexalate/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lib qmake tar:bzip2 -USE_QT5= core gui widgets buildtools_build linguisttools_build +USES= compiler:c++11-lib tar:bzip2 qt:5 +USE_QT= core gui widgets buildtools_build linguisttools_build qmake_build USE_GL= gl INSTALLS_ICONS= yes Index: games/hexglass/Makefile =================================================================== --- games/hexglass/Makefile +++ games/hexglass/Makefile @@ -11,8 +11,8 @@ BROKEN= Unfetchable (google code has gone away) -USE_QT4= gui moc_build rcc_build -USES= qmake +USES= qt:4 +USE_QT= gui moc_build qmake_build rcc_build PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.xpm Index: games/jag/Makefile =================================================================== --- games/jag/Makefile +++ games/jag/Makefile @@ -14,11 +14,11 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= 2D arcade-puzzle game like KDiamonds -USES= dos2unix qmake zip +USES= dos2unix zip qt:4 USE_SDL= sdl mixer DOS2UNIX_FILES= Game.pro USE_XORG= x11 -USE_QT4= uic_build moc_build rcc_build \ +USE_QT= uic_build moc_build qmake_build rcc_build \ corelib svg xml opengl network PLIST_FILES= bin/${PORTNAME} Index: games/kajongg/Makefile =================================================================== --- games/kajongg/Makefile +++ games/kajongg/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 python tar:xz twisted:run sqlite +USES= cmake:outsource kde:4 python tar:xz twisted:run sqlite qt:4 USE_KDE= kdelibs pykde4 automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DINSTALL_KAJONGG:BOOL=TRUE .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kanagram/Makefile =================================================================== --- games/kanagram/Makefile +++ games/kanagram/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Letter order game for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdeedu automoc4 -USE_QT4= xml corelib declarative gui opengl script xml \ +USE_QT= xml corelib declarative gui opengl script xml \ moc_build qmake_build rcc_build uic_build .include Index: games/kapman/Makefile =================================================================== --- games/kapman/Makefile +++ games/kapman/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui xml \ +USE_QT= corelib gui xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kardsgt/Makefile =================================================================== --- games/kardsgt/Makefile +++ games/kardsgt/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake -USE_QT4= assistantclient corelib gui network \ - moc_build rcc_build uic_build +USES= qt:4 +USE_QT= assistantclient corelib gui network \ + moc_build qmake_build rcc_build uic_build ALL_TARGET= qmake release MAKE_JOBS_UNSAFE= yes Index: games/katomic/Makefile =================================================================== --- games/katomic/Makefile +++ games/katomic/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 shebangfix tar:xz +USES= cmake:outsource kde:4 shebangfix qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 SHEBANG_FILES= katomic-levelset-upd.pl -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kblackbox/Makefile =================================================================== --- games/kblackbox/Makefile +++ games/kblackbox/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui xml \ +USE_QT= corelib gui xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kblocks/Makefile =================================================================== --- games/kblocks/Makefile +++ games/kblocks/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui network \ +USE_QT= corelib gui network \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kbounce/Makefile =================================================================== --- games/kbounce/Makefile +++ games/kbounce/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kbreakout/Makefile =================================================================== --- games/kbreakout/Makefile +++ games/kbreakout/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui xml \ +USE_QT= corelib gui xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kcheckers/Makefile =================================================================== --- games/kcheckers/Makefile +++ games/kcheckers/Makefile @@ -10,8 +10,8 @@ MAINTAINER= johans@FreeBSD.org COMMENT= Qt version of the classic boardgame checkers -USES= qmake -USE_QT4= corelib gui moc_build rcc_build +USES= qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common.h Index: games/kdiamond/Makefile =================================================================== --- games/kdiamond/Makefile +++ games/kdiamond/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kfourinline/Makefile =================================================================== --- games/kfourinline/Makefile +++ games/kfourinline/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kgoldrunner/Makefile =================================================================== --- games/kgoldrunner/Makefile +++ games/kgoldrunner/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/khangman/Makefile =================================================================== --- games/khangman/Makefile +++ games/khangman/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Hangman game for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdeedu automoc4 -USE_QT4= corelib declarative gui opengl script xml \ +USE_QT= corelib declarative gui opengl script xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: games/kigo/Makefile =================================================================== --- games/kigo/Makefile +++ games/kigo/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/killbots/Makefile =================================================================== --- games/killbots/Makefile +++ games/killbots/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui qtestlib xml \ +USE_QT= corelib gui qtestlib xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kiriki/Makefile =================================================================== --- games/kiriki/Makefile +++ games/kiriki/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kjumpingcube/Makefile =================================================================== --- games/kjumpingcube/Makefile +++ games/kjumpingcube/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/klickety/Makefile =================================================================== --- games/klickety/Makefile +++ games/klickety/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 shebangfix tar:xz +USES= cmake:outsource kde:4 shebangfix qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 SHEBANG_FILES= klickety-2.0-inherit-ksame-highscore.pl -USE_QT4= corelib gui xml \ +USE_QT= corelib gui xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/klines/Makefile =================================================================== --- games/klines/Makefile +++ games/klines/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kmahjongg/Makefile =================================================================== --- games/kmahjongg/Makefile +++ games/kmahjongg/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libkmahjongglib.so:games/libkmahjongg -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kmines/Makefile =================================================================== --- games/kmines/Makefile +++ games/kmines/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/knavalbattle/Makefile =================================================================== --- games/knavalbattle/Makefile +++ games/knavalbattle/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui network xml \ +USE_QT= corelib gui network xml \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/knetwalk/Makefile =================================================================== --- games/knetwalk/Makefile +++ games/knetwalk/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/knights-kde4/Makefile =================================================================== --- games/knights-kde4/Makefile +++ games/knights-kde4/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:bzip2 +USES= cmake:outsource kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 workspace libkdegames -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= DOCS NLS Index: games/kolf/Makefile =================================================================== --- games/kolf/Makefile +++ games/kolf/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/kollision/Makefile =================================================================== --- games/kollision/Makefile +++ games/kollision/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/konquest/Makefile =================================================================== --- games/konquest/Makefile +++ games/konquest/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kpat/Makefile =================================================================== --- games/kpat/Makefile +++ games/kpat/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build post-patch: ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ Index: games/kreversi/Makefile =================================================================== --- games/kreversi/Makefile +++ games/kreversi/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kshisen/Makefile =================================================================== --- games/kshisen/Makefile +++ games/kshisen/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libkmahjongglib.so:games/libkmahjongg -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/ksirk/Makefile =================================================================== --- games/ksirk/Makefile +++ games/ksirk/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libqca.so:devel/qca -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui corelib gui network qt3support svg xml \ +USE_QT= corelib gui corelib gui network qt3support svg xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: games/ksnakeduel/Makefile =================================================================== --- games/ksnakeduel/Makefile +++ games/ksnakeduel/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kspaceduel/Makefile =================================================================== --- games/kspaceduel/Makefile +++ games/kspaceduel/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/ksquares/Makefile =================================================================== --- games/ksquares/Makefile +++ games/ksquares/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/ksudoku/Makefile =================================================================== --- games/ksudoku/Makefile +++ games/ksudoku/Makefile @@ -7,10 +7,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_GL= glu USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui corelib gui opengl \ +USE_QT= corelib gui corelib gui opengl \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/ktuberling/Makefile =================================================================== --- games/ktuberling/Makefile +++ games/ktuberling/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> .include Index: games/kubrick/Makefile =================================================================== --- games/kubrick/Makefile +++ games/kubrick/Makefile @@ -7,10 +7,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_GL= glu USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui opengl \ +USE_QT= corelib gui opengl \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/libkdegames/Makefile =================================================================== --- games/libkdegames/Makefile +++ games/libkdegames/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Libraries used by KDE 4 games -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build +USE_QT= network phonon xml moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= LOWLATENCY Index: games/libkmahjongg/Makefile =================================================================== --- games/libkmahjongg/Makefile +++ games/libkmahjongg/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Library for the Mahjongg Solitaire for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: games/lskat/Makefile =================================================================== --- games/lskat/Makefile +++ games/lskat/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui gui svg \ +USE_QT= corelib gui gui svg \ moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/openmw/Makefile =================================================================== --- games/openmw/Makefile +++ games/openmw/Makefile @@ -25,9 +25,9 @@ USE_GITHUB= yes GH_ACCOUNT= OpenMW -USES= cmake:outsource compiler:c++14-lang ninja openal pkgconfig +USES= cmake:outsource compiler:c++14-lang ninja openal pkgconfig qt:5 USE_GL= gl -USE_QT5= qmake_build buildtools_build core gui network opengl \ +USE_QT= qmake_build buildtools_build core gui network opengl \ printsupport widgets USE_SDL= sdl2 USE_XORG= xt Index: games/openpref/Makefile =================================================================== --- games/openpref/Makefile +++ games/openpref/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake -USE_QT4= corelib gui moc_build rcc_build uic_build +USES= qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/${PORTNAME} \ Index: games/pairs/Makefile =================================================================== --- games/pairs/Makefile +++ games/pairs/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= declarative opengl phonon xmlpatterns \ +USE_QT= declarative opengl phonon xmlpatterns \ moc_build qmake_build rcc_build uic_build .include Index: games/palapeli/Makefile =================================================================== --- games/palapeli/Makefile +++ games/palapeli/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= corelib gui gui \ +USE_QT= corelib gui gui \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: games/peg-e/Makefile =================================================================== --- games/peg-e/Makefile +++ games/peg-e/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lib qmake tar:bzip2 -USE_QT5= core gui widgets qmake_build buildtools_build linguisttools_build +USES= compiler:c++11-lib tar:bzip2 qt:5 +USE_QT= core gui widgets qmake_build buildtools_build linguisttools_build USE_GL= gl INSTALLS_ICONS= yes Index: games/picmi/Makefile =================================================================== --- games/picmi/Makefile +++ games/picmi/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdegames automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ svg xml .include <${.CURDIR}/../kdegames4/Makefile.common> Index: games/pokerth/Makefile =================================================================== --- games/pokerth/Makefile +++ games/pokerth/Makefile @@ -23,9 +23,9 @@ libprotobuf.so:devel/protobuf BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient -USES= iconv gmake qmake tar:bzip2 -USE_QT4= gui corelib network sql sql-sqlite3 \ - moc_build rcc_build uic_build +USES= iconv gmake qt:4 tar:bzip2 +USE_QT= gui corelib network sql sql-sqlite3 \ + moc_build qmake_build rcc_build uic_build USE_SDL= mixer QMAKE_SOURCE_PATH= pokerth.pro Index: games/qgo/Makefile =================================================================== --- games/qgo/Makefile +++ games/qgo/Makefile @@ -12,8 +12,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= desktop-file-utils qmake tar:bzip2 -USE_QT4= gui network qtestlib moc_build rcc_build uic_build +USES= desktop-file-utils qt:4 tar:bzip2 +USE_QT= gui network qtestlib moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/qgo share/applications/qgo.desktop share/pixmaps/qgo.png Index: games/qnetwalk/Makefile =================================================================== --- games/qnetwalk/Makefile +++ games/qnetwalk/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -USES= qmake -USE_QT4= corelib gui moc_build rcc_build +USES= qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build USE_SDL= mixer PLIST_FILES= bin/qnetwalk \ Index: games/qtads/Makefile =================================================================== --- games/qtads/Makefile +++ games/qtads/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -USES= gmake pkgconfig qmake tar:bzip2 -USE_QT4= gui moc_build network rcc_build uic_build +USES= gmake pkgconfig qt:4 tar:bzip2 +USE_QT= gui moc_build network qmake_build rcc_build uic_build USE_SDL= sdl mixer sound QMAKE_ARGS+= QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_RELEASE="" Index: games/quackle/Makefile =================================================================== --- games/quackle/Makefile +++ games/quackle/Makefile @@ -13,8 +13,8 @@ USE_GITHUB= yes -USES= compiler:c++11-lib gmake qmake -USE_QT4= corelib gui moc_build +USES= compiler:c++11-lib gmake qt:4 +USE_QT= corelib gui moc_build qmake_build BUILD_WRKSRC= ${WRKSRC}/quacker Index: games/simsu/Makefile =================================================================== --- games/simsu/Makefile +++ games/simsu/Makefile @@ -15,8 +15,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= compiler:c++11-lib qmake tar:bzip2 -USE_QT5= buildtools_build widgets +USES= compiler:c++11-lib tar:bzip2 qt:5 +USE_QT= buildtools_build qmake_build widgets OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes Index: games/solarus-quest-editor/Makefile =================================================================== --- games/solarus-quest-editor/Makefile +++ games/solarus-quest-editor/Makefile @@ -24,8 +24,8 @@ CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF USE_SDL= sdl2 ttf2 image2 -USE_QT5= buildtools core gui linguist qmake widgets -USES= cmake compiler:c++11-lib openal +USE_QT= buildtools_build core gui linguist qmake_build widgets +USES= cmake compiler:c++11-lib openal qt:5 DESKTOP_ENTRIES= "Solarus Quest Editor" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;" false Index: games/solarus/Makefile =================================================================== --- games/solarus/Makefile +++ games/solarus/Makefile @@ -20,10 +20,10 @@ CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF MAKE_ARGS+= DESTDIR=${STAGEDIR} -USE_QT5= buildtools_build core gui linguisttools_build widgets +USE_QT= buildtools_build core gui linguisttools_build qmake_build widgets USE_SDL= sdl2 ttf2 image2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= cmake qmake compiler:c++11-lib openal +USES= cmake compiler:c++11-lib openal qt:5 USE_LDCONFIG= yes .include Index: games/spellathon/Makefile =================================================================== --- games/spellathon/Makefile +++ games/spellathon/Makefile @@ -20,9 +20,9 @@ libfontconfig.so:x11-fonts/fontconfig CXXFLAGS+= -fPIC -USES= gettext iconv qmake +USES= gettext iconv qt:4 USE_GNOME= glib20 -USE_QT4= corelib gui moc_build rcc_build uic_build +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_LDCONFIG= yes Index: games/sudoku-sensei/Makefile =================================================================== --- games/sudoku-sensei/Makefile +++ games/sudoku-sensei/Makefile @@ -17,8 +17,9 @@ WRKSRC= ${WRKDIR}/SudokuSenseiSources -USES= qmake -USE_QT4= moc_build uic_build corelib gui iconengines_run imageformats_run +USES= qt:4 +USE_QT= moc_build qmake_build uic_build corelib gui \ + iconengines_run imageformats_run SUB_FILES= ${PORTNAME} pkg-deinstall pkg-message Index: games/tanglet/Makefile =================================================================== --- games/tanglet/Makefile +++ games/tanglet/Makefile @@ -14,8 +14,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= compiler:c++11-lib desktop-file-utils qmake shared-mime-info tar:bzip2 -USE_QT5= buildtools_build linguisttools_build core gui widgets +USES= compiler:c++11-lib desktop-file-utils shared-mime-info tar:bzip2 qt:5 +USE_QT= buildtools_build linguisttools_build qmake_build core gui widgets CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 Index: games/tbe/Makefile =================================================================== --- games/tbe/Makefile +++ games/tbe/Makefile @@ -12,8 +12,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/unzip:archivers/unzip -USES= cmake compiler:c++11-lib execinfo tar:tgz -USE_QT4= gui linguisttools_build moc_build qmake_build rcc_build \ +USES= cmake compiler:c++11-lib execinfo qt:4 tar:tgz +USE_QT= gui linguisttools_build moc_build qmake_build rcc_build \ + svg uic_build xml USE_GITHUB= yes Index: games/tetzle/Makefile =================================================================== --- games/tetzle/Makefile +++ games/tetzle/Makefile @@ -16,8 +16,8 @@ BROKEN_FreeBSD_9= does not build -USES= compiler:c++11-lib desktop-file-utils qmake tar:bzip2 -USE_QT5= core gui widgets buildtools_build linguisttools_build +USES= compiler:c++11-lib desktop-file-utils tar:bzip2 qt:5 +USE_QT= core gui widgets buildtools_build linguisttools_build qmake_build USE_GL= gl INSTALLS_ICONS= yes Index: games/warzone2100/Makefile =================================================================== --- games/warzone2100/Makefile +++ games/warzone2100/Makefile @@ -22,12 +22,12 @@ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu -USES= bison compiler:c++11-lib gmake localbase openal:al pkgconfig ssl tar:xz +USES= bison compiler:c++11-lib gmake localbase openal:al pkgconfig ssl qt:5 tar:xz GNU_CONFIGURE= yes USE_GL= gl glu glew USE_SDL= sdl2 USE_XORG= x11 xrandr -USE_QT5= core gui widgets script buildtools_build +USE_QT= core gui widgets script buildtools_build QT_NONSTANDARD= yes CONFIGURE_ARGS= --program-transform-name="" --with-distributor="FreeBSD ports" CONFIGURE_ENV= LIBCRYPTO_CFLAGS="-I${OPENSSLINC}" \ Index: german/tipp10/Makefile =================================================================== --- german/tipp10/Makefile +++ german/tipp10/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license_en.txt -USES= qmake dos2unix zip +USES= dos2unix zip qt:4 DOS2UNIX_GLOB= *.pro *.cpp -USE_QT4= gui sql corelib network script qtestlib \ - rcc_build uic_build moc_build \ +USE_QT= gui sql corelib network script qtestlib \ + rcc_build uic_build moc_build qmake_build \ sql-sqlite2_run sql-sqlite3_run QMAKE_ARGS+= DATADIR="${DATADIR}" WRKSRC= ${WRKDIR}/tipp10_source_v2-1-0 Index: graphics/appleseed/Makefile =================================================================== --- graphics/appleseed/Makefile +++ graphics/appleseed/Makefile @@ -22,8 +22,8 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= not ported to it yet -USES= cmake:outsource -USE_QT4= moc_build qmake_build rcc_build uic_build opengl +USES= cmake:outsource qt:4 +USE_QT= moc_build qmake_build rcc_build uic_build opengl LDFLAGS+= -lboost_atomic CMAKE_ARGS= -DUSE_STATIC_BOOST:BOOL=OFF -DUSE_STATIC_OIIO:BOOL=OFF \ Index: graphics/aqsis/Makefile =================================================================== --- graphics/aqsis/Makefile +++ graphics/aqsis/Makefile @@ -25,11 +25,11 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -USES= cmake:outsource desktop-file-utils shared-mime-info shebangfix +USES= cmake:outsource desktop-file-utils shared-mime-info shebangfix qt:4 SHEBANG_FILES= examples/*/*/*.sh \ tools/neqsus/houdini/post.sh \ distribution/linux/*.sh -USE_QT4= opengl qmake_build moc_build rcc_build uic_build +USE_QT= opengl qmake_build moc_build rcc_build uic_build PLIST_SUB+= LIBVERS=${PORTVERSION:R} INSTALLS_ICONS= yes Index: graphics/autoq3d/Makefile =================================================================== --- graphics/autoq3d/Makefile +++ graphics/autoq3d/Makefile @@ -14,11 +14,11 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -USES= dos2unix qmake zip +USES= dos2unix zip qt:4 DOS2UNIX_FILES= *.pro src/cmds/*.cpp src/fgui/*.cpp docs/*.txt DOS2UNIX_REGEX= .*.[^p][^n][^g]$ USE_GL= glu -USE_QT4= corelib gui opengl moc_build +USE_QT= corelib gui opengl moc_build qmake_build PORTDOCS= 3DQformat.txt ChangeLog.txt OPTIONS_DEFINE= DOCS Index: graphics/burplex/Makefile =================================================================== --- graphics/burplex/Makefile +++ graphics/burplex/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/dcraw:graphics/dcraw -USES= qmake -USE_QT4= gui uic_build moc_build rcc_build \ +USES= qt:4 +USE_QT= gui uic_build moc_build qmake_build rcc_build \ imageformats_run WRKSRC= ${WRKDIR}/${PORTNAME} Index: graphics/converseen/Makefile =================================================================== --- graphics/converseen/Makefile +++ graphics/converseen/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick -USES= cmake tar:bzip2 compiler:c++11-lang -USE_QT5= core network gui linguisttools_build qmake_build \ +USES= cmake tar:bzip2 compiler:c++11-lang qt:5 +USE_QT= core network gui linguisttools_build qmake_build \ buildtools_build widgets post-patch: @${REINPLACE_CMD} -e '/^ appdata.path =/s|/usr/share|$$$${SHARE_DIR}|' \ Index: graphics/darknock/Makefile =================================================================== --- graphics/darknock/Makefile +++ graphics/darknock/Makefile @@ -14,8 +14,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= qmake -USE_QT4= gui linguisttools_build moc_build rcc_build uic_build +USES= qt:4 +USE_QT= gui linguisttools_build moc_build qmake_build rcc_build uic_build PORTDOCS= changelog PLIST_FILES= bin/darknock share/pixmaps/darknock.png Index: graphics/digikam-kde4/Makefile =================================================================== --- graphics/digikam-kde4/Makefile +++ graphics/digikam-kde4/Makefile @@ -26,7 +26,7 @@ USES+= pkgconfig shebangfix USE_KDE+= libkdcraw libkexiv2 libkipi runtime_run -USE_QT4+= sql-sqlite3_run +USE_QT+= sql-sqlite3_run USE_LDCONFIG= yes CMAKE_ARGS+= -DWITH_Sqlite2:BOOL=OFF @@ -52,7 +52,7 @@ PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF -MYSQL_USE= MYSQL=server QT4=sql-mysql_run +MYSQL_USE= MYSQL=server QT=sql-mysql_run MYSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \ -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin \ Index: graphics/digikam-kde4/Makefile.common =================================================================== --- graphics/digikam-kde4/Makefile.common +++ graphics/digikam-kde4/Makefile.common @@ -118,9 +118,9 @@ USES+= tar:bzip2 .if !defined(NO_BUILD) -USES+= cmake kde:4 +USES+= cmake kde:4 qt:4 USE_KDE+= automoc4 kdelibs -USE_QT4+= qmake_build moc_build rcc_build uic_build +USE_QT+= qmake_build moc_build rcc_build uic_build WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} Index: graphics/dilay/Makefile =================================================================== --- graphics/dilay/Makefile +++ graphics/dilay/Makefile @@ -16,10 +16,10 @@ USE_GITHUB= yes GH_ACCOUNT= abau -USES= compiler:c++14-lang gmake qmake +USES= compiler:c++14-lang gmake qt:5 USE_CXXSTD= c++14 USE_GL= gl -USE_QT5= core gui opengl widgets xml buildtools_build +USE_QT= core gui opengl widgets xml buildtools_build qmake_build # Workaround for: Parallel build fails (https://github.com/abau/dilay/issues/19) MAKE_JOBS_UNSAFE=yes Index: graphics/djview4/Makefile =================================================================== --- graphics/djview4/Makefile +++ graphics/djview4/Makefile @@ -33,9 +33,11 @@ OPTIONS_DEFAULT= QT5 QT_DESC= Qt toolkit -QT4_USE= QT4=corelib,gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build QT4_USE+= XORG=x11 -QT5_USE= QT5=core,gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= QT=core,gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build post-patch: # Use prebuilt icons, without using conversion tool Index: graphics/easypaint/Makefile =================================================================== --- graphics/easypaint/Makefile +++ graphics/easypaint/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 -USES= qmake -USE_QT4= gui xml uic_build moc_build rcc_build +USES= qt:4 +USE_QT= gui xml uic_build moc_build qmake_build rcc_build QPROFILE= easyPaint WRKSRC= ${WRKDIR}/${QPROFILE} Index: graphics/eos-movrec/Makefile =================================================================== --- graphics/eos-movrec/Makefile +++ graphics/eos-movrec/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 -USES= cmake dos2unix pkgconfig tar:bzip2 +USES= cmake dos2unix pkgconfig qt:4 tar:bzip2 DOS2UNIX_GLOB= *.pro *.cpp *.h -USE_QT4= qmake_build moc_build rcc_build uic_build gui +USE_QT= qmake_build moc_build rcc_build uic_build gui INSTALLS_ICONS= yes ICON_SIZES= 16x16 32x32 128x128 256x256 512x512 Index: graphics/evolvotron/Makefile =================================================================== --- graphics/evolvotron/Makefile +++ graphics/evolvotron/Makefile @@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python qmake -USE_QT4= corelib gui xml moc_build +USES= python qt:4 +USE_QT= corelib gui xml moc_build qmake_build QMAKE_ARGS= VERSION_NUMBER="${PORTVERSION}" QMAKE_SOURCE_PATH= ${WRKSRC}/main.pro MAKE_JOBS_UNSAFE= yes Index: graphics/fracplanet/Makefile =================================================================== --- graphics/fracplanet/Makefile +++ graphics/fracplanet/Makefile @@ -21,9 +21,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= gmake +USES= gmake qt:4 USE_GL= glu -USE_QT4= corelib moc_build qmake_build gui opengl +USE_QT= corelib moc_build qmake_build gui opengl QT_NONSTANDARD= yes HAS_CONFIGURE= yes CONFIGURE_ENV= QTDIR="${PREFIX}" Index: graphics/fraqtive/Makefile =================================================================== --- graphics/fraqtive/Makefile +++ graphics/fraqtive/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:bzip2 -USE_QT4= corelib gui opengl xml uic_build moc_build rcc_build +USES= qt:4 tar:bzip2 +USE_QT= corelib gui opengl xml uic_build moc_build qmake_build rcc_build USE_GL= gl glu OPTIONS_DEFINE= SSE2 Index: graphics/gle-graphics/Makefile =================================================================== --- graphics/gle-graphics/Makefile +++ graphics/gle-graphics/Makefile @@ -14,8 +14,6 @@ LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= multi -BUILD_DEPENDS= qmake-qt4:devel/qmake4 - BITMAP_IMAGES_CONFIGURE_WITH= jpeg=${LOCALBASE} tiff=${LOCALBASE} png=${LOCALBASE} BITMAP_IMAGES_DESC= Support for including bitmap images BITMAP_IMAGES_LIB_DEPENDS= libpng.so:graphics/png \ @@ -47,9 +45,10 @@ USE_GCC= yes USE_GL= yes USE_LDCONFIG= yes -USE_QT4= gui moc network opengl rcc -USES= gmake ncurses pathfix CPPFLAGS+= -I${NCURSESINC} +USE_QT= gui moc network opengl rcc qmake_build +USES= gmake ncurses pathfix qt:4,qmake_dummy + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} Index: graphics/gnash/Makefile =================================================================== --- graphics/gnash/Makefile +++ graphics/gnash/Makefile @@ -27,8 +27,10 @@ CONFLICTS= gnash-devel-[0-9]* -USES= cpe tar:bzip2 compiler:features autoreconf pkgconfig gmake libtool jpeg desktop-file-utils +USES= cpe tar:bzip2 compiler:features autoreconf pkgconfig gmake libtool jpeg desktop-file-utils qt:4 + CPE_VENDOR= gnu + GNU_CONFIGURE= yes WANT_GSTREAMER= yes USE_GNOME= libxml2 @@ -132,7 +134,7 @@ .if ${PORT_OPTIONS:MKDE4} GNASH_GUIS+= kde4 -USE_QT4= moc_build +USE_QT= moc_build QT_NONSTANDARD= yes USE_KDE= kdelibs CONFIGURE_ARGS+= --without-gconf Index: graphics/graphviz/Makefile =================================================================== --- graphics/graphviz/Makefile +++ graphics/graphviz/Makefile @@ -90,8 +90,8 @@ GTK2_USE= XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20 GNOMEUI_USE= GNOME=libgnomeui SMYRNA_USE= GNOME=libglade2 GL=glut -GVEDIT_USE= qt4=qmake_build,moc_build,rcc_build,uic_build \ - qt4=linguist_build,corelib,gui +GVEDIT_USE= qt=qmake_build,moc_build,rcc_build,uic_build \ + qt=linguist_build,corelib,gui GHOSTSCRIPT_USES=ghostscript PERL_USES= perl5 PHP_USES= php:build Index: graphics/gwenview-kde4/Makefile =================================================================== --- graphics/gwenview-kde4/Makefile +++ graphics/gwenview-kde4/Makefile @@ -11,10 +11,10 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libpng.so:graphics/png -USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz +USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 tar:xz USE_KDE= kactivities kdelibs baloo kfilemetadata \ libkdcraw libkipi libkonq automoc4 soprano -USE_QT4= corelib gui opengl qmake_build moc_build uic_build rcc_build +USE_QT= corelib gui opengl qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes .include Index: graphics/ipe/Makefile =================================================================== --- graphics/ipe/Makefile +++ graphics/ipe/Makefile @@ -18,9 +18,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= compiler:c++11-lib gmake jpeg lua:52 pkgconfig +USES= compiler:c++11-lib gmake jpeg lua:52 pkgconfig qt:5 USE_GNOME= cairo -USE_QT5= buildtools_build core gui qmake_build widgets +USE_QT= buildtools_build core gui widgets USE_TEX= pdftex MAKE_ENV= DL_LIBS="" \ INSTALL_DIR="${MKDIR}" \ Index: graphics/kamera-kde4/Makefile =================================================================== --- graphics/kamera-kde4/Makefile +++ graphics/kamera-kde4/Makefile @@ -9,8 +9,8 @@ LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: graphics/kcolorchooser/Makefile =================================================================== --- graphics/kcolorchooser/Makefile +++ graphics/kcolorchooser/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 application to select colors from the screen or from a palette -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: graphics/kcoloredit/Makefile =================================================================== --- graphics/kcoloredit/Makefile +++ graphics/kcoloredit/Makefile @@ -11,9 +11,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Palette files editor for KDE -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build APP_VER= 2.0.0 EXTRA_VER= 4.4.0 Index: graphics/kdegraphics4-mobipocket/Makefile =================================================================== --- graphics/kdegraphics4-mobipocket/Makefile +++ graphics/kdegraphics4-mobipocket/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Mobipocket plugins for Strigi indexing and thumbnails -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 strigi -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build +USE_QT= corelib gui qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes .include Index: graphics/kdegraphics4-strigi-analyzer/Makefile =================================================================== --- graphics/kdegraphics4-strigi-analyzer/Makefile +++ graphics/kdegraphics4-strigi-analyzer/Makefile @@ -9,8 +9,8 @@ LIB_DEPENDS= libtiff.so:graphics/tiff -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 strigi -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: graphics/kdegraphics4-svgpart/Makefile =================================================================== --- graphics/kdegraphics4-svgpart/Makefile +++ graphics/kdegraphics4-svgpart/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= SVG KPart -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: graphics/kdegraphics4-thumbnailers/Makefile =================================================================== --- graphics/kdegraphics4-thumbnailers/Makefile +++ graphics/kdegraphics4-thumbnailers/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Thumbnailers for various graphics file formats -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= kdelibs libkdcraw libkexiv2 automoc4 -USE_QT4= gui qmake_build moc_build uic_build rcc_build +USE_QT= gui qmake_build moc_build uic_build rcc_build .include Index: graphics/kf5-kimageformats/Makefile =================================================================== --- graphics/kf5-kimageformats/Makefile +++ graphics/kf5-kimageformats/Makefile @@ -11,8 +11,8 @@ LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \ libHalf.so:graphics/ilmbase -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui printsupport qmake_build widgets +USE_QT= buildtools_build core gui printsupport qmake_build widgets .include Index: graphics/kf5-kplotting/Makefile =================================================================== --- graphics/kf5-kplotting/Makefile +++ graphics/kf5-kplotting/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 lightweight plotting framework -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= core gui testlib widgets \ +USE_QT= core gui testlib widgets \ buildtools_build qmake_build .include Index: graphics/kiconedit/Makefile =================================================================== --- graphics/kiconedit/Makefile +++ graphics/kiconedit/Makefile @@ -10,9 +10,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE icon editor -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build EXTRA_VER= 4.4.0 Index: graphics/klatexformula/Makefile =================================================================== --- graphics/klatexformula/Makefile +++ graphics/klatexformula/Makefile @@ -12,8 +12,8 @@ BUILD_DEPENDS= help2man:misc/help2man USES= cmake:outsource desktop-file-utils ghostscript:run \ - shared-mime-info -USE_QT4= gui xml dbus designer_build linguisttools_build \ + qt:4 shared-mime-info +USE_QT= gui xml dbus designer_build linguisttools_build \ qmake_build moc_build rcc_build uic_build USE_TEX= latex dvipsk CMAKE_ARGS= -DQT_QMAKE_EXECUTABLE_FINDQT=${QMAKE} \ Index: graphics/kolourpaint/Makefile =================================================================== --- graphics/kolourpaint/Makefile +++ graphics/kolourpaint/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 paint program -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 qimageblitz -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: graphics/kphotoalbum-kde4/Makefile =================================================================== --- graphics/kphotoalbum-kde4/Makefile +++ graphics/kphotoalbum-kde4/Makefile @@ -15,9 +15,9 @@ SHEBANG_FILES= script/open-raw.pl script/kpa-backup.sh -USES= cmake:outsource jpeg kde:4 pkgconfig shebangfix tar:bzip2 +USES= cmake:outsource jpeg kde:4 pkgconfig shebangfix qt:4 tar:bzip2 USE_KDE= kdelibs libkdcraw libkipi automoc4 -USE_QT4= phonon sql \ +USE_QT= phonon sql \ qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= MARBLE NLS Index: graphics/kpovmodeler/Makefile =================================================================== --- graphics/kpovmodeler/Makefile +++ graphics/kpovmodeler/Makefile @@ -13,10 +13,10 @@ RUN_DEPENDS= povray:graphics/povray-meta -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_GL= glu USE_KDE= kdelibs automoc4 -USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build +USE_QT= corelib opengl qmake_build moc_build rcc_build uic_build APP_VER= 1.1.3 EXTRA_VER= 4.3.1 Index: graphics/kqtquickcharts/Makefile =================================================================== --- graphics/kqtquickcharts/Makefile +++ graphics/kqtquickcharts/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= QtQuick plugin to render interactive charts -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: graphics/ksaneplugin/Makefile =================================================================== --- graphics/ksaneplugin/Makefile +++ graphics/ksaneplugin/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 plugin for scanning through libksane -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libksane automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: graphics/ksnapshot/Makefile =================================================================== --- graphics/ksnapshot/Makefile +++ graphics/ksnapshot/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 screen capture program -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkipi automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_XORG= x11 xext xfixes .include Index: graphics/libkdcraw-kde4/Makefile =================================================================== --- graphics/libkdcraw-kde4/Makefile +++ graphics/libkdcraw-kde4/Makefile @@ -16,9 +16,9 @@ CMAKE_ARGS+= -DWITH_OpenMP:BOOL=False \ -DENABLE_RAWSPEED=True -USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz +USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes pre-configure: Index: graphics/libkexiv2-kde4/Makefile =================================================================== --- graphics/libkexiv2-kde4/Makefile +++ graphics/libkexiv2-kde4/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= corelib gui xml \ +USE_QT= corelib gui xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: graphics/libkface/Makefile =================================================================== --- graphics/libkface/Makefile +++ graphics/libkface/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 -USES= cmake:outsource kde:4 pathfix pkgconfig tar:xz +USES= cmake:outsource kde:4 pathfix pkgconfig qt:4 tar:xz USE_KDE= kdelibs automoc4 marble USE_LDCONFIG= yes -USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build +USE_QT= network phonon xml moc_build qmake_build rcc_build uic_build .include Index: graphics/libkipi-kde4/Makefile =================================================================== --- graphics/libkipi-kde4/Makefile +++ graphics/libkipi-kde4/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Image Plugin Interface -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= gui moc_build qmake_build rcc_build uic_build +USE_QT= gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes pre-configure: Index: graphics/libksane/Makefile =================================================================== --- graphics/libksane/Makefile +++ graphics/libksane/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libsane.so:graphics/sane-backends -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes pre-configure: Index: graphics/libkscreen/Makefile =================================================================== --- graphics/libkscreen/Makefile +++ graphics/libkscreen/Makefile @@ -15,9 +15,9 @@ libxcb-image.so:x11/xcb-util-image \ libxcb-render-util.so:x11/xcb-util-renderutil -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib dbus gui script \ +USE_QT= corelib dbus gui script \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: graphics/lprof-devel/Makefile =================================================================== --- graphics/lprof-devel/Makefile +++ graphics/lprof-devel/Makefile @@ -16,9 +16,9 @@ libtiff.so:graphics/tiff \ libvigraimpex.so:graphics/vigra -USES= cmake desktop-file-utils jpeg tar:bzip2 +USES= cmake desktop-file-utils jpeg qt:4 tar:bzip2 USE_XORG= x11 xext sm ice xxf86vm -USE_QT4= corelib gui qt3support svg assistantclient \ +USE_QT= corelib gui qt3support svg assistantclient \ linguisttools_build qmake_build moc_build uic_build rcc_build CMAKE_ARGS= -DQTTRANS_LRELEASE_EXECUTABLE="${LOCALBASE}/bin/lrelease-qt4" Index: graphics/luminance-qt5/Makefile =================================================================== --- graphics/luminance-qt5/Makefile +++ graphics/luminance-qt5/Makefile @@ -22,8 +22,8 @@ libraw_r.so:graphics/libraw \ libboost_system.so:devel/boost-libs -USES= cmake:outsource jpeg pkgconfig tar:bzip2 -USE_QT5= concurrent declarative gui printsupport sql webkit xml \ +USES= cmake:outsource jpeg pkgconfig tar:bzip2 qt:5 +USE_QT= concurrent declarative gui printsupport sql webkit xml \ buildtools_build linguist_build qmake_build \ imageformats_run INSTALLS_ICONS= yes Index: graphics/luminance/Makefile =================================================================== --- graphics/luminance/Makefile +++ graphics/luminance/Makefile @@ -21,8 +21,8 @@ libraw_r.so:graphics/libraw \ libboost_system.so:devel/boost-libs -USES= cmake jpeg tar:bzip2 -USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \ +USES= cmake jpeg qt:4 tar:bzip2 +USE_QT= gui sql webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build imageformats_run INSTALLS_ICONS= yes Index: graphics/luxrender/Makefile =================================================================== --- graphics/luxrender/Makefile +++ graphics/luxrender/Makefile @@ -53,7 +53,8 @@ FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage X11_DESC= Build GUI executable (requires Qt 4) -X11_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,corelib,gui +X11_USES= qt:4 +X11_USE= QT=moc_build,qmake_build,rcc_build,uic_build,corelib,gui X11_PLIST_FILES= bin/luxrender post-extract: Index: graphics/lximage-qt/Makefile =================================================================== --- graphics/lximage-qt/Makefile +++ graphics/lximage-qt/Makefile @@ -17,9 +17,9 @@ libfm.so:x11/libfm USES= cmake:outsource compiler:c++11-lib desktop-file-utils gettext-runtime \ - localbase:ldflags lxqt pkgconfig tar:xz + localbase:ldflags lxqt pkgconfig qt:5 tar:xz USE_GNOME= glib20 -USE_QT5= buildtools_build qmake_build core dbus gui printsupport \ +USE_QT= buildtools_build qmake_build core dbus gui printsupport \ svg widgets x11extras USE_LXQT= libfmqt lxqt USE_XORG= ice sm x11 xcb xext xfixes Index: graphics/lximageqt-l10n/Makefile =================================================================== --- graphics/lximageqt-l10n/Makefile +++ graphics/lximageqt-l10n/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ -USES= cmake:outsource lxqt tar:xz -USE_QT5= buildtools_build qmake_build +USES= cmake:outsource lxqt qt:5 tar:xz +USE_QT= buildtools_build qmake_build USE_LXQT= lxqt CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \ Index: graphics/meshviewer/Makefile =================================================================== --- graphics/meshviewer/Makefile +++ graphics/meshviewer/Makefile @@ -16,9 +16,9 @@ WRKSRC= ${WRKDIR}/mview-${PORTVERSION} -USES= gmake pkgconfig +USES= gmake pkgconfig qt:4 USE_GL= glu -USE_QT4= corelib gui opengl moc_build +USE_QT= corelib gui opengl moc_build CXXFLAGS+= -I. -Imesh -Imathvector \ `pkg-config --cflags QtOpenGL glu` LDFLAGS+= -lpthread `pkg-config --libs QtOpenGL glu` Index: graphics/mitsuba/Makefile =================================================================== --- graphics/mitsuba/Makefile +++ graphics/mitsuba/Makefile @@ -23,9 +23,9 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE instructions -USES= cmake jpeg tar:bzip2 +USES= cmake jpeg qt:4 tar:bzip2 USE_GL= glew -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ gui opengl network xml xmlpatterns CMAKE_ARGS= -DMTS_SIMPLE_PATHS:BOOL=OFF -DBUILD_PYTHON:BOOL=OFF \ Index: graphics/nomacs/Makefile =================================================================== --- graphics/nomacs/Makefile +++ graphics/nomacs/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libsysinfo.so:devel/libsysinfo \ libopencv_core.so:graphics/opencv2-core -USES= cmake desktop-file-utils dos2unix pkgconfig tar:bzip2 -USE_QT4= gui network linguist_build moc_build \ +USES= cmake desktop-file-utils dos2unix pkgconfig qt:4 tar:bzip2 +USE_QT= gui network linguist_build moc_build \ qmake_build rcc_build uic_build DOS2UNIX_REGEX= .*\.(cpp|h|txt) Index: graphics/nvidia-texture-tools/Makefile =================================================================== --- graphics/nvidia-texture-tools/Makefile +++ graphics/nvidia-texture-tools/Makefile @@ -24,7 +24,7 @@ USE_GITHUB= yes GH_ACCOUNT= castano -USES= alias cmake jpeg +USES= alias cmake jpeg qt:4 CMAKE_ARGS= -DNVTT_SHARED=TRUE CFLAGS+= -fPIC @@ -38,7 +38,7 @@ OPTIONS_SUB= yes COMPRESSUI_DESC=Build compressor UI (requires Qt4) -COMPRESSUI_USE= QT4=qmake_build,moc_build,uic_build,rcc_build,corelib,gui,opengl +COMPRESSUI_USE= QT=qmake_build,moc_build,uic_build,rcc_build,corelib,gui,opengl post-patch-COMPRESSUI-on: @${REINPLACE_CMD} -e '/FIND_PACKAGE.*Qt4/ s|)$$| REQUIRED&|' \ Index: graphics/okular/Makefile =================================================================== --- graphics/okular/Makefile +++ graphics/okular/Makefile @@ -19,10 +19,10 @@ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket -USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz +USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 tar:xz USE_KDE= kdelibs automoc4 qimageblitz kactivities \ libkexiv2 -USE_QT4= corelib declarative gui opengl xml \ +USE_QT= corelib declarative gui opengl xml \ qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes Index: graphics/opencsg/Makefile =================================================================== --- graphics/opencsg/Makefile +++ graphics/opencsg/Makefile @@ -11,9 +11,9 @@ MAINTAINER= mr@FreeBSD.org COMMENT= Constructive Solid Geometry rendering library -USES= qmake +USES= qt:4 USE_GL= glew -USE_QT4= corelib gui +USE_QT= corelib gui qmake_build WRKSRC= ${WRKDIR}/${DISTNAME}/src PLIST_SUB= PORTVERSION=${PORTVERSION} Index: graphics/opencv2/Makefile =================================================================== --- graphics/opencv2/Makefile +++ graphics/opencv2/Makefile @@ -18,7 +18,7 @@ CONFLICTS_INSTALL= ${PKGBASE:S/${PORTNAME}2/${PORTNAME}/} -USES= cmake pkgconfig +USES= cmake pkgconfig qt:4 USE_LDCONFIG= yes NOT_FOR_ARCHS= sparc64 @@ -107,7 +107,7 @@ PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL= WITH_PNG -QT4_USE= QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib +QT4_USE= QT=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib QT4_CMAKE_ON= -DWITH_QT:STRING="4" QT4_CMAKE_OFF= -DWITH_QT:BOOL=false Index: graphics/openimageio/Makefile =================================================================== --- graphics/openimageio/Makefile +++ graphics/openimageio/Makefile @@ -19,7 +19,7 @@ # fbm also installs bin/idiff CONFLICTS= fbm-[0-9]* -USES= cmake:outsource compiler:c11 +USES= cmake:outsource compiler:c11 qt:4 CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \ -DLINKSTATIC:BOOL=OFF \ -DNOTHREADS:BOOL=OFF \ @@ -54,7 +54,7 @@ IMAGEVIEWER_CMAKE_ON= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON IMAGEVIEWER_CMAKE_OFF= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF -IMAGEVIEWER_USE= GL=glew QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build +IMAGEVIEWER_USE= GL=glew QT=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build OCIO_CMAKE_ON= -DUSE_OCIO:BOOL=ON OCIO_CMAKE_OFF= -DUSE_OCIO:BOOL=OFF Index: graphics/osg-devel/Makefile =================================================================== --- graphics/osg-devel/Makefile +++ graphics/osg-devel/Makefile @@ -23,7 +23,7 @@ CONFLICTS= osg-[0-9]* -USES= alias cmake:outsource jpeg pkgconfig zip +USES= alias cmake:outsource jpeg pkgconfig zip qt:4 USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes @@ -71,7 +71,7 @@ NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF -QT4_USE= QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build +QT4_USE= QT=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build QT4_CMAKE_ON= -DOSG_USE_QT=ON QT4_CMAKE_OFF= -DOSG_USE_QT=OFF LUA_USES= lua:52 Index: graphics/osg/Makefile =================================================================== --- graphics/osg/Makefile +++ graphics/osg/Makefile @@ -97,11 +97,13 @@ PDF_USE= gnome=cairo PDF_VARS= FORCE_REQUIRE+=Poppler-glib PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib -QT4_USE= qt4=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4 QT4_VARS= FORCE_REQUIRE+=Qt4 QT4_VARS_OFF= FORCE_IGNORE+=Qt4 -QT5_USE= qt5=buildtools_build,core,gui,opengl,qmake_build,webkit +QT5_USES= qt:5 +QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5 QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets" QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets" Index: graphics/oyranos/Makefile =================================================================== --- graphics/oyranos/Makefile +++ graphics/oyranos/Makefile @@ -26,11 +26,11 @@ BROKEN_FreeBSD_9= does not build -USES= cmake gettext iconv pkgconfig tar:bzip2 +USES= cmake gettext iconv pkgconfig qt:4 tar:bzip2 USE_GL= yes USE_LDCONFIG= yes USE_GNOME= libxml2 -USE_QT4= gui moc_build qmake_build rcc_build uic_build +USE_QT= gui moc_build qmake_build rcc_build uic_build USE_XORG= xfixes xinerama xrandr xxf86vm CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PREFIX}/etc/xdg LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} Index: graphics/pencil/Makefile =================================================================== --- graphics/pencil/Makefile +++ graphics/pencil/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= libming.so:graphics/ming \ libpng.so:graphics/png -USES= qmake zip -USE_QT4= gui opengl xml moc_build rcc_build +USES= zip qt:4 +USE_QT= gui opengl xml moc_build qmake_build rcc_build USE_GL= gl QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/ming WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source Index: graphics/pfstools/Makefile =================================================================== --- graphics/pfstools/Makefile +++ graphics/pfstools/Makefile @@ -17,7 +17,7 @@ PFS_BUILD= ${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_SUB+= PFS_BASE=${PREFIX} -USES= gmake libtool pathfix pkgconfig +USES= gmake libtool pathfix pkgconfig qt:4 GNU_CONFIGURE= yes CONFIGURE_TARGET= ${PFS_BUILD} CONFIGURE_ARGS+= --disable-jpeghdr --disable-matlab \ @@ -46,7 +46,7 @@ TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff QT_CONFIGURE_ENABLE= qt -QT_USE= QT4=moc_build,corelib,gui +QT_USE= QT=moc_build,corelib,gui IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick Index: graphics/phototonic/Makefile =================================================================== --- graphics/phototonic/Makefile +++ graphics/phototonic/Makefile @@ -17,8 +17,8 @@ USE_GITHUB= yes GH_ACCOUNT= oferkv -USES= desktop-file-utils gettext qmake -USE_QT5= buildtools_build imageformats svg widgets +USES= desktop-file-utils gettext qt:5 +USE_QT= buildtools_build qmake_build imageformats svg widgets post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ Index: graphics/poppler/Makefile =================================================================== --- graphics/poppler/Makefile +++ graphics/poppler/Makefile @@ -61,7 +61,8 @@ .if ${SLAVEPORT}==qt4 CONFIGURE_ARGS+=--enable-poppler-qt4 CONFIGURE_ENV+= MOCQT4=${MOC} -USE_QT4= gui corelib xml qtestlib moc_build +USES+= qt:4 +USE_QT= gui corelib xml qtestlib moc_build BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 .else @@ -71,7 +72,8 @@ .if ${SLAVEPORT}==qt5 CONFIGURE_ARGS+=--enable-poppler-qt5 CONFIGURE_ENV+= MOCQT5=${MOC} -USE_QT5= core gui widgets xml buildtools_build testlib_build +USES+= qt:5 +USE_QT= core gui widgets xml buildtools_build testlib_build BUILD_WRKSRC= ${WRKSRC}/qt5 INSTALL_WRKSRC= ${WRKSRC}/qt5 .else Index: graphics/prison/Makefile =================================================================== --- graphics/prison/Makefile +++ graphics/prison/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= libdmtx.so:graphics/libdmtx \ libqrencode.so:graphics/libqrencode -USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build -USES= cmake +USE_QT= corelib gui qmake_build moc_build rcc_build uic_build +USES= cmake qt:4 USE_LDCONFIG= yes .include Index: graphics/py-qt4-svg/Makefile =================================================================== --- graphics/py-qt4-svg/Makefile +++ graphics/py-qt4-svg/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtSvg PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui svg moc_build qmake_build +USE_QT= corelib gui svg moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: graphics/py-qt5-svg/Makefile =================================================================== --- graphics/py-qt5-svg/Makefile +++ graphics/py-qt5-svg/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtSvg PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run widgets_run -USE_QT5= core gui svg widgets qmake_build +USE_QT= core gui svg widgets qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: graphics/qcomicbook/Makefile =================================================================== --- graphics/qcomicbook/Makefile +++ graphics/qcomicbook/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 -USES= cmake:outsource pkgconfig -USE_QT4= corelib gui linguisttools_build moc_build qmake_build rcc_build \ +USES= cmake:outsource pkgconfig qt:4 +USE_QT= corelib gui linguisttools_build moc_build qmake_build rcc_build \ uic_build xml OPTIONS_DEFINE= 7ZIP ACE RAR Index: graphics/qgis/Makefile =================================================================== --- graphics/qgis/Makefile +++ graphics/qgis/Makefile @@ -29,8 +29,8 @@ GH_PROJECT= ${PORTNAME:tu} USES= bison cmake cpe desktop-file-utils execinfo fortran \ - gmake python:2 sqlite -USE_QT4= corelib designer gui linguist_build moc_build network \ + gmake python:2 qt:4 sqlite +USE_QT= corelib designer gui linguist_build moc_build network \ qmake_build rcc_build script sql svg testlib uic_build xml \ webkit Index: graphics/qiviewer/Makefile =================================================================== --- graphics/qiviewer/Makefile +++ graphics/qiviewer/Makefile @@ -15,9 +15,9 @@ BROKEN= Unfetchable (google code has gone away) -USES= desktop-file-utils qmake tar:bzip2 -USE_QT4= corelib gui imageformats_run linguisttools_build \ - moc_build rcc_build uic_build +USES= desktop-file-utils qt:4 tar:bzip2 +USE_QT= corelib gui imageformats_run linguisttools_build \ + moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/qiviewer \ share/applications/qiviewer.desktop \ Index: graphics/qt4-iconengines/Makefile =================================================================== --- graphics/qt4-iconengines/Makefile +++ graphics/qt4-iconengines/Makefile @@ -9,8 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG icon engine -USES= pkgconfig -USE_QT4= qmake_build moc_build corelib gui svg xml +USES= pkgconfig qt:4 +USE_QT= qmake_build moc_build corelib gui svg xml QT_DIST= yes HAS_CONFIGURE= yes Index: graphics/qt4-imageformats/Makefile =================================================================== --- graphics/qt4-imageformats/Makefile +++ graphics/qt4-imageformats/Makefile @@ -13,8 +13,8 @@ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= jpeg pkgconfig -USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml +USES= jpeg pkgconfig qt:4 +USE_QT= qmake_build moc_build rcc_build corelib gui svg xml QT_DIST= yes HAS_CONFIGURE= yes Index: graphics/qt4-opengl/Makefile =================================================================== --- graphics/qt4-opengl/Makefile +++ graphics/qt4-opengl/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt OpenGL support module -USE_QT4= qmake_build moc_build corelib gui +USES= qt:4 +USE_QT= qmake_build moc_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_GL= gl USE_XORG= x11 Index: graphics/qt4-pixeltool/Makefile =================================================================== --- graphics/qt4-pixeltool/Makefile +++ graphics/qt4-pixeltool/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 screen magnifier -USE_QT4= qmake_build moc_build corelib gui network +USES= qt:4 +USE_QT= qmake_build moc_build corelib gui network QT_DIST= yes HAS_CONFIGURE= yes Index: graphics/qt4-svg/Makefile =================================================================== --- graphics/qt4-svg/Makefile +++ graphics/qt4-svg/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG support module -USE_QT4= qmake_build moc_build corelib gui +USES= qt:4 +USE_QT= qmake_build moc_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: graphics/qt5-3d/Makefile =================================================================== --- graphics/qt5-3d/Makefile +++ graphics/qt5-3d/Makefile @@ -11,10 +11,9 @@ LIB_DEPENDS= libassimp.so.3:multimedia/assimp # Base GCC fails to build the code, pull in a more recent compiler. -USES= compiler:c++0x pkgconfig qmake -USE_QT5= concurrent core gui qml quick buildtools_build +USES= compiler:c++0x pkgconfig qt:5 tar:xz +USE_QT= concurrent core gui qml quick buildtools_build QT_DIST= ${PORTNAME} -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: graphics/qt5-graphicaleffects/Makefile =================================================================== --- graphics/qt5-graphicaleffects/Makefile +++ graphics/qt5-graphicaleffects/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Quick graphical effects -USE_QT5= buildtools_build core gui quick qml +USES= qt:5 tar:xz +USE_QT= buildtools_build core gui quick qml QT_DIST= ${PORTNAME} -USES= qmake .include Index: graphics/qt5-imageformats/Makefile =================================================================== --- graphics/qt5-imageformats/Makefile +++ graphics/qt5-imageformats/Makefile @@ -13,8 +13,8 @@ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp -USE_QT5= core gui buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui buildtools_build QT_DIST= ${PORTNAME} -USES= qmake .include Index: graphics/qt5-opengl/Makefile =================================================================== --- graphics/qt5-opengl/Makefile +++ graphics/qt5-opengl/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5-compatible OpenGL support module +USES= qt:5 tar:xz USE_GL= gl -USE_QT5= core gui widgets qmake_build buildtools_build +USE_QT= core gui widgets qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: graphics/qt5-pixeltool/Makefile =================================================================== --- graphics/qt5-pixeltool/Makefile +++ graphics/qt5-pixeltool/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 screen magnifier -USE_QT5= core gui widgets buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui widgets buildtools_build QT_DIST= tools -USES= qmake # qt5logo.png is installed by qt5-widgets. DESKTOP_ENTRIES="Qt 5 PixelTool" "" \ Index: graphics/qt5-svg/Makefile =================================================================== --- graphics/qt5-svg/Makefile +++ graphics/qt5-svg/Makefile @@ -8,9 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG support module -USE_QT5= core gui widgets buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui widgets buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: graphics/qtawesome/Makefile =================================================================== --- graphics/qtawesome/Makefile +++ graphics/qtawesome/Makefile @@ -11,7 +11,6 @@ LICENSE= MIT USE_GITHUB= yes -USES= qmake GH_ACCOUNT= gamecreature GH_PROJECT= QtAwesome @@ -21,8 +20,10 @@ OPTIONS_SINGLE_GUI= QT4 QT5 OPTIONS_DEFAULT= QT4 -QT4_USE= qt4=corelib,gui,qmake_build,moc_build -QT5_USE= qt5=core,gui,qmake_build,buildtools_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui,qmake_build,moc_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,qmake_build,buildtools_build MAKE_ARGS+= ${PORT_OPTIONS:MQT*:S/QT/QT=/} WRKSRC= ${WRKDIR}/QtAwesome-${GH_TAGNAME}/QtAwesome Index: graphics/qtgtl/Makefile =================================================================== --- graphics/qtgtl/Makefile +++ graphics/qtgtl/Makefile @@ -13,8 +13,8 @@ LIB_DEPENDS= libGTLCore.so:graphics/opengtl -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build -USES= cmake:outsource pathfix pkgconfig tar:bzip2 +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build +USES= cmake:outsource pathfix pkgconfig qt:4 tar:bzip2 USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/graphics/opengtl/pkg-descr Index: graphics/qxv/Makefile =================================================================== --- graphics/qxv/Makefile +++ graphics/qxv/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:bzip2 -USE_QT4= corelib gui moc_build uic_build rcc_build +USES= qt:4 tar:bzip2 +USE_QT= corelib gui moc_build qmake_build uic_build rcc_build MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/${PORTNAME} Index: graphics/scantailor/Makefile =================================================================== --- graphics/scantailor/Makefile +++ graphics/scantailor/Makefile @@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs #MAKE_JOBS_UNSAFE= yes -USES= cmake gettext jpeg -USE_QT4= corelib gui xml qmake_build uic_build moc_build rcc_build \ +USES= cmake gettext jpeg qt:4 +USE_QT= corelib gui xml qmake_build uic_build moc_build rcc_build \ linguist_build USE_XORG+= xrender Index: graphics/seam-carving-gui/Makefile =================================================================== --- graphics/seam-carving-gui/Makefile +++ graphics/seam-carving-gui/Makefile @@ -13,9 +13,9 @@ BROKEN= Unfetchable (google code has gone away) -USES= dos2unix gmake qmake +USES= dos2unix gmake qt:4 DOS2UNIX_GLOB= *.cpp -USE_QT4= gui imageformats_run moc_build uic_build +USE_QT= gui imageformats_run moc_build qmake_build uic_build WRKSRC= ${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION} Index: graphics/seexpr/Makefile =================================================================== --- graphics/seexpr/Makefile +++ graphics/seexpr/Makefile @@ -15,9 +15,9 @@ GH_ACCOUNT= wdas GH_PROJECT= SeExpr -USES= bison cmake compiler:c++0x pyqt:4 python +USES= bison cmake compiler:c++0x pyqt:4 python qt:4 USE_PYQT= gui_build sip_build -USE_QT4= moc_build qmake_build rcc_build uic_build gui opengl +USE_QT= moc_build qmake_build rcc_build uic_build gui opengl MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40 Index: graphics/showimage/Makefile =================================================================== --- graphics/showimage/Makefile +++ graphics/showimage/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource kde:4 tar:bzip2 +USES= cmake:outsource kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: graphics/skanlite/Makefile =================================================================== --- graphics/skanlite/Makefile +++ graphics/skanlite/Makefile @@ -12,8 +12,8 @@ LIB_DEPENDS= libksane.so:graphics/libksane -USES= cmake:outsource gettext kde:4 tar:xz +USES= cmake:outsource gettext kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: graphics/smillaenlarger/Makefile =================================================================== --- graphics/smillaenlarger/Makefile +++ graphics/smillaenlarger/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv3 -USES= qmake zip -USE_QT4= qmake_build moc_build rcc_build uic_build gui +USES= zip qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build gui WRKSRC= ${WRKDIR}/${DISTNAME}/SmillaEnlargerSrc Index: graphics/structuresynth/Makefile =================================================================== --- graphics/structuresynth/Makefile +++ graphics/structuresynth/Makefile @@ -11,9 +11,9 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Rule-based 3D structure generator -USES= qmake zip dos2unix +USES= zip dos2unix qt:4 USE_GL= glu -USE_QT4= corelib gui opengl moc_build rcc_build xml script +USE_QT= corelib gui opengl moc_build qmake_build rcc_build xml script WRKSRC= ${WRKDIR}/structure-synth DOS2UNIX_GLOB= *.cpp *.h Index: graphics/tiled/Makefile =================================================================== --- graphics/tiled/Makefile +++ graphics/tiled/Makefile @@ -15,9 +15,9 @@ USE_GITHUB= yes GH_ACCOUNT= bjorn -USES= compiler:c++11-lib desktop-file-utils qmake shared-mime-info -USE_QT5= core gui widgets opengl network \ - buildtools_build linguisttools_build +USES= compiler:c++11-lib desktop-file-utils shared-mime-info qt:5 +USE_QT= core gui widgets opengl network \ + buildtools_build linguisttools_build qmake_build USE_GL= gl USE_LDCONFIG= yes Index: graphics/tulip/Makefile =================================================================== --- graphics/tulip/Makefile +++ graphics/tulip/Makefile @@ -46,13 +46,15 @@ OPTIONS_SINGLE_GUI= QT4 QT5 OPTIONS_DEFAULT= QT4 -QT4_USE= qt4=corelib,gui,network,opengl,webkit \ - qt4=xml,xmlpatterns \ - qt4=moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= qt=corelib,gui,network,opengl,webkit \ + qt=xml,xmlpatterns \ + qt=moc_build,qmake_build,rcc_build,uic_build QT4_CMAKE_ON= -DUSE_QT5_IF_INSTALLED:BOOL=OFF -QT5_USE= qt5=core,gui,network,opengl,webkit,widgets \ - qt5=xml,xmlpatterns \ - qt5=buildtools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,network,opengl,webkit,widgets \ + qt=xml,xmlpatterns \ + qt=buildtools_build,qmake_build QT5_CMAKE_ON= -DUSE_QT5_IF_INSTALLED:BOOL=ON post-build: Index: graphics/yagf/Makefile =================================================================== --- graphics/yagf/Makefile +++ graphics/yagf/Makefile @@ -25,10 +25,10 @@ OPTIONS_DEFAULT= CUNEIFORM -USES= cmake desktop-file-utils pkgconfig +USES= cmake desktop-file-utils pkgconfig qt:4 USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_QT4= corelib gui imageformats linguist_build \ +USE_QT= corelib gui imageformats linguist_build \ moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/yagf lib/yagf/libxspreload.so share/applications/YAGF.desktop\ Index: graphics/zbar/Makefile =================================================================== --- graphics/zbar/Makefile +++ graphics/zbar/Makefile @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= iconv jpeg libtool gmake pathfix pkgconfig +USES= iconv jpeg libtool gmake pathfix pkgconfig qt:4 INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-jpeg=yes @@ -45,7 +45,7 @@ GTK2_CONFIGURE_ON= --with-gtk=yes GTK2_CONFIGURE_OFF= --with-gtk=no -QT4_USE= QT4=gui,moc_build +QT4_USE= QT=gui,moc_build QT4_CONFIGURE_ON= --with-qt=yes QT4_CONFIGURE_OFF= --with-qt=no Index: graphics/zint/Makefile =================================================================== --- graphics/zint/Makefile +++ graphics/zint/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libpng.so:graphics/png -USES= cmake +USES= cmake qt:4 USE_LDCONFIG= yes -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build designer +USE_QT= gui xml qmake_build uic_build moc_build rcc_build designer DESKTOP_ENTRIES="Zint" "Barcode generator" "" "zint-qt" "" false Index: irc/dxirc/Makefile =================================================================== --- irc/dxirc/Makefile +++ irc/dxirc/Makefile @@ -41,12 +41,14 @@ NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify -QT4_USE= QT4=corelib,gui,network \ - QT4=moc_build,rcc_build,uic_build,qmake_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,network \ + QT=moc_build,rcc_build,uic_build,qmake_build QT4_CMAKE_ON= -DQT5:BOOL=OFF -QT5_USE= QT5=core,gui,multimedia,network,widgets \ - QT5=buildtools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= QT=core,gui,multimedia,network,widgets \ + QT=buildtools_build,qmake_build QT5_CMAKE_ON= -DQT5:BOOL=ON .include Index: irc/konversation-kde4/Makefile =================================================================== --- irc/konversation-kde4/Makefile +++ irc/konversation-kde4/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libqca.so:devel/qca -USES= cmake:outsource gettext kde:4 shebangfix tar:xz +USES= cmake:outsource gettext kde:4 shebangfix qt:4 tar:xz USE_KDE= pimlibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build SHEBANG_FILES= data/scripts/mail \ data/updaters/*.pl Index: irc/kvirc/Makefile =================================================================== --- irc/kvirc/Makefile +++ irc/kvirc/Makefile @@ -19,9 +19,9 @@ COMMENT?= IRC client for KDE 4 USE_PERL5= build -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ dbus gui network sql xml -USES= cmake cpe gettext perl5 ssl tar:bzip2 +USES= cmake cpe gettext perl5 ssl qt:4 tar:bzip2 CMAKE_ARGS= -DWANT_ESD=no -DWANT_DOXYGEN=no \ -DMANDIR=${MANPREFIX} USE_LDCONFIG= yes @@ -56,11 +56,11 @@ OPTIONS_DEFINE+= PHONON WEBKIT PHONON_DESC= Build with Phonon support -PHONON_USE= QT4=phonon +PHONON_USE= QT=phonon PHONON_CMAKE_OFF= -DWITHOUT_PHONON=yes WEBKIT_DESC= Build with QtWebkit support -WEBKIT_USE= QT4=webkit +WEBKIT_USE= QT=webkit WEBKIT_CMAKE_OFF= -DWITHOUT_QTWEBKIT=yes .else #defined(PKGNAMESUFFIX) CONFLICTS_INSTALL= kvirc-qt4-4.* Index: irc/quassel-core/Makefile =================================================================== --- irc/quassel-core/Makefile +++ irc/quassel-core/Makefile @@ -8,7 +8,7 @@ MASTERDIR= ${.CURDIR}/../quassel -USE_QT5= buildtools_build core network qmake_build script sql sql-sqlite3_run +USE_QT= buildtools_build core network qmake_build script sql sql-sqlite3_run CMAKE_ARGS+= -DWITH_KDE=off \ -DUSE_QT5=on \ -DWANT_CORE=on \ Index: irc/quassel/Makefile =================================================================== --- irc/quassel/Makefile +++ irc/quassel/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource compiler:c++11-lib cpe execinfo pkgconfig tar:bzip2 +USES= cmake:outsource compiler:c++11-lib cpe execinfo pkgconfig tar:bzip2 qt:5 CPE_VENDOR= quassel-irc CPE_PRODUCT= quassel_irc @@ -21,7 +21,8 @@ .if !defined(MASTERDIR) LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt5 -USE_QT5= buildtools_build core dbus gui network phonon4 qmake_build webkit widgets +USE_QT= buildtools_build core dbus gui network \ + phonon4 qmake_build webkit widgets CMAKE_ARGS= -DWITH_KDE=off \ -DUSE_QT5=on \ -DWANT_CORE=off @@ -41,7 +42,7 @@ MONO_CMAKE_ON= -DWANT_MONO=on MONO_CMAKE_OFF= -DWANT_MONO=off -NLS_USE= QT5=linguisttools_build +NLS_USE= QT=linguisttools_build post-patch-NLS-off: ${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \ Index: japanese/fcitx-skk/Makefile =================================================================== --- japanese/fcitx-skk/Makefile +++ japanese/fcitx-skk/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libfcitx-config.so:chinese/fcitx \ libskk.so:japanese/libskk -USES= tar:xz compiler:c++11-lang cmake gettext pkgconfig +USES= tar:xz compiler:c++11-lang cmake gettext pkgconfig qt:4 INSTALLS_ICONS= yes CMAKE_ARGS+= -DSKK_DEFAULT_PATH=${LOCALBASE}/share/skk/SKK-JISYO.L @@ -26,7 +26,7 @@ .include .if ${PORT_OPTIONS:MQT4} -USE_QT4= qmake_build moc_build rcc_build uic_build gui +USE_QT= qmake_build moc_build rcc_build uic_build gui USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt PLIST_SUB+= QT4="" .else Index: japanese/kiten/Makefile =================================================================== --- japanese/kiten/Makefile +++ japanese/kiten/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Japanese reference/study tool for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: japanese/mozc-server/Makefile =================================================================== --- japanese/mozc-server/Makefile +++ japanese/mozc-server/Makefile @@ -24,7 +24,7 @@ hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic USES= compiler:c++11-lang pkgconfig iconv:wchar_t gmake \ - tar:bzip2 python:2.7,build shebangfix + tar:bzip2 python:2.7,build qt:4 shebangfix SHEBANG_FILES= src/build_mozc.py BUILD_WRKSRC= ${WRKSRC}/src @@ -44,7 +44,7 @@ LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX} .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" USE_GNOME= glib20 gtk20 -USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build +USE_QT= corelib gui qmake_build moc_build rcc_build uic_build .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" USE_XORG= xcb USE_GNOME= glib20 gtk20 Index: japanese/qt4-codecs-jp/Makefile =================================================================== --- japanese/qt4-codecs-jp/Makefile +++ japanese/qt4-codecs-jp/Makefile @@ -10,7 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt EUC-JP/JIS codec plugins -USE_QT4= qmake_build corelib +USES= qt:4 +USE_QT= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes Index: java/classpath/Makefile =================================================================== --- java/classpath/Makefile +++ java/classpath/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gmake iconv libtool perl5 pkgconfig +USES= gmake iconv libtool perl5 pkgconfig qt:4 USE_LDCONFIG= yes USE_PERL5= build USE_XORG= x11 ice xtst xaw xproto xext @@ -111,7 +111,7 @@ CONFIGURE_ARGS+= --enable-default-toolkit=gnu.java.awt.peer.qt.QtToolkit .endif CONFIGURE_ENV+= MOC="${LOCALBASE}/bin/moc-qt4" -USE_QT4= moc_build corelib gui +USE_QT= moc_build corelib gui PLIST_SUB+= QT4="" .else PLIST_SUB+= QT4="@comment " Index: korean/qt4-codecs-kr/Makefile =================================================================== --- korean/qt4-codecs-kr/Makefile +++ korean/qt4-codecs-kr/Makefile @@ -10,7 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt EUC-KR codec plugin -USE_QT4= qmake_build corelib +USES= qt:4 +USE_QT= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes Index: lang/basic256/Makefile =================================================================== --- lang/basic256/Makefile +++ lang/basic256/Makefile @@ -19,9 +19,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= bison dos2unix qmake +USES= bison dos2unix qt:5 USE_SDL= sdl mixer -USE_QT5= buildtools core gui multimedia network printsupport sql widgets serialport +USE_QT= buildtools_build qmake_build \ + core gui multimedia network printsupport sql widgets serialport QMAKE_ARGS+= LOCALBASE="${LOCALBASE}" QMAKE_SOURCE_PATH= BASIC256.pro Index: lang/kf5-kross/Makefile =================================================================== --- lang/kf5-kross/Makefile +++ lang/kf5-kross/Makefile @@ -8,12 +8,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 multi-language application scripting -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons doctools ecm i18n iconthemes itemviews \ jobwidgets kio parts service solid sonnet textwidgets \ widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ script uiplugin uitools widgets xml .include Index: lang/kturtle/Makefile =================================================================== --- lang/kturtle/Makefile +++ lang/kturtle/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Educational programming environment for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build +USE_QT= corelib gui xml moc_build qmake_build rcc_build uic_build .include Index: lang/py-qt5-qml/Makefile =================================================================== --- lang/py-qt5-qml/Makefile +++ lang/py-qt5-qml/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtQml PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run network_run -USE_QT5= core gui network qml buildtools_build qmake_build +USE_QT= core gui network qml buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: lang/qt5-qml/Makefile =================================================================== --- lang/qt5-qml/Makefile +++ lang/qt5-qml/Makefile @@ -10,10 +10,9 @@ BROKEN_powerpc64= Does not build -USE_QT5= core network buildtools_build +USES= python:build qt:5 tar:xz +USE_QT= core network buildtools_build QT_DIST= declarative -USES= python:build qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src Index: mail/emailrelay/Makefile =================================================================== --- mail/emailrelay/Makefile +++ mail/emailrelay/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf pkgconfig +USES= autoreconf pkgconfig qt:4 GNU_CONFIGURE= yes CONFIGURE_ENV= e_spooldir=${PREFIX}/var/spool/emailrelay CONFIGURE_ARGS= --without-pam @@ -29,7 +29,7 @@ GUI_CONFIGURE_ENABLE= gui GUI_CONFIGURE_ENV= e_qtmoc="${MOC}" -GUI_USE= QT4=gui,moc +GUI_USE= QT=gui,moc OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USE= OPENSSL=yes Index: mail/kbiff/Makefile =================================================================== --- mail/kbiff/Makefile +++ mail/kbiff/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -USES= cmake gettext kde:4 perl5 tar:bzip2 +USES= cmake gettext kde:4 perl5 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build Index: mail/kshowmail/Makefile =================================================================== --- mail/kshowmail/Makefile +++ mail/kshowmail/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -USES= cmake gettext kde:4 perl5 +USES= cmake gettext kde:4 perl5 qt:5 USE_KDE= automoc4 kdelibs pimlibs -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build Index: mail/qgmailnotifier/Makefile =================================================================== --- mail/qgmailnotifier/Makefile +++ mail/qgmailnotifier/Makefile @@ -10,8 +10,8 @@ MAINTAINER= crees@FreeBSD.org COMMENT= Portable Qt 4 based GMail notifier -USES= qmake tar:tgz -USE_QT4= moc_build uic_build gui network xml rcc_build +USES= qt:4 tar:tgz +USE_QT= moc_build qmake_build uic_build gui network xml rcc_build WRKSRC= ${WRKDIR}/${PORTNAME} Index: mail/trojita/Makefile =================================================================== --- mail/trojita/Makefile +++ mail/trojita/Makefile @@ -25,8 +25,8 @@ -DWITH_SHARED_PLUGINS:STRING=ON -DWITH_TESTS:STRING=OFF \ -DWITH_ZLIB:STRING=ON \ -DWITH_QT5:STRING=ON -USES= cmake compiler:c++11-lib cpe desktop-file-utils tar:xz -USE_QT5= buildtools_build linguisttools_build qmake_build \ +USES= cmake compiler:c++11-lib cpe desktop-file-utils qt:5 tar:xz +USE_QT= buildtools_build linguisttools_build qmake_build \ core dbus gui network sql sql-sqlite3 svg webkit widgets .include Index: math/abakus/Makefile =================================================================== --- math/abakus/Makefile +++ math/abakus/Makefile @@ -15,9 +15,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libmpfr.so:math/mpfr -USES= bison cmake kde:4 tar:bzip2 +USES= bison cmake kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \ -DCMAKE_REQUIRED_FLAGS:STRING="${LDFLAGS}" \ -DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex Index: math/analitza/Makefile =================================================================== --- math/analitza/Makefile +++ math/analitza/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Library from KDE Education project -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui opengl svg xml \ +USE_QT= corelib gui opengl svg xml \ moc_build qmake_build rcc_build uic_build USE_GL= glu USE_LDCONFIG= yes Index: math/cantor/Makefile =================================================================== --- math/cantor/Makefile +++ math/cantor/Makefile @@ -12,9 +12,9 @@ libqalculate.so:math/libqalculate \ libanalitza.so:math/analitza -USES= cmake:outsource kde:4 pkgconfig python:2 tar:xz +USES= cmake:outsource kde:4 pkgconfig python:2 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib qtestlib_build xml xmlpatterns \ +USE_QT= corelib qtestlib_build xml xmlpatterns \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: math/cgal/Makefile =================================================================== --- math/cgal/Makefile +++ math/cgal/Makefile @@ -22,8 +22,8 @@ BROKEN_sparc64= Does not build: fails to compile all_files.cpp USE_LDCONFIG= yes -USES= cmake shebangfix tar:xz -USE_QT5= buildtools_build core gui opengl qmake_build widgets +USES= cmake shebangfix qt:5 tar:xz +USE_QT= buildtools_build core gui opengl qmake_build widgets SHEBANG_FILES= scripts/cgal_create_CMakeLists \ scripts/cgal_create_cmake_script Index: math/freemat/Makefile =================================================================== --- math/freemat/Makefile +++ math/freemat/Makefile @@ -24,9 +24,9 @@ libportaudio.so:audio/portaudio \ libumfpack.so:math/suitesparse -USES= blaslapack cmake:outsource dos2unix fortran pkgconfig python:build +USES= blaslapack cmake:outsource dos2unix fortran pkgconfig python:build qt:4 USE_GL= yes -USE_QT4= gui network opengl svg webkit xml \ +USE_QT= gui network opengl svg webkit xml \ moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DCMAKE_LIBRARY_PATH:STRING="${LOCALBASE}/llvm33/lib" \ -DCMAKE_PREFIX_PATH:STRING="${LOCALBASE}/share/llvm33/cmake" \ Index: math/kalgebra/Makefile =================================================================== --- math/kalgebra/Makefile +++ math/kalgebra/Makefile @@ -11,10 +11,10 @@ CMAKE_ARGS= -DBUILD_mobile:BOOL=FALSE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_GL= glu USE_KDE= kdelibs libkdeedu automoc4 -USE_QT4= corelib declarative gui opengl \ +USE_QT= corelib declarative gui opengl \ moc_build qmake_build rcc_build uic_build .include Index: math/kbruch/Makefile =================================================================== --- math/kbruch/Makefile +++ math/kbruch/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 application to exercise fractions -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: math/kcalc/Makefile =================================================================== --- math/kcalc/Makefile +++ math/kcalc/Makefile @@ -10,8 +10,8 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= xml qmake_build moc_build rcc_build uic_build +USE_QT= xml qmake_build moc_build rcc_build uic_build .include Index: math/kig/Makefile =================================================================== --- math/kig/Makefile +++ math/kig/Makefile @@ -10,8 +10,8 @@ LIB_DEPENDS= libboost_python.so:devel/boost-python-libs -USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= gui xml moc_build qmake_build rcc_build uic_build +USE_QT= gui xml moc_build qmake_build rcc_build uic_build .include Index: math/kmplot/Makefile =================================================================== --- math/kmplot/Makefile +++ math/kmplot/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Mathematical function plotter for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= xml moc_build qmake_build rcc_build uic_build +USE_QT= xml moc_build qmake_build rcc_build uic_build .include Index: math/labplot/Makefile =================================================================== --- math/labplot/Makefile +++ math/labplot/Makefile @@ -15,11 +15,11 @@ LIB_DEPENDS= libgsl.so:math/gsl -USES= cmake kde:4 shared-mime-info tar:bzip2 +USES= cmake kde:4 shared-mime-info qt:4 tar:bzip2 USE_XORG= xft xpm USE_GCC= yes USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build post-patch: @${REINPLACE_CMD} -e \ Index: math/mathmod/Makefile =================================================================== --- math/mathmod/Makefile +++ math/mathmod/Makefile @@ -12,9 +12,10 @@ LICENSE= GPLv2 -USES= dos2unix qmake zip +USES= dos2unix zip qt:5 USE_GL= gl -USE_QT5= buildtools_build core gui opengl qmake_build widgets + +USE_QT= buildtools_build core gui opengl qmake_build widgets BRANCHE= 274 WRKSRC= ${WRKDIR}/${PORTNAME:tl}-branches-${BRANCHE}-trunk Index: math/octave/Makefile =================================================================== --- math/octave/Makefile +++ math/octave/Makefile @@ -37,14 +37,14 @@ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= charsetfix fortran gmake libtool perl5 pkgconfig readline tar:xz +USES= charsetfix fortran gmake libtool perl5 pkgconfig readline qt:4 tar:xz USE_LDCONFIG= yes USE_PERL5= build USE_TEX= dvipsk:build GNU_CONFIGURE= yes USE_JAVA= yes JAVA_VERSION= 1.7+ -USE_QT4= corelib gui network opengl uic_build moc_build rcc_build linguist_build +USE_QT= corelib gui network opengl uic_build moc_build rcc_build linguist_build USE_XORG= x11 xext xfixes xft USE_GL= gl glu Index: math/plplot/Makefile =================================================================== --- math/plplot/Makefile +++ math/plplot/Makefile @@ -22,7 +22,8 @@ USE_GNOME= pango USE_PERL5= build -USES= cmake ghostscript localbase perl5 pathfix pkgconfig +USES= cmake ghostscript localbase perl5 pathfix pkgconfig qt:4 + CMAKE_ARGS= -DENABLE_java:BOOL=OFF \ -DENABLE_octave:BOOL=OFF \ -DENABLE_pdl:BOOL=OFF \ @@ -91,7 +92,7 @@ THREADS_CMAKE_OFF= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF -QT4_USE= QT4=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build +QT4_USE= QT=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build QT4_CMAKE_OFF= -DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON WXGTK_LIB_DEPENDS= libagg.so:graphics/agg Index: math/qtiplot/Makefile =================================================================== --- math/qtiplot/Makefile +++ math/qtiplot/Makefile @@ -17,9 +17,9 @@ # qwt.5:x11-toolkits/qwt5 \ # qwtplot3d-qt4:math/qwtplot3d-qt4 -USES= dos2unix gmake qmake tar:bzip2 -USE_QT4= gui opengl svg qt3support network assistantclient \ - moc_build rcc_build +USES= dos2unix gmake qt:4 tar:bzip2 +USE_QT= gui opengl svg qt3support network assistantclient \ + moc_build qmake_build rcc_build USE_GL= glu QMAKE_ARGS+= LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD} DOS2UNIX_GLOB= *.pro @@ -34,7 +34,7 @@ DOCS_DESC= Install the QtiPlot Handbook DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc -DOCS_USE= QT4=assistant-adp_run +DOCS_USE= QT=assistant-adp_run PYTHON_DESC= Python scripting support PYTHON_USES= python @@ -43,7 +43,7 @@ PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PYTHON_VERSION=${PYTHON_VERSION} -NLS_USE= QT4=linguisttools_build +NLS_USE= QT=linguisttools_build post-extract: ${CP} ${FILESDIR}/build.conf ${WRKSRC} Index: math/qtoctave/Makefile =================================================================== --- math/qtoctave/Makefile +++ math/qtoctave/Makefile @@ -11,10 +11,10 @@ RUN_DEPENDS= octave:math/octave -USE_QT4= designer gui network script svg xml \ +USE_QT= designer gui network script svg xml \ qmake_build moc_build rcc_build uic_build \ linguisttools_build -USES= cmake +USES= cmake qt:4 CMAKE_ARGS+= -DWITH_UseRPMTools:Bool=Off post-patch: Index: math/qwtplot3d-qt4/Makefile =================================================================== --- math/qwtplot3d-qt4/Makefile +++ math/qwtplot3d-qt4/Makefile @@ -10,8 +10,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 3D plotting widgets for scientific data and math expressions -USES= dos2unix qmake tar:tgz -USE_QT4= gui moc_build opengl +USES= dos2unix qt:4 tar:tgz +USE_QT= gui moc_build opengl qmake_build USE_GL= glu USE_LDCONFIG= yes Index: math/rkward-kde4/Makefile =================================================================== --- math/rkward-kde4/Makefile +++ math/rkward-kde4/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/R:math/R \ ${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate -USES= cmake gettext fortran kde:4 php:cli shared-mime-info -USE_QT4= corelib dbus gui qmake_build moc_build network phonon rcc_build \ +USES= cmake gettext fortran kde:4 php:cli shared-mime-info qt:4 +USE_QT= corelib dbus gui qmake_build moc_build network phonon rcc_build \ script svg uic_build webkit xml USE_XORG= x11 USE_KDE= automoc4 kdelibs Index: math/rocs/Makefile =================================================================== --- math/rocs/Makefile +++ math/rocs/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= cmake:outsource grantlee:4 kde:4 tar:xz +USES= cmake:outsource grantlee:4 kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= gui qtestlib script scripttools webkit xml \ +USE_QT= gui qtestlib script scripttools webkit xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: math/speedcrunch/Makefile =================================================================== --- math/speedcrunch/Makefile +++ math/speedcrunch/Makefile @@ -13,9 +13,9 @@ USE_GITHUB= yes GH_PROJECT= SpeedCrunch -USES= cmake:outsource +USES= cmake:outsource qt:4 CMAKE_SOURCE_PATH= ${WRKSRC}/src -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network +USE_QT= qmake_build moc_build rcc_build uic_build corelib gui network USE_XORG= x11 xext sm ice .include Index: math/vtk5/Makefile =================================================================== --- math/vtk5/Makefile +++ math/vtk5/Makefile @@ -24,7 +24,7 @@ SUB_FILES= vtk.3 -USES= alias cmake:outsource jpeg +USES= alias cmake:outsource jpeg qt:4 USE_XORG= xt USE_LDCONFIG= ${PREFIX}/lib/vtk-${PORTVERSION:R} CXXFLAGS+= -DUSE_INTERP_ERRORLINE @@ -119,7 +119,7 @@ .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4= corelib designer gui opengl qmake_build uic_build \ +USE_QT= corelib designer gui opengl qmake_build uic_build \ moc_build rcc_build CMAKE_ARGS+= -DVTK_USE_QVTK:BOOL=ON \ -DVTK_USE_QT:BOOL=ON \ Index: math/vtk6/Makefile =================================================================== --- math/vtk6/Makefile +++ math/vtk6/Makefile @@ -126,14 +126,16 @@ .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4= gui_build gui_run network_build network_run sql_build sql_run \ +USES+= qt:4 +USE_QT= gui_build gui_run network_build network_run sql_build sql_run \ moc_build uic_build qmake_build rcc_build opengl webkit_build \ webkit_run CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="4" .endif .if ${PORT_OPTIONS:MQT5} -USE_QT5= gui_build gui_run network_build network_run sql_build sql_run \ +USES+= qt:5 +USE_QT= gui_build gui_run network_build network_run sql_build sql_run \ qmake_build opengl webkit_build buildtools webkit_run CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="5" \ -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 @@ -149,9 +151,9 @@ .if ${PORT_OPTIONS:MDESIGNER} .if ${PORT_OPTIONS:MQT5} -USE_QT5+= designer +USE_QT+= designer .elif ${PORT_OPTIONS:MQT4} -USE_QT4+= designer +USE_QT+= designer .else IGNORE= designer requires either QT4 or QT5 .endif Index: math/vtk6/pkg-plist =================================================================== --- math/vtk6/pkg-plist +++ math/vtk6/pkg-plist @@ -4519,3 +4519,4 @@ lib/cmake/vtk-%%VER2%%/vtkWrapTcl.cmake lib/cmake/vtk-%%VER2%%/vtkWrapperInit.data.in lib/cmake/vtk-%%VER2%%/vtkWrapping.cmake +@dir share/cmake/hdf5 Index: misc/artikulate/Makefile =================================================================== --- misc/artikulate/Makefile +++ misc/artikulate/Makefile @@ -14,9 +14,9 @@ IGNORE= not usable, links to both GStreamer 0.10.x and 1.x -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs libkdeedu runtime_run -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: misc/bibletime/Makefile =================================================================== --- misc/bibletime/Makefile +++ misc/bibletime/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libclucene-core.so:textproc/clucene \ libsword.so:misc/sword -USES= cmake:outsource tar:xz +USES= cmake:outsource qt:4 tar:xz USE_OPENSSL= yes -USE_QT4= corelib dbus gui iconengines network phonon qtestlib script \ +USE_QT= corelib dbus gui iconengines network phonon qtestlib script \ svg webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build Index: misc/kde-thumbnailer-chm/Makefile =================================================================== --- misc/kde-thumbnailer-chm/Makefile +++ misc/kde-thumbnailer-chm/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libchm.so:misc/chmlib -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= lib/kde4/chmthumbnail.so \ Index: misc/kde-thumbnailer-epub/Makefile =================================================================== --- misc/kde-thumbnailer-epub/Makefile +++ misc/kde-thumbnailer-epub/Makefile @@ -9,9 +9,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE thumbnail generator for ePub files -USES= cmake:outsource kde:4 +USES= cmake:outsource kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= lib/kde4/epubthumbnail.so \ Index: misc/kde-thumbnailer-fb2/Makefile =================================================================== --- misc/kde-thumbnailer-fb2/Makefile +++ misc/kde-thumbnailer-fb2/Makefile @@ -9,9 +9,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE thumbnail generator for fb2 files -USES= cmake:outsource kde:4 +USES= cmake:outsource kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= lib/kde4/fb2thumbnail.so \ Index: misc/kde4-l10n/files/bsd.l10n.mk =================================================================== --- misc/kde4-l10n/files/bsd.l10n.mk +++ misc/kde4-l10n/files/bsd.l10n.mk @@ -3,9 +3,9 @@ DISTNAME= ${PORTNAME}-${KDE4_L10N}-${PORTVERSION} DIST_SUBDIR?= KDE/${PORTVERSION}/kde-l10n -USE_QT4= uic_build moc_build qmake_build rcc_build xml +USE_QT= uic_build moc_build qmake_build rcc_build xml USE_KDE= kdelibs automoc4 -USES= cmake gettext kde:4 tar:xz +USES= cmake gettext kde:4 tar:xz qt:4 # Support for spelling dictionaries Index: misc/kgeography/Makefile =================================================================== --- misc/kgeography/Makefile +++ misc/kgeography/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 geography trainer -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= xml moc_build qmake_build rcc_build uic_build +USE_QT= xml moc_build qmake_build rcc_build uic_build .include Index: misc/klettres/Makefile =================================================================== --- misc/klettres/Makefile +++ misc/klettres/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Alphabet learning tool for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= xml moc_build qmake_build rcc_build uic_build +USE_QT= xml moc_build qmake_build rcc_build uic_build .include Index: misc/krecipes-kde4/Makefile =================================================================== --- misc/krecipes-kde4/Makefile +++ misc/krecipes-kde4/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv2 -USES= cmake gettext kde:4 shared-mime-info -USE_QT4= moc_build qmake_build rcc_build uic_build +USES= cmake gettext kde:4 shared-mime-info qt:4 +USE_QT= moc_build qmake_build rcc_build uic_build USE_KDE= automoc4 kdelibs qimageblitz OPTIONS_MULTI= DB @@ -20,13 +20,13 @@ OPTIONS_DEFAULT= SQLITE SQLITE_USES= sqlite -SQLITE_USE= QT4=sql-sqlite3_run +SQLITE_USE= QT=sql-sqlite3_run SQLITE_CMAKE_OFF= -DWITH_Sqlite:BOOL=OFF MYSQL_USE= MYSQL=yes \ - QT4=sql-mysql_run + QT=sql-mysql_run PGSQL_USES= pgsql -PGSQL_USE= QT4=sql-pgsql_run +PGSQL_USE= QT=sql-pgsql_run .include Index: misc/ktouch/Makefile =================================================================== --- misc/ktouch/Makefile +++ misc/ktouch/Makefile @@ -9,9 +9,9 @@ RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib declarative opengl phonon script sql xmlpatterns \ +USE_QT= corelib declarative opengl phonon script sql xmlpatterns \ moc_build qmake_build rcc_build uic_build USE_XORG= xkbfile Index: misc/kwordquiz/Makefile =================================================================== --- misc/kwordquiz/Makefile +++ misc/kwordquiz/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Flash card trainer for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkdeedu automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: misc/libkdeedu/Makefile =================================================================== --- misc/libkdeedu/Makefile +++ misc/libkdeedu/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Libraries used by KDE educational applications -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build +USE_QT= corelib gui xml moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: misc/parley/Makefile =================================================================== --- misc/parley/Makefile +++ misc/parley/Makefile @@ -7,10 +7,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Vocabulary trainer for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_GNOME= libxml2 libxslt USE_KDE= kdelibs libkdeedu attica automoc4 -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build USE_XORG= x11 xrender .include Index: misc/py-qt4-demo/Makefile =================================================================== --- misc/py-qt4-demo/Makefile +++ misc/py-qt4-demo/Makefile @@ -15,7 +15,7 @@ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} NO_BUILD= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 Index: misc/py-qt4-doc/Makefile =================================================================== --- misc/py-qt4-doc/Makefile +++ misc/py-qt4-doc/Makefile @@ -15,7 +15,7 @@ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} NO_BUILD= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= # DOCSDIR= ${PREFIX}/share/doc/py-qt4 Index: misc/py-qt5-demo/Makefile =================================================================== --- misc/py-qt5-demo/Makefile +++ misc/py-qt5-demo/Makefile @@ -13,7 +13,7 @@ DISTINFO_FILE= ${PYQT_DISTINFO_FILE} NO_BUILD= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= # EXAMPLESDIR= ${PREFIX}/share/examples/py-qt5 Index: misc/py-qt5-doc/Makefile =================================================================== --- misc/py-qt5-doc/Makefile +++ misc/py-qt5-doc/Makefile @@ -13,7 +13,7 @@ DISTINFO_FILE= ${PYQT_DISTINFO_FILE} NO_BUILD= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= # DOCSDIR= ${PREFIX}/share/doc/py-qt5 Index: misc/qbrew/Makefile =================================================================== --- misc/qbrew/Makefile +++ misc/qbrew/Makefile @@ -10,8 +10,8 @@ MAINTAINER= david@usermode.org COMMENT= Homebrewer's recipe calculator -USES= qmake -USE_QT4= moc_build uic_build rcc_build xml gui +USES= qt:4 +USE_QT= moc_build qmake_build uic_build rcc_build xml gui PORTDOCS= * QMAKE_ARGS= CONFIG+="configure" Index: misc/qmetro/Makefile =================================================================== --- misc/qmetro/Makefile +++ misc/qmetro/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2 -USES= dos2unix qmake zip +USES= dos2unix zip qt:4 INSTALLS_ICONS= yes -USE_QT4= gui xml uic_build moc_build multimedia \ +USE_QT= gui xml uic_build moc_build qmake_build multimedia \ rcc_build LDFLAGS= -lz DOS2UNIX_FILES= rc/alarm.pri Index: misc/qt4-doc/Makefile =================================================================== --- misc/qt4-doc/Makefile +++ misc/qt4-doc/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation -USE_QT4= # empty +USES= qt:4 QT_DIST= yes NO_BUILD= yes Index: misc/qt4-l10n/Makefile =================================================================== --- misc/qt4-l10n/Makefile +++ misc/qt4-l10n/Makefile @@ -8,7 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt localized messages -USE_QT4= linguisttools_build +USES= qt:4 +USE_QT= linguisttools_build QT_DIST= yes NO_ARCH= yes Index: misc/qt4-qtconfig/Makefile =================================================================== --- misc/qt4-qtconfig/Makefile +++ misc/qt4-qtconfig/Makefile @@ -9,8 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 graphical configuration utility -USES= pkgconfig -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USES= pkgconfig qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build \ corelib dbus gui xml QT_DIST= yes @@ -41,7 +41,7 @@ OPTIONS_DEFAULT=PHONON PHONON_DESC= Phonon multimedia framework support (implies GStreamer) -PHONON_USE= GSTREAMER=yes QT4=phonon,phonon-gst +PHONON_USE= GSTREAMER=yes QT=phonon,phonon-gst PHONON_CONFIGURE_ON= -phonon -gstreamer PHONON_CONFIGURE_OFF= -no-phonon -no-gstreamer Index: misc/qt4-qtdemo/Makefile =================================================================== --- misc/qt4-qtdemo/Makefile +++ misc/qt4-qtdemo/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 demonstration and example applications -USES= pkgconfig +USES= pkgconfig qt:4 USE_GSTREAMER= yes -USE_QT4= qmake_build moc_build rcc_build uic_build corelib designer \ +USE_QT= qmake_build moc_build rcc_build uic_build corelib designer \ gui network opengl sql svg qtestlib xml imageformats_run dbus \ script webkit phonon help assistant_run phonon-gst_run scripttools \ xmlpatterns multimedia Index: misc/qt5-doc/Makefile =================================================================== --- misc/qt5-doc/Makefile +++ misc/qt5-doc/Makefile @@ -12,8 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation -USES= gmake python:build qmake:norecursive,outsource tar:xz -USE_QT5= buildtools_build concurrent_build help_build qdoc_build +USES= gmake python:build qt:5,qmake_norecursive,qmake_outsource tar:xz +USE_QT= buildtools_build concurrent_build help_build qdoc_build qmake_build QMAKE_SOURCE_PATH= ${WRKSRC}/qt.pro ALL_TARGET= docs Index: misc/qt5-examples/Makefile =================================================================== --- misc/qt5-examples/Makefile +++ misc/qt5-examples/Makefile @@ -16,8 +16,8 @@ NO_ARCH= yes NO_BUILD= yes -USES= tar:xz -USE_QT5= # +USES= qt:5 tar:xz +USE_QT= # DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr DISTINFO_FILE= ${.CURDIR:H:H}/misc/qt5-doc/distinfo Index: misc/qt5-l10n/Makefile =================================================================== --- misc/qt5-l10n/Makefile +++ misc/qt5-l10n/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt localized messages -USES= qmake -USE_QT5= qmake_build linguisttools_build +USES= qt:5 tar:xz +USE_QT= qmake_build linguisttools_build QT_DIST= translations .include Index: misc/qt5ct/Makefile =================================================================== --- misc/qt5ct/Makefile +++ misc/qt5ct/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= gettext-runtime qmake tar:bz2 -USE_QT5= core dbus gui svg widgets buildtools_build \ - linguisttools_build +USES= gettext-runtime tar:bz2 qt:5 +USE_QT= core dbus gui svg widgets buildtools_build \ + linguisttools_build qmake_build USE_GL= egl gl USE_XORG= x11 xext xrender Index: misc/saaghar/Makefile =================================================================== --- misc/saaghar/Makefile +++ misc/saaghar/Makefile @@ -18,9 +18,9 @@ OPTIONS_DEFINE= DEBUG -USES= qmake dos2unix -USE_QT4= gui network sql xml sql-sqlite3_run \ - moc_build rcc_build uic_build phonon \ +USES= dos2unix qt:4 +USE_QT= gui network sql xml sql-sqlite3_run \ + moc_build qmake_build rcc_build uic_build phonon \ dbus declarative xmlpatterns svg script WRKSRC= ${WRKDIR}/Saaghar Index: misc/tellico-kde4/Makefile =================================================================== --- misc/tellico-kde4/Makefile +++ misc/tellico-kde4/Makefile @@ -18,9 +18,9 @@ libexempi.so:textproc/exempi \ libqjson.so:devel/qjson -USES= cmake gettext kde:4 pkgconfig shared-mime-info tar:bzip2 +USES= cmake gettext kde:4 pkgconfig shared-mime-info qt:4 tar:bzip2 USE_KDE= kdelibs libksane pimlibs \ automoc4 qimageblitz libkcddb libkcompactdisc -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build .include Index: multimedia/2mandvd/Makefile =================================================================== --- multimedia/2mandvd/Makefile +++ multimedia/2mandvd/Makefile @@ -30,10 +30,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= desktop-file-utils gmake perl5 qmake:norecursive shebangfix +USES= desktop-file-utils gmake perl5 shebangfix qt:4,qmake_norecursiv SHEBANG_FILES= fake.pl -USE_QT4= corelib gui opengl \ - linguisttools_build moc_build rcc_build uic_build +USE_QT= corelib gui opengl \ + linguisttools_build moc_build qmake_build rcc_build uic_build USE_GL= glu USE_SDL= sdl USE_PERL5= run Index: multimedia/abby/Makefile =================================================================== --- multimedia/abby/Makefile +++ multimedia/abby/Makefile @@ -16,8 +16,8 @@ OPTIONS_DEFAULT= CCLIVE CCLIVE_DESC= Use cclive backend (instead of clive) -USES= qmake tar:bzip2 -USE_QT4= gui network xml moc_build rcc_build uic_build +USES= qt:4 tar:bzip2 +USE_QT= gui network xml moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/abby Index: multimedia/avidemux/Makefile.common =================================================================== --- multimedia/avidemux/Makefile.common +++ multimedia/avidemux/Makefile.common @@ -15,7 +15,7 @@ LICENSE= GPLv2 USE_GNOME= libxml2 -USE_QT4= # empty +USE_QT= # empty OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options @@ -100,7 +100,8 @@ .if ${PORT_OPTIONS:MQT4} CMAKE_ARGS+= -DLRELEASE_EXECUTABLE=${LOCALBASE}/bin/lrelease-qt4 -USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build gui +USES+= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build linguist_build gui PLIST_SUB+= QT4="" .else CMAKE_ARGS+= -DQT4:BOOL=OFF Index: multimedia/baka-mplayer/Makefile =================================================================== --- multimedia/baka-mplayer/Makefile +++ multimedia/baka-mplayer/Makefile @@ -16,15 +16,15 @@ GH_ACCOUNT= u8sand GH_PROJECT= Baka-MPlayer -USES= compiler:c++11-lib pkgconfig qmake -USE_QT5= qmake_build buildtools_build gui network svg widgets x11extras +USES= compiler:c++11-lib pkgconfig qt:5 +USE_QT= qmake_build buildtools_build gui network svg widgets x11extras QMAKE_SOURCE_PATH=${WRKSRC}/src QMAKE_ARGS= lupdate="${LUPDATE}" lrelease="${LRELEASE}" OPTIONS_DEFINE= DOCS NLS NOTO OPTIONS_SUB= yes -NLS_USE= QT5=linguisttools_build +NLS_USE= QT=linguisttools_build NLS_QMAKE_ON= CONFIG+="install_translations" NOTO_DESC= Original look with Noto Sans font NOTO_RUN_DEPENDS= noto>0:x11-fonts/noto Index: multimedia/bangarang/Makefile =================================================================== --- multimedia/bangarang/Makefile +++ multimedia/bangarang/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libtag.so:audio/taglib PROJECTHOST= bangarangissuetracking -USES= cmake:outsource gettext kde:4 -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USES= cmake:outsource gettext kde:4 qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build \ corelib gui phonon USE_KDE= automoc4 kdelibs Index: multimedia/bino/Makefile =================================================================== --- multimedia/bino/Makefile +++ multimedia/bino/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv3+ -USES= desktop-file-utils gmake pkgconfig tar:xz +USES= desktop-file-utils gmake pkgconfig qt:4 tar:xz USE_GL= glew GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_QT4= moc_build opengl rcc_build +USE_QT= moc_build opengl rcc_build # no port fow equalizer now, lirc detecting not working CONFIGURE_ARGS+= --without-equalizer --without-liblircclient --docdir=${DOCSDIR} Index: multimedia/clipgrab/Makefile =================================================================== --- multimedia/clipgrab/Makefile +++ multimedia/clipgrab/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv3 -USES= qmake tar:bzip2 -USE_QT4= gui xml uic_build moc_build \ +USES= qt:4 tar:bzip2 +USE_QT= gui xml uic_build moc_build qmake_build \ rcc_build network dbus webkit PLIST_FILES= bin/${PORTNAME} \ Index: multimedia/dragon/Makefile =================================================================== --- multimedia/dragon/Makefile +++ multimedia/dragon/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= phonon moc_build qmake_build rcc_build uic_build +USE_QT= phonon moc_build qmake_build rcc_build uic_build .include Index: multimedia/dvbcut/Makefile =================================================================== --- multimedia/dvbcut/Makefile +++ multimedia/dvbcut/Makefile @@ -24,7 +24,7 @@ GH_PROJECT= dvbcut-deb GH_TAGNAME= 040c1ef -USES= qmake:outsource pkgconfig desktop-file-utils shared-mime-info +USES= pkgconfig desktop-file-utils shared-mime-info CXXFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libavcodec \ @@ -39,8 +39,10 @@ OPTIONS_RADIO_QT= QT4 QT5 OPTIONS_DEFAULT= QT4 -QT4_USE= QT4=corelib,gui,xml,qt3support,linguisttools_build,moc_build,rcc_build,uic_build -QT5_USE= QT5=core,gui,widgets,xml,buildtools_build,linguisttools_build GL=gl +QT4_USES= qt:4,qmake_outsource +QT4_USE= QT=corelib,gui,xml,qt3support,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build +QT5_USES= qt:5,qmake_outsource +QT5_USE= QT=core,gui,widgets,xml,buildtools_build,linguisttools_build,qmake_build GL=gl post-build: @${SED} -e 's;@prefix@;${PREFIX};' \ Index: multimedia/gstreamer-qt4/Makefile =================================================================== --- multimedia/gstreamer-qt4/Makefile +++ multimedia/gstreamer-qt4/Makefile @@ -17,12 +17,12 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= bison cmake gmake kde:4 pathfix pkgconfig tar:bzip2 +USES= bison cmake gmake kde:4 pathfix pkgconfig qt:4 tar:bzip2 USE_LDCONFIG= yes USE_GSTREAMER= yes USE_GNOME= glib20 USE_KDE= automoc4 -USE_QT4= corelib gui opengl declarative \ +USE_QT= corelib gui opengl declarative \ qmake_build moc_build rcc_build uic_build qtestlib_build PLIST_SUB= VERSION="${PORTVERSION}" GST_VERSION="${GST_VERSION}" Index: multimedia/gstreamer1-qt4/Makefile =================================================================== --- multimedia/gstreamer1-qt4/Makefile +++ multimedia/gstreamer1-qt4/Makefile @@ -22,11 +22,13 @@ USE_GL= gl USE_GNOME= glib20 . if ${PKGNAMESUFFIX:M4} -USE_QT4= corelib gui opengl declarative script \ +USES+= qt:4 +USE_QT= corelib gui opengl declarative script \ qmake_build moc_build rcc_build uic_build qtestlib_build PLIST_SUB= QT4_ONLY="" QT5_ONLY="@comment " . else -USE_QT5= buildtools_build qmake_build core gui network opengl \ +USES+= qt:5 +USE_QT= buildtools_build qmake_build core gui network opengl \ qml quick testlib widgets QTVER_SUFFIX= 5 PLIST_SUB= QT4_ONLY="@comment " QT5_ONLY="" Index: multimedia/k9copy-kde4/Makefile =================================================================== --- multimedia/k9copy-kde4/Makefile +++ multimedia/k9copy-kde4/Makefile @@ -17,9 +17,9 @@ libmpeg2.so:multimedia/libmpeg2 \ libavcodec0.so:multimedia/ffmpeg0 -USES= cmake gettext kde:4 +USES= cmake gettext kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= MENCODER MPLAYER DVDAUTHOR MENCODER_DESC= MEncoder support Index: multimedia/kaffeine/Makefile =================================================================== --- multimedia/kaffeine/Makefile +++ multimedia/kaffeine/Makefile @@ -16,9 +16,9 @@ BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 -USES= cmake kde:4 cpe gettext pkgconfig +USES= cmake kde:4 cpe gettext pkgconfig qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= corelib dbus gui network phonon sql svg xml \ +USE_QT= corelib dbus gui network phonon sql svg xml \ moc_build qmake_build rcc_build uic_build USE_XORG= xscrnsaver Index: multimedia/kdemultimedia4-ffmpegthumbs/Makefile =================================================================== --- multimedia/kdemultimedia4-ffmpegthumbs/Makefile +++ multimedia/kdemultimedia4-ffmpegthumbs/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libswscale.so:multimedia/ffmpeg -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib dbus gui network svg xml .include Index: multimedia/kdemultimedia4-mplayerthumbs/Makefile =================================================================== --- multimedia/kdemultimedia4-mplayerthumbs/Makefile +++ multimedia/kdemultimedia4-mplayerthumbs/Makefile @@ -13,8 +13,8 @@ RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= phonon moc_build qmake_build rcc_build uic_build +USE_QT= phonon moc_build qmake_build rcc_build uic_build .include Index: multimedia/kdenlive/Makefile =================================================================== --- multimedia/kdenlive/Makefile +++ multimedia/kdenlive/Makefile @@ -15,9 +15,9 @@ libqjson.so:devel/qjson RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} -USES= cmake kde:4 pkgconfig shared-mime-info tar:bzip2 +USES= cmake kde:4 pkgconfig shared-mime-info qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs nepomuk-core -USE_QT4= corelib dbus gui opengl script svg xml \ +USE_QT= corelib dbus gui opengl script svg xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 CMAKE_ARGS= -DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFX}" Index: multimedia/kf5-kmediaplayer/Makefile =================================================================== --- multimedia/kf5-kmediaplayer/Makefile +++ multimedia/kf5-kmediaplayer/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 plugin interface for media player features -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons \ ecm i18n jobwidgets kio parts service sonnet textwidgets \ widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ testlib widgets xml .include Index: multimedia/kmplayer-kde4/Makefile =================================================================== --- multimedia/kmplayer-kde4/Makefile +++ multimedia/kmplayer-kde4/Makefile @@ -20,9 +20,9 @@ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake:outsource gettext-runtime kde:4 pkgconfig +USES= cmake:outsource gettext-runtime kde:4 pkgconfig qt:4 USE_GNOME= cairo gdkpixbuf2 gtk20 -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ moc_build qmake_build rcc_build uic_build USE_KDE= automoc4 kdelibs soprano USE_XORG= x11 Index: multimedia/kplayer-kde4/Makefile =================================================================== --- multimedia/kplayer-kde4/Makefile +++ multimedia/kplayer-kde4/Makefile @@ -12,8 +12,8 @@ RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake gettext kde:4 tar:bzip2 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USES= cmake gettext kde:4 qt:4 tar:bzip2 +USE_QT= corelib qmake_build moc_build rcc_build uic_build USE_KDE= kdelibs automoc4 LDFLAGS+= -L${LOCALBASE}/lib -lX11 -L${LOCALBASE}/kde4/lib -lsolid Index: multimedia/mediadownloader/Makefile =================================================================== --- multimedia/mediadownloader/Makefile +++ multimedia/mediadownloader/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv3 -USES= qmake +USES= qt:4 USE_GL= gl glu USE_XORG= xtst USE_GSTREAMER= ffmpeg -USE_QT4= dbus gui network moc_build opengl phonon phonon-gst \ +USE_QT= dbus gui network moc_build opengl phonon phonon-gst qmake_build \ rcc_build uic_build webkit xml xmlpatterns QMAKEPRO= ${PORTNAME}.pro PLIST_FILES= bin/${PORTNAME} Index: multimedia/minitube/Makefile =================================================================== --- multimedia/minitube/Makefile +++ multimedia/minitube/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= minitube -PORTVERSION= 2.5.2 +PORTVERSION= 2.4 CATEGORIES= multimedia www MAINTAINER= ports@FreeBSD.org @@ -13,17 +13,15 @@ USE_GITHUB= yes GH_ACCOUNT= flaviotordini -USES= qmake -USE_GL= gl -USE_QT5= core dbus gui network phonon4 script sql widgets \ - buildtools_build imageformats_run sql-sqlite3_run +USES= qt:4 +USE_QT= corelib dbus gui network phonon script sql xml \ + moc_build qmake_build rcc_build imageformats_run QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} \ DEFINES+=APP_GOOGLE_API_KEY="${MINITUBE_GOOGLE_API_KEY}" -INSTALLS_ICONS= yes OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USE= QT5=linguisttools_build +NLS_USE= QT=linguisttools_build pre-everything:: @${CAT} ${PKGMESSAGE} @@ -31,9 +29,7 @@ post-patch: # Remove BOM @${REINPLACE_CMD} -e '1 s|^.*/|/|g' \ - ${WRKSRC}/src/aggregatevideosource.cpp - @${REINPLACE_CMD} -e 's|/usr/include|/usr/local/include|g' \ - ${WRKSRC}/minitube.pro + ${WRKSRC}/src/aggregatevideosource.cpp post-patch-NLS-off: @${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${WRKSRC}/minitube.pro Index: multimedia/mkvtoolnix/Makefile =================================================================== --- multimedia/mkvtoolnix/Makefile +++ multimedia/mkvtoolnix/Makefile @@ -22,7 +22,7 @@ BROKEN_FreeBSD_9= does not build: g++48 internal compiler error BROKEN_sparc64= does not install -USES= compiler:c++11-lib iconv localbase pkgconfig tar:xz +USES= compiler:c++11-lib iconv localbase pkgconfig qt:5 tar:xz GNU_CONFIGURE= yes USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes @@ -46,7 +46,7 @@ QT5_DESC= Build and install GUI application (Qt 5) QT5_USES= desktop-file-utils shared-mime-info -QT5_USE= QT5=buildtools_build,core,gui,network,quick,widgets +QT5_USE= QT=buildtools_build,core,gui,network,quick,widgets QT5_CONFIGURE_ENABLE= qt .include Index: multimedia/mlt/Makefile =================================================================== --- multimedia/mlt/Makefile +++ multimedia/mlt/Makefile @@ -75,8 +75,10 @@ KDE4_USE= KDE=kdelibs KDE4_IMPLIES= QT4 -QT4_USE= QT4=corelib,gui,opengl,svg,xml -QT5_USE= QT5=core,gui,opengl,svg,xml +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,opengl,svg,xml +QT5_USES= qt:5 +QT5_USE= QT=core,gui,opengl,svg,xml SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE=resample Index: multimedia/mpc-qt/Makefile =================================================================== --- multimedia/mpc-qt/Makefile +++ multimedia/mpc-qt/Makefile @@ -18,8 +18,8 @@ GH_ACCOUNT= cmdrkotori GH_TAGNAME= 165c793 -USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake -USE_QT5= qmake_build buildtools_build core gui network widgets x11extras +USES= compiler:c++11-lib desktop-file-utils pkgconfig qt:5 +USE_QT= qmake_build buildtools_build core gui network widgets x11extras USE_GL= gl CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 Index: multimedia/mythtv-frontend/Makefile =================================================================== --- multimedia/mythtv-frontend/Makefile +++ multimedia/mythtv-frontend/Makefile @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 amd64 NOPRECIOUSMAKEVARS= # don't override $(ARCH) in ffmpeg makefiles -USES= gmake libtool pkgconfig -USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \ +USES= gmake libtool pkgconfig qt:4 +USE_QT= gui sql network script linguist_build l10n sql-mysql_run \ moc_build qmake_build rcc_build uic_build QT_NONSTANDARD= yes HAS_CONFIGURE= yes @@ -73,7 +73,7 @@ VDPAU_CONFIGURE_ENABLE= vdpau OPENGL_CONFIGURE_ENABLE= opengl-video -OPENGL_USE= QT4=opengl +OPENGL_USE= QT=opengl post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ Index: multimedia/mythtv/Makefile =================================================================== --- multimedia/mythtv/Makefile +++ multimedia/mythtv/Makefile @@ -32,10 +32,10 @@ ONLY_FOR_ARCHS= i386 amd64 USE_PERL5= run build NOPRECIOUSMAKEVARS= # don't override $(ARCH) in ffmpeg makefiles -USES= gmake libtool perl5 pkgconfig pathfix shebangfix +USES= gmake libtool perl5 pkgconfig pathfix qt:4 shebangfix SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \ programs/scripts/database/mythconverg_restore.pl -USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \ +USE_QT= gui sql network script linguist_build l10n sql-mysql_run \ moc_build qmake_build rcc_build uic_build imageformats QT_NONSTANDARD= yes HAS_CONFIGURE= yes @@ -75,7 +75,7 @@ VDPAU_CONFIGURE_ENABLE= vdpau OPENGL_CONFIGURE_ENABLE= opengl-video -OPENGL_USE= QT4=opengl +OPENGL_USE= QT=opengl .include Index: multimedia/obs-studio/Makefile =================================================================== --- multimedia/obs-studio/Makefile +++ multimedia/obs-studio/Makefile @@ -25,11 +25,11 @@ libfontconfig.so:x11-fonts/fontconfig \ libdbus-1.so:devel/dbus -USES= cmake:outsource compiler:c++11-lib pkgconfig +USES= cmake:outsource compiler:c++11-lib pkgconfig qt:5 USE_GITHUB= yes USE_GL= gl USE_LDCONFIG= yes -USE_QT5= gui core widgets x11extras buildtools_build qmake_build imageformats_run +USE_QT= gui core widgets x11extras buildtools_build qmake_build imageformats_run USE_XORG= sm ice xcb xcomposite xext xfixes xinerama xrandr x11 CMAKE_ARGS= -DUNIX_STRUCTURE:BOOL=ON \ Index: multimedia/phonon-designerplugin/Makefile =================================================================== --- multimedia/phonon-designerplugin/Makefile +++ multimedia/phonon-designerplugin/Makefile @@ -12,9 +12,9 @@ LICENSE= LGPL21 -USE_QT4= phonon designer \ +USE_QT= phonon designer \ qmake_build moc_build rcc_build uic_build -USES= cmake tar:xz +USES= cmake qt:4 tar:xz CMAKE_ARGS= -DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer BUILD_WRKSRC= ${WRKSRC}/designer Index: multimedia/phonon-gstreamer/Makefile =================================================================== --- multimedia/phonon-gstreamer/Makefile +++ multimedia/phonon-gstreamer/Makefile @@ -16,12 +16,12 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} -USES= cmake kde:4 pkgconfig tar:xz +USES= cmake kde:4 pkgconfig qt:4 tar:xz USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER1= yes USE_KDE= automoc4 -USE_QT4= corelib gui opengl phonon \ +USE_QT= corelib gui opengl phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 Index: multimedia/phonon-vlc/Makefile =================================================================== --- multimedia/phonon-vlc/Makefile +++ multimedia/phonon-vlc/Makefile @@ -15,9 +15,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} -USES= cmake kde:4 pkgconfig tar:xz +USES= cmake kde:4 pkgconfig qt:4 tar:xz USE_KDE= automoc4 -USE_QT4= corelib gui phonon \ +USE_QT= corelib gui phonon \ qmake_build moc_build rcc_build uic_build post-install: Index: multimedia/phonon-xine/Makefile =================================================================== --- multimedia/phonon-xine/Makefile +++ multimedia/phonon-xine/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libxine.so:multimedia/libxine -USES= cmake kde:4 pkgconfig tar:bzip2 +USES= cmake kde:4 pkgconfig qt:4 tar:bzip2 USE_KDE= automoc4 -USE_QT4= corelib dbus gui phonon \ +USE_QT= corelib dbus gui phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= xcb Index: multimedia/phonon/Makefile =================================================================== --- multimedia/phonon/Makefile +++ multimedia/phonon/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libqzeitgeist.so:sysutils/qzeitgeist -USES= cmake kde:4 pathfix tar:xz +USES= cmake kde:4 pathfix qt:4 tar:xz USE_KDE= automoc4 -USE_QT4= corelib dbus gui \ +USE_QT= corelib dbus gui \ qmake_build moc_build rcc_build uic_build CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \ -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \ Index: multimedia/py-openlp/Makefile =================================================================== --- multimedia/py-openlp/Makefile +++ multimedia/py-openlp/Makefile @@ -35,10 +35,10 @@ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ unoconv:textproc/unoconv -USES= desktop-file-utils python +USES= desktop-file-utils python qt:4 USE_PYTHON= distutils autoplist USE_GSTREAMER= good bad ugly -USE_QT4= linguist phonon-gst +USE_QT= linguist phonon-gst QT_LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 NO_ARCH= yes Index: multimedia/py-qt4-multimedia/Makefile =================================================================== --- multimedia/py-qt4-multimedia/Makefile +++ multimedia/py-qt4-multimedia/Makefile @@ -10,9 +10,9 @@ CONFIGURE_ARGS= --enable QtMultimedia PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui multimedia moc_build qmake_build +USE_QT= corelib gui multimedia moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: multimedia/py-qt4-phonon/Makefile =================================================================== --- multimedia/py-qt4-phonon/Makefile +++ multimedia/py-qt4-phonon/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable phonon PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui phonon moc_build qmake_build +USE_QT= corelib gui phonon moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: multimedia/py-qt5-multimedia/Makefile =================================================================== --- multimedia/py-qt5-multimedia/Makefile +++ multimedia/py-qt5-multimedia/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtMultimedia PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run network_run -USE_QT5= core gui multimedia network qmake_build +USE_QT= core gui multimedia network qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: multimedia/py-qt5-multimediawidgets/Makefile =================================================================== --- multimedia/py-qt5-multimediawidgets/Makefile +++ multimedia/py-qt5-multimediawidgets/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtMultimediaWidgets PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run multimedia_run widgets_run -USE_QT5= core gui multimedia network widgets qmake_build +USE_QT= core gui multimedia network widgets qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: multimedia/qmmp-plugin-pack-qt5/Makefile =================================================================== --- multimedia/qmmp-plugin-pack-qt5/Makefile +++ multimedia/qmmp-plugin-pack-qt5/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= libqmmpui.so:multimedia/qmmp-qt5 BUILD_DEPENDS= qmmp-qt5>=1.1.0:multimedia/qmmp-qt5 -USES= cmake:outsource pkgconfig tar:bzip2 -USE_QT5= core gui widgets \ +USES= cmake:outsource pkgconfig tar:bzip2 qt:5 +USE_QT= core gui widgets \ buildtools_build linguisttools_build qmake_build USE_LDCONFIG= yes Index: multimedia/qmmp-plugin-pack/Makefile =================================================================== --- multimedia/qmmp-plugin-pack/Makefile +++ multimedia/qmmp-plugin-pack/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libqmmpui.so:multimedia/qmmp BUILD_DEPENDS= qmmp>=0.10.0:multimedia/qmmp -USES= cmake:outsource localbase pkgconfig tar:bzip2 -USE_QT4= corelib gui linguisttools_build moc_build qmake_build rcc_build +USES= cmake:outsource localbase pkgconfig qt:4 tar:bzip2 +USE_QT= corelib gui linguisttools_build moc_build qmake_build rcc_build USE_LDCONFIG= yes OPTIONS_SUB= yes @@ -42,7 +42,7 @@ MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 \ libtag.so:audio/taglib -MPG123_USE= QT4=uic_build +MPG123_USE= QT=uic_build MPG123_CMAKE_ON= -DUSE_MPG123:BOOL=TRUE MPG123_CMAKE_OFF= -DUSE_MPG123:BOOL=FALSE Index: multimedia/qmmp-qt5/Makefile =================================================================== --- multimedia/qmmp-qt5/Makefile +++ multimedia/qmmp-qt5/Makefile @@ -16,8 +16,8 @@ CONFLICTS= ${PORTNAME}-0.* PORTSCOUT= limit:^1\..* -USES= cmake:outsource pathfix pkgconfig tar:bzip2 -USE_QT5= core gui network widgets xml \ +USES= cmake:outsource pathfix pkgconfig tar:bzip2 qt:5 +USE_QT= core gui network widgets xml \ buildtools_build linguisttools_build qmake_build USE_LDCONFIG= yes @@ -71,7 +71,7 @@ QSUI_CMAKE_BOOL= USE_QSUI SKINNEDUI_DESC= Skinned GUI -SKINNEDUI_USE= QT5=x11extras XORG=x11 +SKINNEDUI_USE= QT=x11extras XORG=x11 SKINNEDUI_CMAKE_BOOL= USE_SKINNED DIR_ASSOC_DESC= inode/directory mime type association @@ -94,7 +94,7 @@ PULSEAUDIO_CMAKE_BOOL= USE_PULSE QTMULTIMEDIA_DESC= Support to use Qt low-level multimedia API -QTMULTIMEDIA_USE= QT5=multimedia +QTMULTIMEDIA_USE= QT=multimedia QTMULTIMEDIA_CMAKE_BOOL= USE_QTMULTIMEDIA FLAC_LIB_DEPENDS= libFLAC.so:audio/flac \ @@ -210,7 +210,7 @@ COPYPASTE_CMAKE_BOOL= USE_COPYPASTE MPRIS_DESC= Support the Media Player Remote -MPRIS_USE= QT5=dbus +MPRIS_USE= QT=dbus MPRIS_CMAKE_BOOL= USE_MPRIS SCROBBLER_DESC= Support Libre.fm/Last.fm scrobbler feature @@ -232,15 +232,15 @@ LYRICS_DESC= Support to show lyrics using lyrics.wikia.com LYRICS_CMAKE_BOOL= USE_LYRICS -HAL_USE= QT5=dbus +HAL_USE= QT=dbus HAL_CMAKE_BOOL= USE_HAL HOTKEY_DESC= Support global shortcut keys -HOTKEY_USE= QT5=x11extras XORG=x11 +HOTKEY_USE= QT=x11extras XORG=x11 HOTKEY_CMAKE_BOOL= USE_HOTKEY GNOMEHOTKEY_DESC= Support GNOME/Cinnamon shortcut keys -GNOMEHOTKEY_USE= QT5=dbus +GNOMEHOTKEY_USE= QT=dbus GNOMEHOTKEY_CMAKE_BOOL= USE_GNOMEHOTKEY FILEOPS_DESC= Support file operation @@ -250,14 +250,14 @@ COVER_CMAKE_BOOL= USE_COVER KDENOTIFY_DESC= Support to popup notifier for KDE -KDENOTIFY_USE= QT5=dbus +KDENOTIFY_USE= QT=dbus KDENOTIFY_CMAKE_BOOL= USE_KDENOTIFY TRACKCHANGE_DESC= Enable to run external command each track TRACKCHANGE_CMAKE_BOOL= USE_TRACKCHANGE UDISKS2_DESC= Support removable disc detection using UDisks -UDISKS2_USE= QT5=dbus +UDISKS2_USE= QT=dbus UDISKS2_CMAKE_BOOL= USE_UDISKS2 QMMP_DIALOG_DESC= An original dialog Index: multimedia/qmmp/Makefile =================================================================== --- multimedia/qmmp/Makefile +++ multimedia/qmmp/Makefile @@ -15,8 +15,8 @@ CONFLICTS= ${PORTNAME}-qt5-1.* PORTSCOUT= limit:^0.* -USES= cmake:outsource localbase pathfix pkgconfig tar:bzip2 -USE_QT4= corelib gui network xml \ +USES= cmake:outsource localbase pathfix pkgconfig qt:4 tar:bzip2 +USE_QT= corelib gui network xml \ linguisttools_build moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes @@ -67,7 +67,7 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen QSUI_DESC= Simple UI based on standard widgets set -QSUI_USE= QT4=uic_build +QSUI_USE= QT=uic_build QSUI_CMAKE_BOOL= USE_QSUI SKINNEDUI_DESC= Skinned GUI @@ -94,7 +94,7 @@ PULSEAUDIO_CMAKE_BOOL= USE_PULSE QTMULTIMEDIA_DESC= Support to use Qt low-level multimedia API -QTMULTIMEDIA_USE= QT4=multimedia +QTMULTIMEDIA_USE= QT=multimedia QTMULTIMEDIA_CMAKE_BOOL= USE_QTMULTIMEDIA FLAC_LIB_DEPENDS= libFLAC.so:audio/flac \ @@ -137,7 +137,7 @@ PROJECTM_DESC= Support the projectM music visualiser PROJECTM_LIB_DEPENDS= libprojectM.so.2:graphics/libprojectm -PROJECTM_USE= GL=gl QT4=opengl +PROJECTM_USE= GL=gl QT=opengl PROJECTM_CMAKE_BOOL= USE_PROJECTM OSS_CMAKE_BOOL= USE_OSS @@ -210,7 +210,7 @@ COPYPASTE_CMAKE_BOOL= USE_COPYPASTE MPRIS_DESC= Support the Media Player Remote -MPRIS_USE= QT4=dbus +MPRIS_USE= QT=dbus MPRIS_CMAKE_BOOL= USE_MPRIS SCROBBLER_DESC= Support Libre.fm/Last.fm scrobbler feature @@ -232,7 +232,7 @@ LYRICS_DESC= Support to show lyrics using lyrics.wikia.com LYRICS_CMAKE_BOOL= USE_LYRICS -HAL_USE= QT4=dbus +HAL_USE= QT=dbus HAL_CMAKE_BOOL= USE_HAL HOTKEY_DESC= Support global shortcut keys @@ -240,7 +240,7 @@ HOTKEY_CMAKE_BOOL= USE_HOTKEY GNOMEHOTKEY_DESC= Support GNOME/Cinnamon shortcut keys -GNOMEHOTKEY_USE= QT4=dbus +GNOMEHOTKEY_USE= QT=dbus GNOMEHOTKEY_CMAKE_BOOL= USE_GNOMEHOTKEY FILEOPS_DESC= Support file operation @@ -250,7 +250,7 @@ COVER_CMAKE_BOOL= USE_COVER KDENOTIFY_DESC= Support to popup notifier for KDE -KDENOTIFY_USE= QT4=dbus +KDENOTIFY_USE= QT=dbus KDENOTIFY_CMAKE_BOOL= USE_KDENOTIFY TRACKCHANGE_DESC= Enable to run external command each track @@ -258,8 +258,8 @@ UDISKS_DESC= Support removable disc detection (obsolete) UDISKS2_DESC= Support removable disc detection using UDisks -UDISKS_USE= QT4=dbus -UDISKS2_USE= QT4=dbus +UDISKS_USE= QT=dbus +UDISKS2_USE= QT=dbus UDISKS_CMAKE_BOOL= USE_UDISKS UDISKS2_CMAKE_BOOL= USE_UDISKS2 Index: multimedia/qt4-mobility/Makefile =================================================================== --- multimedia/qt4-mobility/Makefile +++ multimedia/qt4-mobility/Makefile @@ -17,10 +17,11 @@ LIB_DEPENDS= libblkid.so:misc/e2fsprogs-libblkid -DATE= 20130703 -USES= pkgconfig qmake shebangfix tar:xz +DATE= 20130703 +USES= pkgconfig shebangfix qt:4 tar:xz SHEBANG_FILES= bin/pathhelper bin/syncheaders -USE_QT4=declarative corelib dbus gui linguist_build moc_build +USE_QT= declarative corelib dbus gui \ + linguist_build moc_build qmake_build USE_LDCONFIG= yes MOBILITY_MODS= @@ -31,31 +32,31 @@ BEARER_DESC= Bearer module CONNECTIVITY_DESC= Connectivity module -CONNECTIVITY_USE= qt4=rcc_build +CONNECTIVITY_USE= qt=rcc_build CONTACTS_DESC= Contacts module FEEDBACK_DESC= Feedback module GALLERY_DESC= Gallery module LOCATION_DESC= Location module -LOCATION_USE= qt4=rcc_build,sql +LOCATION_USE= qt=rcc_build,sql MESSAGING_DESC= Messaging module MULTIMEDIA_DESC= Multimedia module MULTIMEDIA_LIB_DEPENDS= libpulse.so:audio/pulseaudio MULTIMEDIA_BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat -MULTIMEDIA_USE= qt4=opengl gstreamer=bad +MULTIMEDIA_USE= qt=opengl gstreamer=bad ORGANIZER_DESC= Organizer module PUBLISHSUBSCRIBE_DESC= Publishsubscribe module SENSORS_DESC= (BROKEN) Sensors module SERVICEFRAMEWORK_DESC= (BROKEN) ServiceFramework module -SERVICEFRAMEWORK_USE= qt4=sql +SERVICEFRAMEWORK_USE= qt=sql SYSTEMINFO_DESC= (BROKEN) Systeminfo module -SYSTEMINFO_USE= qt4=network +SYSTEMINFO_USE= qt=network VERSIT_DESC= Versit module -VERSIT_USE= qt4=rcc_build +VERSIT_USE= qt=rcc_build OPTIONS_DEFAULT=BEARER CONNECTIVITY CONTACTS FEEDBACK GALLERY LOCATION \ MESSAGING MULTIMEDIA ORGANIZER PUBLISHSUBSCRIBE VERSIT Index: multimedia/qt4-multimedia/Makefile =================================================================== --- multimedia/qt4-multimedia/Makefile +++ multimedia/qt4-multimedia/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt low-level multimedia API -USE_QT4= qmake_build moc_build uic_build corelib gui +USES= qt:4 +USE_QT= qmake_build moc_build uic_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: multimedia/qt5-multimedia/Makefile =================================================================== --- multimedia/qt5-multimedia/Makefile +++ multimedia/qt5-multimedia/Makefile @@ -8,13 +8,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module +USES= pkgconfig qt:5 tar:xz USE_GL= yes -USE_QT5= core gui network opengl qml quick widgets \ +USE_QT= core gui network opengl qml quick widgets \ buildtools_build QT_DIST= ${PORTNAME} USE_XORG= x11 xext xv -USES= pkgconfig qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= XVIDEO QT_CONFIG= xlib Index: multimedia/qt5-phonon4-designerplugin/Makefile =================================================================== --- multimedia/qt5-phonon4-designerplugin/Makefile +++ multimedia/qt5-phonon4-designerplugin/Makefile @@ -14,9 +14,9 @@ LICENSE= LGPL21 -USES= cmake:outsource kde:5 tar:xz +USES= cmake:outsource kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build qmake_build designer phonon4 +USE_QT= buildtools_build qmake_build designer phonon4 CMAKE_ARGS= -DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer \ -DPHONON_BUILD_PHONON4QT5=ON Index: multimedia/qt5-phonon4-gstreamer/Makefile =================================================================== --- multimedia/qt5-phonon4-gstreamer/Makefile +++ multimedia/qt5-phonon4-gstreamer/Makefile @@ -17,12 +17,12 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} -USES= cmake:outsource kde:5 pkgconfig tar:xz +USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER1= yes USE_KDE= ecm -USE_QT5= buildtools_build qmake_build core gui opengl phonon4 widgets \ +USE_QT= buildtools_build qmake_build core gui opengl phonon4 widgets \ x11extras CMAKE_ARGS= -DPHONON_BUILD_PHONON4QT5=ON Index: multimedia/qt5-phonon4-vlc/Makefile =================================================================== --- multimedia/qt5-phonon4-vlc/Makefile +++ multimedia/qt5-phonon4-vlc/Makefile @@ -16,9 +16,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} -USES= cmake:outsource kde:5 pkgconfig tar:xz +USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= core gui widgets phonon4 \ +USE_QT= core gui widgets phonon4 \ buildtools_build qmake_build CMAKE_ARGS= -DPHONON_BUILD_PHONON4QT5=ON Index: multimedia/qt5-phonon4/Makefile =================================================================== --- multimedia/qt5-phonon4/Makefile +++ multimedia/qt5-phonon4/Makefile @@ -15,9 +15,9 @@ LICENSE= LGPL21 -USES= cmake:outsource kde:5 pathfix tar:xz +USES= cmake:outsource kde:5 pathfix qt:5 tar:xz USE_KDE= ecm -USE_QT5= core dbus gui opengl widgets \ +USE_QT= core dbus gui opengl widgets \ buildtools_build qmake_build CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \ -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \ Index: multimedia/smplayer-skins/Makefile =================================================================== --- multimedia/smplayer-skins/Makefile +++ multimedia/smplayer-skins/Makefile @@ -10,8 +10,8 @@ MAINTAINER= pawel@FreeBSD.org COMMENT= Skins for SMPlayer (Skinnable GUI) -USES= tar:bzip2 -USE_QT4= rcc_build +USES= qt:4 tar:bzip2 +USE_QT= rcc_build NO_ARCH= yes DATADIR= ${PREFIX}/share/smplayer Index: multimedia/smplayer-themes/Makefile =================================================================== --- multimedia/smplayer-themes/Makefile +++ multimedia/smplayer-themes/Makefile @@ -10,8 +10,8 @@ MAINTAINER= nemysis@FreeBSD.org COMMENT= Themes for SMPlayer -USES= tar:bzip2 -USE_QT4= rcc_build +USES= qt:4 tar:bzip2 +USE_QT= rcc_build NO_ARCH= yes DATADIR= ${PREFIX}/share/smplayer Index: multimedia/smplayer/Makefile =================================================================== --- multimedia/smplayer/Makefile +++ multimedia/smplayer/Makefile @@ -16,14 +16,14 @@ smplayer-skins>=0:multimedia/smplayer-skins \ smplayer-themes>=0:multimedia/smplayer-themes -USE_QT4= gui dbus network script xml moc_build rcc_build uic_build \ - uic3_build porting_build linguisttools_build +USE_QT= gui dbus network script xml moc_build qmake_build rcc_build \ + uic_build uic3_build porting_build linguisttools_build ALL_TARGET= src/smplayer CONFIGURE_WRKSRC= ${WRKSRC}/src MAKE_ARGS+= PREFIX=${PREFIX} DESTDIR=${STAGEDIR} -USES= cpe desktop-file-utils dos2unix gmake qmake tar:bzip2 +USES= cpe desktop-file-utils dos2unix gmake qt:4 tar:bzip2 CPE_VENDOR= ricardo_villalba DOS2UNIX_REGEX= .*.[^p][^n][^g]$ INSTALLS_ICONS= yes Index: multimedia/smtube/Makefile =================================================================== --- multimedia/smtube/Makefile +++ multimedia/smtube/Makefile @@ -11,9 +11,9 @@ RUN_DEPENDS= smplayer:multimedia/smplayer -USES= gmake tar:bzip2 +USES= gmake qt:4 tar:bzip2 ALL_TARGET= #empty -USE_QT4= linguisttools_build moc_build qmake_build \ +USE_QT= linguisttools_build moc_build qmake \ rcc_build script uic_build webkit MAKE_ARGS= DATA_PATH=${DATADIR} DOC_PATH=${DOCSDIR} \ LRELEASE=${LRELEASE} MAKE=${MAKE_CMD} Index: multimedia/subtitlecomposer-kde4/Makefile =================================================================== --- multimedia/subtitlecomposer-kde4/Makefile +++ multimedia/subtitlecomposer-kde4/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libicui18n.so:devel/icu -USES= cmake:outsource gettext kde:4 shared-mime-info +USES= cmake:outsource gettext kde:4 shared-mime-info qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build phonon +USE_QT= qmake_build moc_build rcc_build uic_build phonon USE_GITHUB= yes GH_ACCOUNT= maxrd2 Index: multimedia/umplayer/Makefile =================================================================== --- multimedia/umplayer/Makefile +++ multimedia/umplayer/Makefile @@ -15,9 +15,9 @@ RUN_DEPENDS= mplayer:multimedia/mplayer -USES= desktop-file-utils gmake qmake tar:xz -USE_QT4= gui network xml moc_build rcc_build uic_build \ - linguisttools_build +USES= desktop-file-utils gmake qt:4 tar:xz +USE_QT= gui network xml moc_build rcc_build uic_build \ + linguisttools_build qmake_build INSTALLS_ICONS= yes MAKE_ARGS+= PREFIX=${PREFIX} DESTDIR=${STAGEDIR} QMAKE_ARGS+= "DEFINES+=NO_DEBUG_ON_CONSOLE" Index: multimedia/vlc/Makefile =================================================================== --- multimedia/vlc/Makefile +++ multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# Created by: Brian Somers + # Created by: Brian Somers # $FreeBSD$ PORTNAME= vlc @@ -234,13 +234,15 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse -QT4_USE= QT4=gui,corelib,moc_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= QT=gui,corelib,moc_build,rcc_build,uic_build # QT_CFLAGS: pkg-config --cflags "QtCore QtGui >= 4.6.0" # QT_LIBS: pkg-config --libs "QtCore QtGui >= 4.6.0" QT4_CONFIGURE_ENV= QT_CFLAGS="-I${QT_INCDIR}/QtGui -DQT_SHARED -I${QT_INCDIR} -I${QT_INCDIR}/QtCore" \ QT_LIBS="-lQtGui -L${QT_LIBDIR} -lQtCore" -QT5_USE= QT5=gui,core,widgets,x11extras,buildtools_build +QT5_USES= qt:5 +QT5_USE= QT=gui,core,widgets,x11extras,buildtools_build REALRTSP_CONFIGURE_ENABLE= realrtsp Index: net-im/cutegram/Makefile =================================================================== --- net-im/cutegram/Makefile +++ net-im/cutegram/Makefile @@ -22,8 +22,8 @@ GH_TAGNAME= 91bf14b:tools GH_SUBDIR= Cutegram/asemantools:tools -USES= qmake:outsource desktop-file-utils -USE_QT5= qmake_build buildtools_build core qml quick sql xml multimedia \ +USES= desktop-file-utils qt:5,qmake_outsource +USE_QT= qmake_build buildtools_build core qml quick sql xml multimedia \ widgets dbus webkit quickcontrols graphicaleffects sql-sqlite3 USE_OPENSSL= yes QMAKE_ARGS= LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \ Index: net-im/diligent/Makefile =================================================================== --- net-im/diligent/Makefile +++ net-im/diligent/Makefile @@ -11,14 +11,12 @@ LICENSE= LGPL3 -LIB_DEPENDS= libQt5WebKitWidgets.so:www/webkit-qt5 - USE_LDCONFIG= yes -USE_QT5= core gui network svg linguist \ - buildtools x11extras widgets -USE_GL+= gl -USES= compiler:c++11-lang qmake tar:xz +USES= compiler:c++11-lang qt:5 tar:xz +USE_QT= core gui network svg linguist \ + buildtools qmake_build x11extras webkit widgets +USE_GL+= gl QMAKE_ARGS= CONFIG+="configure" USE_GITHUB= yes Index: net-im/ekiga/Makefile =================================================================== --- net-im/ekiga/Makefile +++ net-im/ekiga/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USES= cpe gettext gmake kde:4 libtool pathfix perl5 pkgconfig \ - tar:xz + qt:4 tar:xz USE_XORG= xv USE_GNOME= gtk20 intlhack libxml2 INSTALLS_ICONS= yes @@ -52,7 +52,7 @@ .if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB} USE_KDE= kdelibs -USE_QT4= corelib +USE_QT= corelib CONFIGURE_ARGS+=--enable-kde #CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE_PREFIX}/include -I${QT_INCDIR} \ # -I${LOCALBASE}/include" KDE_LIBS="-L${KDE_PREFIX}/lib" Index: net-im/hotot/Makefile =================================================================== --- net-im/hotot/Makefile +++ net-im/hotot/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= lyricat GH_PROJECT= Hotot -USES= cmake gettext kde:4 python +USES= cmake gettext kde:4 python qt:4 USE_GNOME= intltool INSTALLS_ICONS= yes @@ -38,7 +38,7 @@ .endif .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MKDE4} -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib gui sql webkit PLIST_SUB+= QT4="" .else Index: net-im/kmess-kde4/Makefile =================================================================== --- net-im/kmess-kde4/Makefile +++ net-im/kmess-kde4/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libqca.so:devel/qca \ libgif.so:graphics/giflib -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_GNOME= libxml2 libxslt USE_KDE= kdelibs libkonq automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: net-im/kopete-kde4/Makefile =================================================================== --- net-im/kopete-kde4/Makefile +++ net-im/kopete-kde4/Makefile @@ -18,12 +18,12 @@ libjasper.so:graphics/jasper BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -USES= cmake:outsource jpeg kde:4 pkgconfig shebangfix sqlite tar:xz \ - webplugin:native +USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 shebangfix sqlite \ + tar:xz webplugin:native USE_GNOME= libxml2 libxslt USE_KDE= kdelibs pimlibs \ automoc4 qimageblitz -USE_QT4= corelib gui network qt3support sql xml \ +USE_QT= corelib gui network qt3support sql xml \ moc_build qmake_build rcc_build uic_build uic3_build USE_XORG= x11 xdamage xext xscrnsaver xtst USE_LDCONFIG= yes Index: net-im/ktp-accounts-kcm/Makefile =================================================================== --- net-im/ktp-accounts-kcm/Makefile +++ net-im/ktp-accounts-kcm/Makefile @@ -13,9 +13,9 @@ libktpcommoninternalsprivate.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= HAZE IRC JABBER SALUT Index: net-im/ktp-approver/Makefile =================================================================== --- net-im/ktp-approver/Makefile +++ net-im/ktp-approver/Makefile @@ -12,8 +12,8 @@ libktpcommoninternalsprivate.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-auth-handler/Makefile =================================================================== --- net-im/ktp-auth-handler/Makefile +++ net-im/ktp-auth-handler/Makefile @@ -13,9 +13,9 @@ libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib dbus gui xml webkit \ +USE_QT= corelib dbus gui xml webkit \ moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-common-internals/Makefile =================================================================== --- net-im/ktp-common-internals/Makefile +++ net-im/ktp-common-internals/Makefile @@ -12,9 +12,9 @@ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 RUN_DEPENDS= ${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control -USES= cmake compiler:c++11-lang gettext kde:4 tar:bzip2 +USES= cmake compiler:c++11-lang gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs pimlibs automoc4 -USE_QT4= declarative script \ +USE_QT= declarative script \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: net-im/ktp-contact-list/Makefile =================================================================== --- net-im/ktp-contact-list/Makefile +++ net-im/ktp-contact-list/Makefile @@ -12,8 +12,8 @@ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-contact-runner/Makefile =================================================================== --- net-im/ktp-contact-runner/Makefile +++ net-im/ktp-contact-runner/Makefile @@ -11,8 +11,8 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-desktop-applets/Makefile =================================================================== --- net-im/ktp-desktop-applets/Makefile +++ net-im/ktp-desktop-applets/Makefile @@ -10,8 +10,8 @@ LIB_DEPENDS= libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-filetransfer-handler/Makefile =================================================================== --- net-im/ktp-filetransfer-handler/Makefile +++ net-im/ktp-filetransfer-handler/Makefile @@ -11,8 +11,8 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-kded-integration-module/Makefile =================================================================== --- net-im/ktp-kded-integration-module/Makefile +++ net-im/ktp-kded-integration-module/Makefile @@ -11,8 +11,8 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-send-file/Makefile =================================================================== --- net-im/ktp-send-file/Makefile +++ net-im/ktp-send-file/Makefile @@ -13,8 +13,8 @@ RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build .include Index: net-im/ktp-text-ui/Makefile =================================================================== --- net-im/ktp-text-ui/Makefile +++ net-im/ktp-text-ui/Makefile @@ -13,9 +13,9 @@ libktpcommoninternalsprivate.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USES= cmake compiler:c++11-lang gettext kde:4 tar:bzip2 +USES= cmake compiler:c++11-lang gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 -USE_QT4= corelib webkit xml \ +USE_QT= corelib webkit xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: net-im/libaccounts-qt5/Makefile =================================================================== --- net-im/libaccounts-qt5/Makefile +++ net-im/libaccounts-qt5/Makefile @@ -20,8 +20,8 @@ FETCH_BEFORE_ARGS= -o ${DISTFILES} -USES= compiler:c++11-lib qmake pathfix pkgconfig python tar:bz2 -USE_QT5= buildtools_build core qmake_build testlib xml +USES= compiler:c++11-lib pathfix pkgconfig python tar:bz2 qt:5 +USE_QT= buildtools_build core qmake_build testlib xml pre-configure: ${REINPLACE_CMD} -e 's,$$$${INSTALL_LIBDIR},${LOCALBASE}/libdata,' \ Index: net-im/libjreen/Makefile =================================================================== --- net-im/libjreen/Makefile +++ net-im/libjreen/Makefile @@ -20,9 +20,9 @@ USE_GITHUB= yes USE_LDCONFIG= yes -USE_QT4= moc_build qmake_build rcc_build network +USE_QT= moc_build qmake_build rcc_build network -USES= cmake pkgconfig:build +USES= cmake pkgconfig:build qt:4 pre-configure: ${REINPLACE_CMD} -e 's,lib.*/pkgconfig,libdata/pkgconfig,' \ Index: net-im/libqtelegram-ae/Makefile =================================================================== --- net-im/libqtelegram-ae/Makefile +++ net-im/libqtelegram-ae/Makefile @@ -17,8 +17,8 @@ GH_ACCOUNT= Aseman-Land GH_PROJECT= libqtelegram-aseman-edition -USES= qmake:outsource -USE_QT5= qmake_build buildtools_build core gui network multimedia +USES= qt:5,qmake_outsource +USE_QT= qmake_build buildtools_build core gui network multimedia USE_OPENSSL= yes USE_LDCONFIG= yes Index: net-im/licq-qt-gui/Makefile =================================================================== --- net-im/licq-qt-gui/Makefile +++ net-im/licq-qt-gui/Makefile @@ -16,8 +16,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/licq/protocol_icq.so:${LICQ_PORT}-icq USE_XORG= x11 xext ice xscrnsaver -USES= cmake -USE_QT4= qmake_build moc_build rcc_build uic_build linguisttools_build \ +USES= cmake qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build linguisttools_build \ corelib xml gui OPTIONS_DEFINE= HUNSPELL KDE4 Index: net-im/plasma-applet-ktp/Makefile =================================================================== --- net-im/plasma-applet-ktp/Makefile +++ net-im/plasma-applet-ktp/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= corelib declarative \ +USE_QT= corelib declarative \ moc_build qmake_build rcc_build uic_build .include Index: net-im/psi/Makefile =================================================================== --- net-im/psi/Makefile +++ net-im/psi/Makefile @@ -15,8 +15,8 @@ HAS_CONFIGURE= yes QT_NONSTANDARD= yes -USES= pkgconfig tar:bzip2 -USE_QT4= gui network xml imageformats_run \ +USES= pkgconfig qt:4 tar:bzip2 +USE_QT= gui network xml imageformats_run \ qmake_build moc_build rcc_build uic_build USE_XORG= xscrnsaver @@ -32,7 +32,7 @@ DEBUG_CONFIGURE_ON= --debug DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus DBUS_CONFIGURE_OFF= --disable-qdbus ASPELL_DESC= Use aspell for spell checking Index: net-im/psimedia/Makefile =================================================================== --- net-im/psimedia/Makefile +++ net-im/psimedia/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= liboil-0.3.so:devel/liboil \ libspeexdsp.so:audio/speexdsp -USES= pkgconfig tar:bzip2 +USES= pkgconfig qt:4 tar:bzip2 HAS_CONFIGURE= yes -USE_QT4= gui qmake_build moc_build uic_build +USE_QT= gui qmake_build moc_build uic_build USE_GSTREAMER= jpeg speex theora vorbis QT_NONSTANDARD= yes Index: net-im/qTox/Makefile =================================================================== --- net-im/qTox/Makefile +++ net-im/qTox/Makefile @@ -30,12 +30,12 @@ SUB_FILES= pkg-message -USES= compiler:c++11-lib desktop-file-utils gettext gmake openal:soft pkgconfig qmake +USES= compiler:c++11-lib desktop-file-utils gettext gmake openal:soft pkgconfig qt:5 USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 USE_XORG= x11 xscrnsaver USE_GL= gl -USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ - concurrent buildtools_build linguisttools_build +USE_QT= core gui network xml opengl sql sql-sqlite3_run widgets svg \ + concurrent buildtools_build linguisttools_build qmake_build ICON_SIZES= 14x14 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 QMAKE_ARGS= FREEBSD_PKGVERSION=${PKGVERSION} Index: net-im/qwit-devel/Makefile =================================================================== --- net-im/qwit-devel/Makefile +++ net-im/qwit-devel/Makefile @@ -14,8 +14,8 @@ BROKEN= Unfetchable (google code has gone away) -USES= qmake tar:bzip2 -USE_QT4= gui network xml moc_build rcc_build \ +USES= qt:4 tar:bzip2 +USE_QT= gui network xml moc_build qmake_build rcc_build \ uic_build post-patch: Index: net-im/qwit/Makefile =================================================================== --- net-im/qwit/Makefile +++ net-im/qwit/Makefile @@ -13,9 +13,9 @@ BROKEN= Unfetchable (google code has gone away) -USES= qmake tar:bzip2 -USE_QT4= gui network xml moc_build rcc_build \ - uic_build +USES= qt:4 tar:bzip2 +USE_QT= gui network xml moc_build qmake_build rcc_build uic_build + post-patch: ${REINPLACE_CMD} '/icon.path/s,share/icons,share/pixmaps,' \ ${WRKSRC}/qwit.pro Index: net-im/qxmpp/Makefile =================================================================== --- net-im/qxmpp/Makefile +++ net-im/qxmpp/Makefile @@ -14,13 +14,15 @@ CONFLICTS?= ${PORTNAME}-qt5-[0-9]* -USES= qmake pathfix pkgconfig libtool +USES= pathfix pkgconfig libtool .if defined(QXMPP_SLAVE) -USE_QT5= core gui network xml buildtools_build +USES+= qt:5 +USE_QT= core gui network xml buildtools_build qmake_build PLIST_SUB= QDNS="@comment " .else -USE_QT4= corelib gui network qtestlib xml uic_build moc_build \ - rcc_build +USES+= qt:4 +USE_QT= corelib gui network qtestlib xml uic_build moc_build \ + qmake_build rcc_build PLIST_SUB= QDNS="" .endif QMAKE_ARGS= QXMPP_NO_TESTS=1 Index: net-im/ramblercontacts/Makefile =================================================================== --- net-im/ramblercontacts/Makefile +++ net-im/ramblercontacts/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 -USES= qmake dos2unix +USES= dos2unix qt:4 DOS2UNIX_FILES= src/config.inc USE_XORG= xscrnsaver -USE_QT4= moc_build rcc_build uic_build designer_build \ +USE_QT= moc_build qmake_build rcc_build uic_build designer_build \ webkit USE_LDCONFIG= yes Index: net-im/ricochet/Makefile =================================================================== --- net-im/ricochet/Makefile +++ net-im/ricochet/Makefile @@ -21,9 +21,10 @@ USE_GITHUB= yes GH_ACCOUNT= ricochet-im -USES= compiler:c++11-lib gmake pkgconfig qmake ssl +USES= compiler:c++11-lib gmake pkgconfig ssl qt:5 USE_GL= gl -USE_QT5= core gui network qml quick widgets multimedia buildtools_build linguisttools_build +USE_QT= core gui network qml quick widgets multimedia \ + buildtools_build linguisttools_build qmake_build QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${LOCALBASE} PLIST_FILES= bin/ricochet \ Index: net-im/ring-daemon/Makefile =================================================================== --- net-im/ring-daemon/Makefile +++ net-im/ring-daemon/Makefile @@ -37,11 +37,11 @@ --enable-video \ --enable-ipv6 -USES= autoreconf compiler:c++14-lang gmake libtool pkgconfig +USES= autoreconf compiler:c++14-lang gmake libtool pkgconfig qt:5 USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 USE_XORG= x11 xscrnsaver USE_GL= gl -USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ +USE_QT= core gui network xml opengl sql sql-sqlite3_run widgets svg \ concurrent buildtools_build linguisttools_build GNU_CONFIGURE= yes MYFLAGS= -I${WRKSRC}/contrib/native/pjproject/pjlib/include -I${LOCALBASE}/include -DPJ_LINUX -I${LOCALBASE}/include/jsoncpp Index: net-im/ring-gnome/Makefile =================================================================== --- net-im/ring-gnome/Makefile +++ net-im/ring-gnome/Makefile @@ -33,11 +33,11 @@ SUB_FILES= pkg-message -USES= cmake compiler:c++14-lang gettext gmake pkgconfig shebangfix sqlite +USES= cmake compiler:c++14-lang gettext gmake pkgconfig shebangfix sqlite qt:5 USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 libxml2 gtk30 USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xscrnsaver USE_GL= gl egl -USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ +USE_QT= core gui network xml opengl sql sql-sqlite3_run widgets svg \ concurrent buildtools_build linguisttools_build qmake_build SHEBANG_FILES= ${WRKSRC}/src/ring.cx INSTALLS_ICONS= yes Index: net-im/ring-libclient/Makefile =================================================================== --- net-im/ring-libclient/Makefile +++ net-im/ring-libclient/Makefile @@ -19,11 +19,11 @@ #GH_TUPLE+= savoirfairelinux:ring-lrc:9eaac77 GH_TUPLE+= savoirfairelinux:ring-lrc:cb5ee04 -USES= cmake compiler:c++14-lang gmake +USES= cmake compiler:c++14-lang gmake qt:5 USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 USE_XORG= x11 xscrnsaver USE_GL= gl -USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ +USE_QT= core gui network xml opengl sql sql-sqlite3_run widgets svg \ concurrent buildtools_build linguisttools_build qmake_build USE_LDCONFIG= yes CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release Index: net-im/teamwords/Makefile =================================================================== --- net-im/teamwords/Makefile +++ net-im/teamwords/Makefile @@ -12,9 +12,9 @@ LICENSE= LGPL3 USE_LDCONFIG= yes -USE_QT5= core gui network svg linguist \ - buildtools x11extras -USES= compiler:c++11-lang qmake tar:xz +USE_QT= core gui network svg linguist x11extras \ + buildtools_build qmake_build +USES= compiler:c++11-lang qt:5 tar:xz QMAKE_ARGS= CONFIG+="configure" Index: net-im/telegramqml/Makefile =================================================================== --- net-im/telegramqml/Makefile +++ net-im/telegramqml/Makefile @@ -18,8 +18,8 @@ GH_ACCOUNT= Aseman-Land GH_PROJECT= TelegramQML -USES= qmake:outsource -USE_QT5= qmake_build buildtools_build core qml quick sql xml multimedia +USES= qt:5,qmake_outsource +USE_QT= qmake_build buildtools_build core qml quick sql xml multimedia USE_OPENSSL= yes USE_LDCONFIG= yes QMAKE_ARGS= BUILD_MODE+=lib \ Index: net-im/telepathy-logger-qt4/Makefile =================================================================== --- net-im/telepathy-logger-qt4/Makefile +++ net-im/telepathy-logger-qt4/Makefile @@ -17,11 +17,11 @@ libtelepathy-logger.so:net-im/telepathy-logger \ libtelepathy-qt4.so:net-im/telepathy-qt4 -USES= bison:build cmake kde:4 pkgconfig python:build tar:bzip2 +USES= bison:build cmake kde:4 pkgconfig python:build qt:4 tar:bzip2 USE_GNOME= glib20 libxml2 USE_GSTREAMER= qt4 USE_KDE= # empty -USE_QT4= corelib dbus moc_build qmake_build rcc_build uic_build +USE_QT= corelib dbus moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR:BOOL=True USE_LDCONFIG= yes Index: net-im/telepathy-qt4/Makefile =================================================================== --- net-im/telepathy-qt4/Makefile +++ net-im/telepathy-qt4/Makefile @@ -30,11 +30,13 @@ -DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \ -DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE} . if ${PKGNAMESUFFIX:M4} -USE_QT4= corelib dbus gui network qtestlib_build xml \ +USES+= qt:4 +USE_QT= corelib dbus gui network qtestlib_build xml \ moc_build qmake_build rcc_build uic_build SHLIB_SUFFIX= 2 . else -USE_QT5= core dbus gui network xml \ +USES+= qt:5 +USE_QT= core dbus gui network xml \ buildtools_build qmake_build testlib_build widgets_build SHLIB_SUFFIX= 0 . endif Index: net-im/vacuum-im/Makefile =================================================================== --- net-im/vacuum-im/Makefile +++ net-im/vacuum-im/Makefile @@ -15,10 +15,10 @@ GH_ACCOUNT= Vacuum-IM GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} -USES= cmake +USES= cmake qt:4 USE_XORG= xscrnsaver USE_LDCONFIG= yes -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ +USE_QT= gui xml qmake_build uic_build moc_build rcc_build \ network linguist_build webkit PORTDOCS= AUTHORS CHANGELOG COPYING README TRANSLATORS Index: net-mgmt/nagiosagent/Makefile =================================================================== --- net-mgmt/nagiosagent/Makefile +++ net-mgmt/nagiosagent/Makefile @@ -15,8 +15,8 @@ PLIST_FILES= bin/NagiosAgent \ share/pixmaps/NagiosAgent.png -USES= qmake zip -USE_QT4= gui network corelib uic_build rcc_build moc_build +USES= zip qt:4 +USE_QT= gui network corelib uic_build moc_build qmake_build rcc_build DESKTOP_ENTRIES= "NagiosAgent" "GUI client for Nagios" \ "${PREFIX}/share/pixmaps/NagiosAgent.png" \ Index: net-mgmt/qkismet/Makefile =================================================================== --- net-mgmt/qkismet/Makefile +++ net-mgmt/qkismet/Makefile @@ -12,8 +12,8 @@ RUN_DEPENDS= kismet:net-mgmt/kismet -USES= qmake tar:bzip2 -USE_QT4= gui xml uic_build moc_build rcc_build network +USES= qt:4 tar:bzip2 +USE_QT= gui xml uic_build moc_build qmake_build rcc_build network WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src Index: net-mgmt/seafile-gui/Makefile =================================================================== --- net-mgmt/seafile-gui/Makefile +++ net-mgmt/seafile-gui/Makefile @@ -24,11 +24,11 @@ GH_ACCOUNT= haiwen GH_PROJECT= seafile-client -USES= compiler:c++11-lang cmake gettext pkgconfig shebangfix +USES= compiler:c++11-lang cmake gettext pkgconfig shebangfix qt:5 SHEBANG_FILES= extensions/*.sh scripts/*.sh fsplugin/*.sh \ scripts/*.py USE_OPENSSL= yes -USE_QT5= core dbus gui network testlib widgets \ +USE_QT= core dbus gui network testlib widgets \ qmake_build buildtools_build linguisttools_build INSTALLS_ICONS= yes CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \ Index: net-mgmt/vidalia/Makefile =================================================================== --- net-mgmt/vidalia/Makefile +++ net-mgmt/vidalia/Makefile @@ -9,8 +9,8 @@ MAINTAINER= fk@fabiankeil.de COMMENT= Graphical Tor controller based on Qt 4.x -USES= cmake +USES= cmake qt:4 INSTALLS_ICONS= yes -USE_QT4= gui moc_build qmake_build rcc_build uic_build network xml linguist_build +USE_QT= gui moc_build qmake_build rcc_build uic_build network xml linguist_build .include Index: net-p2p/amule-devel/Makefile =================================================================== --- net-p2p/amule-devel/Makefile +++ net-p2p/amule-devel/Makefile @@ -19,7 +19,7 @@ CONFLICTS= amule-[0-9]* -USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ +USES= bison desktop-file-utils gmake perl5 pkgconfig qt:4 shebangfix \ tar:bzip2 USE_PERL5= build USE_WX= 2.8 @@ -91,7 +91,7 @@ PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 -PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build +PLASMAMULE_USE= KDE=kdelibs QT=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ Index: net-p2p/amule/Makefile =================================================================== --- net-p2p/amule/Makefile +++ net-p2p/amule/Makefile @@ -18,7 +18,7 @@ CONFLICTS= amule-devel-[0-9]* -USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ +USES= bison desktop-file-utils gmake perl5 pkgconfig qt:4 shebangfix \ tar:xz USE_PERL5= build USE_WX= 2.8 @@ -89,7 +89,7 @@ PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 -PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build +PLASMAMULE_USE= KDE=kdelibs QT=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ Index: net-p2p/bitcoin/Makefile =================================================================== --- net-p2p/bitcoin/Makefile +++ net-p2p/bitcoin/Makefile @@ -23,14 +23,14 @@ SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" -USES+= desktop-file-utils -USE_QT4= corelib gui moc_build linguisttools_build network qmake_build \ +USES+= desktop-file-utils qt:4 +USE_QT= corelib gui moc_build linguisttools_build network qmake_build \ rcc_build uic_build BUILD_DEPENDS+= protoc:devel/protobuf LIB_DEPENDS+= libprotobuf.so:devel/protobuf -TESTS_USE= QT4=testlib +TESTS_USE= QT=testlib TESTS_PLIST_FILES= bin/test_bitcoin-qt \ bin/test_bitcoin .endif @@ -46,7 +46,7 @@ ZMQ_DESC= Block and transaction broadcasting with ZeroMQ DBUS_CONFIGURE_WITH= qtdbus -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus DEBUG_CONFIGURE_ENABLE= debug DEBUG_INSTALL_TARGET_OFF= install-strip Index: net-p2p/bitmessage/Makefile =================================================================== --- net-p2p/bitmessage/Makefile +++ net-p2p/bitmessage/Makefile @@ -21,7 +21,7 @@ GH_ACCOUNT= Bitmessage GH_PROJECT= PyBitmessage -USES= python pyqt:4 ssl +USES= python pyqt:4 ssl qt:4 NATIVE_POW_USES=gmake INSTALLS_ICONS= yes Index: net-p2p/digitalcoin/Makefile =================================================================== --- net-p2p/digitalcoin/Makefile +++ net-p2p/digitalcoin/Makefile @@ -21,8 +21,8 @@ GH_ACCOUNT= baritus GH_TAGNAME= 96b098a -USES= bdb:48 desktop-file-utils gmake ssl -USE_QT4= corelib gui qmake_build linguisttools_build uic_build \ +USES= bdb:48 desktop-file-utils gmake ssl qt:4 +USE_QT= corelib gui qmake_build linguisttools_build uic_build \ moc_build rcc_build PLIST_FILES= bin/${BINARY} share/applications/digitalcoin-qt.desktop \ Index: net-p2p/dogecoin/Makefile =================================================================== --- net-p2p/dogecoin/Makefile +++ net-p2p/dogecoin/Makefile @@ -25,7 +25,7 @@ USE_GITHUB= yes -USES= bdb:5 gmake compiler:c++11-lib pkgconfig autoreconf ssl +USES= bdb:5 gmake compiler:c++11-lib pkgconfig autoreconf ssl qt:4 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-incompatible-bdb \ SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \ @@ -45,7 +45,7 @@ GUI_CONFIGURE_ENABLE= gui .if ${PORT_OPTIONS:MGUI} -USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build dbus +USE_QT= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build dbus PLIST_FILES+= share/applications/dogecoin-qt.desktop \ share/pixmaps/dogecoin64.png \ bin/dogecoin-qt Index: net-p2p/eiskaltdcpp-qt/Makefile =================================================================== --- net-p2p/eiskaltdcpp-qt/Makefile +++ net-p2p/eiskaltdcpp-qt/Makefile @@ -16,9 +16,9 @@ MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib -USES= cmake gettext compiler:c++11-lib desktop-file-utils +USES= cmake gettext compiler:c++11-lib desktop-file-utils qt:4 USE_OPENSSL= yes -USE_QT4= gui xml network qmake_build uic_build \ +USE_QT= gui xml network qmake_build uic_build \ moc_build rcc_build linguisttools_build OPTIONS_DEFINE= ASPELL FREE_SPACE DBUS_NOTIFY QTSCRIPT QML SQLITE @@ -42,17 +42,17 @@ FREE_SPACE_CMAKE_BOOL= FREE_SPACE_BAR_C -DBUS_NOTIFY_USE= QT4=dbus +DBUS_NOTIFY_USE= QT=dbus DBUS_NOTIFY_CMAKE_BOOL= DBUS_NOTIFY -QTSCRIPT_USE= QT4=script +QTSCRIPT_USE= QT=script QTSCRIPT_RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:devel/qtscriptgenerator QTSCRIPT_CMAKE_BOOL= USE_JS -QML_USE= QT4=declarative +QML_USE= QT=declarative QML_CMAKE_BOOL= USE_QT_QML -SQLITE_USE= QT4=sql-sqlite3 +SQLITE_USE= QT=sql-sqlite3 SQLITE_CMAKE_BOOL= USE_QT_SQLITE .include "${MASTERDIR}/Makefile" Index: net-p2p/ktorrent/Makefile =================================================================== --- net-p2p/ktorrent/Makefile +++ net-p2p/ktorrent/Makefile @@ -15,9 +15,9 @@ libgmp.so:math/gmp \ libktorrent.so:net-p2p/libktorrent -USES= cmake:outsource gettext kde:4 tar:bzip2 +USES= cmake:outsource gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 pimlibs workspace -USE_QT4= corelib gui network qt3support qtestlib webkit \ +USE_QT= corelib gui network qt3support qtestlib webkit \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Index: net-p2p/libktorrent/Makefile =================================================================== --- net-p2p/libktorrent/Makefile +++ net-p2p/libktorrent/Makefile @@ -14,9 +14,9 @@ libgmp.so:math/gmp \ libqca.so:devel/qca -USES= cmake:outsource gettext kde:4 tar:bzip2 +USES= cmake:outsource gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= qtestlib_build qmake_build moc_build rcc_build uic_build +USE_QT= qtestlib_build qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes SHLIB_VER= 5.0.1 Index: net-p2p/litecoin/Makefile =================================================================== --- net-p2p/litecoin/Makefile +++ net-p2p/litecoin/Makefile @@ -24,8 +24,8 @@ SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" -USES+= cpe desktop-file-utils -USE_QT4= corelib gui moc_build linguisttools_build network qmake_build \ +USES+= cpe desktop-file-utils qt:4 +USE_QT= corelib gui moc_build linguisttools_build network qmake_build \ rcc_build uic_build CPE_VENDOR= bitcoin CPE_PRODUCT= bitcoin-qt @@ -34,9 +34,9 @@ BUILD_DEPENDS+= protoc:devel/protobuf LIB_DEPENDS+= libprotobuf.so:devel/protobuf -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus -TESTS_USE= QT4=testlib +TESTS_USE= QT=testlib TESTS_PLIST_FILES= bin/test_litecoin-qt .endif Index: net-p2p/namecoin/Makefile =================================================================== --- net-p2p/namecoin/Makefile +++ net-p2p/namecoin/Makefile @@ -23,7 +23,7 @@ USE_GITHUB= yes -USES= bdb:48 gmake compiler:c++11-lib ssl +USES= bdb:48 gmake compiler:c++11-lib ssl qt:4 MAKE_JOBS_UNSAFE=yes CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} @@ -33,7 +33,7 @@ .include .if ${PORT_OPTIONS:MX11} -USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build +USE_QT= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build BINARY= namecoin-qt LIB_DEPENDS+= libprotobuf.so:devel/protobuf @@ -51,7 +51,7 @@ .endif .if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus +USE_QT+= dbus QMAKE_USE_DBUS= 1 .else QMAKE_USE_DBUS= 0 Index: net-p2p/qbittorrent/Makefile =================================================================== --- net-p2p/qbittorrent/Makefile +++ net-p2p/qbittorrent/Makefile @@ -16,8 +16,8 @@ libboost_system.so:devel/boost-libs USES= compiler:c++11-lib execinfo pkgconfig tar:xz -QT4_USE= QT4=corelib,network,xml,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build -QT5_USE= QT5=core,network,xml,qmake_build,buildtools_build,linguisttools_build +QT4_USE= QT=corelib,network,xml,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build +QT5_USE= QT=core,network,xml,qmake_build,buildtools_build,linguisttools_build QT_NONSTANDARD= yes DESTDIRNAME= INSTALL_ROOT GNU_CONFIGURE= yes @@ -43,8 +43,10 @@ .if ${WITH_GUI} == "yes" LIB_DEPENDS+= libGeoIP.so:net/GeoIP USES+= desktop-file-utils -QT4_USE+= QT4=gui -QT5_USE+= QT5=concurrent,gui,widgets GL=gl +QT4_USES= qt:4 +QT4_USE+= QT=gui +QT5_USES= qt:5 +QT5_USE+= QT=concurrent,gui,widgets GL=gl OPTIONS_DEFAULT+= DBUS .else CONFIGURE_ARGS+= --disable-gui Index: net-p2p/retroshare/Makefile =================================================================== --- net-p2p/retroshare/Makefile +++ net-p2p/retroshare/Makefile @@ -24,10 +24,10 @@ libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd -USES= compiler:features desktop-file-utils dos2unix execinfo pkgconfig qmake ssl +USES= compiler:features desktop-file-utils dos2unix execinfo pkgconfig ssl qt:5 USE_GNOME= glib20 libxml2 libxslt USE_GL= gl -USE_QT5= buildtools_build uitools_build core gui network xml \ +USE_QT= buildtools_build qmake_build uitools_build core gui network xml \ widgets multimedia printsupport INSTALLS_ICONS= yes Index: net-p2p/transmission-qt4/Makefile =================================================================== --- net-p2p/transmission-qt4/Makefile +++ net-p2p/transmission-qt4/Makefile @@ -15,8 +15,10 @@ SLAVEPORT= qt4 QT_NONSTANDARD= yes -USE_QT4= moc_build qmake_build rcc_build uic_build gui dbus network -USES= compiler:c++11-lib desktop-file-utils + +USES= compiler:c++11-lib desktop-file-utils qt:4 +USE_QT= gui dbus network \ + moc_build qmake_build rcc_build uic_build EXTRA_CONF_ARGS=--disable-cli \ --disable-daemon \ Index: net-p2p/transmission-remote-gui/Makefile =================================================================== --- net-p2p/transmission-remote-gui/Makefile +++ net-p2p/transmission-remote-gui/Makefile @@ -17,7 +17,7 @@ USE_FPC= cairo fcl-base fcl-image fcl-net pasjpeg rtl-objpas rtl-extra \ x11 -USES= iconv zip +USES= iconv zip qt:4 USE_GNOME= # WRKSRC= ${WRKDIR}/TransGUI Index: net-p2p/valknut/Makefile =================================================================== --- net-p2p/valknut/Makefile +++ net-p2p/valknut/Makefile @@ -17,9 +17,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME} -USE_QT4= corelib gui network qt3support \ +USE_QT= corelib gui network qt3support \ moc_build uic_build rcc_build linguisttools_build -USES= gmake perl5 pkgconfig tar:bzip2 +USES= gmake perl5 pkgconfig qt:4 tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes INSTALLS_ICONS= yes Index: net-p2p/zetacoin/Makefile =================================================================== --- net-p2p/zetacoin/Makefile +++ net-p2p/zetacoin/Makefile @@ -43,9 +43,9 @@ X11_CONFIGURE_OFF= --with-daemon X11_BUILD_DEPENDS= protoc:devel/protobuf X11_LIB_DEPENDS= libprotobuf.so:devel/protobuf -X11_USE= qt4=corelib,network,gui,qmake_build,linguisttools_build \ - qt4=uic_build,moc_build,rcc_build,qtestlib_build -X11_USES= desktop-file-utils +X11_USE= qt=corelib,network,gui,qmake_build,linguisttools_build \ + qt=uic_build,moc_build,rcc_build,qtestlib_build +X11_USES= desktop-file-utils qt:4 WALLET_CONFIGURE_ENABLE=wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} Index: net/avahi-qt4/Makefile =================================================================== --- net/avahi-qt4/Makefile +++ net/avahi-qt4/Makefile @@ -17,7 +17,8 @@ PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= qt4 -USE_QT4= corelib moc_build +USES= qt:4 +USE_QT= corelib moc_build AVAHI_PKGCONFIG= avahi-qt4.pc .include "${MASTERDIR}/Makefile" Index: net/avahi/Makefile =================================================================== --- net/avahi/Makefile +++ net/avahi/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= avahi-app>=0.6.31:net/avahi-app -USES= metaport +USES= metaport qt:4 OPTIONS_DEFINE= AUTOIPD GTK MONO QT4 PYTHON OPTIONS_DEFAULT=AUTOIPD GTK Index: net/cagibi/Makefile =================================================================== --- net/cagibi/Makefile +++ net/cagibi/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE SSDP/uPNP proxy -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 -USE_QT4= corelib network xml dbus \ +USE_QT= corelib network xml dbus \ qmake_build moc_build rcc_build uic_build .include Index: net/hupnp/Makefile =================================================================== --- net/hupnp/Makefile +++ net/hupnp/Makefile @@ -14,9 +14,9 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/hupnp/LICENSE_LGPLv3.txt -USES= gmake qmake zip -USE_QT4= corelib network xml dbus gui \ - moc_build rcc_build uic_build +USES= gmake zip qt:4 +USE_QT= corelib network xml dbus gui \ + moc_build qmake_build rcc_build uic_build QMAKE_ARGS= "CONFIG+=DISABLE_AVTESTAPP DISABLE_TESTAPP" Index: net/kdenetwork4-filesharing/Makefile =================================================================== --- net/kdenetwork4-filesharing/Makefile +++ net/kdenetwork4-filesharing/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Filesharing via Samba -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: net/kdenetwork4-strigi-analyzers/Makefile =================================================================== --- net/kdenetwork4-strigi-analyzers/Makefile +++ net/kdenetwork4-strigi-analyzers/Makefile @@ -10,8 +10,8 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs strigi automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: net/kf5-kxmlrpcclient/Makefile =================================================================== --- net/kf5-kxmlrpcclient/Makefile +++ net/kf5-kxmlrpcclient/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 interaction with XMLRPC services -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= config coreaddons ecm doctools i18n kio service -USE_QT5= buildtools_build core gui qmake_build xml +USE_QT= buildtools_build core gui qmake_build xml .include Index: net/kget/Makefile =================================================================== --- net/kget/Makefile +++ net/kget/Makefile @@ -14,12 +14,12 @@ libqca.so:devel/qca \ libboost_thread.so:devel/boost-libs -USES= cmake:outsource kde:4 shebangfix sqlite tar:xz +USES= cmake:outsource kde:4 shebangfix sqlite qt:4 tar:xz USE_KDE= kdelibs workspace libkonq \ nepomuk-core nepomuk-widgets automoc4 ontologies \ soprano SHEBANG_FILES= conf/*.pl -USE_QT4= gui sql moc_build qmake_build rcc_build uic_build +USE_QT= gui sql moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null CONFIGURE_ENV= XDG_CONFIG_HOME=/dev/null Index: net/kio-upnp-ms/Makefile =================================================================== --- net/kio-upnp-ms/Makefile +++ net/kio-upnp-ms/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libHUpnp.so:net/hupnp -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= corelib network xml dbus gui \ +USE_QT= corelib network xml dbus gui \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${DISTNAME:C/.[^.]*$//} Index: net/knemo-kde4/Makefile =================================================================== --- net/knemo-kde4/Makefile +++ net/knemo-kde4/Makefile @@ -9,9 +9,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE network monitor -USES= cmake gettext kde:4 shebangfix tar:xz +USES= cmake gettext kde:4 shebangfix qt:4 tar:xz SHEBANG_FILES= src/kconf_update/*.pl -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build USE_KDE= kdelibs workspace automoc4 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: net/krdc/Makefile =================================================================== --- net/krdc/Makefile +++ net/krdc/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libvncserver.so:net/libvncserver \ libtelepathy-qt4.so:net-im/telepathy-qt4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= FREERDP Index: net/krfb/Makefile =================================================================== --- net/krfb/Makefile +++ net/krfb/Makefile @@ -9,9 +9,9 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 -USES= alias cmake:outsource jpeg kde:4 tar:xz +USES= alias cmake:outsource jpeg kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui network \ +USE_QT= corelib gui network \ moc_build qmake_build rcc_build uic_build .include Index: net/kwooty/Makefile =================================================================== --- net/kwooty/Makefile +++ net/kwooty/Makefile @@ -14,9 +14,9 @@ ${LOCALBASE}/bin/par2:archivers/par2cmdline \ ${LOCALBASE}/bin/7z:archivers/p7zip -USES= cmake gettext kde:4 +USES= cmake gettext kde:4 qt:4 USE_KDE= kdelibs automoc4 workspace -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes post-patch: Index: net/libkfbapi/Makefile =================================================================== --- net/libkfbapi/Makefile +++ net/libkfbapi/Makefile @@ -14,10 +14,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource gettext kde:4 tar:bzip2 +USES= cmake:outsource gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes -USE_QT4= gui webkit \ +USE_QT= gui webkit \ qmake_build moc_build rcc_build uic_build pre-configure: Index: net/libkvkontakte/Makefile =================================================================== --- net/libkvkontakte/Makefile +++ net/libkvkontakte/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource gettext kde:4 pkgconfig tar:xz -USE_QT4= moc_build qmake_build rcc_build uic_build +USES= cmake:outsource gettext kde:4 pkgconfig qt:4 tar:xz +USE_QT= moc_build qmake_build rcc_build uic_build USE_KDE= automoc4 kdelibs USE_LDCONFIG= yes Index: net/libmaia/Makefile =================================================================== --- net/libmaia/Makefile +++ net/libmaia/Makefile @@ -12,8 +12,8 @@ GH_ACCOUNT= wiedi GH_TAGNAME= e930451 -USES= gmake qmake -USE_QT5= buildtools_build network xml +USES= gmake qt:5 +USE_QT= buildtools_build qmake_build network xml PLIST_FILES= include/maia/maiaObject.h \ include/maia/maiaXmlRpcClient.h \ Index: net/ostinato/Makefile =================================================================== --- net/ostinato/Makefile +++ net/ostinato/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf -USES= qmake -USE_QT4= corelib gui moc_build rcc_build uic_build network script \ +USES= qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build network script \ xml PLIST_FILES= bin/drone \ Index: net/py-qt4-network/Makefile =================================================================== --- net/py-qt4-network/Makefile +++ net/py-qt4-network/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtNetwork PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run -USE_QT4= moc_build corelib network qmake_build +USE_QT= moc_build corelib network qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: net/py-qt5-network/Makefile =================================================================== --- net/py-qt5-network/Makefile +++ net/py-qt5-network/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtNetwork PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= sip_build core_run -USE_QT5= core network qmake_build +USE_QT= core network qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: net/qjsonrpc/Makefile =================================================================== --- net/qjsonrpc/Makefile +++ net/qjsonrpc/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL21 -USES= qmake -USE_QT4= moc_build network qtestlib_build rcc_build +USES= qt:4 +USE_QT= moc_build qmake_build network qtestlib_build rcc_build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/devonit-qjsonrpc-adefe89b0c6f Index: net/qoauth/Makefile =================================================================== --- net/qoauth/Makefile +++ net/qoauth/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libqca.so:devel/qca -USES= qmake tar:bzip2 +USES= qt:4 tar:bzip2 USE_LDCONFIG= yes -USE_QT4= corelib qtestlib network moc_build +USE_QT= corelib qtestlib network moc_build qmake_build USE_OPENSSL= yes post-patch: Index: net/qt4-network/Makefile =================================================================== --- net/qt4-network/Makefile +++ net/qt4-network/Makefile @@ -14,10 +14,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USE_QT4= qmake_build moc_build rcc_build corelib +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build corelib QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_OPENSSL= yes ALL_TARGET= first Index: net/qt5-network/Makefile =================================================================== --- net/qt5-network/Makefile +++ net/qt5-network/Makefile @@ -11,12 +11,12 @@ LIB_DEPENDS= libproxy.so:net/libproxy RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss +USES= qt:5 tar:xz USE_OPENSSL= yes -USE_QT5= core qmake_build buildtools_build +USE_QT= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: net/qtweetlib/Makefile =================================================================== --- net/qtweetlib/Makefile +++ net/qtweetlib/Makefile @@ -15,9 +15,9 @@ GH_ACCOUNT= minimoog GH_PROJECT= QTweetLib -USES= cmake +USES= cmake qt:4 USE_GITHUB= yes USE_LDCONFIG= yes -USE_QT4= gui moc_build network qmake_build rcc_build uic_build +USE_QT= gui moc_build network qmake_build rcc_build uic_build .include Index: net/quiterss/Makefile =================================================================== --- net/quiterss/Makefile +++ net/quiterss/Makefile @@ -15,7 +15,7 @@ NO_WRKSUBDIR= yes -USES= desktop-file-utils pkgconfig qmake:outsource sqlite +USES= desktop-file-utils pkgconfig sqlite INSTALLS_ICONS= yes OPTIONS_DEFINE= DEBUG @@ -23,11 +23,13 @@ OPTIONS_SINGLE_GUI= QT4 QT5 OPTIONS_DEFAULT= QT5 -QT4_USE= QT4=moc_build,rcc_build,uic_build,linguisttools_build -QT4_USE+= QT4=corelib,gui,network,xml,webkit,phonon,sql,sql-sqlite3_run - -QT5_USE= QT5=buildtools_build,linguisttools_build,core,xml,gui,widgets -QT5_USE+= QT5=network,multimedia,printsupport,webkit,sql,sql-sqlite3_run +QT4_USES= qt:4,qmake_outsource +QT4_USE= QT=moc_build,qmake_build,rcc_build,uic_build,linguisttools_build +QT4_USE+= QT=corelib,gui,network,xml,webkit,phonon,sql,sql-sqlite3_run + +QT5_USES= qt:5,qmake_outsource +QT5_USE= QT=buildtools_build,linguisttools_build,qmake_build,core,xml,gui,widgets +QT5_USE+= QT=network,multimedia,printsupport,webkit,sql,sql-sqlite3_run post-patch-DEBUG-on: @${REINPLACE_CMD} 's|debug_and_release|debug|' \ Index: net/rsplib/Makefile =================================================================== --- net/rsplib/Makefile +++ net/rsplib/Makefile @@ -17,9 +17,9 @@ --enable-qt --with-qt-lib=${QT_LIBDIR} \ --with-qt-include=${QT_INCDIR} INSTALL_TARGET= install-strip -USES= gmake libtool shebangfix +USES= gmake libtool shebangfix qt:4 SHEBANG_FILES= rsplib/scriptingserviceexample USE_LDCONFIG= yes -USE_QT4= gui xml moc_build +USE_QT= gui xml moc_build .include Index: net/smb4k-kde4/Makefile =================================================================== --- net/smb4k-kde4/Makefile +++ net/smb4k-kde4/Makefile @@ -16,10 +16,10 @@ SAMBA_PORT?= net/samba36 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde4 USE_KDE= kdelibs automoc4 runtime -USE_QT4= corelib gui network opengl script svg webkit \ +USE_QT= corelib gui network opengl script svg webkit \ qmake_build moc_build rcc_build uic_build phonon DOCSDIR= ${PREFIX}/share/doc/HTML/en/smb4k SUB_FILES= pkg-message Index: net/spoofer/Makefile =================================================================== --- net/spoofer/Makefile +++ net/spoofer/Makefile @@ -17,7 +17,7 @@ PORTDOCS= README -USES= compiler:c++11-lib +USES= compiler:c++11-lib qt:5 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-development @@ -28,7 +28,7 @@ .include .if ${PORT_OPTIONS:MGUI} -USE_QT5= buildtools_build qmake_build core network gui widgets +USE_QT= buildtools_build qmake_build core network gui widgets USE_GL+= gl USE_RC_SUBR= ${PORTNAME} INSTALLS_ICONS= yes Index: net/wireshark/Makefile =================================================================== --- net/wireshark/Makefile +++ net/wireshark/Makefile @@ -81,7 +81,8 @@ GTK2_USE= GNOME=gtk20,cairo GTK3_USE= GNOME=gtk30,cairo -QT5_USE= qt5=core,gui,widgets,printsupport,buildtools_build,linguisttools_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,widgets,printsupport,buildtools_build,linguisttools_build LUA_USES= lua:5[1-2] KRB_BASE_USES= gssapi Index: net/wpa_gui/Makefile =================================================================== --- net/wpa_gui/Makefile +++ net/wpa_gui/Makefile @@ -29,9 +29,9 @@ SUB_FILES= pkg-message SUB_LIST= LOCALBASE=${LOCALBASE} -USE_QT4= corelib gui moc_build rcc_build uic_build \ +USES= qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build \ imageformats_run -USES= qmake INSTALLS_ICONS= yes OPTIONS_DEFINE= DEBUG Index: net/x2goclient/Makefile =================================================================== --- net/x2goclient/Makefile +++ net/x2goclient/Makefile @@ -19,10 +19,10 @@ RUN_DEPENDS= nxproxy:net/nxproxy \ x2goclient-cli:net/x2goclient-cli -USES= qmake +USES= qt:4 USE_XORG= xpm -USE_QT4= gui network svg \ - linguisttools_build moc_build rcc_build uic_build +USE_QT= gui network svg \ + linguisttools_build moc_build qmake_build rcc_build uic_build QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" OPTIONS_DEFINE= DOCS LDAP Index: net/zeroconf-ioslave/Makefile =================================================================== --- net/zeroconf-ioslave/Makefile +++ net/zeroconf-ioslave/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Network monitor for DNS-SD services (Zeroconf) -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: polish/kadu/Makefile =================================================================== --- polish/kadu/Makefile +++ polish/kadu/Makefile @@ -36,13 +36,14 @@ GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz USES= cmake compiler:c++11-lib execinfo gettext-runtime \ - libarchive pkgconfig readline tar:bzip2 + libarchive pkgconfig qt:5 readline tar:bzip2 USE_XORG= x11 xext xfixes xscrnsaver USE_GNOME= glib20 -USE_QT5= concurrent core dbus declarative gui multimedia network \ +USE_QT= concurrent core dbus declarative gui multimedia network \ qml quick script scripttools sql webkit widgets x11extras \ xml xmlpatterns buildtools_build linguisttools_build \ qmake_build imageformats_run sql-sqlite3_run + # Setting KADU_VERSION disables git invocation CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON \ -DENABLE_TESTS=OFF Index: polish/qfaktury/Makefile =================================================================== --- polish/qfaktury/Makefile +++ polish/qfaktury/Makefile @@ -10,8 +10,8 @@ MAINTAINER= meritus@innervision.pl COMMENT= Polish invoicing desktop program -USES= qmake -USE_QT4= uic_build moc_build rcc_build corelib gui xml qt3support +USES= qt:4 +USE_QT= uic_build moc_build qmake_build rcc_build corelib gui xml qt3support PORTDOCS= ChangeLog.txt ReadMe.txt ReleaseNotes.txt TODO.txt Index: polish/qnapi/Makefile =================================================================== --- polish/qnapi/Makefile +++ polish/qnapi/Makefile @@ -19,9 +19,9 @@ USE_GITHUB= yes -USES= compiler:c++11-lib pkgconfig qmake +USES= compiler:c++11-lib pkgconfig qt:5 USE_GL= gl -USE_QT5= buildtools_build core gui network widgets xml +USE_QT= buildtools_build qmake_build core gui network widgets xml CXXFLAGS+= -I${LOCALBASE}/include/maia QMAKE_ARGS= LIBS=-lmaia Index: ports-mgmt/kpackagekit/Makefile =================================================================== --- ports-mgmt/kpackagekit/Makefile +++ ports-mgmt/kpackagekit/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt4 -USES= cmake gettext kde:4 pkgconfig tar:bzip2 +USES= cmake gettext kde:4 pkgconfig qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes Index: ports-mgmt/octopkg/Makefile =================================================================== --- ports-mgmt/octopkg/Makefile +++ ports-mgmt/octopkg/Makefile @@ -15,9 +15,9 @@ USE_GITHUB= yes GH_ACCOUNT= aarnt -USE_QT5= core concurrent gui network xml widgets quick concurrent \ - buildtools_build -USES= qmake compiler:c++11-lib +USES= compiler:c++11-lib qt:5 +USE_QT= core concurrent gui network xml widgets quick concurrent \ + buildtools_build qmake_build PLIST_FILES= bin/${PORTNAME} share/pixmaps/octopi_green.png Index: ports-mgmt/packagekit/Makefile =================================================================== --- ports-mgmt/packagekit/Makefile +++ ports-mgmt/packagekit/Makefile @@ -21,7 +21,7 @@ IGNORE= does not build with new polkit USES= cpe execinfo gettext gmake iconv libtool pathfix pkgconfig \ - python:build shared-mime-info shebangfix sqlite:3 + python:build qt:4 shared-mime-info shebangfix sqlite:3 CPE_VENDOR= packagekit_project SHEBANG_FILES= backends/test/helpers/search-name.sh \ contrib/cron/packagekit-background.cron @@ -80,7 +80,7 @@ CONFIGURE_ARGS+=--enable-qt LIB_DEPENDS+= libcppunit.so:devel/cppunit -USE_QT4+= dbus gui xml sql moc_build +USE_QT+= dbus gui xml sql moc_build #.include "${PORTSDIR}/Mk/bsd.qt.mk" .endif Index: ports-mgmt/portrac/Makefile =================================================================== --- ports-mgmt/portrac/Makefile +++ ports-mgmt/portrac/Makefile @@ -19,9 +19,9 @@ # Unhide std::to_string() to fix build with GCC (ports/193528) CXXFLAGS= -D_GLIBCXX_USE_C99 -USES= compiler:c++11-lib qmake tar:bzip2 +USES= compiler:c++11-lib tar:bzip2 qt:5 USE_CXXSTD= c++11 -USE_QT5= widgets buildtools_build +USE_QT= widgets buildtools_build qmake_build do-install: ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/portrac ${STAGEDIR}${PREFIX}/bin && \ Index: print/kde4-print-manager/Makefile =================================================================== --- print/kde4-print-manager/Makefile +++ print/kde4-print-manager/Makefile @@ -11,9 +11,9 @@ LIB_DEPENDS= libcups.so:print/cups RUN_DEPENDS= ${LOCALBASE}/share/cups/data/testprint:print/cups-filters -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= designer network \ +USE_QT= designer network \ qmake_build moc_build uic_build rcc_build post-patch: Index: print/kover/Makefile =================================================================== --- print/kover/Makefile +++ print/kover/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= libcddb.so:audio/libcddb \ libcdio.so:sysutils/libcdio -USES= cmake gettext kde:4 perl5 pkgconfig shared-mime-info tar:bzip2 +USES= cmake gettext kde:4 perl5 pkgconfig shared-mime-info qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build Index: print/kpdftool/Makefile =================================================================== --- print/kpdftool/Makefile +++ print/kpdftool/Makefile @@ -13,8 +13,8 @@ RUN_DEPENDS= convert:graphics/ImageMagick -USE_QT4= qt3support moc_build porting_build uic3_build -USES= ghostscript:run qmake zip +USE_QT= qt3support moc_build porting_build qmake_build uic3_build +USES= ghostscript:run zip qt:4 DESKTOP_ENTRIES= "KPDFTool" "${COMMENT}" "kpdftool" \ "kpdftool" "Qt;Utility;" true Index: print/lyx/Makefile =================================================================== --- print/lyx/Makefile +++ print/lyx/Makefile @@ -22,8 +22,8 @@ MINOR_VERSION= 2 USES= desktop-file-utils execinfo gmake iconv pkgconfig perl5 \ - python:2 tar:xz -USE_QT5= core concurrent gui svg widgets buildtools_build qmake_build + python:2 qt:5 tar:xz +USE_QT= core concurrent gui svg widgets buildtools_build GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-included-boost \ --without-included-mythes \ Index: print/py-qt5-printsupport/Makefile =================================================================== --- print/py-qt5-printsupport/Makefile +++ print/py-qt5-printsupport/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtPrintSupport PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run -USE_QT5= core gui printsupport widgets qmake_build +USE_QT= core gui printsupport widgets qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: print/qpdfview/Makefile =================================================================== --- print/qpdfview/Makefile +++ print/qpdfview/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 -USES= desktop-file-utils pkgconfig qmake +USES= desktop-file-utils pkgconfig USE_LDCONFIG= yes QMAKE_SOURCE_PATH= ${PORTNAME}.pro @@ -34,10 +34,12 @@ DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre DJVU_QMAKE_OFF= "CONFIG+=without_djvu" -QT4_USE= qt4=dbus,gui,imageformats,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml +QT4_USES= qt:4 +QT4_USE= qt=dbus,gui,imageformats,linguisttools,moc_build,qmake_build,rcc_build,sql,sql-sqlite3,svg,xml QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 -QT5_USE= qt5=buildtools_build,concurrent,imageformats,linguisttools,printsupport,sql,sql-sqlite3,svg,xml +QT5_USES= qt:5 +QT5_USE= qt=buildtools_build,concurrent,imageformats,linguisttools,printsupport,qmake_build,sql,sql-sqlite3,svg,xml QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 PS_LIB_DEPENDS= libspectre.so:print/libspectre Index: print/qt5-printsupport/Makefile =================================================================== --- print/qt5-printsupport/Makefile +++ print/qt5-printsupport/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt print support module -USE_QT5= core gui widgets qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui widgets qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: print/scribus/Makefile =================================================================== --- print/scribus/Makefile +++ print/scribus/Makefile @@ -25,10 +25,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ ${PYTHON_SITELIBDIR}/PIL/_imaging.so:graphics/py-pillow -USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network -USE_GNOME= libartlgpl2 libxml2 USES= cmake:outsource desktop-file-utils execinfo ghostscript:run jpeg \ - pkgconfig python shared-mime-info tar:xz + pkgconfig python qt:4 shared-mime-info tar:xz +USE_QT= gui linguist_build moc_build qmake_build rcc_build uic_build xml network +USE_GNOME= libartlgpl2 libxml2 USE_LDCONFIG= yes CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit Index: science/avogadro/Makefile =================================================================== --- science/avogadro/Makefile +++ science/avogadro/Makefile @@ -16,9 +16,9 @@ BUILD_DEPENDS= eigen2>2:math/eigen2 LIB_DEPENDS= libopenbabel.so:science/openbabel -USES= cmake desktop-file-utils pkgconfig tar:bzip2 +USES= cmake desktop-file-utils pkgconfig qt:4 tar:bzip2 USE_GL= glu gl -USE_QT4= gui network opengl \ +USE_QT= gui network opengl \ linguisttools_build moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DENABLE_GLSL=OFF \ -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs Index: science/kalzium/Makefile =================================================================== --- science/kalzium/Makefile +++ science/kalzium/Makefile @@ -16,11 +16,11 @@ ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= kdelibs automoc4 USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes -USE_QT4= corelib declarative designer opengl script xml \ +USE_QT= corelib declarative designer opengl script xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: science/kst2/Makefile =================================================================== --- science/kst2/Makefile +++ science/kst2/Makefile @@ -41,8 +41,10 @@ NETCDF_IGNORE= does not support NetCDF 4 TOOLKIT_DESC= Qt toolkit -QT4_USE= ${_USE_QT4:S/^/QT4=/} -QT5_USE= ${_USE_QT5:S/^/QT5=/} +QT4_USES= qt:4 +QT4_USE= ${_USE_QT4:S/^/QT=/} +QT5_USES= qt:5 +QT5_USE= ${_USE_QT5:S/^/QT=/} QT5_CMAKE_ON= -Dkst_qt5=on post-patch: Index: science/massxpert/Makefile =================================================================== --- science/massxpert/Makefile +++ science/massxpert/Makefile @@ -20,10 +20,10 @@ libfontconfig.so:x11-fonts/fontconfig USE_GCC= any -USES= cmake gettext tar:bzip2 +USES= cmake gettext qt:4 tar:bzip2 USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_GNOME= glib20 -USE_QT4= corelib gui xml rcc_build qmake_build uic_build moc_build \ +USE_QT= corelib gui xml rcc_build qmake_build uic_build moc_build \ svg USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes Index: science/paraview/Makefile =================================================================== --- science/paraview/Makefile +++ science/paraview/Makefile @@ -33,7 +33,7 @@ CONFLICTS_BUILD= protobuf* -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USE_QT= qmake_build moc_build rcc_build uic_build \ linguisttools_build assistant_run qt3support \ dbus designer gui help-tools network script \ sql svg xml webkit assistantclient clucene \ @@ -42,7 +42,7 @@ USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm USE_LDCONFIG= yes USE_GSTREAMER= yes -USES= alias desktop-file-utils cmake:outsource execinfo gmake jpeg python shebangfix +USES= alias desktop-file-utils cmake:outsource execinfo gmake jpeg python shebangfix qt:4 INSTALLS_ICONS= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \ Index: science/pulseview/Makefile =================================================================== --- science/pulseview/Makefile +++ science/pulseview/Makefile @@ -17,8 +17,9 @@ libsigrok.so:devel/libsigrok \ libsigrokdecode.so:devel/libsigrokdecode -USES= cmake pkgconfig -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build +USES= cmake pkgconfig qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build + CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DDISABLE_WERROR:BOOL=TRUE PLIST_FILES= bin/pulseview man/man1/pulseview.1.gz Index: science/qtresistors/Makefile =================================================================== --- science/qtresistors/Makefile +++ science/qtresistors/Makefile @@ -11,8 +11,8 @@ MAINTAINER= vg@FreeBSD.org COMMENT= Calculate resistance of resistor by the colors on the resistor -USES= qmake -USE_QT4= gui uic_build moc_build +USES= qt:4 +USE_QT= gui uic_build moc_build qmake_build WRKSRC= ${WRKDIR}/qtResistors Index: science/silo/Makefile =================================================================== --- science/silo/Makefile +++ science/silo/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --disable-static INSTALL_TARGET= install-strip -USES= gmake libtool readline +USES= gmake libtool readline qt:4 USE_LDCONFIG= yes OPTIONS_DEFINE= FORTRAN HDF5 PYTHON QT4 Index: science/step/Makefile =================================================================== --- science/step/Makefile +++ science/step/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libqalculate.so:math/libqalculate \ libgsl.so:math/gsl -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= opengl moc_build qmake_build rcc_build uic_build +USE_QT= opengl moc_build qmake_build rcc_build uic_build pre-configure: # Avoid building translations, should the user pass Index: security/fwbuilder/Makefile =================================================================== --- security/fwbuilder/Makefile +++ security/fwbuilder/Makefile @@ -33,7 +33,7 @@ libnetsnmp.so:net-mgmt/net-snmp PLIST_SUB= BUILD_VERSION=${DISTVERSION}.${BUILD} -USE_QT4= corelib \ +USE_QT= corelib \ gui \ iconengines \ inputmethods \ @@ -48,7 +48,7 @@ QTDIR?= ${PREFIX} USE_OPENSSL= yes -USES= autoreconf:build gmake libtool +USES= autoreconf:build gmake libtool qt:4 GNU_CONFIGURE= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ INSTALL_ROOT=${STAGEDIR} Index: security/gpgme/Makefile =================================================================== --- security/gpgme/Makefile +++ security/gpgme/Makefile @@ -17,7 +17,7 @@ libgpg-error.so:security/libgpg-error GNU_CONFIGURE= yes -USES= cpe gmake libtool localbase:ldflags tar:bzip2 +USES= cpe gmake libtool localbase:ldflags tar:bzip2 qt:5 USE_LDCONFIG= yes INSTALL_TARGET= install-strip @@ -69,7 +69,7 @@ LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp CONFIGURE_ARGS+=--enable-languages="cpp qt" USES+= compiler:c++11-lib pkgconfig -USE_QT5= buildtools_build core testlib +USE_QT= buildtools_build core testlib . endif . if ${SLAVEPORT} == "python" Index: security/ike/Makefile =================================================================== --- security/ike/Makefile +++ security/ike/Makefile @@ -14,7 +14,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= iked -USES= bison cmake libedit localbase:ldflags tar:tbz2 +USES= bison cmake libedit localbase:ldflags tar:tbz2 qt:4 USE_OPENSSL= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -38,7 +38,7 @@ LDAP_CMAKE_ON= -DLDAP=YES NATT_CMAKE_ON= -DNATT=YES QTGUI_CMAKE_ON= -DQTGUI=YES -QTGUI_USE= QT4=gui,moc_build,qmake_build,rcc_build,uic_build +QTGUI_USE= QT=gui,moc_build,qmake_build,rcc_build,uic_build post-install: @if ! ${SYSCTL} -a | ${GREP} -q ipsec; then \ Index: security/keepassx-devel/Makefile =================================================================== --- security/keepassx-devel/Makefile +++ security/keepassx-devel/Makefile @@ -22,10 +22,10 @@ CONFLICTS_INSTALL= keepassx-0.* keepassx2-* -USES= cmake compiler:c++11-lib desktop-file-utils shared-mime-info +USES= cmake compiler:c++11-lib desktop-file-utils shared-mime-info qt:5 USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_QT5= buildtools_build concurrent core gui linguisttools qmake_build \ +USE_QT= buildtools_build concurrent core gui linguisttools qmake_build \ testlib widgets x11extras USE_XORG= ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \ xt xtst Index: security/keepassx/Makefile =================================================================== --- security/keepassx/Makefile +++ security/keepassx/Makefile @@ -14,8 +14,8 @@ DATADIR= ${PREFIX}/share/${PORTNAME:tl} WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${PORTVERSION} -USES= desktop-file-utils qmake shared-mime-info -USE_QT4= moc_build uic_build qt3support_build rcc_build \ +USES= desktop-file-utils shared-mime-info qt:4 +USE_QT= moc_build uic_build qmake_build qt3support_build rcc_build \ corelib gui xml USE_XORG= xt inputproto xtst xrender xrandr xfixes xcursor\ xext x11 sm ice xi Index: security/keepassx2/Makefile =================================================================== --- security/keepassx2/Makefile +++ security/keepassx2/Makefile @@ -24,10 +24,10 @@ CONFLICTS_INSTALL= keepassx-0.* keepassx-devel-* -USES= cmake compiler:features desktop-file-utils shared-mime-info +USES= cmake compiler:features desktop-file-utils shared-mime-info qt:4 USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_QT4= corelib gui xml qtestlib uic_build moc_build \ +USE_QT= corelib gui xml qtestlib uic_build moc_build \ qmake_build rcc_build linguisttools USE_XORG= ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \ xt xtst Index: security/kf5-kdesu/Makefile =================================================================== --- security/kf5-kdesu/Makefile +++ security/kf5-kdesu/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 integration with su for elevated privileges -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= config coreaddons dbusaddons ecm i18n pty service -USE_QT5= buildtools_build core dbus qmake_build xml +USE_QT= buildtools_build core dbus qmake_build xml USE_XORG= ice sm x11 xext .include Index: security/kgpg-kde4/Makefile =================================================================== --- security/kgpg-kde4/Makefile +++ security/kgpg-kde4/Makefile @@ -10,8 +10,8 @@ RUN_DEPENDS= gpg2:security/gnupg -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs pimlibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: security/kqoauth/Makefile =================================================================== --- security/kqoauth/Makefile +++ security/kqoauth/Makefile @@ -10,8 +10,8 @@ LICENSE= LGPL21 -USES= pkgconfig qmake -USE_QT4= corelib network gui moc_build qtestlib_build +USES= pkgconfig qt:4 +USE_QT= corelib network gui moc_build qmake_build qtestlib_build USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes QMAKE_SOURCE_PATH= ${PORTNAME}.pro Index: security/kwalletmanager/Makefile =================================================================== --- security/kwalletmanager/Makefile +++ security/kwalletmanager/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Password manager for KDE -USES= cmake:outsource gmake kde:4 tar:xz +USES= cmake:outsource gmake kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: security/nmapsi4/Makefile =================================================================== --- security/nmapsi4/Makefile +++ security/nmapsi4/Makefile @@ -16,9 +16,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/nmap:security/nmap -USES= cmake tar:xz +USES= cmake qt:4 tar:xz INSTALLS_ICONS= yes -USE_QT4= gui qmake_build uic_build moc_build rcc_build network \ +USE_QT= gui qmake_build uic_build moc_build rcc_build network \ linguist_build webkit dbus CMAKE_ARGS+= -DBUILD_KDELIBS=off Index: security/ophcrack/Makefile =================================================================== --- security/ophcrack/Makefile +++ security/ophcrack/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= gmake localbase ssl tar:bzip2 +USES= gmake localbase ssl qt:4 tar:bzip2 GNU_CONFIGURE= yes PLIST_FILES= bin/ophcrack @@ -29,7 +29,7 @@ .include .if ${PORT_OPTIONS:MX11} || ${PORT_OPTIONS:MGRAPH} -USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui +USE_QT= moc_build qmake_build rcc_build uic_build corelib gui .else CONFIGURE_ARGS+= --disable-gui .endif Index: security/pinentry/Makefile =================================================================== --- security/pinentry/Makefile +++ security/pinentry/Makefile @@ -90,14 +90,15 @@ .endif .if ${PINENTRY_GUI} == "qt4" -USES+= compiler:c++11-lib -USE_QT4= corelib gui moc_build +USES+= compiler:c++11-lib qt:4 +USE_QT= gui moc_build + PLIST_FILES= bin/pinentry-qt4 CONFIGURE_ARGS+=--disable-pinentry-qt5 \ --program-suffix=4 .elif ${PINENTRY_GUI} == "qt5" -USES+= compiler:c++11-lib -USE_QT5= core gui widgets buildtools_build +USES+= compiler:c++11-lib qt:5 +USE_QT= core gui widgets buildtools_build PLIST_FILES= bin/pinentry-qt5 CONFIGURE_ARGS+=--enable-pinentry-qt5 \ --program-suffix=5 Index: security/qtkeychain-qt5/Makefile =================================================================== --- security/qtkeychain-qt5/Makefile +++ security/qtkeychain-qt5/Makefile @@ -22,12 +22,14 @@ .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" CONFLICTS_INSTALL= qtkeychain-qt5-[0-9]* CMAKE_ARGS+= -DBUILD_WITH_QT4=YES -USE_QT4= corelib dbus linguisttools_build moc_build rcc_build qmake_build +USES+= qt:4 +USE_QT= corelib dbus linguisttools_build moc_build rcc_build qmake_build PLIST= ${PKGDIR}/pkg-plist.qt4 PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt .else CONFLICTS_INSTALL= qtkeychain-qt4-[0-9]* -USE_QT5= core dbus linguisttools_build buildtools_build qmake_build +USES+= qt:5 +USE_QT= core dbus linguisttools_build buildtools_build qmake_build PLIST= ${PKGDIR}/pkg-plist.qt5 PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5 .endif Index: security/quantis/Makefile =================================================================== --- security/quantis/Makefile +++ security/quantis/Makefile @@ -29,7 +29,6 @@ EXTRACT_BEFORE_ARGS= -aqo USES= cmake compiler:c++11-lang zip:infozip -USE_QT4= # empty but required USE_LDCONFIG= yes SUB_FILES= pkg-message @@ -74,7 +73,8 @@ CXXFLAGS+= -I${LOCALBASE}/include . if ${PORT_OPTIONS:MGUI} -USE_QT4+= gui moc_build uic_build rcc_build qmake_build +USES+= qt:4 +USE_QT+= gui moc_build uic_build rcc_build qmake_build . else CMAKE_ARGS+= -DDISABLE_EASYQUANTIS_GUI=1 . endif Index: security/tpmmanager/Makefile =================================================================== --- security/tpmmanager/Makefile +++ security/tpmmanager/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libtspi.so:security/trousers -USES= qmake -USE_QT4= gui moc_build rcc_build uic_build +USES= qt:4 +USE_QT= gui moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/${PORTNAME} PORTDOCS= * Index: security/xca/Makefile =================================================================== --- security/xca/Makefile +++ security/xca/Makefile @@ -27,9 +27,11 @@ OPTIONS_SINGLE_TOOLKIT= QT4 QT5 OPTIONS_DEFAULT= QT4 -QT4_USE= qt4=gui,linguist_build,moc_build,qmake_build \ - qt4=rcc_build,uic_build -QT5_USE= qt5=widgets,buildtools_build,linguist_build +QT4_USES= qt:4 +QT4_USE= qt=gui,linguist_build,moc_build,qmake_build \ + qt=rcc_build,uic_build +QT5_USES= qt:5 +QT5_USE= qt=widgets,buildtools_build,linguist_build TOOLKIT_DESC= Qt toolkit post-patch: Index: security/yubikey-personalization-gui/Makefile =================================================================== --- security/yubikey-personalization-gui/Makefile +++ security/yubikey-personalization-gui/Makefile @@ -15,8 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= Yubico -USES= pkgconfig qmake -USE_QT4= corelib gui moc_build rcc_build testlib_build uic_build +USES= pkgconfig qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build testlib_build uic_build PLIST_FILES= bin/yubikey-personalization-gui Index: sysutils/android-file-transfer/Makefile =================================================================== --- sysutils/android-file-transfer/Makefile +++ sysutils/android-file-transfer/Makefile @@ -38,11 +38,13 @@ FUSE_CMAKE_BOOL=BUILD_FUSE FUSE_PLIST_FILES=bin/aft-mtp-mount -QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,corelib,gui +QT4_USES= qt:4 +QT4_USE= QT=qmake_build,moc_build,rcc_build,uic_build,corelib,gui QT4_CMAKE_ON= -DBUILD_QT_UI=on -DDESIRED_QT_VERSION=4 QT4_PLIST_FILES=${QT5_PLIST_FILES} -QT5_USE= QT5=qmake_build,buildtools_build,core,gui,widgets +QT5_USES= qt:5 +QT5_USE= QT=qmake_build,buildtools_build,core,gui,widgets QT5_CMAKE_ON= -DBUILD_QT_UI=on -DDESIRED_QT_VERSION=5 QT5_PLIST_FILES=bin/android-file-transfer \ share/applications/android-file-transfer.desktop \ Index: sysutils/bacula-bat/Makefile =================================================================== --- sysutils/bacula-bat/Makefile +++ sysutils/bacula-bat/Makefile @@ -9,8 +9,8 @@ LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \ libbac.so:sysutils/bacula-client -USES= pkgconfig -USE_QT4= qmake_build uic_build moc_build rcc_build +USES= pkgconfig qt:4 +USE_QT= qmake_build uic_build moc_build rcc_build WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist Index: sysutils/bacula5-bat/Makefile =================================================================== --- sysutils/bacula5-bat/Makefile +++ sysutils/bacula5-bat/Makefile @@ -12,8 +12,8 @@ CONFLICTS= bacula-bat-* -USES= pkgconfig -USE_QT4= qmake_build uic_build moc_build rcc_build +USES= pkgconfig qt:4 +USE_QT= qmake_build uic_build moc_build rcc_build WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist Index: sysutils/baloo-widgets/Makefile =================================================================== --- sysutils/baloo-widgets/Makefile +++ sysutils/baloo-widgets/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= The BalooWidgets library -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 baloo kfilemetadata -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes .include Index: sysutils/baloo/Makefile =================================================================== --- sysutils/baloo/Makefile +++ sysutils/baloo/Makefile @@ -13,10 +13,10 @@ LIB_DEPENDS= libxapian.so:databases/xapian-core \ libqjson.so:devel/qjson -USES= cmake:outsource gmake kde:4 tar:xz +USES= cmake:outsource gmake kde:4 qt:4 tar:xz USE_KDE= akonadi automoc4 kdelibs kfilemetadata \ pimlibs -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes .include Index: sysutils/bareos-bat/Makefile =================================================================== --- sysutils/bareos-bat/Makefile +++ sysutils/bareos-bat/Makefile @@ -12,8 +12,8 @@ CONFLICTS= bacula*-bat-* -USES= pkgconfig desktop-file-utils -USE_QT4= qmake_build uic_build moc_build rcc_build +USES= pkgconfig desktop-file-utils qt:4 +USE_QT= qmake_build uic_build moc_build rcc_build WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist Index: sysutils/bareos-traymonitor/Makefile =================================================================== --- sysutils/bareos-traymonitor/Makefile +++ sysutils/bareos-traymonitor/Makefile @@ -13,8 +13,8 @@ CONFLICTS= bacula*-bat-* -USES= pkgconfig gettext-runtime desktop-file-utils -USE_QT4= qmake_build uic_build moc_build rcc_build gui corelib +USES= pkgconfig gettext-runtime desktop-file-utils qt:4 +USE_QT= qmake_build uic_build moc_build rcc_build gui corelib WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist Index: sysutils/bsdisks/Makefile =================================================================== --- sysutils/bsdisks/Makefile +++ sysutils/bsdisks/Makefile @@ -10,8 +10,8 @@ LICENSE= BSD3CLAUSE -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang qt:5 -USE_QT5= qmake_build buildtools_build core dbus +USE_QT= qmake_build buildtools_build core dbus .include Index: sysutils/filelight-kde4/Makefile =================================================================== --- sysutils/filelight-kde4/Makefile +++ sysutils/filelight-kde4/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Map of concentric segmented-rings representing file system -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: sysutils/k3b-kde4/Makefile =================================================================== --- sysutils/k3b-kde4/Makefile +++ sysutils/k3b-kde4/Makefile @@ -16,11 +16,11 @@ RUN_DEPENDS= cdrecord:sysutils/cdrtools BUILD_DEPENDS= cdrecord:sysutils/cdrtools -USES= cmake gettext kde:4 pkgconfig shared-mime-info tar:xz +USES= cmake gettext kde:4 pkgconfig shared-mime-info qt:4 tar:xz CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \ -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF USE_KDE= automoc4 kdelibs libkcddb -USE_QT4= gui phonon qt3support webkit \ +USE_QT= gui phonon qt3support webkit \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Index: sysutils/kcm-polkit-kde/Makefile =================================================================== --- sysutils/kcm-polkit-kde/Makefile +++ sysutils/kcm-polkit-kde/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde -USES= cmake gmake kde:4 pkgconfig tar:bzip2 +USES= cmake gmake kde:4 pkgconfig qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= dbus xml moc_build qmake_build rcc_build uic_build +USE_QT= dbus xml moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-kcmodules-1 Index: sysutils/kcron/Makefile =================================================================== --- sysutils/kcron/Makefile +++ sysutils/kcron/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE task scheduler -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: sysutils/kdf/Makefile =================================================================== --- sysutils/kdf/Makefile +++ sysutils/kdf/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Shows free space of devices for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: sysutils/kdirstat/Makefile =================================================================== --- sysutils/kdirstat/Makefile +++ sysutils/kdirstat/Makefile @@ -15,10 +15,10 @@ WRKSRC= ${WRKDIR}/jeromerobert-k4dirstat-3a4663ee20e7 -USES= cmake cpe desktop-file-utils gettext-tools kde:4 tar:bzip2 +USES= cmake cpe desktop-file-utils gettext-tools kde:4 qt:4 tar:bzip2 CPE_VENDOR= kdirstat_project USE_KDE= automoc4 kdelibs libkonq -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes post-patch: Index: sysutils/kf5-baloo/Makefile =================================================================== --- sysutils/kf5-baloo/Makefile +++ sysutils/kf5-baloo/Makefile @@ -11,11 +11,11 @@ LIB_DEPENDS= liblmdb.so:databases/lmdb \ libinotify.so:devel/libinotify -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz USE_KDE= auth completion config coreaddons crash dbusaddons \ filemetadata5 i18n idletime jobwidgets kio service \ solid widgetsaddons -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ qml quick testlib widgets .include Index: sysutils/kf5-kwallet/Makefile =================================================================== --- sysutils/kf5-kwallet/Makefile +++ sysutils/kf5-kwallet/Makefile @@ -17,10 +17,10 @@ libqgpgme.so:security/gpgme-qt5 \ libgpgmepp.so:security/gpgme-cpp -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \ doctools ecm i18n iconthemes notifications service \ widgetsaddons windowsystem -USE_QT5= buildtools_build core dbus gui qmake_build widgets xml +USE_QT= buildtools_build core dbus gui qmake_build widgets xml .include Index: sysutils/kfilemetadata/Makefile =================================================================== --- sysutils/kfilemetadata/Makefile +++ sysutils/kfilemetadata/Makefile @@ -15,9 +15,9 @@ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes .include Index: sysutils/kfloppy/Makefile =================================================================== --- sysutils/kfloppy/Makefile +++ sysutils/kfloppy/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Floppy disk formatter for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: sysutils/knutclient-kde4/Makefile =================================================================== --- sysutils/knutclient-kde4/Makefile +++ sysutils/knutclient-kde4/Makefile @@ -19,8 +19,8 @@ CONFLICTS= knutclient-0.* -USES= cmake gettext kde:4 +USES= cmake gettext kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build +USE_QT= corelib gui qmake_build moc_build rcc_build uic_build .include Index: sysutils/krename-kde4/Makefile =================================================================== --- sysutils/krename-kde4/Makefile +++ sysutils/krename-kde4/Makefile @@ -13,9 +13,9 @@ libexiv2.so:graphics/exiv2 \ libpodofo.so:graphics/podofo -USES= cmake:outsource gettext kde:4 tar:bzip2 +USES= cmake:outsource gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build post-patch: ${REINPLACE_CMD} 's,FREETYPE_INCLUDE_DIR,FREETYPE_INCLUDE_DIR_freetype2,' \ Index: sysutils/kshutdown-kde4/Makefile =================================================================== --- sysutils/kshutdown-kde4/Makefile +++ sysutils/kshutdown-kde4/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= alias cmake:outsource compiler:c++0x gettext kde:4 zip -USE_QT4= corelib dbus gui moc_build qmake_build rcc_build svg uic_build +USES= alias cmake:outsource compiler:c++0x gettext kde:4 zip qt:4 +USE_QT= corelib dbus gui moc_build qmake_build rcc_build svg uic_build USE_KDE= automoc4 kdelibs workspace WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} Index: sysutils/ksystemlog/Makefile =================================================================== --- sysutils/ksystemlog/Makefile +++ sysutils/ksystemlog/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE system log application -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: sysutils/kuser/Makefile =================================================================== --- sysutils/kuser/Makefile +++ sysutils/kuser/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE user manager -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs pimlibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: sysutils/luckybackup/Makefile =================================================================== --- sysutils/luckybackup/Makefile +++ sysutils/luckybackup/Makefile @@ -13,8 +13,8 @@ RUN_DEPENDS= rsync:net/rsync -USES= qmake -USE_QT4= gui network moc_build rcc_build uic_build +USES= qt:4 +USE_QT= gui network moc_build qmake_build rcc_build uic_build post-patch: ${REINPLACE_CMD} -e 's|/usr|$$$${PREFIX}|g' -e '/INSTALLS/s|debianmenu ||' \ Index: sysutils/nepomuk-core/Makefile =================================================================== --- sysutils/nepomuk-core/Makefile +++ sysutils/nepomuk-core/Makefile @@ -16,10 +16,10 @@ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 baloo kdelibs kfilemetadata \ ontologies soprano -USE_QT4= corelib dbus gui qmake_build moc_build rcc_build uic_build +USE_QT= corelib dbus gui qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null Index: sysutils/nepomuk-widgets/Makefile =================================================================== --- sysutils/nepomuk-widgets/Makefile +++ sysutils/nepomuk-widgets/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= The NepomukWidget libraries -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 soprano nepomuk-core -USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build +USE_QT= corelib dbus gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include Index: sysutils/pcbsd-syscache/Makefile =================================================================== --- sysutils/pcbsd-syscache/Makefile +++ sysutils/pcbsd-syscache/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE WRKSRC_SUBDIR= src-sh/syscache -USE_QT5= core network buildtools qmake -USES= pkgconfig tar:xz +USES= pkgconfig qt:5,qmake_dummy tar:xz +USE_QT= core network buildtools_build qmake_build NO_BUILD= yes MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} Index: sysutils/pcbsd-utils-qt5/Makefile =================================================================== --- sysutils/pcbsd-utils-qt5/Makefile +++ sysutils/pcbsd-utils-qt5/Makefile @@ -29,9 +29,9 @@ MAKE_JOBS_UNSAFE=yes ONLY_FOR_ARCHS= amd64 USE_LDCONFIG= yes -USE_QT5= core gui network svg linguist \ - buildtools x11extras -USES= desktop-file-utils python qmake shebangfix tar:xz +USES= desktop-file-utils python shebangfix qt:5 tar:xz +USE_QT= core gui network svg linguist \ + buildtools_build qmake_build x11extras SHEBANG_FILES= pc-netmanager/src/NetworkManager/resources/umts_stick \ pc-sysmanager/scripts/fastest_cvsup Index: sysutils/pcbsd-utils/Makefile =================================================================== --- sysutils/pcbsd-utils/Makefile +++ sysutils/pcbsd-utils/Makefile @@ -14,8 +14,9 @@ eject:sysutils/eject WRKSRC_SUBDIR= src-sh/pcbsd-utils -USE_QT5= core network buildtools qmake -USES= pkgconfig tar:xz + +USES= pkgconfig qt:5,qmake_dummy tar:xz +USE_QT= core network buildtools_build qmake_build MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} USE_GITHUB= yes Index: sysutils/plasma-applet-apcups/Makefile =================================================================== --- sysutils/plasma-applet-apcups/Makefile +++ sysutils/plasma-applet-apcups/Makefile @@ -15,8 +15,8 @@ PROJECTHOST= plasma-apcups -USES= cmake gettext kde:4 +USES= cmake gettext kde:4 qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: sysutils/policykit-qt/Makefile =================================================================== --- sysutils/policykit-qt/Makefile +++ sysutils/policykit-qt/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libpolkit.so:sysutils/policykit USE_LDCONFIG= yes -USES= cmake gettext kde:4 pkgconfig tar:bzip2 +USES= cmake gettext kde:4 pkgconfig qt:4 tar:bzip2 USE_KDE= automoc4 -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ qmake_build moc_build rcc_build uic_build PORTSCOUT= limit:^0 Index: sysutils/polkit-kde/Makefile =================================================================== --- sysutils/polkit-kde/Makefile +++ sysutils/polkit-kde/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= NLS OPTIONS_SUB= yes Index: sysutils/polkit-qt/Makefile =================================================================== --- sysutils/polkit-qt/Makefile +++ sysutils/polkit-qt/Makefile @@ -22,14 +22,15 @@ .if empty(PKGNAMESUFFIX) -USES+= kde:4 +USES+= kde:4 qt:4 USE_KDE= automoc4 -USE_QT4= corelib dbus gui \ +USE_QT= corelib dbus gui \ qmake_build moc_build rcc_build uic_build CMAKE_ARGS+= -DUSE_QT4:BOOL=ON \ -DUSE_QT5:BOOL=OFF .else -USE_QT5= core dbus gui widgets buildtools_build qmake_build +USES+= qt:5 +USE_QT= core dbus gui widgets buildtools_build qmake_build CMAKE_ARGS+= -DUSE_QT4:BOOL=OFF \ -DUSE_QT5:BOOL=ON .endif Index: sysutils/qpxtool/Makefile =================================================================== --- sysutils/qpxtool/Makefile +++ sysutils/qpxtool/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libpng.so:graphics/png -USES= gmake tar:bzip2 -USE_QT4= qmake_build moc_build rcc_build linguisttools_build \ +USES= gmake qt:4 tar:bzip2 +USE_QT= qmake_build moc_build rcc_build linguisttools_build \ corelib gui network sql QT_NONSTANDARD= yes HAS_CONFIGURE= yes @@ -27,9 +27,9 @@ OPTIONS_GROUP_DB= SQLITE MYSQL PGSQL OPTIONS_DEFAULT= SQLITE -SQLITE_USE= QT4=sql-sqlite3_run -MYSQL_USE= QT4=sql-mysql_run -PGSQL_USE= QT4=sql-pgsql_run +SQLITE_USE= QT=sql-sqlite3_run +MYSQL_USE= QT=sql-mysql_run +PGSQL_USE= QT=sql-pgsql_run post-configure: @${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKE_AGRS}|' \ Index: sysutils/qsynergy/Makefile =================================================================== --- sysutils/qsynergy/Makefile +++ sysutils/qsynergy/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake -USE_QT4= moc_build rcc_build uic_build gui network +USES= qt:4 +USE_QT= moc_build qmake_build rcc_build uic_build gui network PLIST_FILES= bin/qsynergy \ share/pixmaps/qsynergy.xpm Index: sysutils/qt5-qtpaths/Makefile =================================================================== --- sysutils/qt5-qtpaths/Makefile +++ sysutils/qt5-qtpaths/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Command line client to QStandardPaths -USE_QT5= core +USES= qt:5 tar:xz +USE_QT= core QT_DIST= tools -USES= qmake PLIST_FILES= ${QT_BINDIR}/qtpaths Index: sysutils/qtpass/Makefile =================================================================== --- sysutils/qtpass/Makefile +++ sysutils/qtpass/Makefile @@ -12,10 +12,11 @@ RUN_DEPENDS= pass:sysutils/password-store -USES= qmake:outsource +USES= qt:5,qmake_outsource USE_GITHUB= yes GH_ACCOUNT= IJhack -USE_QT5= buildtools_build core gui linguisttools_build network widgets +USE_QT= core gui linguisttools_build network widgets \ + buildtools_build qmake_build USE_GL= gl PLIST_FILES= bin/qtpass \ Index: sysutils/qzeitgeist/Makefile =================================================================== --- sysutils/qzeitgeist/Makefile +++ sysutils/qzeitgeist/Makefile @@ -20,9 +20,9 @@ BUILD_DEPENDS= rapper:textproc/raptor2 \ ${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib -USES= cmake kde:4 python:build tar:bzip2 +USES= cmake kde:4 python:build qt:4 tar:bzip2 USE_KDE= automoc4 -USE_QT4= dbus declarative qtestlib \ +USE_QT= dbus declarative qtestlib \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: sysutils/searchmonkey/Makefile =================================================================== --- sysutils/searchmonkey/Makefile +++ sysutils/searchmonkey/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3+ -USES= qmake dos2unix zip +USES= dos2unix zip qt:4 DOS2UNIX_GLOB= *.cpp *.h -USE_QT4= corelib gui moc_build rcc_build uic_build +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/${PORTNAME} Index: sysutils/sweeper/Makefile =================================================================== --- sysutils/sweeper/Makefile +++ sysutils/sweeper/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Cleans temporal files for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: sysutils/tarsnap-gui/Makefile =================================================================== --- sysutils/tarsnap-gui/Makefile +++ sysutils/tarsnap-gui/Makefile @@ -11,8 +11,8 @@ USE_GITHUB= yes GH_ACCOUNT= Tarsnap -USES= compiler:c++11-lib qmake -USE_QT5= qmake_build widgets network buildtools_build sql-sqlite3 +USES= compiler:c++11-lib qt:5 +USE_QT= qmake_build widgets network buildtools_build sql-sqlite3 PLIST_FILES= bin/tarsnap-gui Index: textproc/ansifilter/Makefile =================================================================== --- textproc/ansifilter/Makefile +++ textproc/ansifilter/Makefile @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= gmake tar:bzip2 +USES= gmake qt:4 tar:bzip2 MAKEFILE= makefile PORTDOCS= ChangeLog README @@ -22,8 +22,8 @@ OPTIONS_DEFINE= DOCS QT4 -QT4_USES= qmake:norecursive -QT4_USE= QT4=gui,moc_build +QT4_USES= qt:4,qmake_norecursive +QT4_USE= QT=gui,moc_build QT4_ALL_TARGET= all all-gui QT4_PLIST_FILES= bin/${PORTNAME}-gui QT4_DESKTOP_ENTRIES= "ANSIFilter" "" "" "${PORTNAME}-gui" \ Index: textproc/beediff/Makefile =================================================================== --- textproc/beediff/Makefile +++ textproc/beediff/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/licence.txt -USES= qmake -USE_QT4= corelib gui moc_build rcc_build +USES= qt:4 +USE_QT= corelib gui moc_build qmake_build rcc_build USE_XORG= x11 xext WRKSRC= ${WRKDIR}/${PORTNAME} Index: textproc/clucene-qt4/Makefile =================================================================== --- textproc/clucene-qt4/Makefile +++ textproc/clucene-qt4/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt bindings for the CLucene full-text search library -USE_QT4= qmake_build corelib +USES= qt:4 +USE_QT= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: textproc/dikt/Makefile =================================================================== --- textproc/dikt/Makefile +++ textproc/dikt/Makefile @@ -9,9 +9,9 @@ MAINTAINER= goran.tal@gmail.com COMMENT= Dictionary for KDE4 -USES= cmake kde:4 tar:txz +USES= cmake kde:4 tar:txz qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui network svg xml \ +USE_QT= corelib gui network svg xml \ qmake_build moc_build rcc_build uic_build PLIST_FILES= bin/dikt \ Index: textproc/dixit/Makefile =================================================================== --- textproc/dixit/Makefile +++ textproc/dixit/Makefile @@ -19,8 +19,8 @@ LICENSE= GPLv3+ -USES= qmake -USE_QT4= corelib gui network moc_build rcc_build +USES= qt:4 +USE_QT= corelib gui network moc_build qmake_build rcc_build LDFLAGS+= -lz PLIST_SUB= _DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F} \ Index: textproc/fcitx-qt5/Makefile =================================================================== --- textproc/fcitx-qt5/Makefile +++ textproc/fcitx-qt5/Makefile @@ -12,15 +12,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libfcitx-config.so:chinese/fcitx \ - libQt5DBus.so:devel/dbus-qt5 \ libxkbcommon.so:x11/libxkbcommon USE_GITHUB= yes GH_ACCOUNT= fcitx -USES= compiler:c++11-lib cmake gettext kde:5 pkgconfig +USES= compiler:c++11-lib cmake gettext kde:5 pkgconfig qt:5 USE_KDE= ecm -USE_QT5= core gui qmake widgets buildtools_build +USE_QT= core dbus gui qmake_build widgets buildtools_build USE_LDCONFIG= yes .include Index: textproc/goldendict/Makefile =================================================================== --- textproc/goldendict/Makefile +++ textproc/goldendict/Makefile @@ -17,11 +17,11 @@ libvorbis.so:audio/libvorbis NO_WRKSUBDIR= yes -USES= dos2unix execinfo iconv pkgconfig qmake tar:bzip2 +USES= dos2unix execinfo iconv pkgconfig qt:4 tar:bzip2 DOS2UNIX_FILES= processwrapper.cc USE_XORG= xtst -USE_QT4= corelib gui webkit phonon \ - linguist_build moc_build rcc_build script_build uic_build +USE_QT= corelib gui webkit phonon \ + linguist_build moc_build qmake_build rcc_build script_build uic_build INSTALLS_ICONS= yes post-patch: Index: textproc/ibus-qt/Makefile =================================================================== --- textproc/ibus-qt/Makefile +++ textproc/ibus-qt/Makefile @@ -21,8 +21,8 @@ GH_ACCOUNT= ibus -USE_QT4= gui dbus moc_build qmake_build moc_build uic_build rcc_build -USES= cmake pkgconfig +USE_QT= gui dbus moc_build qmake_build moc_build uic_build rcc_build +USES= cmake pkgconfig qt:4 CMAKE_ARGS= -DDOCDIR=${PREFIX}/share/doc/ibus-qt -DLIBDIR=lib USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include Index: textproc/kdiff3/Makefile =================================================================== --- textproc/kdiff3/Makefile +++ textproc/kdiff3/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource kde:4 +USES= cmake:outsource kde:4 qt:4 USE_KDE= kdelibs libkonq automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= NLS DOCS Index: textproc/kf5-kcodecs/Makefile =================================================================== --- textproc/kf5-kcodecs/Makefile +++ textproc/kf5-kcodecs/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for string manipulation -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core linguisttools qmake_build +USE_QT= buildtools_build core linguisttools qmake_build .include Index: textproc/kf5-sonnet/Makefile =================================================================== --- textproc/kf5-sonnet/Makefile +++ textproc/kf5-sonnet/Makefile @@ -12,9 +12,9 @@ LIB_DEPENDS= libaspell.so:textproc/aspell \ libhunspell-1.5.so:textproc/hunspell -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui linguisttools qmake_build \ +USE_QT= buildtools_build core gui linguisttools qmake_build \ testlib widgets .include Index: textproc/kompare/Makefile =================================================================== --- textproc/kompare/Makefile +++ textproc/kompare/Makefile @@ -10,8 +10,8 @@ LIB_DEPENDS= libkomparediff2.so:textproc/libkomparediff2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: textproc/libkomparediff2/Makefile =================================================================== --- textproc/libkomparediff2/Makefile +++ textproc/libkomparediff2/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Library to compare files and strings -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes .include Index: textproc/py-qt4-xml/Makefile =================================================================== --- textproc/py-qt4-xml/Makefile +++ textproc/py-qt4-xml/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtXml PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run -USE_QT4= corelib xml moc_build qmake_build +USE_QT= corelib xml moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: textproc/py-qt4-xmlpatterns/Makefile =================================================================== --- textproc/py-qt4-xmlpatterns/Makefile +++ textproc/py-qt4-xmlpatterns/Makefile @@ -10,9 +10,9 @@ CONFIGURE_ARGS= --enable QtXmlPatterns PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run network_run -USE_QT4= corelib network xmlpatterns moc_build qmake_build +USE_QT= corelib network xmlpatterns moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: textproc/py-qt5-xml/Makefile =================================================================== --- textproc/py-qt5-xml/Makefile +++ textproc/py-qt5-xml/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtXml PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= sip_build core_run -USE_QT5= core xml buildtools_build qmake_build +USE_QT= core xml buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: textproc/py-qt5-xmlpatterns/Makefile =================================================================== --- textproc/py-qt5-xmlpatterns/Makefile +++ textproc/py-qt5-xmlpatterns/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtXmlPatterns PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= sip_build core_run network_run -USE_QT5= core network xmlpatterns qmake_build +USE_QT= core network xmlpatterns qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: textproc/qstardict/Makefile =================================================================== --- textproc/qstardict/Makefile +++ textproc/qstardict/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= dos2unix pkgconfig qmake tar:bzip2 -USE_QT4= corelib gui network xml uic_build moc_build rcc_build +USES= dos2unix pkgconfig qt:4 tar:bzip2 +USE_QT= corelib gui network xml uic_build moc_build qmake_build rcc_build USE_GNOME= glib20 USE_XORG= x11 DOS2UNIX_FILES= qstardict.pri @@ -26,7 +26,7 @@ OPTIONS_DEFAULT=DBUS OPTIONS_SUB= yes -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus DBUS_QMAKE_OFF= NO_DBUS=1 NLS_QMAKE_OFF= NO_TRANSLATIONS=1 Index: textproc/qt4-xml/Makefile =================================================================== --- textproc/qt4-xml/Makefile +++ textproc/qt4-xml/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SAX and DOM implementations -USE_QT4= qmake_build moc_build corelib +USES= qt:4 +USE_QT= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: textproc/qt4-xmlpatterns-tool/Makefile =================================================================== --- textproc/qt4-xmlpatterns-tool/Makefile +++ textproc/qt4-xmlpatterns-tool/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt command-line utility for running XQueries -USE_QT4= qmake_build xmlpatterns +USES= qt:4 +USE_QT= qmake_build xmlpatterns QT_DIST= yes HAS_CONFIGURE= yes Index: textproc/qt4-xmlpatterns/Makefile =================================================================== --- textproc/qt4-xmlpatterns/Makefile +++ textproc/qt4-xmlpatterns/Makefile @@ -9,11 +9,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema -USE_QT4= qmake_build moc_build rcc_build corelib network +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build corelib network QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: textproc/qt5-xml/Makefile =================================================================== --- textproc/qt5-xml/Makefile +++ textproc/qt5-xml/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SAX and DOM implementations -USE_QT5= core qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core qmake_build buildtools_build QT_DIST= base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: textproc/qt5-xmlpatterns/Makefile =================================================================== --- textproc/qt5-xmlpatterns/Makefile +++ textproc/qt5-xmlpatterns/Makefile @@ -10,9 +10,8 @@ BROKEN_powerpc64= Does not build -USE_QT5= core network buildtools_build +USES= qt:5 tar:xz +USE_QT= core network buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: textproc/scim-bridge-qt4/Makefile =================================================================== --- textproc/scim-bridge-qt4/Makefile +++ textproc/scim-bridge-qt4/Makefile @@ -18,9 +18,9 @@ RUN_DEPENDS= scim-bridge:textproc/scim-bridge -USE_QT4= corelib gui moc_build +USE_QT= corelib gui moc_build QT_NONSTANDARD= yes -USES= gettext gmake libtool pkgconfig +USES= gettext gmake libtool pkgconfig qt:4 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ Index: textproc/sigil/Makefile =================================================================== --- textproc/sigil/Makefile +++ textproc/sigil/Makefile @@ -21,10 +21,10 @@ GH_PROJECT= Sigil USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - pkgconfig python:3 shebangfix + pkgconfig python:3 qt:5 shebangfix SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \ src/Resource_Files/python3lib/*.py -USE_QT5= concurrent core gui network printsupport svg webkit \ +USE_QT= concurrent core gui network printsupport svg webkit \ widgets xml xmlpatterns \ buildtools_build linguisttools_build qmake_build \ imageformats_run Index: textproc/soprano/Makefile =================================================================== --- textproc/soprano/Makefile +++ textproc/soprano/Makefile @@ -14,9 +14,9 @@ librdf.so:textproc/redland \ libiodbc.so:databases/libiodbc -USE_QT4= corelib dbus network qtestlib_build xml \ +USE_QT= corelib dbus network qtestlib_build xml \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource pkgconfig tar:bzip2 +USES= cmake:outsource pkgconfig qt:4 tar:bzip2 CMAKE_ARGS+= -DSOPRANO_DISABLE_CLUCENE_INDEX=yes \ -DSOPRANO_DISABLE_SESAME2_BACKEND=yes USE_LDCONFIG= yes Index: textproc/uim-kde4/Makefile =================================================================== --- textproc/uim-kde4/Makefile +++ textproc/uim-kde4/Makefile @@ -12,8 +12,8 @@ USE_GCC= any USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build qt3support uic rcc -USES+= kde:4 +USE_QT= qmake_build moc_build qt3support uic rcc +USES+= kde:4 qt:4 MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} Index: textproc/uim-qt4/Makefile =================================================================== --- textproc/uim-qt4/Makefile +++ textproc/uim-qt4/Makefile @@ -7,8 +7,8 @@ LIB_DEPENDS= libuim.so:textproc/uim -USE_QT4= qmake_build moc_build qt3support uic -USES= iconv libtool +USES= iconv libtool qt:4 +USE_QT= moc_build qmake_build qt3support uic MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} Index: textproc/xxdiff/Makefile =================================================================== --- textproc/xxdiff/Makefile +++ textproc/xxdiff/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= bison gmake tar:bz2 -USE_QT4= gui moc_build qmake_build uic_build +USES= bison gmake tar:bz2 qt:4,qmake_dummy +USE_QT= gui moc_build qmake_build uic_build BUILD_WRKSRC= ${WRKSRC}/src Index: www/aria2fe/Makefile =================================================================== --- www/aria2fe/Makefile +++ www/aria2fe/Makefile @@ -15,8 +15,8 @@ RUN_DEPENDS= aria2c:www/aria2 \ xterm:x11/xterm -USES= tar:bzip2 qmake -USE_QT4= gui moc_build rcc_build uic_build +USES= qt:4 tar:bzip2 +USE_QT= gui moc_build qmake_build rcc_build uic_build PLIST_FILES= bin/${PORTNAME} Index: www/arora/Makefile =================================================================== --- www/arora/Makefile +++ www/arora/Makefile @@ -14,13 +14,13 @@ BROKEN= Unfetchable (google code has gone away) -USES= desktop-file-utils qmake -USE_QT4= network webkit moc_build uic_build rcc_build \ +USES= desktop-file-utils qt:4 +USE_QT= network webkit moc_build qmake_build uic_build rcc_build \ sql-sqlite3_run imageformats_run gui script sql OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USE= QT4=linguisttools_build +NLS_USE= QT=linguisttools_build BROKEN_ia64= core dump on application startup Index: www/bookmarkbridge/Makefile =================================================================== --- www/bookmarkbridge/Makefile +++ www/bookmarkbridge/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf gmake perl5 pkgconfig shebangfix +USES= autoreconf gmake perl5 pkgconfig shebangfix qt:4 SHEBANG_FILES= bookmarkbridge/docs/autodocs.pl USE_XORG= x11 ice xext -USE_QT4= corelib gui qt3support moc_build rcc_build uic_build +USE_QT= corelib gui qt3support moc_build rcc_build uic_build USE_GNOME= libxml2 GNU_CONFIGURE= yes Index: www/choqok/Makefile =================================================================== --- www/choqok/Makefile +++ www/choqok/Makefile @@ -17,9 +17,9 @@ libqoauth.so:net/qoauth \ libtelepathy-qt4.so:net-im/telepathy-qt4 -USES= cmake gettext kde:4 tar:xz +USES= cmake gettext kde:4 qt:4 tar:xz USE_KDE= attica automoc4 kdelibs -USE_QT4= gui imageformats_run network \ +USE_QT= gui imageformats_run network \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: www/cutycapt/Makefile =================================================================== --- www/cutycapt/Makefile +++ www/cutycapt/Makefile @@ -14,8 +14,8 @@ WRKSRC= ${WRKDIR}/CutyCapt -USES= qmake -USE_QT4= moc_build imageformats_run webkit +USES= qt:4 +USE_QT= moc_build qmake_build imageformats_run webkit PLIST_FILES= bin/CutyCapt Index: www/kdewebdev4/Makefile =================================================================== --- www/kdewebdev4/Makefile +++ www/kdewebdev4/Makefile @@ -12,10 +12,10 @@ LIB_DEPENDS= libtidy.so:www/tidy-lib \ libboost_thread.so:devel/boost-libs -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_GNOME= libxml2 libxslt USE_KDE= kdelibs pimlibs automoc4 -USE_QT4= dbus porting_build \ +USE_QT= dbus porting_build \ qmake_build moc_build rcc_build uic_build uic3_build USE_LDCONFIG= yes Index: www/kf5-kdewebkit/Makefile =================================================================== --- www/kf5-kdewebkit/Makefile +++ www/kf5-kdewebkit/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library providing integration of QtWebKit -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons \ ecm i18n jobwidgets kio parts service sonnet textwidgets \ wallet widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build webkit \ +USE_QT= buildtools_build core dbus gui network qmake_build webkit \ widgets xml .include Index: www/kf5-khtml/Makefile =================================================================== --- www/kf5-khtml/Makefile +++ www/kf5-khtml/Makefile @@ -12,12 +12,12 @@ libpng16.so:graphics/png USES= cmake:outsource compiler:c++11-lib gettext jpeg kde:5 \ - tar:xz + qt:5 tar:xz USE_KDE= archive auth bookmarks codecs completion config \ configwidgets coreaddons ecm globalaccel i18n iconthemes \ jobwidgets js kio notifications parts service sonnet \ textwidgets wallet widgetsaddons windowsystem xmlgui -USE_QT5= buildtools_build core dbus gui network phonon4 \ +USE_QT= buildtools_build core dbus gui network phonon4 \ printsupport qmake_build widgets x11extras xml USE_XORG= ice sm x11 xext Index: www/kf5-kjs/Makefile =================================================================== --- www/kf5-kjs/Makefile +++ www/kf5-kjs/Makefile @@ -10,8 +10,8 @@ LIB_DEPENDS= libpcre.so:devel/pcre -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm doctools -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include Index: www/kf5-kjsembed/Makefile =================================================================== --- www/kf5-kjsembed/Makefile +++ www/kf5-kjsembed/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for binding JavaScript objects to QObjects -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive doctools ecm i18n js -USE_QT5= buildtools_build core gui qmake_build svg \ +USE_QT= buildtools_build core gui qmake_build svg \ uiplugin uitools widgets xml .include Index: www/kpartsplugin/Makefile =================================================================== --- www/kpartsplugin/Makefile +++ www/kpartsplugin/Makefile @@ -10,9 +10,9 @@ MAINTAINER= avilla@FreeBSD.org COMMENT= Browser file viewer using KDE technology -USES= cmake kde:4 webplugin:native tar:bzip2 +USES= cmake kde:4 qt:4,qmake_dummy tar:bzip2 webplugin:native USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build +USE_QT= corelib gui moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DNSPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}" PORTDATE= 20120723 Index: www/kwebkitpart/Makefile =================================================================== --- www/kwebkitpart/Makefile +++ www/kwebkitpart/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Web browser component for KDE SC based on QtWebKit -USES= cmake kde:4 cpe tar:xz +USES= cmake kde:4 cpe qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= designer gui webkit \ +USE_QT= designer gui webkit \ moc_build qmake_build rcc_build uic_build CPE_VENDOR= urs_wolfer Index: www/linkchecker/Makefile =================================================================== --- www/linkchecker/Makefile +++ www/linkchecker/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} -USES= cpe python:2 +USES= cpe python:2 qt:4 CPE_VENDOR= bastian_kleineidam USE_PYTHON= distutils autoplist INSTALLS_ICONS= yes Index: www/otter-browser/Makefile =================================================================== --- www/otter-browser/Makefile +++ www/otter-browser/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Browser based on Qt 5 -USE_QT5= concurrent core dbus gui multimedia network printsupport \ +USE_QT= concurrent core dbus gui multimedia network printsupport \ qml script sql sql-sqlite3 webkit widgets xmlpatterns \ buildtools_build qmake_build -USES= cmake:outsource compiler:c++11-lib desktop-file-utils +USES= cmake:outsource compiler:c++11-lib desktop-file-utils qt:5 USE_GITHUB= yes GH_ACCOUNT= OtterBrowser Index: www/py-qt4-webkit/Makefile =================================================================== --- www/py-qt4-webkit/Makefile +++ www/py-qt4-webkit/Makefile @@ -10,9 +10,9 @@ CONFIGURE_ARGS= --enable QtWebKit PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run network_run -USE_QT4= corelib gui network webkit \ +USE_QT= corelib gui network webkit \ moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: www/py-qt5-webkit/Makefile =================================================================== --- www/py-qt5-webkit/Makefile +++ www/py-qt5-webkit/Makefile @@ -12,10 +12,10 @@ CONFIGURE_ARGS= --enable QtWebKit PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run network_run -USE_QT5= core gui network webkit qmake_build +USE_QT= core gui network webkit qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: www/py-qt5-webkitwidgets/Makefile =================================================================== --- www/py-qt5-webkitwidgets/Makefile +++ www/py-qt5-webkitwidgets/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtWebKitWidgets PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run printsupport_run webkit_run widgets_run -USE_QT5= core gui network printsupport webkit widgets \ +USE_QT= core gui network printsupport webkit widgets \ qmake_build OPTIONS_DEFINE= API DEBUG Index: www/qt5-webchannel/Makefile =================================================================== --- www/qt5-webchannel/Makefile +++ www/qt5-webchannel/Makefile @@ -8,9 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients -USE_QT5= buildtools_build core qml quick +USES= qt:5 tar:xz +USE_QT= buildtools_build core qml quick QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: www/qt5-websockets/Makefile =================================================================== --- www/qt5-websockets/Makefile +++ www/qt5-websockets/Makefile @@ -8,9 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt implementation of WebSocket protocol -USE_QT5= buildtools_build core network qml quick +USES= qt:5 tar:xz +USE_QT= buildtools_build core network qml quick QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: www/qupzilla-qt4/Makefile =================================================================== --- www/qupzilla-qt4/Makefile +++ www/qupzilla-qt4/Makefile @@ -17,9 +17,9 @@ CONFLICTS_INSTALL= ${PORTNAME}-qt5* -USES= desktop-file-utils execinfo pkgconfig qmake ssl tar:xz -USE_QT4= corelib gui network script sql webkit xml \ - linguisttools_build moc_build rcc_build uic_build \ +USES= desktop-file-utils execinfo pkgconfig qt:4 ssl tar:xz +USE_QT= corelib gui network script sql webkit xml \ + linguisttools_build moc_build qmake_build rcc_build uic_build \ imageformats_run sql-sqlite3_run USE_XORG= x11 CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ @@ -31,7 +31,7 @@ OPTIONS_DEFAULT=DBUS OPTIONS_SUB= yes -DBUS_USE= QT4=dbus +DBUS_USE= QT=dbus DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true" GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring Index: www/qupzilla-qt5/Makefile =================================================================== --- www/qupzilla-qt5/Makefile +++ www/qupzilla-qt5/Makefile @@ -17,10 +17,11 @@ CONFLICTS_INSTALL= ${PORTNAME}-qt4* -USES= desktop-file-utils execinfo pkgconfig qmake ssl tar:xz -USE_QT5= core concurrent gui network printsupport script sql webkit \ +USES= desktop-file-utils execinfo pkgconfig qt:5 ssl tar:xz +USE_QT= core concurrent gui network printsupport script sql webkit \ widgets x11extras xml imageformats_run sql-sqlite3_run \ - buildtools_build linguisttools_build + buildtools_build linguisttools_build qmake_build + USE_XORG= x11 USE_GL= gl CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ @@ -32,7 +33,7 @@ OPTIONS_DEFAULT=DBUS OPTIONS_SUB= yes -DBUS_USE= QT5=dbus +DBUS_USE= QT=dbus DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true" GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring Index: www/rekonq/Makefile =================================================================== --- www/rekonq/Makefile +++ www/rekonq/Makefile @@ -14,9 +14,9 @@ LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_GFDL= ${WRKSRC}/COPYING.DOC -USES= cmake:outsource gettext kde:4 tar:xz +USES= cmake:outsource gettext kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= script webkit \ +USE_QT= script webkit \ moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= OPERA NEPOMUK Index: www/webkit-qt4/Makefile =================================================================== --- www/webkit-qt4/Makefile +++ www/webkit-qt4/Makefile @@ -9,14 +9,14 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt WebKit implementation -USE_QT4= corelib declarative gui network \ +USES= qt:4 +USE_QT= corelib declarative gui network \ qmake_build moc_build rcc_build QT_DIST= yes USE_XORG= xrender -USES= pkgconfig +USES= pkgconfig qt:4 HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: www/webkit-qt5/Makefile =================================================================== --- www/webkit-qt5/Makefile +++ www/webkit-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www MASTER_SITE_SUBDIR= community_releases/${QT5_VERSION:R}/${QT5_VERSION}/ PKGNAMEPREFIX= qt5- @@ -21,23 +20,22 @@ BROKEN_sparc64= cannot build: uses i386 assembler +USES= bison gperf jpeg perl5 pkgconfig python:build \ + qt:5,qmake_outsource sqlite tar:xz USE_GL= gl USE_GNOME= libxml2 libxslt USE_PERL5= build -USE_QT5= core gui network opengl printsupport qml quick sql \ - widgets buildtools_build +USE_QT= core gui network opengl printsupport qml quick sql \ + widgets buildtools_build qmake_build QT_DIST= ${PORTNAME} USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes USE_XORG= x11 xcomposite xrender -USES= bison gperf jpeg perl5 pkgconfig python:build qmake:outsource \ - sqlite # Use flex(1) from ports. MAKE_ENV= PATH="${LOCALBASE}/bin:${PATH}" # "all" builds many more targets. The default one is called "first" in # QtWebKit, and is invoked by default when make is called without arguments. ALL_TARGET= first -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge Index: www/wt/Makefile =================================================================== --- www/wt/Makefile +++ www/wt/Makefile @@ -175,7 +175,8 @@ .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4= corelib moc_build +USES+= qt:4 +USE_QT= corelib moc_build .endif .if ${PORT_OPTIONS:MOPENGL} Index: x11-clocks/amor/Makefile =================================================================== --- x11-clocks/amor/Makefile +++ x11-clocks/amor/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Small animation which sits on top of active window -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: x11-clocks/kteatime/Makefile =================================================================== --- x11-clocks/kteatime/Makefile +++ x11-clocks/kteatime/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Handy timer for steeping tea -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: x11-clocks/ktimer/Makefile =================================================================== --- x11-clocks/ktimer/Makefile +++ x11-clocks/ktimer/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Countdown launcher for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: x11-clocks/ktux/Makefile =================================================================== --- x11-clocks/ktux/Makefile +++ x11-clocks/ktux/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Tux-in-a-Spaceship screen saver -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs workspace automoc4 -USE_QT4= qt3support moc_build qmake_build rcc_build uic_build +USE_QT= qt3support moc_build qmake_build rcc_build uic_build .include Index: x11-clocks/plasma-applet-adjustableclock/Makefile =================================================================== --- x11-clocks/plasma-applet-adjustableclock/Makefile +++ x11-clocks/plasma-applet-adjustableclock/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 workspace -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: x11-clocks/plasma-applet-geekclock/Makefile =================================================================== --- x11-clocks/plasma-applet-geekclock/Makefile +++ x11-clocks/plasma-applet-geekclock/Makefile @@ -11,9 +11,9 @@ MAINTAINER= jhale@FreeBSD.org COMMENT= KDE4 geeky analog clock plasma applet -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 kdelibs workspace -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build PLIST_FILES= lib/kde4/plasma_applet_geekclock.so \ Index: x11-fm/doublecmd/Makefile =================================================================== --- x11-fm/doublecmd/Makefile +++ x11-fm/doublecmd/Makefile @@ -21,7 +21,7 @@ PORTDOCS= * -USES= dos2unix desktop-file-utils +USES= dos2unix desktop-file-utils qt:4 USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \ fcl-xml iconvenc pasjpeg rtl-extra x11 USE_XORG= x11 Index: x11-fm/krusader2/Makefile =================================================================== --- x11-fm/krusader2/Makefile +++ x11-fm/krusader2/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource gettext kde:4 tar:bzip2 +USES= cmake:outsource gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include Index: x11-fm/pcmanfm-qt/Makefile =================================================================== --- x11-fm/pcmanfm-qt/Makefile +++ x11-fm/pcmanfm-qt/Makefile @@ -17,8 +17,8 @@ libfm.so:x11/libfm USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - gettext-runtime localbase:ldflags lxqt pkgconfig tar:xz -USE_QT5= buildtools_build qmake_build core dbus gui widgets \ + gettext-runtime localbase:ldflags lxqt pkgconfig qt:5 tar:xz +USE_QT= buildtools_build qmake_build core dbus gui widgets \ x11extras USE_LXQT= lxqt libfmqt USE_GNOME= glib20 Index: x11-fm/pcmanfmqt-l10n/Makefile =================================================================== --- x11-fm/pcmanfmqt-l10n/Makefile +++ x11-fm/pcmanfmqt-l10n/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ -USES= cmake:outsource lxqt tar:xz -USE_QT5= buildtools_build qmake_build +USES= cmake:outsource lxqt qt:5 tar:xz +USE_QT= buildtools_build qmake_build USE_LXQT= lxqt CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \ Index: x11-fm/qtfm/Makefile =================================================================== --- x11-fm/qtfm/Makefile +++ x11-fm/qtfm/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= dos2unix qmake +USES= dos2unix qt:4 DOS2UNIX_REGEX= .*\.(h|cpp) -USE_QT4= gui network moc_build rcc_build \ +USE_QT= gui network moc_build qmake_build rcc_build \ imageformats_run post-patch: Index: x11-fm/ultracopier/Makefile =================================================================== --- x11-fm/ultracopier/Makefile +++ x11-fm/ultracopier/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:xz -USE_QT5= buildtools_build linguisttools_build \ +USES= qt:5 tar:xz +USE_QT= buildtools_build linguisttools_build qmake_build \ core gui network widgets xml QMAKE_ARGS= LRELEASE="${LRELEASE}" ultracopier-core.pro Index: x11-fonts/fontmatrix/Makefile =================================================================== --- x11-fonts/fontmatrix/Makefile +++ x11-fonts/fontmatrix/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -USES= cmake -USE_QT4= corelib xml gui svg network moc_build uic_build rcc_build qmake_build linguisttools_build +USES= cmake qt:4 +USE_QT= corelib xml gui svg network moc_build uic_build rcc_build qmake_build linguisttools_build INSTALLS_ICONS= yes OPTIONS_DEFINE= FONTFORGE Index: x11-themes/adwaita-qt4/Makefile =================================================================== --- x11-themes/adwaita-qt4/Makefile +++ x11-themes/adwaita-qt4/Makefile @@ -22,8 +22,8 @@ EXTRA_PATCHES= ${.CURDIR}/../adwaita-qt5/files/patch-CMakeLists.txt PLIST_FILES= %%QT_PLUGINDIR%%/styles/adwaita.so -USES= cmake:outsource compiler:c++11-lib localbase pkgconfig -USE_QT4= moc_build rcc_build uic_build qmake_build corelib gui +USES= cmake:outsource compiler:c++11-lib localbase pkgconfig qt:4 +USE_QT= moc_build rcc_build uic_build qmake_build corelib gui CMAKE_ARGS+= -DBUILD_EXAMPLE:BOOL=OFF \ -DUSE_QT4:BOOL=ON Index: x11-themes/adwaita-qt5/Makefile =================================================================== --- x11-themes/adwaita-qt5/Makefile +++ x11-themes/adwaita-qt5/Makefile @@ -21,8 +21,8 @@ DISTINFO_FILE= ${.CURDIR}/../adwaita-common/distinfo PLIST_FILES= %%QT_PLUGINDIR%%/styles/adwaita.so -USES= cmake:outsource compiler:c++11-lib localbase pkgconfig -USE_QT5= buildtools_build qmake_build core gui widgets +USES= cmake:outsource compiler:c++11-lib localbase pkgconfig qt:5 +USE_QT= buildtools_build qmake_build core gui widgets CMAKE_ARGS+= -DBUILD_EXAMPLE:BOOL=OFF Index: x11-themes/gtk-qt4-engine/Makefile =================================================================== --- x11-themes/gtk-qt4-engine/Makefile +++ x11-themes/gtk-qt4-engine/Makefile @@ -13,8 +13,8 @@ BROKEN= Unfetchable (google code has gone away) USE_GNOME= gtk20 -USE_QT4= corelib gui moc_build rcc_build uic_build qmake_build -USES= cmake gettext kde:4 pkgconfig tar:bzip2 +USE_QT= corelib gui moc_build rcc_build uic_build qmake_build +USES= cmake gettext kde:4 pkgconfig qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 WRKSRC= ${WRKDIR}/${PORTNAME} Index: x11-themes/kde-gtk-config/Makefile =================================================================== --- x11-themes/kde-gtk-config/Makefile +++ x11-themes/kde-gtk-config/Makefile @@ -9,10 +9,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= GTK2 and GTK3 Configurator for KDE -USES= cmake:outsource gettext kde:4 pkgconfig tar:xz +USES= cmake:outsource gettext kde:4 pkgconfig qt:4 tar:xz USE_GNOME= gtk20 gtk30 USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build post-patch: ${REINPLACE_CMD} -e '/^install/s,KDE4_LIBEXEC_INSTALL_DIR,LIBEXEC_INSTALL_DIR,g' \ Index: x11-themes/kde4-base-artwork/Makefile =================================================================== --- x11-themes/kde4-base-artwork/Makefile +++ x11-themes/kde4-base-artwork/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build NO_BUILD= yes .include Index: x11-themes/kde4-style-bespin/Makefile =================================================================== --- x11-themes/kde4-style-bespin/Makefile +++ x11-themes/kde4-style-bespin/Makefile @@ -16,8 +16,8 @@ WRKSRC= ${WRKDIR}/cloudcity -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 workspace -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build .include Index: x11-themes/kde4-style-nitrogen/Makefile =================================================================== --- x11-themes/kde4-style-nitrogen/Makefile +++ x11-themes/kde4-style-nitrogen/Makefile @@ -16,8 +16,8 @@ WRKSRC= ${WRKDIR}/kde4-kstyle-nitrogen-${PORTVERSION}-Source -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build .include Index: x11-themes/kde4-style-oxygen-transparent/Makefile =================================================================== --- x11-themes/kde4-style-oxygen-transparent/Makefile +++ x11-themes/kde4-style-oxygen-transparent/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -USES= cmake kde:4 tar:xz +USES= cmake kde:4 qt:4 tar:xz USE_KDE= kdelibs workspace automoc4 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build .include Index: x11-themes/kde4-style-polyester/Makefile =================================================================== --- x11-themes/kde4-style-polyester/Makefile +++ x11-themes/kde4-style-polyester/Makefile @@ -14,8 +14,8 @@ LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include Index: x11-themes/kde4-style-skulpture/Makefile =================================================================== --- x11-themes/kde4-style-skulpture/Makefile +++ x11-themes/kde4-style-skulpture/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 workspace -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build .include Index: x11-themes/kde4-wallpapers/Makefile =================================================================== --- x11-themes/kde4-wallpapers/Makefile +++ x11-themes/kde4-wallpapers/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Set of wallpapers for the KDE Plasma workspace -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build NO_BUILD= yes Index: x11-themes/kde4-windeco-crystal/Makefile =================================================================== --- x11-themes/kde4-windeco-crystal/Makefile +++ x11-themes/kde4-windeco-crystal/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:bzip2 +USES= cmake:outsource kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 workspace -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USE_QT= qmake_build moc_build rcc_build uic_build \ corelib gui qt3support WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: x11-themes/kde4-windeco-dekorator/Makefile =================================================================== --- x11-themes/kde4-windeco-dekorator/Makefile +++ x11-themes/kde4-windeco-dekorator/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= libqimageblitz.so:x11/qimageblitz -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 workspace -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT= corelib qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include Index: x11-themes/kdeartwork4/Makefile =================================================================== --- x11-themes/kdeartwork4/Makefile +++ x11-themes/kdeartwork4/Makefile @@ -10,9 +10,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkexiv2 workspace automoc4 -USE_QT4= corelib gui opengl \ +USE_QT= corelib gui opengl \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xt Index: x11-themes/kf5-breeze-icons/Makefile =================================================================== --- x11-themes/kf5-breeze-icons/Makefile +++ x11-themes/kf5-breeze-icons/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= The Breeze icon theme for KDE -USES= cmake:outsource kde:5 tar:xz +USES= cmake:outsource kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core qmake_build testlib +USE_QT= buildtools_build core qmake_build testlib NO_ARCH= yes Index: x11-themes/kf5-kemoticons/Makefile =================================================================== --- x11-themes/kf5-kemoticons/Makefile +++ x11-themes/kf5-kemoticons/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library to convert emoticons -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= archive config coreaddons ecm service -USE_QT5= buildtools_build core gui qmake_build widgets xml +USE_QT= buildtools_build core gui qmake_build widgets xml .include Index: x11-themes/kf5-kiconthemes/Makefile =================================================================== --- x11-themes/kf5-kiconthemes/Makefile +++ x11-themes/kf5-kiconthemes/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for handling icons in applications -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive auth codecs config configwidgets coreaddons ecm \ i18n itemviews widgetsaddons -USE_QT5= buildtools_build concurrent core dbus gui qmake_build \ +USE_QT= buildtools_build concurrent core dbus gui qmake_build \ script svg widgets xml .include Index: x11-themes/kf5-oxygen-icons5/Makefile =================================================================== --- x11-themes/kf5-oxygen-icons5/Makefile +++ x11-themes/kf5-oxygen-icons5/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= The Oxygen icon theme for KDE -USES= cmake:outsource kde:5 tar:xz -USE_QT5= buildtools_build core qmake_build testlib +USES= cmake:outsource kde:5 qt:5 tar:xz +USE_QT= buildtools_build core qmake_build testlib USE_KDE= ecm NO_ARCH= yes Index: x11-themes/qt4-style-Kvantum/Makefile =================================================================== --- x11-themes/qt4-style-Kvantum/Makefile +++ x11-themes/qt4-style-Kvantum/Makefile @@ -15,8 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= tsujan -USES= compiler:c++11-lang qmake -USE_QT4= corelib gui svg rcc_build uic_build moc_build +USES= compiler:c++11-lang qt:4 +USE_QT= corelib gui svg rcc_build uic_build moc_build qmake_build USE_XORG= x11 xext WRKSRC_SUBDIR= ${PORTNAME} Index: x11-themes/qt4-style-float/Makefile =================================================================== --- x11-themes/qt4-style-float/Makefile +++ x11-themes/qt4-style-float/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv2 -USES= tar:bzip2 qmake -USE_QT4= corelib gui moc_build rcc_build +USES= qt:4 tar:bzip2 +USE_QT= corelib gui moc_build qmake_build rcc_build WRKSRC= ${WRKDIR}/floatstyle-${PORTVERSION} Index: x11-themes/qt4-style-phase/Makefile =================================================================== --- x11-themes/qt4-style-phase/Makefile +++ x11-themes/qt4-style-phase/Makefile @@ -15,8 +15,8 @@ LICENSE= MIT -USES= tar:bzip2 qmake -USE_QT4= corelib gui moc_build +USES= qt:4 tar:bzip2 +USE_QT= corelib gui moc_build qmake_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: x11-themes/qt4-style-quantumstyle/Makefile =================================================================== --- x11-themes/qt4-style-quantumstyle/Makefile +++ x11-themes/qt4-style-quantumstyle/Makefile @@ -16,8 +16,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake -USE_QT4= corelib gui svg rcc_build uic_build moc_build +USES= qt:4 +USE_QT= corelib gui svg rcc_build uic_build moc_build qmake_build WRKSRC= ${WRKDIR}/QuantumStyle Index: x11-themes/qt5-style-Kvantum/Makefile =================================================================== --- x11-themes/qt5-style-Kvantum/Makefile +++ x11-themes/qt5-style-Kvantum/Makefile @@ -15,8 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= tsujan -USES= compiler:c++11-lang qmake -USE_QT5= core gui svg widgets x11extras buildtools_build +USES= compiler:c++11-lang qt:5 +USE_QT= core gui svg widgets x11extras buildtools_build qmake_build USE_XORG= x11 xext USE_GL= gl INSTALLS_ICONS= yes Index: x11-themes/qt5-style-plugins/Makefile =================================================================== --- x11-themes/qt5-style-plugins/Makefile +++ x11-themes/qt5-style-plugins/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL21 -USES= qmake -USE_QT5= buildtools_build core gui widgets +USES= qt:5 +USE_QT= buildtools_build core gui qmake_build widgets USE_GL+= gl WRKSRC= ${WRKDIR}/qtstyleplugins-src-${PORTVERSION} Index: x11-themes/qtcurve/Makefile =================================================================== --- x11-themes/qtcurve/Makefile +++ x11-themes/qtcurve/Makefile @@ -74,20 +74,22 @@ WITH_qt4= On # required for KDE 4 PKGNAMEPREFIX= kde4-style- USE_KDE= kdelibs workspace automoc4 -USES+= kde:4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USES+= kde:4 qt:4 +USE_QT= moc_build qmake_build rcc_build uic_build BUILD_WRKSRC= ${WRKSRC}/qt4 .endif .if ${QTCURVE_SLAVE} == "qt4" PKGNAMEPREFIX= qt4-style- -USE_QT4= dbus gui svg moc_build qmake_build rcc_build uic_build +USES+= qt:4 +USE_QT= dbus gui svg moc_build qmake_build rcc_build uic_build PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so .endif .if ${QTCURVE_SLAVE} == "qt5" PKGNAMEPREFIX= qt5-style- -USE_QT5= dbus gui svg widgets x11extras buildtools_build qmake_build +USES+= qt:5 +USE_QT= dbus gui svg widgets x11extras buildtools_build qmake_build PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so .endif Index: x11-toolkits/attica/Makefile =================================================================== --- x11-toolkits/attica/Makefile +++ x11-toolkits/attica/Makefile @@ -11,10 +11,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Open Collaboration Services API library -USE_QT4= network qtestlib_build xml \ +USE_QT= network qtestlib_build xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes -USES= cmake:outsource tar:bzip2 +USES= cmake:outsource qt:4 tar:bzip2 CMAKE_ARGS= -DATTICA_ENABLE_TESTS:BOOL=OFF \ -DQT4_BUILD:BOOL=ON Index: x11-toolkits/kf5-attica/Makefile =================================================================== --- x11-toolkits/kf5-attica/Makefile +++ x11-toolkits/kf5-attica/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Open Collaboration Services API library KDE5 version -USES= cmake:outsource compiler:c++11-lib kde:5 pathfix tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pathfix qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui network qmake_build widgets +USE_QT= buildtools_build core gui network qmake_build widgets .include Index: x11-toolkits/kf5-kcompletion/Makefile =================================================================== --- x11-toolkits/kf5-kcompletion/Makefile +++ x11-toolkits/kf5-kcompletion/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 text completion helpers and widgets -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= config ecm widgetsaddons -USE_QT5= buildtools_build core gui linguisttools qmake_build \ +USE_QT= buildtools_build core gui linguisttools qmake_build \ widgets xml .include Index: x11-toolkits/kf5-kconfigwidgets/Makefile =================================================================== --- x11-toolkits/kf5-kconfigwidgets/Makefile +++ x11-toolkits/kf5-kconfigwidgets/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 widgets for configuration dialogs -USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix qt:5 tar:xz USE_KDE= archive auth codecs config coreaddons doctools ecm guiaddons \ i18n widgetsaddons -USE_QT5= buildtools_build core dbus gui qmake_build widgets xml +USE_QT= buildtools_build core dbus gui qmake_build widgets xml SHEBANG_FILES= src/preparetips5 Index: x11-toolkits/kf5-kdesignerplugin/Makefile =================================================================== --- x11-toolkits/kf5-kdesignerplugin/Makefile +++ x11-toolkits/kf5-kdesignerplugin/Makefile @@ -8,12 +8,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 integration of Frameworks widgets in Qt Designer/Creator -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons doctools ecm i18n iconthemes itemviews \ jobwidgets kdewebkit kio plotting service solid sonnet \ textwidgets widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus designer gui linguisttools \ +USE_QT= buildtools_build core dbus designer gui linguisttools \ network qmake_build webkit widgets xml .include Index: x11-toolkits/kf5-kguiaddons/Makefile =================================================================== --- x11-toolkits/kf5-kguiaddons/Makefile +++ x11-toolkits/kf5-kguiaddons/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtGui -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui qmake_build testlib widgets x11extras +USE_QT= buildtools_build core gui qmake_build testlib widgets x11extras USE_XORG= ice sm x11 xcb xext .include Index: x11-toolkits/kf5-kitemviews/Makefile =================================================================== --- x11-toolkits/kf5-kitemviews/Makefile +++ x11-toolkits/kf5-kitemviews/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 widget addons for Qt Model/View -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui linguisttools qmake_build \ +USE_QT= buildtools_build core gui linguisttools qmake_build \ testlib widgets .include Index: x11-toolkits/kf5-kjobwidgets/Makefile =================================================================== --- x11-toolkits/kf5-kjobwidgets/Makefile +++ x11-toolkits/kf5-kjobwidgets/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 widgets for tracking KJob instance -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm widgetsaddons -USE_QT5= buildtools_build core dbus gui linguisttools \ +USE_QT= buildtools_build core dbus gui linguisttools \ qmake_build widgets x11extras .include Index: x11-toolkits/kf5-ktextwidgets/Makefile =================================================================== --- x11-toolkits/kf5-ktextwidgets/Makefile +++ x11-toolkits/kf5-ktextwidgets/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 advanced text editing widgets -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets \ coreaddons dbusaddons ecm guiaddons i18n \ iconthemes itemviews service sonnet \ widgetsaddons windowsystem -USE_QT5= buildtools_build core dbus gui qmake_build widgets xml +USE_QT= buildtools_build core dbus gui qmake_build widgets xml .include Index: x11-toolkits/kf5-kwidgetsaddons/Makefile =================================================================== --- x11-toolkits/kf5-kwidgetsaddons/Makefile +++ x11-toolkits/kf5-kwidgetsaddons/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtWidgets -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui linguisttools \ +USE_QT= buildtools_build core gui linguisttools \ qmake_build uiplugin uitools testlib widgets .include Index: x11-toolkits/kf5-kxmlgui/Makefile =================================================================== --- x11-toolkits/kf5-kxmlgui/Makefile +++ x11-toolkits/kf5-kxmlgui/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 user configurable main windows -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= attica5 auth codecs config configwidgets coreaddons ecm \ globalaccel i18n iconthemes itemviews sonnet textwidgets \ widgetsaddons windowsystem -USE_QT5= buildtools_build core dbus gui network printsupport \ +USE_QT= buildtools_build core dbus gui network printsupport \ qmake_build widgets xml .include Index: x11-toolkits/kirigami/Makefile =================================================================== --- x11-toolkits/kirigami/Makefile +++ x11-toolkits/kirigami/Makefile @@ -11,9 +11,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= QtQuick based components set -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= ecm kdeclarative plasma-framework -USE_QT5= buildtools_build core gui linguisttools network qmake_build \ +USE_QT= buildtools_build core gui linguisttools network qmake_build \ qml quick svg testlib widgets .include Index: x11-toolkits/nucleo/Makefile =================================================================== --- x11-toolkits/nucleo/Makefile +++ x11-toolkits/nucleo/Makefile @@ -16,7 +16,7 @@ libpng.so:graphics/png \ libfreetype.so:print/freetype2 -USES= gmake jpeg libtool pathfix pkgconfig shebangfix tar:bzip2 +USES= gmake jpeg libtool pathfix pkgconfig shebangfix qt:4 tar:bzip2 USE_GL= glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-opencv @@ -51,7 +51,7 @@ MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder -QT4_USE= QT4=moc_build,corelib +QT4_USE= QT=moc_build,corelib QT4_CONFIGURE_OFF= --without-qt QT4_MAKE_ARGS= QT4MOC="${MOC}" Index: x11-toolkits/py-qt4-gui/Makefile =================================================================== --- x11-toolkits/py-qt4-gui/Makefile +++ x11-toolkits/py-qt4-gui/Makefile @@ -11,9 +11,9 @@ CONFIGURE_ARGS= --enable QtGui PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run -USE_QT4= corelib gui imageformats_run inputmethods_run iconengines_run \ +USE_QT= corelib gui imageformats_run inputmethods_run iconengines_run \ moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: x11-toolkits/py-qt5-gui/Makefile =================================================================== --- x11-toolkits/py-qt5-gui/Makefile +++ x11-toolkits/py-qt5-gui/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtGui PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run -USE_QT5= core gui qmake_build imageformats_run +USE_QT= core gui qmake_build imageformats_run OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: x11-toolkits/py-qt5-quick/Makefile =================================================================== --- x11-toolkits/py-qt5-quick/Makefile +++ x11-toolkits/py-qt5-quick/Makefile @@ -9,9 +9,9 @@ CONFIGURE_ARGS= --enable QtQuick PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= sip_build core_run gui_run -USE_QT5= core quick qmake_build +USE_QT= core quick qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: x11-toolkits/py-qt5-widgets/Makefile =================================================================== --- x11-toolkits/py-qt5-widgets/Makefile +++ x11-toolkits/py-qt5-widgets/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtWidgets PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run -USE_QT5= core gui widgets qmake_build +USE_QT= core gui widgets qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: x11-toolkits/qt4-declarative/Makefile =================================================================== --- x11-toolkits/qt4-declarative/Makefile +++ x11-toolkits/qt4-declarative/Makefile @@ -8,12 +8,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \ +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build corelib gui network \ opengl script sql svg xml xmlpatterns QT_DIST= yes HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH Index: x11-toolkits/qt4-gui/Makefile =================================================================== --- x11-toolkits/qt4-gui/Makefile +++ x11-toolkits/qt4-gui/Makefile @@ -14,12 +14,11 @@ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils -USE_QT4= qmake_build moc_build rcc_build uic_build corelib +USES= pkgconfig qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build corelib QT_DIST= yes -USES= pkgconfig HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_XORG= xrender xrandr xinerama inputproto xfixes \ sm xcursor xext x11 ice xi xt Index: x11-toolkits/qt4pas/Makefile =================================================================== --- x11-toolkits/qt4pas/Makefile +++ x11-toolkits/qt4pas/Makefile @@ -11,10 +11,10 @@ MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Qt4 binding for FreePascal +USES= qt:4 +USE_QT= corelib gui network script webkit \ + moc_build qmake_build USE_LDCONFIG= yes -USE_QT4= corelib gui network script webkit \ - moc_build -USES= qmake QT4_VER_MIN= 4.5.3 Index: x11-toolkits/qt5-canvas3d/Makefile =================================================================== --- x11-toolkits/qt5-canvas3d/Makefile +++ x11-toolkits/qt5-canvas3d/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt canvas3d module -USE_QT5= core gui network qml quick buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui network qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: x11-toolkits/qt5-charts/Makefile =================================================================== --- x11-toolkits/qt5-charts/Makefile +++ x11-toolkits/qt5-charts/Makefile @@ -10,9 +10,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 charts module -USES= qmake +USES= qt:5 USE_GL= gl -USE_QT5= core network gui widgets qml quick designer \ +USE_QT= core network gui widgets qml quick designer \ buildtools_build qmake_build DESCR= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr Index: x11-toolkits/qt5-declarative/Makefile =================================================================== --- x11-toolkits/qt5-declarative/Makefile +++ x11-toolkits/qt5-declarative/Makefile @@ -11,11 +11,10 @@ DISTINFO_FILE= ${MASTERDIR}/distinfo QT5_VERSION= ${DISTVERSION} -USE_QT5= core designer gui network opengl script sql webkit \ +USES= qt:5 tar:xz +USE_QT= core designer gui network opengl script sql webkit \ widgets xmlpatterns buildtools_build QT_DIST= quick1 -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # qt5logo.png is installed by qt5-widgets. DESKTOP_ENTRIES="Qt 5 QML viewer" "" \ Index: x11-toolkits/qt5-gui/Makefile =================================================================== --- x11-toolkits/qt5-gui/Makefile +++ x11-toolkits/qt5-gui/Makefile @@ -22,17 +22,16 @@ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= compiler:features jpeg +USES= compiler:features jpeg qt:5 tar:xz USE_GL= gl egl USE_GNOME= glib20 -USE_QT5= core dbus network qmake_build buildtools_build +USE_QT= core dbus network qmake_build buildtools_build QT_DIST= base USE_XORG= ice sm x11 xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ -no-evdev \ -system-harfbuzz -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11-toolkits/qt5-quick/Makefile =================================================================== --- x11-toolkits/qt5-quick/Makefile +++ x11-toolkits/qt5-quick/Makefile @@ -8,12 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces +USES= python:build qt:5 tar:xz USE_GL= gl -USE_QT5= core gui network qml sql testlib \ +USE_QT= core gui network qml sql testlib \ widgets xmlpatterns buildtools_build QT_DIST= declarative -USES= python:build qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge Index: x11-toolkits/qt5-quickcontrols/Makefile =================================================================== --- x11-toolkits/qt5-quickcontrols/Makefile +++ x11-toolkits/qt5-quickcontrols/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick -USE_QT5= core gui qml quick widgets \ +USES= qt:5 tar:xz +USE_QT= core gui qml quick widgets \ buildtools_build QT_DIST= quickcontrols -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: x11-toolkits/qt5-quickcontrols2/Makefile =================================================================== --- x11-toolkits/qt5-quickcontrols2/Makefile +++ x11-toolkits/qt5-quickcontrols2/Makefile @@ -8,10 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick -USE_QT5= core gui qml quick widgets \ +USES= qt:5 tar:xz +USE_QT= core gui qml quick widgets \ buildtools_build QT_DIST= ${PORTNAME} -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: x11-toolkits/qt5-uiplugin/Makefile =================================================================== --- x11-toolkits/qt5-uiplugin/Makefile +++ x11-toolkits/qt5-uiplugin/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Custom Qt widget plugin interface for Qt Designer -USE_QT5= core gui widgets +USES= qt:5 tar:xz +USE_QT= core gui widgets QT_DIST= tools -USES= qmake BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} Index: x11-toolkits/qt5-widgets/Makefile =================================================================== --- x11-toolkits/qt5-widgets/Makefile +++ x11-toolkits/qt5-widgets/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt C++ widgets module -USE_QT5= core gui qmake_build buildtools_build +USES= qt:5 tar:xz +USE_QT= core gui qmake_build buildtools_build QT_DIST= base USE_XORG= x11 HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11-toolkits/qtermwidget/Makefile =================================================================== --- x11-toolkits/qtermwidget/Makefile +++ x11-toolkits/qtermwidget/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv2 -USES= cmake:outsource compiler:c++11-lang pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lang pkgconfig qt:5 USE_LDCONFIG= yes -USE_QT5= buildtools_build core gui qmake_build widgets +USE_QT= buildtools_build core gui qmake_build widgets CMAKE_ARGS+= -DBUILD_DESIGNER_PLUGIN:BOOL=OFF -DUSE_QT5:BOOL=ON Index: x11-toolkits/qwt5-designerplugin/Makefile =================================================================== --- x11-toolkits/qwt5-designerplugin/Makefile +++ x11-toolkits/qwt5-designerplugin/Makefile @@ -12,8 +12,8 @@ LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 -USES= gmake qmake tar:bzip2 -USE_QT4= designer moc_build rcc_build +USES= gmake qt:4 tar:bzip2 +USE_QT= designer moc_build qmake_build rcc_build QMAKE_ARGS+= CONFIG+=QwtDesigner \ PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL} PORTSCOUT= limit:^5\. Index: x11-toolkits/qwt5/Makefile =================================================================== --- x11-toolkits/qwt5/Makefile +++ x11-toolkits/qwt5/Makefile @@ -9,8 +9,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Qt Widgets for Technical Applications -USES= gmake qmake tar:bzip2 -USE_QT4= gui svg moc_build +USES= gmake qt:4 tar:bzip2 +USE_QT= gui svg moc_build qmake_build USE_LDCONFIG= yes PORTSCOUT= limit:^5\. Index: x11-toolkits/qwt6-designerplugin/Makefile =================================================================== --- x11-toolkits/qwt6-designerplugin/Makefile +++ x11-toolkits/qwt6-designerplugin/Makefile @@ -12,8 +12,8 @@ LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6 -USES= gmake qmake tar:bzip2 -USE_QT4= designer moc_build rcc_build +USES= gmake qt:4 tar:bzip2 +USE_QT= designer moc_build qmake_build rcc_build QMAKE_ARGS+= CONFIG+=QwtDesigner \ PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL} Index: x11-toolkits/qwt6/Makefile =================================================================== --- x11-toolkits/qwt6/Makefile +++ x11-toolkits/qwt6/Makefile @@ -10,8 +10,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Qt Widgets for Technical Applications -USES= gmake qmake tar:bzip2 -USE_QT4= gui opengl svg xml moc_build +USES= gmake qt:4 tar:bzip2 +USE_QT= gui opengl svg xml moc_build qmake_build USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/qwt6 Index: x11-toolkits/soqt/Makefile =================================================================== --- x11-toolkits/soqt/Makefile +++ x11-toolkits/soqt/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= libCoin.so:graphics/Coin -USES= gmake libtool pathfix pkgconfig -USE_QT4= corelib opengl moc_build +USES= gmake libtool pathfix pkgconfig qt:4 +USE_QT= corelib opengl moc_build QT_NONSTANDARD= yes USE_GL= gl GNU_CONFIGURE= yes Index: x11-wm/qlwm/Makefile =================================================================== --- x11-wm/qlwm/Makefile +++ x11-wm/qlwm/Makefile @@ -15,7 +15,8 @@ MAKE_JOBS_UNSAFE= yes -USE_QT4= corelib gui moc_build qmake_build +USES= qt:4 +USE_QT= corelib gui moc_build qmake PORTDOCS= CHANGES README Index: x11/antimicro/Makefile =================================================================== --- x11/antimicro/Makefile +++ x11/antimicro/Makefile @@ -19,8 +19,8 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_XORG= x11 xi xtst -USE_QT5= core gui linguisttools_build qmake_build buildtools_build widgets network +USE_QT= core gui linguisttools_build qmake_build buildtools_build widgets network USE_SDL= sdl2 -USES= cmake pkgconfig desktop-file-utils shared-mime-info +USES= cmake pkgconfig desktop-file-utils shared-mime-info qt:5 .include Index: x11/cool-retro-term/Makefile =================================================================== --- x11/cool-retro-term/Makefile +++ x11/cool-retro-term/Makefile @@ -17,8 +17,8 @@ GH_PROJECT= qmltermwidget:qtw GH_TAGNAME= v0.1.0:qtw -USES= desktop-file-utils qmake -USE_QT5= qmake_build buildtools_build core gui qml quick widgets \ +USES= desktop-file-utils qt:5 +USE_QT= qmake_build buildtools_build core gui qml quick widgets \ graphicaleffects_run quickcontrols_run .include Index: x11/kactivities/Makefile =================================================================== --- x11/kactivities/Makefile +++ x11/kactivities/Makefile @@ -10,9 +10,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Kactivities library -USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs soprano nepomuk-core -USE_QT4= declarative moc_build qmake_build rcc_build uic_build +USE_QT= declarative moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes post-patch: Index: x11/kactivitymanagerd/Makefile =================================================================== --- x11/kactivitymanagerd/Makefile +++ x11/kactivitymanagerd/Makefile @@ -10,10 +10,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Activity Manager daemon -USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs soprano nepomuk-core \ kactivities -USE_QT4= declarative opengl script sql \ +USE_QT= declarative opengl script sql \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes DISTINFO_FILE= ${.CURDIR}/../kactivities/distinfo Index: x11/kde4-baseapps/Makefile =================================================================== --- x11/kde4-baseapps/Makefile +++ x11/kde4-baseapps/Makefile @@ -10,11 +10,11 @@ LIB_DEPENDS= libtidy.so:www/tidy-lib -USES= cmake:outsource gettext kde:4 tar:xz +USES= cmake:outsource gettext kde:4 qt:4 tar:xz USE_GNOME= glib20 USE_KDE= kdelibs baloo baloo-widgets libkonq \ automoc4 kactivities -USE_QT4= corelib dbus gui script xml \ +USE_QT= corelib dbus gui script xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xt USE_LDCONFIG= yes Index: x11/kde4-runtime/Makefile =================================================================== --- x11/kde4-runtime/Makefile +++ x11/kde4-runtime/Makefile @@ -20,11 +20,11 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh RUN_DEPENDS= cagibid:net/cagibi -USES= cmake:outsource gettext gmake jpeg kde:4 shared-mime-info \ +USES= cmake:outsource gettext gmake jpeg kde:4 qt:4 shared-mime-info \ shebangfix tar:xz USE_KDE= kactivities kdelibs oxygen-icons4 \ attica automoc4 pimlibs strigi nepomuk-core -USE_QT4= corelib dbus declarative designer_build gui phonon \ +USE_QT= corelib dbus declarative designer_build gui phonon \ network qtestlib script svg webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xcursor Index: x11/kde4-workspace/Makefile =================================================================== --- x11/kde4-workspace/Makefile +++ x11/kde4-workspace/Makefile @@ -41,12 +41,12 @@ ${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \ - pkgconfig shebangfix tar:xz + pkgconfig qt:4 shebangfix tar:xz USE_GL= glu USE_GNOME= glib20 USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons4 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi -USE_QT4= corelib dbus declarative designer_build gui network \ +USE_QT= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \ @@ -83,7 +83,7 @@ GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF GSTREAMER_DESC= Multimedia via Phonon-GStreamer -GSTREAMER_USE= QT4=phonon-gst_run +GSTREAMER_USE= QT=phonon-gst_run KACTIVITY_DESC= Activity Manager daemon KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd Index: x11/kdelibs4/Makefile =================================================================== --- x11/kdelibs4/Makefile +++ x11/kdelibs4/Makefile @@ -30,13 +30,13 @@ docbook-xml>0:textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl -USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \ +USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 qt:4 \ shared-mime-info shebangfix tar:xz USE_GNOME= libxml2 libxslt USE_KDE= oxygen-icons4 \ attica automoc4 ontologies soprano strigi USE_OPENSSL= yes -USE_QT4= corelib dbus declarative designer_build gui \ +USE_QT= corelib dbus declarative designer_build gui \ network opengl phonon qt3support \ qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build \ Index: x11/kf5-frameworkintegration/Makefile =================================================================== --- x11/kf5-frameworkintegration/Makefile +++ x11/kf5-frameworkintegration/Makefile @@ -9,10 +9,10 @@ COMMENT= KF5 workspace and cross-framework integration plugins USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ - tar:xz + qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \ iconthemes kio notifications widgetsaddons -USE_QT5= buildtools_build core dbus gui qmake_build widgets \ +USE_QT= buildtools_build core dbus gui qmake_build widgets \ x11extras xml USE_XORG= xcb xcursor Index: x11/kf5-frameworks/Makefile =================================================================== --- x11/kf5-frameworks/Makefile +++ x11/kf5-frameworks/Makefile @@ -9,9 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 frameworks meta port -USES= metaport kde:5 +USES= metaport kde:5 qt:5 USE_KDE= ${_USE_FRAMEWORKS_ALL} -# pull bsd.qt.mk for QT_PLUGINDIR in the kf5-dependencies -USE_QT5= # .include Index: x11/kf5-kactivities/Makefile =================================================================== --- x11/kf5-kactivities/Makefile +++ x11/kf5-kactivities/Makefile @@ -11,11 +11,11 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz USE_KDE= bookmarks config configwidgets coreaddons dbusaddons ecm \ globalaccel i18n kcmutils kdeclarative kio package \ service widgetsaddons windowsystem xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build qml \ +USE_QT= buildtools_build core dbus gui network qmake_build qml \ quick sql widgets .include Index: x11/kf5-kded/Makefile =================================================================== --- x11/kf5-kded/Makefile +++ x11/kf5-kded/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 extensible deamon for providing system level services -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= config coreaddons crash dbusaddons doctools ecm \ init service -USE_QT5= buildtools_build core dbus gui qmake_build widgets +USE_QT= buildtools_build core dbus gui qmake_build widgets .include Index: x11/kf5-kdelibs4support/Makefile =================================================================== --- x11/kf5-kdelibs4support/Makefile +++ x11/kf5-kdelibs4support/Makefile @@ -10,7 +10,7 @@ BUILD_DEPENDS= p5-URI>=0:net/p5-URI -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons doctools globalaccel \ guiaddons i18n iconthemes itemviews jobwidgets kded \ @@ -18,7 +18,7 @@ textwidgets unitconversion widgetsaddons windowsystem \ xmlgui \ designerplugin_build designerplugin_run -USE_QT5= buildtools_build core dbus designer gui network \ +USE_QT= buildtools_build core dbus designer gui network \ printsupport qmake_build svg testlib widgets \ x11extras xml USE_XORG= ice sm x11 xext Index: x11/kf5-kglobalaccel/Makefile =================================================================== --- x11/kf5-kglobalaccel/Makefile +++ x11/kf5-kglobalaccel/Makefile @@ -10,10 +10,10 @@ LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm config coreaddons crash dbusaddons i18n service \ windowsystem -USE_QT5= buildtools_build core dbus gui linguisttools qmake_build \ +USE_QT= buildtools_build core dbus gui linguisttools qmake_build \ testlib widgets x11extras USE_XORG= xcb Index: x11/kf5-kinit/Makefile =================================================================== --- x11/kf5-kinit/Makefile +++ x11/kf5-kinit/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 process launcher to speed up launching KDE applications -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= completion config coreaddons crash doctools ecm i18n \ jobwidgets kio service widgetsaddons windowsystem -USE_QT5= buildtools_build core dbus gui network qmake_build widgets +USE_QT= buildtools_build core dbus gui network qmake_build widgets USE_XORG= x11 xcb .include Index: x11/kf5-krunner/Makefile =================================================================== --- x11/kf5-krunner/Makefile +++ x11/kf5-krunner/Makefile @@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 parallelized query system -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= config coreaddons ecm i18n kio package plasma-framework \ service solid threadweaver -USE_QT5= buildtools_build core gui network qmake_build qml \ +USE_QT= buildtools_build core gui network qmake_build qml \ quick widgets .include Index: x11/kf5-kwindowsystem/Makefile =================================================================== --- x11/kf5-kwindowsystem/Makefile +++ x11/kf5-kwindowsystem/Makefile @@ -10,9 +10,9 @@ LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core gui linguisttools qmake_build \ +USE_QT= buildtools_build core gui linguisttools qmake_build \ testlib widgets x11extras USE_XORG= ice sm x11 xcb xext xfixes xrender Index: x11/kf5-plasma-framework/Makefile =================================================================== --- x11/kf5-plasma-framework/Makefile +++ x11/kf5-plasma-framework/Makefile @@ -8,14 +8,14 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 plugin based UI runtime used to write user interfaces -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz USE_GL= egl gl USE_KDE= activities archive auth codecs completion config \ configwidgets coreaddons dbusaddons doctools globalaccel \ guiaddons i18n iconthemes jobwidgets kio package \ notifications service windowsystem xmlgui kdeclarative \ widgetsaddons -USE_QT5= buildtools_build core dbus gui network qmake_build qml \ +USE_QT= buildtools_build core dbus gui network qmake_build qml \ quick script sql svg widgets x11extras xml USE_XORG= ice sm x11 xcb xext xrandr Index: x11/kgamma/Makefile =================================================================== --- x11/kgamma/Makefile +++ x11/kgamma/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 monitor calibration tool -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_XORG= x11 xxf86vm .include Index: x11/konsole/Makefile =================================================================== --- x11/konsole/Makefile +++ x11/konsole/Makefile @@ -7,9 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE terminal emulator -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 libkonq -USE_QT4= xml moc_build qmake_build rcc_build uic_build +USE_QT= xml moc_build qmake_build rcc_build uic_build USE_XORG= x11 xrender CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" Index: x11/leechcraft/Makefile =================================================================== --- x11/leechcraft/Makefile +++ x11/leechcraft/Makefile @@ -20,8 +20,8 @@ #LC_REV= 1526-g7fdb92a INSTALLS_ICONS= yes USE_LDCONFIG= yes -USES= cmake pkgconfig tar:xz -USE_QT4= corelib declarative gui network script sql sql-sqlite3_run \ +USES= cmake pkgconfig qt:4 tar:xz +USE_QT= corelib declarative gui network script sql sql-sqlite3_run \ webkit xml qmake_build moc_build rcc_build uic_build \ linguisttools_build USE_XORG= x11 @@ -370,12 +370,12 @@ ${PORT_OPTIONS:MLAUGHTY} || ${PORT_OPTIONS:MLIZNOO} || \ ${PORT_OPTIONS:MLMP} || ${PORT_OPTIONS:MSYSNOTIFY} || \ ${PORT_OPTIONS:MVROOBY} || ${PORT_OPTIONS:MXTAZY} -USE_QT4+= dbus +USE_QT+= dbus .endif .if ${PORT_OPTIONS:MBLASQ} || ${PORT_OPTIONS:MBLOGIQUE} || \ ${PORT_OPTIONS:MLACKMAN} -USE_QT4+= xmlpatterns +USE_QT+= xmlpatterns .endif .if ${PORT_OPTIONS:MAZOTH} || ${PORT_OPTIONS:MBLASQ} || \ Index: x11/libfm-qt/Makefile =================================================================== --- x11/libfm-qt/Makefile +++ x11/libfm-qt/Makefile @@ -15,8 +15,8 @@ libmenu-cache.so:x11/menu-cache USES= cmake:outsource compiler:c++11-lib gettext-runtime lxqt pkgconfig \ - tar:xz -USE_QT5= buildtools_build qmake_build core gui widgets \ + qt:5 tar:xz +USE_QT= buildtools_build qmake_build core gui widgets \ x11extras USE_GNOME= glib20 USE_XORG= xcb Index: x11/libfmqt-l10n/Makefile =================================================================== --- x11/libfmqt-l10n/Makefile +++ x11/libfmqt-l10n/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ -USES= cmake:outsource lxqt tar:xz -USE_QT5= buildtools_build qmake_build +USES= cmake:outsource lxqt qt:5 tar:xz +USE_QT= buildtools_build qmake_build USE_LXQT= lxqt CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \ Index: x11/libkonq/Makefile =================================================================== --- x11/libkonq/Makefile +++ x11/libkonq/Makefile @@ -9,9 +9,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Core library for Konqueror -USES= cmake kde:4 tar:xz +USES= cmake kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib dbus gui \ +USE_QT= corelib dbus gui \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Index: x11/lumina/Makefile =================================================================== --- x11/lumina/Makefile +++ x11/lumina/Makefile @@ -39,12 +39,13 @@ MAKE_JOBS_UNSAFE=yes +USES= desktop-file-utils qt:5 USE_GL= gl USE_XORG= x11 xdamage xcb USE_LDCONFIG= yes -USE_QT5= core gui widgets network svg multimedia imageformats \ - buildtools_build x11extras concurrent linguisttools quick -USES= desktop-file-utils qmake +USE_QT= core gui widgets network svg multimedia imageformats \ + x11extras concurrent linguisttools quick \ + buildtools_build qmake_build USE_GITHUB= yes GH_ACCOUNT= trueos Index: x11/plasma-scriptengine-python/Makefile =================================================================== --- x11/plasma-scriptengine-python/Makefile +++ x11/plasma-scriptengine-python/Makefile @@ -10,9 +10,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Python -USES= cmake:outsource kde:4 python:2 tar:xz +USES= cmake:outsource kde:4 python:2 qt:4 tar:xz USE_KDE= kdelibs pykde4 automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python Index: x11/plasma-scriptengine-ruby/Makefile =================================================================== --- x11/plasma-scriptengine-ruby/Makefile +++ x11/plasma-scriptengine-ruby/Makefile @@ -10,9 +10,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Ruby -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs korundum automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build USE_RUBY= yes DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo Index: x11/py-qt4-opengl/Makefile =================================================================== --- x11/py-qt4-opengl/Makefile +++ x11/py-qt4-opengl/Makefile @@ -11,10 +11,10 @@ CONFIGURE_ARGS= --enable QtOpenGL PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_GL= gl USE_PYQT= sip_build core_run gui_run -USE_QT4= corelib gui opengl moc_build qmake_build +USE_QT= corelib gui opengl moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: x11/py-qt5-opengl/Makefile =================================================================== --- x11/py-qt5-opengl/Makefile +++ x11/py-qt5-opengl/Makefile @@ -9,10 +9,10 @@ CONFIGURE_ARGS= --enable QtOpenGL PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run widgets_run -USE_QT5= core gui opengl widgets qmake_build +USE_QT= core gui opengl widgets qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: x11/qimageblitz/Makefile =================================================================== --- x11/qimageblitz/Makefile +++ x11/qimageblitz/Makefile @@ -11,8 +11,8 @@ COMMENT= Graphical effects and filters library for KDE4 USE_LDCONFIG= yes -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build -USES= cmake tar:bzip2 +USE_QT= corelib gui qmake_build moc_build uic_build rcc_build +USES= cmake qt:4 tar:bzip2 post-patch: ${REINPLACE_CMD} -e \ Index: x11/qt4-graphicssystems-opengl/Makefile =================================================================== --- x11/qt4-graphicssystems-opengl/Makefile +++ x11/qt4-graphicssystems-opengl/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt OpenGL rendering engine (experimental) -USE_QT4= qmake_build opengl +USES= qt:4 +USE_QT= qmake_build opengl QT_DIST= yes HAS_CONFIGURE= yes Index: x11/qt4-inputmethods/Makefile =================================================================== --- x11/qt4-inputmethods/Makefile +++ x11/qt4-inputmethods/Makefile @@ -9,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt input methods -USE_QT4= qmake_build moc_build corelib gui +USES= qt:4 +USE_QT= qmake_build moc_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes Index: x11/qt5-qev/Makefile =================================================================== --- x11/qt5-qev/Makefile +++ x11/qt5-qev/Makefile @@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt QWidget events introspection tool -USE_QT5= core widgets +USES= qt:5 tar:xz +USE_QT= core widgets QT_DIST= tools -USES= qmake WRKSRC_SUBDIR= src/${PORTNAME} Index: x11/qt5-x11extras/Makefile =================================================================== --- x11/qt5-x11extras/Makefile +++ x11/qt5-x11extras/Makefile @@ -8,9 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt platform-specific features for X11-based systems -USE_QT5= core gui +USES= qt:5 tar:xz +USE_QT= core gui QT_DIST= x11extras -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: x11/qterminal-l10n/Makefile =================================================================== --- x11/qterminal-l10n/Makefile +++ x11/qterminal-l10n/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ -USES= cmake:outsource lxqt tar:xz -USE_QT5= buildtools_build qmake_build +USES= cmake:outsource lxqt qt:5 tar:xz +USE_QT= buildtools_build qmake_build USE_LXQT= lxqt CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \ Index: x11/qterminal/Makefile =================================================================== --- x11/qterminal/Makefile +++ x11/qterminal/Makefile @@ -12,11 +12,11 @@ LIB_DEPENDS= libqtermwidget5.so:x11-toolkits/qtermwidget RUN_DEPENDS= liberation-fonts-ttf>=2.00:x11-fonts/liberation-fonts-ttf \ - qterminal-l10n>0:x11/qterminal-l10n + qterminal-l10n>0:x11/qterminal-l10n USES= cmake:outsource compiler:c++11-lang localbase:ldflags \ - lxqt pkgconfig tar:xz -USE_QT5= buildtools_build core gui qmake_build widgets x11extras + lxqt pkgconfig qt:5 tar:xz +USE_QT= buildtools_build core gui qmake_build widgets x11extras USE_XORG= x11 USE_LXQT= lxqt Index: x11/qxkb/Makefile =================================================================== --- x11/qxkb/Makefile +++ x11/qxkb/Makefile @@ -13,8 +13,8 @@ LIB_DEPENDS= libxkbfile.so:x11/libxkbfile -USES= cmake -USE_QT4= linguisttools_build moc_build qmake_build rcc_build uic_build \ +USES= cmake qt:4 +USE_QT= linguisttools_build moc_build qmake_build rcc_build uic_build \ corelib gui svg USE_GITHUB= yes Index: x11/rsibreak-kde4/Makefile =================================================================== --- x11/rsibreak-kde4/Makefile +++ x11/rsibreak-kde4/Makefile @@ -11,8 +11,8 @@ MAINTAINER= avg@icyb.net.ua COMMENT= KDE RSI prevention tool -USES= cmake gettext kde:4 tar:bzip2 -USE_QT4= qmake_build moc_build rcc_build uic_build +USES= cmake gettext kde:4 qt:4 tar:bzip2 +USE_QT= qmake_build moc_build rcc_build uic_build USE_KDE= kdelibs automoc4 INSTALLS_ICONS= yes Index: x11/yakuake-kde4/Makefile =================================================================== --- x11/yakuake-kde4/Makefile +++ x11/yakuake-kde4/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake gettext kde:4 shebangfix tar:xz +USES= cmake gettext kde:4 shebangfix qt:4 tar:xz SHEBANG_FILES= data/updaters/yakuake-${PORTVERSION}-startupnotification.pl USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build PLIST_SUB= VERSION="${PORTVERSION}"