Page MenuHomeFreeBSD
Files F164881455

D15540.id42895.largetrue.diff
No OneTemporary
Actions

D15540.id42895.largetrue.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -550,12 +550,10 @@
warn "you need USE_XORG+=pixman"
# Qt4
elif expr ${pkg} : '.*/qt4-.*' > /dev/null; then
- warn "you need USE_QT4+=$(echo ${pkg} | sed -E 's|.*/qt4-||')"
- elif expr ${pkg} : '.*/.*-qt4' > /dev/null; then
- warn "you need USE_QT4+=$(echo ${pkg} | sed -E 's|.*/(.*)-qt4|\1|')"
+ warn "you need USES=qt:4 and USE_QT+=$(echo ${pkg} | sed -E 's|.*/qt4-||')"
# Qt5
elif expr ${pkg} : '.*/qt5-.*' > /dev/null; then
- warn "you need USE_QT5+=$(echo ${pkg} | sed -E 's|.*/qt5-||')"
+ warn "you need USES=qt:5 and USE_QT+=$(echo ${pkg} | sed -E 's|.*/qt5-||')"
# MySQL
elif expr ${lib_file} : "${LOCALBASE}/lib/mysql/[^/]*$" > /dev/null; then
warn "you need USES+=mysql"
Index: Mk/Uses/qmake.mk
===================================================================
--- Mk/Uses/qmake.mk
+++ Mk/Uses/qmake.mk
@@ -1,5 +1,13 @@
# $FreeBSD$
#
+# There are three Qt related USES files with different access to Qt.
+# - qmake: The port requires Qt's qmake to build -- creates the configure target
+# - auto includes qt.mk
+# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - auto inclues qt.mk
+# - qt.mk - Dependency handling. USE_QT=foo bar
+#
+#
# Provide support for qmake-based projects
#
# Feature: qmake
@@ -9,6 +17,9 @@
# ARGS description:
# norecursive Don't pass -recursive argument to qmake binary
# outsource Perform an out-of-source build
+# no_env Suppress modification of configure and make environment.
+# no_configure Don't add the configure target -- this is implied by
+# HAS_CONFIGURE=yes and GNU_CONFIGURE=yes
#
#
# Variables for ports:
@@ -33,78 +44,102 @@
.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
+# Suck in qt.mk
+.include "${USESDIR}/qt.mk"
-# _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
+. if !defined(qmake_ARGS)
+qmake_ARGS= #
. endif
-.endfor
-.if ! ${qmake_ARGS:M_env}
-USE_QT${_QT_VERSION:R:R}+= qmake_build
-.endif
+_VALID_ARGS= norecursive outsource no_env no_configure
+. for arg in ${qmake_ARGS}
+. if empty(_VALID_ARGS:M${arg})
+IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized
+. endif
+. endfor
+
+# Check whether we need to add the configure target
+_ADD_CONFIGURE_TARGET= yes
+. if !empty(qmake_ARGS:Mno_configure) || defined(HAS_CONFIGURE) || defined(GNU_CONFIGURE)
+_ADD_CONFIGURE_TARGET= # unset
+. 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}"
+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)
+. if defined(WITH_DEBUG)
+PLIST_SUB+= DEBUG=""
+QMAKE_ARGS+= CONFIG+="debug" \
+ CONFIG-="release"
+. else
+PLIST_SUB+= DEBUG="@comment "
+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 ! ${qmake_ARGS:Mnorecursive}
+QMAKE_ARGS+= -recursive
+. endif
-.if defined(QMAKE_VERBOSE)
-QMAKE_ARGS+= -d
-.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}
+. 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
+. else
QMAKE_SOURCE_PATH?= # empty
-.endif
+. endif
-.if ! ${qmake_ARGS:M_env}
-DESTDIRNAME= INSTALL_ROOT
-.endif
+# Add qmake to USE_QT -- unless it's qmake itself
+. if !${PORTNAME} == qmake
+USE_QT+= qmake_build
+. endif
+. if empty(qmake_ARGS:Mno_env)
+DESTDIRNAME= INSTALL_ROOT
+CONFIGURE_ENV+= QTDIR="${QT_ARCHDIR}" 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
+
+_USES_POST+= qmake
+.endif # _QMAKE_MK_INCLUDED
+
+# =============================================================================
+#
+# =============================================================================
+
+.if defined(_POSTMKINCLUDED) && !defined(_QMAKE_MK_POST_INCLUDED)
+_QMAKE_MK_POST_INCLUDED= qmake.mk
+
# Define a custom target to make it usable by bsd.qt.mk for internal Qt
# configuration.
qmake-configure:
@@ -114,8 +149,8 @@
${QMAKE_SOURCE_PATH} \
${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS}
-.if !target(do-configure) && ! ${qmake_ARGS:M_env}
+. if !target(do-configure) && !empty(_ADD_CONFIGURE_TARGET)
_USES_configure+= 450:qmake-configure
-.endif
+. endif
.endif # !defined(_INCLUDE_USES_QMAKE_MK)
Index: Mk/Uses/qt-dist.mk
===================================================================
--- Mk/Uses/qt-dist.mk
+++ Mk/Uses/qt-dist.mk
@@ -0,0 +1,376 @@
+# $FreeBSD$
+#
+# There are three Qt related USES files with different access to Qt.
+# - qmake: The port requires Qt's qmake to build -- creates the configure target
+# - auto includes qt.mk
+# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - auto inclues qt.mk
+# - qt.mk - Dependency handling. USE_QT=foo bar
+#
+#
+# Usage
+# qt-dist:<version>[,yes|modulename]
+
+.if !defined(_QT_DIST_MK_INCLUDED)
+_QT_DIST_MK_INCLUDED= qt-dist.mk
+
+# Suck in qt.mk and qmake.mk
+.include "${USESDIR}/qt.mk"
+.include "${USESDIR}/qmake.mk"
+
+# Supported distribution arguments
+_QT4_DISTS= yes
+_QT5_DISTS= 3d activeqt androidextras base canvas3d charts connectivity \
+ datavis3d declarative doc gamepad graphicaleffects imageformats \
+ location macextras multimedia networkauth purchasing \
+ quickcontrols2 quickcontrols remoteobjects script scxml sensors \
+ serialbus serialport speech svg tools translations \
+ virtualkeyboard wayland webchannel webengine websockets webview \
+ winextras x11extras xmlpatterns
+_QT_DISTS= ${_QT${_QT_VER}_DISTS}
+
+# We only accept one item as an argument. The fetch target further below works
+# around this.
+_QT_DIST= # empty
+. for dist in ${_QT_DISTS:O:u}
+. if ${qt-dist_ARGS:M${dist}}
+. if empty(_QT_DIST)
+_QT_DIST= ${dist}
+. else
+IGNORE= cannot be installed: different Qt dists specified via qt-dist:[${qt-dist_ARGS:S/ /,/g}]
+. endif
+. endif
+. endfor
+
+# Fall back to sensible defaults for _QT_DIST
+. if empty(_QT_DIST)
+. if ${_QT_VER:M4}
+_QT_DIST= yes # don't force qt-dist to be set for Qt4 ports which all have 'yes'.
+. endif
+. if ${_QT_VER:M5}
+_QT_DIST= ${PORTNAME} # don't force qt-dist to be set for Qt5 ports which 75% of time are ${PORTNAME}
+. endif
+. endif
+
+# Check validitiy
+. if empty(_QT_DISTS:M${_QT_DIST})
+IGNORE= Unsupported qt-dist ${_QT_DIST} for qt:${_QT_VER}
+. endif
+################################################################################
+
+# Set standard bsd.port.mk variables
+MASTER_SITES= ${MASTER_SITE_QT}
+DISTINFO_FILE?= ${.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_VER: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/
+# www/qt5-webengine hackery: The tarballs of 5.9.5 had a different naming scheme.
+. if ${QT5_VERSION} == "5.9.5"
+DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
+. else
+DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
+. endif
+DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
+DIST_SUBDIR= KDE/Qt/${_QT_VERSION}
+
+# Qt (at least when used with qmake) has a tendency to overlink: some libraries
+# have dependencies on others in the mkspec configurations and the latter are
+# always passed to the linker even if they are not actually used. By passing
+# --as-needed to the linker by default when building the Qt ports we do not
+# have to declare a lot of unnecessary dependencies in USE_QT5.
+# This could arguably work for Qt4 too, but since it is maintenance mode it is
+# better not to fix what is not explicitly broken there.
+LDFLAGS+= -Wl,--as-needed
+
+. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
+ defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
+# Ensure that the "makesum" target (with its inner "fetch" one) uses
+# devel/qt*/distinfo for every port.
+. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
+_QT_DIST= ${_QT5_DISTS}
+. endif
+. endif
+
+# Qt5's tarballs are xz compressed.
+. if empty(USES:Mtar)
+tar_ARGS= xz
+.include "${USESDIR}/tar.mk"
+. endif
+
+. if ${_QT_DIST} == "base" && ${PORTNAME} != "qmake"
+# Qt configure requires pkg-config to detect dependencies.
+.include "${USESDIR}/pkgconfig.mk"
+. endif
+
+# -nomake is only used by qtbase's configure script.
+# Other ports from other Qt modules will automatically build examples and
+# tests if the directories exist because of mkspecs/features/qt_parts.prf.
+EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
+ ${DISTNAME:S,$,/tests,:S,^,--exclude ,}
+. endif # ! ${_QT_VER:M4}
+
+CONFIGURE_ENV+= MAKE="${MAKE:T}"
+
+CONFIGURE_ARGS+= -opensource -confirm-license \
+ -no-pch \
+ -prefix ${PREFIX} \
+ -bindir ${PREFIX}/${QT_BINDIR_REL} \
+ -headerdir ${PREFIX}/${QT_INCDIR_REL} \
+ -libdir ${PREFIX}/${QT_LIBDIR_REL} \
+ -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
+ -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \
+ -datadir ${PREFIX}/${QT_DATADIR_REL} \
+ -docdir ${PREFIX}/${QT_DOCDIR_REL} \
+ -translationdir ${PREFIX}/${QT_L10NDIR_REL} \
+ -sysconfdir ${PREFIX}/${QT_ETCDIR_REL}
+
+. if ${_QT_VER:M4}
+CONFIGURE_ARGS+= -fast \
+ -platform ${QMAKESPEC} \
+ -system-libjpeg -system-libpng \
+ -system-libmng -system-libtiff -system-zlib \
+ -no-phonon-backend \
+ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \
+ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos
+. else
+CONFIGURE_ARGS+= -nomake examples -nomake tests \
+ -platform ${QMAKESPECNAME} \
+ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
+ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
+ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \
+ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
+ -testsdir ${PREFIX}/${QT_TESTDIR_REL}
+
+. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
+CONFIGURE_ARGS+= -no-sse2
+. endif
+
+# Work around a bug in current binutils, where the gold linker creates
+# duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports.
+CONFIGURE_ARGS+= -no-use-gold-linker
+# Pass -recheck-all so that multiple calls to the configure script really
+# re-run all checks.
+CONFIGURE_ARGS+= -recheck-all
+. endif # ${_QT_VER:M4}
+
+. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+WITH_DEBUG= yes
+STRIP= # It's done prior to bsd.qt.mk inclusion.
+CONFIGURE_ARGS+= -debug -separate-debug-info
+# Override configuration in global qconfig.pri.
+QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \
+ QT_CONFIG-="release"
+. else
+CONFIGURE_ARGS+= -release -no-separate-debug-info
+QMAKE_ARGS+= QT_CONFIG+="release" \
+ QT_CONFIG-="debug separate_debug_info"
+. endif # defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+
+. if defined(WANT_QT_VERBOSE_CONFIGURE)
+CONFIGURE_ARGS+= -verbose
+. endif
+
+. if ${_QT_DIST} == "base" || ${_QT_VER:M4}
+. if ${_QT_VER:M4}
+_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
+# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
+_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6
+_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-aarch64
+. else
+_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
+. endif
+EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
+ ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
+. endif # ${_QT_DIST} == "base" || ${_QT_VER:M4}
+
+# Override settings installed in qconfig.h and *.pri files. The flags will be
+# installed along with the port, but have to be passed as arguments while
+# building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups")
+# are needed to disable some features.
+. if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
+# Used for both qconfig-*.h and qt_config_*.pri; it can't be empty.
+QT_MODNAME= ${PORTNAME}
+. endif
+QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix).
+QT_CONFIG?= # For *.pri files QT_CONFIG flags.
+. if ${QT_DEFINES}
+QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
+. if ${QT_DEFINES:N-*}
+# Use a script to cleanup qconfig-modules.h (see qt-post-install).
+PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
+. endif
+. endif # ${QT_DEFINES}
+. if ${QT_CONFIG:N-*}
+QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
+. endif
+. if ${QT_CONFIG:M-*}
+QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
+. endif
+
+# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
+# The binaries of both supported Qt versions are installed to
+# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
+# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
+# one depending on the value of QT_SELECT (which we pass to both
+# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
+# RUN_DEPEND on it.
+RUN_DEPENDS+= qtchooser:misc/qtchooser
+
+PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
+ FULLVER=${DISTVERSION:C/-.*//}
+
+# Handle additional PLIST directories, which should only be used for Qt-dist ports.
+. for dir in CMAKE ETC
+# Export QT_CMAKEDIR and QT_ETCDIR.
+PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
+. endfor
+
+
+. if ! ${_QT_VER:M4}
+. if ${_QT_DIST} == "base"
+# qtbase requires some tools to be symlinked to the build directory.
+_QT_TOOLS= # empty
+. if ${PORTNAME} != "qmake"
+_QT_TOOLS+= ${QMAKE}
+. endif
+. if ${PORTNAME} != "buildtools"
+_QT_TOOLS+= ${MOC} ${RCC}
+. endif
+. if ${PORTNAME} != "qdoc"
+_QT_TOOLS+= qdoc
+. endif
+. if ${PORTNAME} != "dbus"
+_QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp
+. endif
+. if ${PORTNAME} != "widgets"
+_QT_TOOLS+= ${UIC}
+. endif
+
+# The list of QtBase components that need to be linked into WRKSRC/lib for
+# other QtBase ports. See below.
+_QT5_BASE= core dbus gui network sql widgets
+
+pre-configure: qtbase-pre-configure
+qtbase-pre-configure:
+. for tool in ${_QT_TOOLS}
+ @${TEST} -e ${QT_BINDIR}/${tool:T} && \
+ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
+ ${TRUE}
+. endfor
+
+# The following is a fix for the inplace upgrade problem we faced (see
+# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
+# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
+# would often gets added by pkgconf for the dependencies, was passed after
+# ${WRKSRC}/lib.
+# * We fix the inplace upgrade problem by moving the Qt5 libraries into
+# ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
+# * However, this means, that the ports belonging to the split up QtBase package
+# now no longer can find their depending QtBase libraries. We fix this by
+# linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
+# on them.
+. if ${_QT_DIST:Mbase}
+. for basedep in ${_QT5_BASE}
+. if ! empty(USE_QT:M${basedep})
+ ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
+. endif
+. endfor
+. endif
+
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
+# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
+# certain paths from pkg-config calls (see the explanation in
+# devel/qt5/files/patch-configure) as well as for setting
+# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for
+# ports/194088.
+post-patch: qtbase-post-patch
+qtbase-post-patch:
+ ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
+ ${WRKSRC}/configure
+
+. if ${PORTNAME} != "qmake"
+_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
+. endif
+. endif
+
+pre-configure: qt5-pre-configure
+qt5-pre-configure:
+# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that
+# requires tests/auto/cmake to be present, otherwise the configure stage will
+# fail.
+# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
+# time, we have to disable the check in a cache file (the only way to get this
+# value through to the configure script in qtbase).
+ ${MKDIR} ${CONFIGURE_WRKSRC}
+ ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
+# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
+# the linker before -L/usr/local/lib. By default, the opposite happens, which
+# is a problem when a Qt port is being upgraded, since an existing library
+# would end up being picked up instead of those built in ${WRKSRC}/lib. Since
+# qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
+# latter to get the linker path order right. qmake is smart enough to strip
+# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
+# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
+ ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
+
+post-install: qt-post-install
+qt-post-install:
+. if ${QT_DEFINES:N-*}
+# We can't use SUB_FILES with a shared pkg-deinstall.in.
+# We need it to be a script instead of a group of @unexecs, otherwise
+# qconfig-modules.h cleanup will be run in pre-deinstall stage, which is
+# useless. This will probably be replaced by a Keywords/ script in the future.
+ @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \
+ -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \
+ ${.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 <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
+ >> ${TMPPLIST}
+. endif # ${QT_DEFINES:N-*}
+. if ${QT_CONFIG:N-*}
+ @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
+ ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
+ > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
+ @${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
+ >> ${TMPPLIST}
+. endif # ${QT_CONFIG:N-*}
+. endif # M4
+
+.endif # defined(_QT_DIST_MK_INCLUDED)
Index: Mk/Uses/qt.mk
===================================================================
--- Mk/Uses/qt.mk
+++ Mk/Uses/qt.mk
@@ -0,0 +1,500 @@
+# $FreeBSD$
+#
+# There are three Qt related USES files with different access to Qt.
+# - qmake: The port requires Qt's qmake to build -- creates the configure target
+# - auto includes qt.mk
+# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - auto includes qt.mk and qmake.mk
+# - qt.mk - Dependency handling. USE_QT=foo bar
+#
+# Usage:
+# USES=qt:<version>[,no_env]
+#
+# Versions: 4 5
+#
+# 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.
+# 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(_QT_MK_INCLUDED)
+_QT_MK_INCLUDED= qt.mk
+
+# Qt versions currently supported by the framework.
+_QT_SUPPORTED?= 4 5
+QT4_VERSION?= 4.8.7
+QT5_VERSION?= 5.10.1
+
+# We accept the Qt version to be passed by either or all of the three mk files.
+. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
+IGNORE= qt needs a version (${_QT_SUPPORTED}) passed via qt, qmake or qt-dist.
+. endif
+
+# Gather all the args together
+_QT_GLOBAL_ARGS= ${qt_ARGS} ${qmake_ARGS} ${qt-dist_ARGS}
+
+# Check fo the Qt version to be used
+_QT_VER= # empty
+. for ver in ${_QT_SUPPORTED:O:u}
+. if ${_QT_GLOBAL_ARGS:M${ver}}
+. if !defined(_QT_VERSION)
+_QT_VER= ${ver}
+. else
+. if ${_QT_VERSION} != ${ver}
+IGNORE?= cannot be installed: different Qt versions specified via qt:[${_QT_SUPPORTED:S/ //g}], qmake:[${_QT_SUPPORTED:S/ //g}] a qt-dist:[${_QT_SUPPORTED:S/ //g}]
+. endif
+. endif
+. endif
+. endfor
+
+. if empty(_QT_VER)
+IGNORE?= cannot decide what Qt version to use: specify one via qt:[${_QT_SUPPORTED:S/ //g}], qmake:[${_QT_SUPPORTED:S/ //g}] or qt-dist:[${_QT_SUPPORTED:S/ //g}]
+. endif
+
+# Set the shortcuts used from now on
+_QT_RELNAME= qt${_QT_VER}
+_QT_VERSION= ${QT${_QT_VER}_VERSION}
+
+# 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_RELNAME}
+QT_ARCHDIR_REL?= ${QT_LIBDIR_REL}
+QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins
+QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME}
+QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports
+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
+QT_CMAKEDIR_REL?= lib/cmake
+QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser
+
+# Not customizable.
+. if ${_QT_VERSION:M4*}
+QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
+_QT_LIBVER= # empty
+. else
+QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
+_QT_LIBVER= ${_QT_VERSION:R:R}
+. endif
+
+LRELEASE?= ${QT_BINDIR}/lrelease
+LUPDATE?= ${QT_BINDIR}/lupdate
+MOC?= ${QT_BINDIR}/moc
+RCC?= ${QT_BINDIR}/rcc
+UIC?= ${QT_BINDIR}/uic
+QMAKE?= ${QT_BINDIR}/qmake
+# Needed to redefine the qmake target for internal Qt configuration.
+_QMAKE?= ${QMAKE}
+QMAKESPECNAME?= freebsd-${QMAKE_COMPILER}
+QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME}
+
+# 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}
+# Export all directories to the plist substituion for QT_DIST ports.
+# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
+. if ${dir:NCMAKE} && ${dir:NETC}
+PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
+. endif
+. endfor
+
+# Pass the chosen Qt version to the environment for qtchooser.
+CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME}
+MAKE_ENV+= QT_SELECT=${_QT_RELNAME}
+
+# Make sure both the installed mkspecs as well as the ones being built are
+# found, with the ones from the port being built having preference.
+CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
+MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
+
+_USES_POST+= qt
+.endif # _QT_MK_INCLUDED
+
+# =============================================================================
+#
+# =============================================================================
+
+.if defined(_POSTMKINCLUDED) && !defined(_QT_MK_POST_INCLUDED)
+_QT_MK_POST_INCLUDED= qt.mk
+
+# The Qt components supported by qt.mk: list of shared, and version specific ones
+_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 charts concurrent connectivity \
+ core datavis3d diag examples gamepad \
+ graphicaleffects location paths phonon4 plugininfo printsupport \
+ qdbus qdoc qdoc-data qev qml quick quickcontrols \
+ quickcontrols2 scxml sensors serialbus serialport speech \
+ sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
+ webengine websockets websockets-qml widgets x11extras
+
+# Dependency tuples: _LIB should be preferred if possible.
+3d_PORT= graphics/${_QT_RELNAME}-3d
+3d_LIB= libQt${_QT_LIBVER}3DCore.so
+
+accessible_PORT= accessibility/${_QT_RELNAME}-accessible
+accessible_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/accessible/libqtaccessiblewidgets.so
+
+assistant_PORT= devel/${_QT_RELNAME}-assistant
+assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant
+
+assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp
+assistant-adp_PATH= assistant_adp
+
+assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient
+assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so
+
+buildtools_PORT= devel/${_QT_RELNAME}-buildtools
+buildtools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
+
+canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
+canvas3d_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtCanvas3D/qmldir
+
+charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
+charts_LIB= libQt${_QT_LIBVER}Charts.so
+
+clucene_PORT= textproc/${_QT_RELNAME}-clucene
+clucene_LIB= libQt${_QT_LIBVER}CLucene.so
+
+codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn
+codecs-cn_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqcncodecs.so
+
+codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp
+codecs-jp_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqjpcodecs.so
+
+codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr
+codecs-kr_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqkrcodecs.so
+
+codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw
+codecs-tw_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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}
+
+datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d
+datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so
+
+dbus_PORT= devel/${_QT_RELNAME}-dbus
+dbus_LIB= libQt${_QT_LIBVER}DBus.so
+
+declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative
+declarative_LIB= libQt${_QT_LIBVER}Declarative.so
+
+demo_PORT= misc/${_QT_RELNAME}-qtdemo
+demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo
+
+designer_PORT= devel/${_QT_RELNAME}-designer
+designer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/designer
+
+diag_PORT= sysutils/${_QT_RELNAME}-qtdiag
+diag_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdiag
+
+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}
+
+gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad
+gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so
+
+graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects
+graphicaleffects_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir
+
+graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl
+graphicssystems-opengl_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/qhelpgenerator
+
+iconengines_PORT= graphics/${_QT_RELNAME}-iconengines
+iconengines_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/iconengines/libqsvgicon.so
+
+imageformats_PORT= graphics/${_QT_RELNAME}-imageformats
+imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so
+
+inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods
+inputmethods_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/inputmethods/libqimsw-multi.so
+
+linguist_PORT= devel/${_QT_RELNAME}-linguist
+linguist_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/linguist
+
+linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools
+linguisttools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/makeqpf
+
+moc_PORT= devel/${_QT_RELNAME}-moc
+moc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths
+
+pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool
+pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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= ${LOCALBASE}/${QT_PLUGINDIR_REL}/phonon_backend/libphonon_gstreamer.so
+
+plugininfo_PORT= sysutils/${_QT_RELNAME}-qtplugininfo
+plugininfo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtplugininfo
+
+porting_PORT= devel/${_QT_RELNAME}-porting
+porting_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qt3to4
+
+printsupport_PORT= print/${_QT_RELNAME}-printsupport
+printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so
+
+qdbus_PORT= devel/${_QT_RELNAME}-qdbus
+qdbus_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbus
+
+qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer
+qdbusviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbusviewer
+
+qdoc_PORT= devel/${_QT_RELNAME}-qdoc
+qdoc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc
+
+qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data
+qdoc-data_PATH= ${LOCALBASE}/${QT_DOCDIR_REL}/global/config.qdocconf
+
+qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3
+qdoc3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc3
+
+qev_PORT= x11/${_QT_RELNAME}-qev
+qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev
+
+qmake_PORT= devel/${_QT_RELNAME}-qmake
+qmake_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmake
+
+qml_PORT= lang/${_QT_RELNAME}-qml
+qml_LIB= libQt${_QT_LIBVER}Qml.so
+
+qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer
+qmlviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer
+
+qt3support_PORT= devel/${_QT_RELNAME}-qt3support
+qt3support_LIB= libQt${_QT_LIBVER}3Support.so
+
+qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig
+qtconfig_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtconfig
+
+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= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
+
+quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
+quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
+
+qvfb_PORT= devel/${_QT_RELNAME}-qvfb
+qvfb_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qvfb
+
+rcc_PORT= devel/${_QT_RELNAME}-rcc
+rcc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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
+
+scxml_PORT= devel/${_QT_RELNAME}-scxml
+scxml_LIB= libQt${_QT_LIBVER}Scxml.so
+
+serialbus_PORT= comms/${_QT_RELNAME}-serialbus
+serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so
+
+serialport_PORT= comms/${_QT_RELNAME}-serialport
+serialport_LIB= libQt${_QT_LIBVER}SerialPort.so
+
+speech_PORT= accessibility/${_QT_RELNAME}-speech
+speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so
+
+sql_PORT= databases/${_QT_RELNAME}-sql
+sql_LIB= libQt${_QT_LIBVER}Sql.so
+
+sql-pgsql_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlpsql.so
+
+. if ${_QT_VERSION:M4*}
+sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin
+. endif
+
+sql-sqlite3_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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?= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/uic
+
+uic3_PORT= devel/${_QT_RELNAME}-uic3
+uic3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/uic3
+
+uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin
+uiplugin_PATH= ${LOCALBASE}/${QT_INCDIR_REL}/QtUiPlugin/QtUiPlugin
+
+uitools_PORT= devel/${_QT_RELNAME}-uitools
+uitools_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt${_QT_LIBVER}UiTools.a
+
+virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
+virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so
+
+webchannel_PORT= www/${_QT_RELNAME}-webchannel
+webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
+
+webengine_PORT= www/${_QT_RELNAME}-webengine
+webengine_LIB= libQt${_QT_LIBVER}WebEngine.so
+
+websockets_PORT= www/${_QT_RELNAME}-websockets
+websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
+
+websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml
+websockets-qml_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtWebSockets/qmldir
+
+webkit_PORT= www/${_QT_RELNAME}-webkit
+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= ${LOCALBASE}/${QT_BINDIR_REL}/xmlpatterns
+
+# Actually add the dependencies to the proper lists.
+_USE_QT_ALL+= ${_USE_QT${_QT_VER}_ONLY}
+_USE_QT= ${USE_QT}
+# 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
+
+.endif # defined(_QT_MK_POST_INCLUDED)
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1399,10 +1399,6 @@
USES+= apache:${USE_APACHE:C/2([0-9])/2.\1/g}
.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
@@ -1963,10 +1959,6 @@
.if defined(USE_OCAML)
.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)
Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk
+++ Mk/bsd.qt.mk
@@ -1,810 +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.10.1
-
-_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}
-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/
-# www/qt5-webengine hackery: The tarballs of 5.9.5 had a different naming scheme.
-. if ${QT5_VERSION} == "5.9.5"
-DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
-. else
-DISTNAME= ${QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
-. endif
-DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
-DIST_SUBDIR= KDE/Qt/${_QT_VERSION}
-
-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 activeqt androidextras base canvas3d charts connectivity \
- datavis3d declarative doc gamepad graphicaleffects imageformats \
- location macextras multimedia networkauth purchasing \
- quickcontrols2 quickcontrols remoteobjects script scxml sensors \
- serialbus serialport speech svg tools translations \
- virtualkeyboard wayland webchannel websockets webview \
- winextras x11extras xmlpatterns
-. endif
-. endif
-
-. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
-# Qt configure requires pkg-config to detect dependencies.
-USES+= pkgconfig
-. endif
-
-# -nomake is only used by qtbase's configure script.
-# Other ports from other Qt modules will automatically build examples and
-# tests if the directories exist because of mkspecs/features/qt_parts.prf.
-EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
- ${DISTNAME:S,$,/tests,:S,^,--exclude ,} \
- --no-same-owner --no-same-permissions
-. endif # ! ${_QT_VERSION:M4*}
-
-CONFIGURE_ENV+= MAKE="${MAKE:T}"
-
-CONFIGURE_ARGS+=-opensource -confirm-license \
- -no-pch \
- -prefix ${PREFIX} \
- -bindir ${PREFIX}/${QT_BINDIR_REL} \
- -headerdir ${PREFIX}/${QT_INCDIR_REL} \
- -libdir ${PREFIX}/${QT_LIBDIR_REL} \
- -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
- -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \
- -datadir ${PREFIX}/${QT_DATADIR_REL} \
- -docdir ${PREFIX}/${QT_DOCDIR_REL} \
- -translationdir ${PREFIX}/${QT_L10NDIR_REL} \
- -sysconfdir ${PREFIX}/${QT_ETCDIR_REL}
-
-. if ${_QT_VERSION:M4*}
-CONFIGURE_ARGS+=-fast \
- -platform ${QMAKESPEC} \
- -system-libjpeg -system-libpng \
- -system-libmng -system-libtiff -system-zlib \
- -no-phonon-backend \
- -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \
- -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos
-. else
-CONFIGURE_ARGS+=-nomake examples -nomake tests \
- -platform ${QMAKESPECNAME} \
- -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
- -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
- -qmldir ${PREFIX}/${QT_QMLDIR_REL} \
- -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
- -testsdir ${PREFIX}/${QT_TESTDIR_REL}
-. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
-CONFIGURE_ARGS+=-no-sse2
-. endif
-# Work around a bug in current binutils, where the gold linker creates
-# duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports.
-CONFIGURE_ARGS+= -no-use-gold-linker
-# Pass -recheck-all so that multiple calls to the configure script really
-# re-run all checks.
-CONFIGURE_ARGS+= -recheck-all
-. endif
-
-. 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 \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
-# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
-_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6
-_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-aarch64
-. else
-_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
-. endif
-EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
- ${_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
-
-# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
-# The binaries of both supported Qt versions are installed to
-# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
-# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
-# one depending on the value of QT_SELECT (which we pass to both
-# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
-# RUN_DEPEND on it.
-RUN_DEPENDS+= qtchooser:misc/qtchooser
-
-PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
- FULLVER=${DISTVERSION:C/-.*//}
-.endif # defined(QT_DIST)
-
-# 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_RELNAME}
-QT_ARCHDIR_REL?=${QT_LIBDIR_REL}
-QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins
-QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME}
-QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports
-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
-QT_CMAKEDIR_REL?= lib/cmake
-QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser
-
-# Not customizable.
-.if ${_QT_VERSION:M4*}
-QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
-
-_QT_LIBVER= # empty
-.else
-QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
-
-_QT_LIBVER= ${_QT_VERSION:R:R}
-.endif
-
-LRELEASE?= ${QT_BINDIR}/lrelease
-LUPDATE?= ${QT_BINDIR}/lupdate
-MOC?= ${QT_BINDIR}/moc
-RCC?= ${QT_BINDIR}/rcc
-UIC?= ${QT_BINDIR}/uic
-QMAKE?= ${QT_BINDIR}/qmake
-# Needed to redefine the qmake target for internal Qt configuration.
-_QMAKE?= ${QMAKE}
-QMAKESPECNAME?= freebsd-${QMAKE_COMPILER}
-QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME}
-
-# 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 BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
- QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
- CMAKE QTCHOOSER
-QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
-# Export all directories to the plist substituion for QT_DIST ports.
-# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
-. if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST)
-PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
-. endif
-.endfor
-
-# Pass the chosen Qt version to the environment for qtchooser.
-CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME}
-MAKE_ENV+= QT_SELECT=${_QT_RELNAME}
-
-# Make sure both the installed mkspecs as well as the ones being built are
-# found, with the ones from the port being built having preference.
-CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
-MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
-
-.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="${QT_ARCHDIR}" 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-mysql sql-odbc sql-pgsql \
- sql-sqlite2 sql-sqlite3 svg testlib webkit \
- xml xmlpatterns
-.if ${ARCH} == amd64 || ${ARCH} == i386
-_USE_QT_ALL+= sql-ibase
-.endif
-
-_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 charts concurrent connectivity \
- core datavis3d diag examples gamepad \
- graphicaleffects location paths phonon4 plugininfo printsupport \
- qdbus qdoc qdoc-data qev qml quick quickcontrols \
- quickcontrols2 scxml sensors serialbus serialport speech \
- sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
- webengine websockets websockets-qml widgets x11extras
-
-3d_PORT= graphics/${_QT_RELNAME}-3d
-3d_LIB= libQt${_QT_LIBVER}3DCore.so
-
-accessible_PORT= accessibility/${_QT_RELNAME}-accessible
-accessible_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/accessible/libqtaccessiblewidgets.so
-
-assistant_PORT= devel/${_QT_RELNAME}-assistant
-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant
-
-assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp
-assistant-adp_PATH= assistant_adp
-
-assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient
-assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so
-
-buildtools_PORT= devel/${_QT_RELNAME}-buildtools
-buildtools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
-
-canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
-canvas3d_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtCanvas3D/qmldir
-
-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
-charts_LIB= libQt${_QT_LIBVER}Charts.so
-
-clucene_PORT= textproc/${_QT_RELNAME}-clucene
-clucene_LIB= libQt${_QT_LIBVER}CLucene.so
-
-codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn
-codecs-cn_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqcncodecs.so
-
-codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp
-codecs-jp_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqjpcodecs.so
-
-codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr
-codecs-kr_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqkrcodecs.so
-
-codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw
-codecs-tw_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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}
-
-datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d
-datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so
-
-dbus_PORT= devel/${_QT_RELNAME}-dbus
-dbus_LIB= libQt${_QT_LIBVER}DBus.so
-
-declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative
-declarative_LIB= libQt${_QT_LIBVER}Declarative.so
-
-demo_PORT= misc/${_QT_RELNAME}-qtdemo
-demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo
-
-designer_PORT= devel/${_QT_RELNAME}-designer
-designer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/designer
-
-diag_PORT= sysutils/${_QT_RELNAME}-qtdiag
-diag_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdiag
-
-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}
-
-gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad
-gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so
-
-graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects
-graphicaleffects_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir
-
-graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl
-graphicssystems-opengl_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/qhelpgenerator
-
-iconengines_PORT= graphics/${_QT_RELNAME}-iconengines
-iconengines_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/iconengines/libqsvgicon.so
-
-imageformats_PORT= graphics/${_QT_RELNAME}-imageformats
-imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so
-
-inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods
-inputmethods_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/inputmethods/libqimsw-multi.so
-
-linguist_PORT= devel/${_QT_RELNAME}-linguist
-linguist_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/linguist
-
-linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools
-linguisttools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/makeqpf
-
-moc_PORT= devel/${_QT_RELNAME}-moc
-moc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths
-
-pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool
-pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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= ${LOCALBASE}/${QT_PLUGINDIR_REL}/phonon_backend/libphonon_gstreamer.so
-
-plugininfo_PORT= sysutils/${_QT_RELNAME}-qtplugininfo
-plugininfo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtplugininfo
-
-porting_PORT= devel/${_QT_RELNAME}-porting
-porting_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qt3to4
-
-printsupport_PORT= print/${_QT_RELNAME}-printsupport
-printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so
-
-qdbus_PORT= devel/${_QT_RELNAME}-qdbus
-qdbus_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbus
-
-qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer
-qdbusviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbusviewer
-
-qdoc_PORT= devel/${_QT_RELNAME}-qdoc
-qdoc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc
-
-qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data
-qdoc-data_PATH= ${LOCALBASE}/${QT_DOCDIR_REL}/global/config.qdocconf
-
-qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3
-qdoc3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc3
-
-qev_PORT= x11/${_QT_RELNAME}-qev
-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev
-
-qmake_PORT= devel/${_QT_RELNAME}-qmake
-qmake_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmake
-
-qml_PORT= lang/${_QT_RELNAME}-qml
-qml_LIB= libQt${_QT_LIBVER}Qml.so
-
-qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer
-qmlviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer
-
-qt3support_PORT= devel/${_QT_RELNAME}-qt3support
-qt3support_LIB= libQt${_QT_LIBVER}3Support.so
-
-qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig
-qtconfig_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtconfig
-
-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= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
-
-quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
-quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
-
-qvfb_PORT= devel/${_QT_RELNAME}-qvfb
-qvfb_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qvfb
-
-rcc_PORT= devel/${_QT_RELNAME}-rcc
-rcc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/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
-
-scxml_PORT= devel/${_QT_RELNAME}-scxml
-scxml_LIB= libQt${_QT_LIBVER}Scxml.so
-
-serialbus_PORT= comms/${_QT_RELNAME}-serialbus
-serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so
-
-serialport_PORT= comms/${_QT_RELNAME}-serialport
-serialport_LIB= libQt${_QT_LIBVER}SerialPort.so
-
-speech_PORT= accessibility/${_QT_RELNAME}-speech
-speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so
-
-sql_PORT= databases/${_QT_RELNAME}-sql
-sql_LIB= libQt${_QT_LIBVER}Sql.so
-
-sql-pgsql_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlpsql.so
-
-. if ${_QT_VERSION:M4*}
-sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin
-. endif
-
-sql-sqlite3_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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?= ${LOCALBASE}/${QT_PLUGINDIR_REL}/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= ${LOCALBASE}/${QT_BINDIR_REL}/uic
-
-uic3_PORT= devel/${_QT_RELNAME}-uic3
-uic3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/uic3
-
-uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin
-uiplugin_PATH= ${LOCALBASE}/${QT_INCDIR_REL}/QtUiPlugin/QtUiPlugin
-
-uitools_PORT= devel/${_QT_RELNAME}-uitools
-uitools_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt${_QT_LIBVER}UiTools.a
-
-virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
-virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so
-
-webchannel_PORT= www/${_QT_RELNAME}-webchannel
-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
-
-webengine_PORT= www/${_QT_RELNAME}-webengine
-webengine_LIB= libQt${_QT_LIBVER}WebEngine.so
-
-websockets_PORT= www/${_QT_RELNAME}-websockets
-websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
-
-websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml
-websockets-qml_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtWebSockets/qmldir
-
-webkit_PORT= www/${_QT_RELNAME}-webkit
-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= ${LOCALBASE}/${QT_BINDIR_REL}/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
-
-# The list of QtBase components that need to be linked into WRKSRC/lib for
-# other QtBase ports. See below.
-_QT5_BASE= core dbus gui network sql widgets
-
-pre-configure: qtbase-pre-configure
-qtbase-pre-configure:
-. for tool in ${_QT_TOOLS}
- @${TEST} -e ${QT_BINDIR}/${tool:T} && \
- ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
- ${TRUE}
-. endfor
-
-# The following is a fix for the inplace upgrade problem we faced (see
-# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
-# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
-# would often gets added by pkgconf for the dependencies, was passed after
-# ${WRKSRC}/lib.
-# * We fix the inplace upgrade problem by moving the Qt5 libraries into
-# ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
-# * However, this means, that the ports belonging to the split up QtBase package
-# now no longer can find their depending QtBase libraries. We fix this by
-# linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
-# on them.
-. if ${QT_DIST:Mbase}
-. for basedep in ${_QT5_BASE}
-. if ${USE_QT5:M${basedep}}
- ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
-. endif
-. endfor
-. endif
-
-#
-# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
-#
-# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
-# certain paths from pkg-config calls (see the explanation in
-# devel/qt5/files/patch-configure) as well as for setting
-# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for
-# ports/194088.
-post-patch: qtbase-post-patch
-qtbase-post-patch:
- ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
- ${WRKSRC}/configure
-
-. if ${PORTNAME} != "qmake"
-_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
-. endif
-. endif # ${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
-#
-# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
-#
-# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
-# the linker before -L/usr/local/lib. By default, the opposite happens, which
-# is a problem when a Qt port is being upgraded, since an existing library
-# would end up being picked up instead of those built in ${WRKSRC}/lib. Since
-# qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
-# latter to get the linker path order right. qmake is smart enough to strip
-# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
-# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
- ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
-
-post-install: qt-post-install
-qt-post-install:
-. if ${QT_DEFINES:N-*}
-# We can't use SUB_FILES with a shared pkg-deinstall.in.
-# We need it to be a script instead of a group of @unexecs, otherwise
-# qconfig-modules.h cleanup will be run in pre-deinstall stage, which is
-# useless. This will probably be replaced by a Keywords/ script in the future.
- @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \
- -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \
- ${.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 <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${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-kde4/Makefile
===================================================================
--- accessibility/jovie-kde4/Makefile
+++ accessibility/jovie-kde4/Makefile
@@ -10,9 +10,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 <bsd.port.mk>
Index: accessibility/kaccessible-kde4/Makefile
===================================================================
--- accessibility/kaccessible-kde4/Makefile
+++ accessibility/kaccessible-kde4/Makefile
@@ -10,9 +10,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 <bsd.port.mk>
Index: accessibility/kmag-kde4/Makefile
===================================================================
--- accessibility/kmag-kde4/Makefile
+++ accessibility/kmag-kde4/Makefile
@@ -8,9 +8,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/kmag/Makefile
===================================================================
--- accessibility/kmag/Makefile
+++ accessibility/kmag/Makefile
@@ -10,10 +10,10 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm \
i18n kio service widgetsaddons xmlgui
-USE_QT5= core dbus gui printsupport widgets xml \
+USE_QT= core dbus gui printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: accessibility/kmousetool-kde4/Makefile
===================================================================
--- accessibility/kmousetool-kde4/Makefile
+++ accessibility/kmousetool-kde4/Makefile
@@ -8,9 +8,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 <bsd.port.mk>
Index: accessibility/kmousetool/Makefile
===================================================================
--- accessibility/kmousetool/Makefile
+++ accessibility/kmousetool/Makefile
@@ -10,10 +10,10 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
ecm i18n iconthemes notifications widgetsaddons xmlgui
-USE_QT5= core dbus gui phonon4 widgets xml \
+USE_QT= core dbus gui phonon4 widgets xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xtst
Index: accessibility/kmouth-kde4/Makefile
===================================================================
--- accessibility/kmouth-kde4/Makefile
+++ accessibility/kmouth-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: accessibility/kmouth/Makefile
===================================================================
--- accessibility/kmouth/Makefile
+++ accessibility/kmouth/Makefile
@@ -10,10 +10,10 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n jobwidgets kio service widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport speech widgets xml \
+USE_QT= core dbus gui network printsupport speech widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: accessibility/qt4-accessible/Makefile
===================================================================
--- accessibility/qt4-accessible/Makefile
+++ accessibility/qt4-accessible/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt accessibility widgets
-USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build qt3support corelib gui network sql xml
USE_CXXSTD= gnu++98
HAS_CONFIGURE= yes
Index: accessibility/qt5-speech/Makefile
===================================================================
--- accessibility/qt5-speech/Makefile
+++ accessibility/qt5-speech/Makefile
@@ -10,8 +10,7 @@
LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
-USES= pkgconfig qmake:outsource
-USE_QT5= core gui buildtools_build qmake_build
-QT_DIST= ${PORTNAME}
+USES= pkgconfig qmake:outsource qt-dist:5,speech
+USE_QT= core gui buildtools_build qmake_build
.include <bsd.port.mk>
Index: archivers/ark-kde4/Makefile
===================================================================
--- archivers/ark-kde4/Makefile
+++ archivers/ark-kde4/Makefile
@@ -14,10 +14,10 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-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/ark/Makefile
===================================================================
--- archivers/ark/Makefile
+++ archivers/ark/Makefile
@@ -10,12 +10,12 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext libarchive kde:5 tar:xz
+USES= cmake:outsource gettext libarchive kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n iconthemes \
itemmodels itemviews jobwidgets khtml kio parts pty service \
solid sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network widgets xml \
+USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: archivers/kf5-karchive/Makefile
===================================================================
--- archivers/kf5-karchive/Makefile
+++ archivers/kf5-karchive/Makefile
@@ -11,8 +11,8 @@
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-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 <bsd.port.mk>
Index: archivers/quazip/Makefile
===================================================================
--- archivers/quazip/Makefile
+++ archivers/quazip/Makefile
@@ -16,14 +16,16 @@
FLAVORS= qt4 qt5
FLAVOR?= ${FLAVORS:[1]}
-USES= cmake:outsource
+USES= cmake:outsource
USE_LDCONFIG= yes
. if ${FLAVOR} == qt4
-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,18 @@
CONFLICTS= gpsbabel14-[0-9]*
-USE_QT5= core qmake_build
+USE_QT= core qmake_build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib=system
-USES= localbase
+USES= localbase qt:5 qt:5
OPTIONS_DEFINE= GUI
OPTIONS_SUB= yes
GUI_ALL_TARGET= gui
-GUI_USE= QT5=gui,xml,network,webkit
-GUI_USE+= QT5=linguisttools_build,moc_build,rcc_build,uic_build
+GUI_USES= qt:5 qt:5
+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/kstars-kde4/Makefile
===================================================================
--- astro/kstars-kde4/Makefile
+++ astro/kstars-kde4/Makefile
@@ -13,9 +13,9 @@
BUILD_DEPENDS= xplanet:astro/xplanet
RUN_DEPENDS= xplanet:astro/xplanet
-USES= cmake:outsource compiler:c++11-lib eigen:3 kde:4 tar:xz
+USES= cmake:outsource compiler:c++11-lib eigen:3 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/kstars/Makefile
===================================================================
--- astro/kstars/Makefile
+++ astro/kstars/Makefile
@@ -19,13 +19,13 @@
RUN_DEPENDS= xplanet:astro/xplanet
USES= cmake:outsource compiler:c++11-lib eigen:3 gettext kde:5 \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets\
coreaddons crash dbusaddons doctools ecm guiaddons i18n \
iconthemes init itemviews jobwidgets kio newstuff notifications \
notifyconfig parts plotting service solid texteditor \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui multimedia network opengl printsupport \
+USE_QT= concurrent core dbus gui multimedia network opengl printsupport \
qml quick sql svg testlib widgets xml \
buildtools_build qmake_build
Index: astro/libkgeomap-kde4/Makefile
===================================================================
--- astro/libkgeomap-kde4/Makefile
+++ astro/libkgeomap-kde4/Makefile
@@ -16,9 +16,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 <bsd.port.mk>
Index: astro/libkgeomap/Makefile
===================================================================
--- astro/libkgeomap/Makefile
+++ astro/libkgeomap/Makefile
@@ -13,9 +13,9 @@
BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
LIB_DEPENDS= libopencv_video.so:graphics/opencv
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n kio marble service textwidgets
-USE_QT5= concurrent core gui network webkit widgets xml \
+USE_QT= concurrent core gui network webkit widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: astro/marble-kde4/Makefile
===================================================================
--- astro/marble-kde4/Makefile
+++ astro/marble-kde4/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libquazip.so:archivers/quazip@qt4
-USES= cmake:outsource kde:4 shared-mime-info tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info 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/marble/Makefile
===================================================================
--- astro/marble/Makefile
+++ astro/marble/Makefile
@@ -12,12 +12,12 @@
LIB_DEPENDS= libquazip5.so:archivers/quazip@qt5
-USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n jobwidgets kio newstuff package parts \
plasma-framework runner service sonnet textwidgets wallet \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus designer gui location network opengl \
+USE_QT= concurrent core dbus designer gui location network opengl \
phonon4 printsupport qml quick script sql svg webkit widgets xml \
buildtools_build qmake_build
Index: astro/merkaartor/Makefile
===================================================================
--- astro/merkaartor/Makefile
+++ astro/merkaartor/Makefile
@@ -18,11 +18,11 @@
USE_GITHUB= yes
GH_ACCOUNT= openstreetmap
-USES= pkgconfig sqlite:3 qmake
+USES= pkgconfig qt:5 sqlite:3 qmake
USE_LDCONFIG= yes
QMAKE_ARGS= SYSTEM_QUAZIP=1
-USE_QT5= buildtools_build \
+USE_QT= buildtools_build \
concurrent core gui imageformats network printsupport svg \
webkit widgets xml
@@ -45,7 +45,8 @@
DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+NLS_USE= QT=linguisttools_build
INSTALLS_ICONS= yes
Index: astro/qlandkartegt/Makefile
===================================================================
--- astro/qlandkartegt/Makefile
+++ astro/qlandkartegt/Makefile
@@ -16,8 +16,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
@@ -19,8 +19,8 @@
libroutino.so:astro/routino
RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
-USES= cmake compiler:c++11-lib desktop-file-utils jpeg
-USE_QT5= buildtools core dbus gui linguisttools network printsupport \
+USES= cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
+USE_QT= buildtools core dbus gui linguisttools network printsupport \
qmake script sql sql-sqlite3 uitools webkit widgets xml
.include <bsd.port.mk>
Index: astro/stellarium-qt4/Makefile
===================================================================
--- astro/stellarium-qt4/Makefile
+++ astro/stellarium-qt4/Makefile
@@ -17,8 +17,8 @@
CONFLICTS_INSTALL= ${PORTNAME}-0.17.*
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
@@ -54,13 +54,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
@@ -17,8 +17,8 @@
USE_GITHUB= yes
GH_ACCOUNT= Stellarium
-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
CMAKE_ARGS= -DENABLE_GPS:BOOL=OFF # XXX: requires Qt5Positioning
@@ -44,10 +44,12 @@
TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx
TEXTURES_DISTFILES= textures-1K.zip:gfx
-MULTIMEDIA_USE= QT5=multimedia
+MULTIMEDIA_USES= qt:5
+MULTIMEDIA_USE= QT=multimedia
MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF
-TELESCOPE_USE= QT5=serialport
+TELESCOPE_USES= qt:5
+TELESCOPE_USE= QT=serialport
TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF
.include <bsd.port.options.mk>
@@ -65,7 +67,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
@@ -13,8 +13,8 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-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/abgate-lv2/Makefile
===================================================================
--- audio/abgate-lv2/Makefile
+++ audio/abgate-lv2/Makefile
@@ -14,11 +14,11 @@
BUILD_DEPENDS= lv2>0:audio/lv2
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:4
USE_GITHUB= yes
GH_ACCOUNT= antanasbruzas
USE_CXXSTD= c++11
-USE_QT4= corelib gui moc_build rcc_build qmake_build uic_build
+USE_QT= corelib gui moc_build rcc_build qmake_build uic_build
USE_GNOME= atkmm gtk20 gtkmm24 libsigc++20
USE_LDCONFIG= yes
Index: audio/acoustid-fingerprinter/Makefile
===================================================================
--- audio/acoustid-fingerprinter/Makefile
+++ audio/acoustid-fingerprinter/Makefile
@@ -18,8 +18,8 @@
BROKEN_armv6= fails to link: fingerprintcalculator.cpp: undefined reference to 'chromaprint_new'
BROKEN_powerpc64= fails to compile: libchromaprint.so: undefined reference to std::__cxx11::basic_string
-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
@@ -24,11 +24,11 @@
${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
USES= cmake:outsource kde:4 mysql:client,embedded pkgconfig \
- shared-mime-info shebangfix ssl tar:bzip2
+ qt:4 shared-mime-info shebangfix ssl tar:bzip2
USE_GL= gl
USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \
nepomuk-core runtime soprano strigi
-USE_QT4= corelib dbus designer gui network opengl \
+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
@@ -13,9 +13,9 @@
LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia
-USES= tar:xz cmake kde:4
+USES= qt:4 tar:xz cmake kde: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
# Too many changes for suffix on literals without a space.
USE_CXXSTD= gnu++98
Index: audio/audiocd-kio/Makefile
===================================================================
--- audio/audiocd-kio/Makefile
+++ audio/audiocd-kio/Makefile
@@ -16,13 +16,13 @@
libKF5Cddb.so:audio/libkcddb \
libKF5CompactDisc.so:audio/libkcompactdisc
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio notifications parts \
service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: audio/cantata/Makefile
===================================================================
--- audio/cantata/Makefile
+++ audio/cantata/Makefile
@@ -15,14 +15,14 @@
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 \
-DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE
-USES= cmake:outsource cpe pkgconfig shebangfix
+USES= cmake:outsource cpe pkgconfig qt:5 shebangfix
SHEBANG_FILES= playlists/cantata-dynamic cantata-remote.cmake \
devices/mounter/mount.cifs.wrapper
CPE_VENDOR= craig_drummond
@@ -72,7 +72,8 @@
MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+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 \
@@ -80,7 +81,8 @@
PROXY_CMAKE_BOOL= ENABLE_PROXY_CONFIG
-QT5_USE= QT5=multimedia
+QT5_USES= qt:5
+QT5_USE= QT=multimedia
TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib \
libtag-extras.so:audio/taglib-extras
Index: audio/carla/Makefile
===================================================================
--- audio/carla/Makefile
+++ audio/carla/Makefile
@@ -18,12 +18,12 @@
CONFLICTS_BUILD= rtaudio-* rtmidi-*
USES= compiler:c++11-lib desktop-file-utils gmake localbase \
- pkgconfig pyqt:5 python:3.4+ shared-mime-info shebangfix tar:bz2
+ pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix tar:bz2
USE_GITHUB= yes
GH_ACCOUNT= falkTX
USE_PYQT= core_run gui_run sip svg_run widgets_run xml_build # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040
USE_GNOME= gtk20 gtk30
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
USE_XORG= x11
USE_LDCONFIG= ${PREFIX}/lib/carla
SHEBANG_FILES= data/carla-single source/native-plugins/resources/*
Index: audio/clementine-player/Makefile
===================================================================
--- audio/clementine-player/Makefile
+++ audio/clementine-player/Makefile
@@ -34,12 +34,12 @@
desktop-file-utils \
gettext-tools \
pkgconfig \
- sqlite
+ 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
@@ -18,9 +18,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
USE_CXXSTD= gnu++98
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 qmake qt:4
+USE_QT= gui xml uic_build moc_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,8 @@
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 qmake qt:4
+USE_QT= qmake_build moc_build uic_build corelib gui network rcc webkit
WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_DEFINE= SNDFILE OGG VORBIS FLAC OPUS SPEEX FAAD FAAC
Index: audio/drumstick/Makefile
===================================================================
--- audio/drumstick/Makefile
+++ audio/drumstick/Makefile
@@ -14,8 +14,8 @@
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont
-USES= cmake:outsource pkgconfig shared-mime-info tar:bz2
-USE_QT5= core gui network svg testlib widgets buildtools_build qmake_build
+USES= cmake:outsource pkgconfig qt:5 shared-mime-info tar:bz2
+USE_QT= core gui network svg testlib widgets buildtools_build qmake_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= PULSEAUDIO MANPAGES
Index: audio/dsbmixer/Makefile
===================================================================
--- audio/dsbmixer/Makefile
+++ audio/dsbmixer/Makefile
@@ -13,10 +13,10 @@
RUN_DEPENDS= dsbwrtsysctl:sysutils/dsbwrtsysctl
-USES= tar:tgz qmake
+USES= qt:5 tar:tgz qmake
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build widgets
+USE_QT= buildtools_build core gui linguisttools_build widgets
QMAKE_ARGS= PORTS=1
Index: audio/dssi/Makefile
===================================================================
--- audio/dssi/Makefile
+++ audio/dssi/Makefile
@@ -37,7 +37,8 @@
OPTIONS_DEFAULT=QT4
OPTIONS_SUB= yes
-QT4_USE= QT4=corelib,gui,moc_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,moc_build
QT_NONSTANDARD= yes
post-patch:
Index: audio/esperanza/Makefile
===================================================================
--- audio/esperanza/Makefile
+++ audio/esperanza/Makefile
@@ -18,10 +18,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
@@ -13,9 +13,9 @@
LIB_DEPENDS= libuchardet.so:textproc/uchardet
-USES= cmake desktop-file-utils pkgconfig
+USES= cmake desktop-file-utils pkgconfig qt:5
USE_GITHUB= yes
-USE_QT5= buildtools_build concurrent_build qmake_build \
+USE_QT= buildtools_build concurrent_build qmake_build \
linguisttools_build core gui network widgets
.include <bsd.port.mk>
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/guidolib/Makefile
===================================================================
--- audio/guidolib/Makefile
+++ audio/guidolib/Makefile
@@ -13,10 +13,10 @@
BUILD_DEPENDS= cmake:devel/cmake
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= grame-cncm
-USE_QT5= core gui widgets printsupport xml buildtools_build qmake_build
+USE_QT= core gui widgets printsupport xml buildtools_build qmake_build
USE_GL= gl
USE_GNOME= cairo
USE_LDCONFIG= yes
Index: audio/hydrogen/Makefile
===================================================================
--- audio/hydrogen/Makefile
+++ audio/hydrogen/Makefile
@@ -16,8 +16,8 @@
USE_GITHUB= yes
GH_ACCOUNT= hydrogen-music
-USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
+USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build corelib \
gui network xml xmlpatterns
OPTIONS_SINGLE= EXPORT
Index: audio/jalv/Makefile
===================================================================
--- audio/jalv/Makefile
+++ audio/jalv/Makefile
@@ -23,10 +23,10 @@
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= compiler:c++11-lang waf tar:bz2 pkgconfig
+USES= compiler:c++11-lang qt:5 waf tar:bz2 pkgconfig
CONFIGURE_ARGS= --no-qt4
USE_CXXSTD= c++11
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
USE_GNOME= atk atkmm cairo cairomm pango pangomm libsigc++20 \
gdkpixbuf2 glib20 glibmm gtk20 gtk30 gtkmm24
QT_NONSTANDARD= yes
Index: audio/juk-kde4/Makefile
===================================================================
--- audio/juk-kde4/Makefile
+++ audio/juk-kde4/Makefile
@@ -13,9 +13,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/juk/Makefile
===================================================================
--- audio/juk/Makefile
+++ audio/juk/Makefile
@@ -11,12 +11,12 @@
LIB_DEPENDS= libtag.so:audio/taglib
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash globalaccel i18n iconthemes itemviews \
jobwidgets kio notifications service solid sonnet textwidgets \
wallet widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 svg widgets xml \
+USE_QT= core dbus gui network phonon4 svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: audio/kaudiocreator/Makefile
===================================================================
--- audio/kaudiocreator/Makefile
+++ audio/kaudiocreator/Makefile
@@ -25,8 +25,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,24 +36,24 @@
. if ${PKGNAMESUFFIX} == "-qt5"
# 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
. elif ${PKGNAMESUFFIX} == "-qt4"
# 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
@@ -81,7 +81,8 @@
MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2
MP4_CMAKE_BOOL= WITH_MP4V2
-PHONON_USE= QT4=phonon
+PHONON_USES= qt:4
+PHONON_USE= QT=phonon
PHONON_CMAKE_BOOL= WITH_PHONON
TAGLIB_DESC= Various audio formats support via Taglib
Index: audio/kio-audiocd-kde4/Makefile
===================================================================
--- audio/kio-audiocd-kde4/Makefile
+++ audio/kio-audiocd-kde4/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-kde4/Makefile
===================================================================
--- audio/kmix-kde4/Makefile
+++ audio/kmix-kde4/Makefile
@@ -11,9 +11,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/kmix/Makefile
===================================================================
--- audio/kmix/Makefile
+++ audio/kmix/Makefile
@@ -11,12 +11,12 @@
LIB_DEPENDS= libasound.so:audio/alsa-lib
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
emoticons globalaccel i18n iconthemes init itemmodels \
itemviews kcmutils kdelibs4support notifications package \
plasma-framework service solid widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
# we want the KF5 version of kmix
Index: audio/kscd-kde4/Makefile
===================================================================
--- audio/kscd-kde4/Makefile
+++ audio/kscd-kde4/Makefile
@@ -13,9 +13,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
@@ -12,9 +12,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/kwave/Makefile
===================================================================
--- audio/kwave/Makefile
+++ audio/kwave/Makefile
@@ -19,12 +19,12 @@
libvorbisenc.so:audio/libvorbis
USES= cmake:outsource desktop-file-utils gettext kde:5 \
- localbase:ldflags pkgconfig tar:xz
+ localbase:ldflags pkgconfig qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemviews \
jobwidgets kio service solid sonnet textwidgets widgetsaddons \
xmlgui
-USE_QT5= concurrent core dbus gui multimedia network widgets xml \
+USE_QT= concurrent core dbus gui multimedia network widgets xml \
buildtools_build qmake_build
OPTIONS_GROUP= AUDIOPLUGIN
Index: audio/lastfm-desktop/Makefile
===================================================================
--- audio/lastfm-desktop/Makefile
+++ audio/lastfm-desktop/Makefile
@@ -21,8 +21,8 @@
USE_GITHUB= yes
GH_ACCOUNT= lastfm
-USES= gettext pkgconfig qmake gmake
-USE_QT4= corelib dbus gui linguist_build moc_build network phonon \
+USES= gettext pkgconfig qmake gmake qt:4
+USE_QT= corelib dbus gui linguist_build moc_build network phonon \
rcc_build sql uic_build webkit xml
SUB_FILES= lastfm-desktop.sh
@@ -37,7 +37,8 @@
OPTIONS_SINGLE_PHONON= GSTREAMER VLC
OPTIONS_DEFAULT= VLC
GSTREAMER_DESC= Multimedia via Phonon-GStreamer
-GSTREAMER_USE= QT4=phonon-gst_run
+GSTREAMER_USES= qt:4
+GSTREAMER_USE= QT=phonon-gst_run
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
@@ -23,9 +23,9 @@
TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
TEST_USE= qt4=qtestlib_build,xml_build
-USES= cmake pkgconfig
+USES= cmake pkgconfig qt:4
USE_GITHUB= yes
USE_LDCONFIG= yes
-USE_QT4= corelib qmake_build moc_build network rcc_build
+USE_QT= corelib qmake_build moc_build network rcc_build
.include <bsd.port.mk>
Index: audio/libkcddb-kde4/Makefile
===================================================================
--- audio/libkcddb-kde4/Makefile
+++ audio/libkcddb-kde4/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 <bsd.port.mk>
Index: audio/libkcddb/Makefile
===================================================================
--- audio/libkcddb/Makefile
+++ audio/libkcddb/Makefile
@@ -9,11 +9,11 @@
LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets \
coreaddons ecm i18n jobwidgets kio service \
widgetsaddons
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: audio/libkcompactdisc-kde4/Makefile
===================================================================
--- audio/libkcompactdisc-kde4/Makefile
+++ audio/libkcompactdisc-kde4/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/libkcompactdisc/Makefile
===================================================================
--- audio/libkcompactdisc/Makefile
+++ audio/libkcompactdisc/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE library for interfacing with audio CDs
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= coreaddons ecm emoticons i18n itemmodels itemviews \
kdelibs4support solid
-USE_QT5= core dbus phonon4\
+USE_QT= core dbus phonon4\
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: audio/liblastfm/Makefile
===================================================================
--- audio/liblastfm/Makefile
+++ audio/liblastfm/Makefile
@@ -13,18 +13,20 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake pkgconfig
+USES= cmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= lastfm
USE_LDCONFIG= yes
SLAVE?= qt4
.if ${SLAVE} == qt4
-USE_QT4= corelib dbus network sql xml \
+USES+= qt:4
+USE_QT= corelib dbus network sql xml \
moc_build qmake_build rcc_build
CMAKE_ON+= BUILD_WITH_QT4
.else
-USE_QT5= core dbus network sql xml \
+USES+= qt:5
+USE_QT= core dbus network sql xml \
buildtools_build qmake_build
CMAKE_OFF+= BUILD_WITH_QT4
QTVER_SUFFIX= 5
@@ -45,9 +47,10 @@
FINGERPRINT_CMAKE_ON= -DLIBFFTW3_INCLUDE_DIR:PATH=`${MAKE} -C ${PORTSDIR}/math/fftw3 -VWRKSRC`/api
.if ${SLAVE} == qt4
-TEST_USE= QT4=qtestlib_build
+TEST_USES= qt:4 qt:5
+TEST_USE= QT=qtestlib_build
.else
-TEST_USE= QT5=testlib_build
+TEST_USE= QT=testlib_build
.endif
TEST_CMAKE_BOOL= BUILD_TESTS
TEST_TEST_TARGET= test
Index: audio/lmms/Makefile
===================================================================
--- audio/lmms/Makefile
+++ audio/lmms/Makefile
@@ -34,11 +34,11 @@
USE_LDCONFIG= yes
USE_XORG= x11 xext xft ice sm
-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 qt:4 shared-mime-info
CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \
-DWANT_CALF:BOOL=OFF \
-DWANT_CAPS:BOOL=OFF \
Index: audio/midipp/Makefile
===================================================================
--- audio/midipp/Makefile
+++ audio/midipp/Makefile
@@ -25,7 +25,9 @@
OPTIONS_DEFAULT= QT5
TOOLKIT_DESC= Qt toolkit
-QT4_USE= ${_USE_QT4:S/^/QT4=/}
-QT5_USE= ${_USE_QT5:S/^/QT5=/} GL=gl
+QT4_USES= qt:4
+QT4_USE= ${_USE_QT4:S/^/QT=/}
+QT5_USES= qt:5
+QT5_USE= ${_USE_QT5:S/^/QT=/} GL=gl
.include <bsd.port.mk>
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= qmake qt:4
+USE_QT= dbus gui moc_build network phonon rcc_build \
sql uic_build xml
INSTALLS_ICONS= yes
Index: audio/mixxx/Makefile
===================================================================
--- audio/mixxx/Makefile
+++ audio/mixxx/Makefile
@@ -33,8 +33,8 @@
BROKEN_aarch64= fails to compile: Exception("invalid machine type")
BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack
-USES= scons iconv pkgconfig
-USE_QT4= corelib gui network opengl script scripttools sql sql-sqlite3 \
+USES= qt:4 scons iconv pkgconfig
+USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
Index: audio/mixxx20/Makefile
===================================================================
--- audio/mixxx20/Makefile
+++ audio/mixxx20/Makefile
@@ -31,8 +31,8 @@
BROKEN_aarch64= fails to compile: Exception("invalid machine type")
BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack
-USES= scons iconv pkgconfig
-USE_QT4= corelib gui network opengl script scripttools sql sql-sqlite3 \
+USES= qt:4 scons iconv pkgconfig
+USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
Index: audio/mumble/Makefile
===================================================================
--- audio/mumble/Makefile
+++ audio/mumble/Makefile
@@ -21,13 +21,13 @@
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-USES= compiler cpe desktop-file-utils gmake pkgconfig qmake ssl
+USES= compiler cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl
USE_GITHUB= yes
GH_ACCOUNT= mumble-voip
GH_PROJECT= mumble celt-0.7.0:mumble_celt_0_7 celt-0.11.0:mumble_celt_0_11
GH_TAGNAME= 5a16cda:mumble_celt_0_7 e18de77:mumble_celt_0_11
GH_SUBDIR= celt-0.7.0-src:mumble_celt_0_7 celt-0.11.0-src:mumble_celt_0_11
-USE_QT4= gui svg iconengines_run xml sql network l10n \
+USE_QT= gui svg iconengines_run xml sql network l10n \
linguist_build moc_build rcc_build uic_build \
opengl sql-sqlite3_run corelib
USE_LDCONFIG= yes
@@ -45,7 +45,8 @@
OPTIONS_DEFAULT= DBUS
DBUS_VARS_OFF= CONFIG+=no-dbus
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
BONJOUR_DESC= Bonjour support
BONJOUR_VARS_OFF= CONFIG+=no-bonjour
Index: audio/murmur/Makefile
===================================================================
--- audio/murmur/Makefile
+++ audio/murmur/Makefile
@@ -17,8 +17,8 @@
USERS= murmur
GROUPS= murmur
-USES= compiler:c++11-lang qmake pkgconfig ssl
-USE_QT4= moc_build corelib network sql xml
+USES= compiler:c++11-lang qmake pkgconfig qt:4 ssl
+USE_QT= moc_build corelib network sql xml
USE_GITHUB= YES
GH_ACCOUNT= mumble-voip
@@ -46,7 +46,7 @@
.endif
.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+= dbus
+USE_QT+= dbus
.else
CONFIG+= no-dbus
.endif
@@ -58,13 +58,13 @@
.endif
.if ${PORT_OPTIONS:MMYSQL}
-USE_QT4+= sql-mysql
+USE_QT+= sql-mysql
.else
CONFIG+= no-sql-mysql
.endif
.if ${PORT_OPTIONS:MSQLITE}
-USE_QT4+= sql-sqlite3_run
+USE_QT+= sql-sqlite3_run
.else
CONFIG+= no-sqlite3_run
.endif
Index: audio/musescore/Makefile
===================================================================
--- audio/musescore/Makefile
+++ audio/musescore/Makefile
@@ -23,8 +23,8 @@
libfreetype.so:print/freetype2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig shared-mime-info zip
-USE_QT5= core gui widgets opengl concurrent designer help network \
+ pkgconfig qt:5 shared-mime-info zip
+USE_QT= core gui widgets opengl concurrent designer help network \
scripttools qml quick svg sql printsupport testlib webkit \
xml xmlpatterns \
buildtools_build linguisttools_build qmake_build uitools_build
Index: audio/mythplugin-mythmusic/Makefile
===================================================================
--- audio/mythplugin-mythmusic/Makefile
+++ audio/mythplugin-mythmusic/Makefile
@@ -20,11 +20,12 @@
libvorbis.so:audio/libvorbis \
libmyth-29.so:multimedia/mythtv
+USES= qt:5
USE_GITHUB= yes
GH_ACCOUNT= MythTV
GH_PROJECT= mythtv
USE_LDCONFIG= yes
-USE_QT5= buildtools_build core gui qmake_build sql xml
+USE_QT= buildtools_build core gui qmake_build sql xml
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-all \
Index: audio/padthv1-lv2/Makefile
===================================================================
--- audio/padthv1-lv2/Makefile
+++ audio/padthv1-lv2/Makefile
@@ -17,12 +17,12 @@
libjack.so:audio/jack \
liblo.so:audio/liblo
-USES= autoreconf gmake pkgconfig shared-mime-info
+USES= autoreconf gmake pkgconfig qt:5 shared-mime-info
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= rncbc
USE_GL= gl
-USE_QT5= core gui widgets xml buildtools_build qmake_build
+USE_QT= core gui widgets xml buildtools_build qmake_build
PLIST_SUB= SHL3=${PORTVERSION} SHL2=${PORTVERSION:R} SHL1=${PORTVERSION:R:R}
Index: audio/pc-mixer/Makefile
===================================================================
--- audio/pc-mixer/Makefile
+++ audio/pc-mixer/Makefile
@@ -13,9 +13,9 @@
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
MAKE_JOBS_UNSAFE=yes
-USES= qmake shebangfix tar:xz
+USES= qmake qt:5 shebangfix tar:xz
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
buildtools x11extras widgets multimedia
USE_GL+= gl
Index: audio/plasma5-plasma-pa/Makefile
===================================================================
--- audio/plasma5-plasma-pa/Makefile
+++ audio/plasma5-plasma-pa/Makefile
@@ -11,11 +11,11 @@
libpulse.so:audio/pulseaudio
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 \
- pkgconfig shebangfix tar:xz
+ pkgconfig qt:5 shebangfix tar:xz
USE_GNOME= gconf2
USE_KDE= config configwidgets coreaddons ecm globalaccel i18n \
kdeclarative package plasma-framework
-USE_QT5= core dbus gui network qml quick widgets \
+USE_QT= core dbus gui network qml quick widgets \
buildtools_build qmake_build
SHEBANG_FILES= data/plasmaVolumeDisableKMixAutostart.pl
Index: audio/polyphone/Makefile
===================================================================
--- audio/polyphone/Makefile
+++ audio/polyphone/Makefile
@@ -19,9 +19,9 @@
libstk-4.6.0.so:audio/stk \
libvorbisfile.so:audio/libvorbis
-USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource shared-mime-info zip
+USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource qt:5 shared-mime-info zip
USE_GL= gl
-USE_QT5= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
+USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
USE_CXXSTD= c++11
QMAKE_ARGS= DEFINES=USE_LOCAL_QCUSTOMPLOT
CXXFLAGS+= -D__UNIX_JACK__
Index: audio/qjackctl/Makefile
===================================================================
--- audio/qjackctl/Makefile
+++ audio/qjackctl/Makefile
@@ -43,14 +43,15 @@
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_CONFIGURE_ENABLE= qt4
+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= qt
-QT5_USES= compiler:c++11-lib
-QT5_USE= QT5=core,dbus,gui,widgets,x11extras,xml \
- QT5=buildtools_build,linguisttools_build,qmake_build \
+QT5_USES= compiler:c++11-lib qt:5
+QT5_USE= QT=core,dbus,gui,widgets,x11extras,xml \
+ QT=buildtools_build,linguisttools_build,qmake_build \
GL=gl \
CXXSTD=c++11
Index: audio/qmidiarp/Makefile
===================================================================
--- audio/qmidiarp/Makefile
+++ audio/qmidiarp/Makefile
@@ -20,10 +20,10 @@
libjack.so:audio/jack
USES= autoreconf compiler:c++11-lib desktop-file-utils \
- gmake localbase libtool pkgconfig
+ gmake localbase libtool pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= emuse
-USE_QT5= core gui network widgets buildtools_build \
+USE_QT= core gui network widgets buildtools_build \
linguisttools_build
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
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= qmake qt:4 tar:bzip2
+USE_QT= moc_build rcc_build uic_build \
corelib gui network xml xmlpatterns
INSTALLS_ICONS= yes
@@ -25,10 +25,12 @@
OPTIONS_SUB= yes
-NLS_USE= QT4=linguisttools_build
+NLS_USES= qt:4
+NLS_USE= QT=linguisttools_build
DBUS_QMAKE_ON= CONFIG+=qdbus
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
DEBUG_QMAKE_ON= CONFIG+=debug
Index: audio/qsampler/Makefile
===================================================================
--- audio/qsampler/Makefile
+++ audio/qsampler/Makefile
@@ -38,13 +38,15 @@
TOOLKIT_DESC= Qt toolkit
-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
post-configure:
Index: audio/qsynth/Makefile
===================================================================
--- audio/qsynth/Makefile
+++ audio/qsynth/Makefile
@@ -14,9 +14,9 @@
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
-USES= autoreconf gmake pkgconfig
+USES= autoreconf gmake pkgconfig qt:5
USE_CXXSTD= c++11
-USE_QT5= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
+USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
USE_GL= gl
USE_GITHUB= yes
GH_ACCOUNT= rncbc
Index: audio/quimup/Makefile
===================================================================
--- audio/quimup/Makefile
+++ audio/quimup/Makefile
@@ -18,8 +18,8 @@
WRKSRC= ${WRKDIR}/Quimup_${PORTVERSION}
-USES= pkgconfig qmake compiler:c++11-lang
-USE_QT5= core gui network widgets buildtools_build
+USES= pkgconfig qmake compiler:c++11-lang qt:5
+USE_QT= core gui network widgets buildtools_build
USE_GL= gl
CXXFLAGS+= -std=c++11
Index: audio/rosegarden/Makefile
===================================================================
--- audio/rosegarden/Makefile
+++ audio/rosegarden/Makefile
@@ -34,13 +34,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
@@ -18,10 +18,10 @@
libmtp.so:multimedia/libmtp
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig
+ pkgconfig qt:5
USE_GNOME= glib20
USE_GSTREAMER1= flac libav mpg123 ogg opus vorbis
-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
WRKSRC= ${WRKDIR}/${PORTNAME}-player
Index: audio/simon/Makefile
===================================================================
--- audio/simon/Makefile
+++ audio/simon/Makefile
@@ -17,9 +17,9 @@
libsphinxad.so:audio/sphinxbase \
libqwt6.so:x11-toolkits/qwt6@qt4
-USES= cmake:outsource gettext kde:4 tar:bz2
+USES= cmake:outsource gettext kde:4 qt:4 tar:bz2
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/sonic-visualiser/Makefile
===================================================================
--- audio/sonic-visualiser/Makefile
+++ audio/sonic-visualiser/Makefile
@@ -21,10 +21,10 @@
libsord-0.so:devel/sord \
libvamp-hostsdk.so:audio/vamp-plugin-sdk
-USES= autoreconf desktop-file-utils pkgconfig
+USES= autoreconf desktop-file-utils pkgconfig qt:5
GNU_CONFIGURE= yes
-USE_QT5= buildtools_build core gui network qmake_build testlib widgets xml
+USE_QT= buildtools_build core gui network qmake_build testlib widgets xml
USE_XORG= x11
USE_GL= gl
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/supercollider/Makefile
===================================================================
--- audio/supercollider/Makefile
+++ audio/supercollider/Makefile
@@ -20,9 +20,9 @@
libsndfile.so:audio/libsndfile \
libfftw3f.so:math/fftw3-float
-USES= cmake:outsource iconv localbase pkgconfig readline \
+USES= cmake:outsource iconv localbase pkgconfig qt:5 readline \
shared-mime-info tar:bzip2
-USE_QT5= buildtools_build concurrent core gui linguisttools location \
+USE_QT= buildtools_build concurrent core gui linguisttools location \
network opengl printsupport qmake_build qml quick sensors \
sql webkit widgets
USE_LDCONFIG= yes
Index: audio/virtual_oss_ctl/Makefile
===================================================================
--- audio/virtual_oss_ctl/Makefile
+++ audio/virtual_oss_ctl/Makefile
@@ -14,7 +14,7 @@
RUN_DEPENDS= virtual_oss:audio/virtual_oss
-USES= qmake tar:bzip2
-USE_QT4= corelib gui qmake_build moc_build rcc_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= corelib gui qmake_build moc_build rcc_build
.include <bsd.port.mk>
Index: audio/vmpk/Makefile
===================================================================
--- audio/vmpk/Makefile
+++ audio/vmpk/Makefile
@@ -15,8 +15,8 @@
LIB_DEPENDS= libdrumstick-rt.so:audio/drumstick
-USES= cmake:outsource pkgconfig tar:bz2
-USE_QT5= core gui network svg widgets x11extras \
+USES= cmake:outsource pkgconfig qt:5 tar:bz2
+USE_QT= core gui network svg widgets x11extras \
buildtools_build linguisttools_build qmake_build
USE_XORG= xcb
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 qmake
+USES= desktop-file-utils qmake qt:5
USE_GL= glu
-USE_QT5= buildtools_build linguisttools_build scripttools_build \
+USE_QT= buildtools_build linguisttools_build scripttools_build \
gui network printsupport script sql svg webkit widgets xml \
imageformats_run
Index: cad/freecad/Makefile
===================================================================
--- cad/freecad/Makefile
+++ cad/freecad/Makefile
@@ -31,10 +31,10 @@
RUN_DEPENDS= pivy>0:graphics/py-pivy@${PY_FLAVOR}
USES= dos2unix compiler:c++11-lib cmake:outsource eigen:3 fortran jpeg \
- python:2.7 localbase
+ python:2.7 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
DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
Index: cad/fritzing/Makefile
===================================================================
--- cad/fritzing/Makefile
+++ cad/fritzing/Makefile
@@ -14,8 +14,8 @@
SUB_FILES+= pkg-install
-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 qmake qt:5 tar:bzip2
+USE_QT= buildtools concurrent core dbus gui imageformats network printsupport qmake serialport sql-sqlite3 svg xml
DOS2UNIX_REGEX= .*pro
INSTALLS_ICONS= yes
USE_GITHUB= yes
Index: cad/klayout/Makefile
===================================================================
--- cad/klayout/Makefile
+++ cad/klayout/Makefile
@@ -11,9 +11,9 @@
LICENSE= GPLv2
-USES= compiler:c++0x gmake python
+USES= compiler:c++0x gmake python 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
@@ -16,8 +16,8 @@
BROKEN_armv6= fails to compile: no matching member function for call to 'map'
BROKEN_armv7= fails to compile: no matching member function for call to 'map'
-USES= qmake zip
-USE_QT4= corelib gui network moc_build sql uic_build \
+USES= qmake qt:4 zip
+USE_QT= corelib gui network moc_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,8 @@
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 qmake qt:4 shared-mime-info
+USE_QT= moc_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,12 +15,12 @@
LIB_DEPENDS= libmuparser.so:math/muparser \
libfreetype.so:print/freetype2
-USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake
+USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= LibreCAD
GH_PROJECT= LibreCAD
USE_GL= gl
-USE_QT5= core gui printsupport svg widgets \
+USE_QT= core gui printsupport svg widgets \
buildtools_build linguisttools_build
QMAKE_ARGS+= BOOST_DIR="${LOCALBASE}"
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 qmake 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 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-devel/Makefile
===================================================================
--- cad/openscad-devel/Makefile
+++ cad/openscad-devel/Makefile
@@ -27,7 +27,7 @@
CONFLICTS= openscad
USES= bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
- pkgconfig python:run qmake shebangfix
+ pkgconfig python:run qmake qt:4 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= openscad
GH_PROJECT= openscad
@@ -35,7 +35,7 @@
#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 uic_build rcc_build
PLIST_SUB= PORTVERSION=${PORTVERSION}
QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3
QMAKE_ARGS+= VERSION=${PORTVERSION} \
Index: cad/openscad/Makefile
===================================================================
--- cad/openscad/Makefile
+++ cad/openscad/Makefile
@@ -26,10 +26,10 @@
CONFLICTS= openscad-devel
USES= bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
- pkgconfig python:run qmake shebangfix
+ pkgconfig python:run qmake qt:4 shebangfix
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 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
@@ -20,10 +20,10 @@
MAKE_JOBS_UNSAFE=yes
-USES= gmake qmake
+USES= gmake qmake 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/qelectrotech/Makefile
===================================================================
--- cad/qelectrotech/Makefile
+++ cad/qelectrotech/Makefile
@@ -15,8 +15,8 @@
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 \
+USES= compiler:c++11-lib desktop-file-utils qmake qt:5 shared-mime-info
+USE_QT= buildtools_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= qt:4 tar:bzip2 cmake desktop-file-utils
INSTALLS_ICONS= yes
GRAPHVIZ_BUILD_DEPENDS= graphviz>=2.22:graphics/graphviz
Index: cad/qucs/Makefile
===================================================================
--- cad/qucs/Makefile
+++ cad/qucs/Makefile
@@ -15,9 +15,9 @@
BUILD_DEPENDS= gperf:devel/gperf \
admsXml:cad/adms
-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= autoreconf compiler:c++11-lib bison gmake libtool shebangfix
+USES= autoreconf compiler:c++11-lib bison gmake libtool qt:4 shebangfix
SHEBANG_FILES= qucs/contrib/ps2sp
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-doc
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= qt:4 tar:xz cmake gettext pkgconfig
INSTALLS_ICONS= yes
_MODEL_VER= 20130308
@@ -31,7 +31,7 @@
.include <bsd.port.options.mk>
.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
@@ -39,7 +39,7 @@
USE_KDE= ecm
USE_XORG= x11 xext xkbfile sm ice
USE_LDCONFIG= yes
-USES= tar:xz cmake:noninja desktop-file-utils \
+USES= qt:4 tar:xz cmake:noninja desktop-file-utils \
gettext-tools:build,run gettext-runtime iconv:wchar_t \
kde:5 pkgconfig shared-mime-info
INSTALLS_ICONS= yes
@@ -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+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods corelib
USE_LDCONFIG+= ${PREFIX}/lib/fcitx/qt
PLIST_SUB+= QT4=""
.else
Index: chinese/gcin-qt4/Makefile
===================================================================
--- chinese/gcin-qt4/Makefile
+++ chinese/gcin-qt4/Makefile
@@ -16,8 +16,8 @@
LIB_DEPENDS= libgcin-im-client.so:chinese/gcin
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/qt4-im
-USES= gmake pkgconfig tar:xz
-USE_QT4= inputmethods qmake_build moc_build corelib gui
+USES= gmake pkgconfig qt:4 tar:xz
+USE_QT= inputmethods qmake_build moc_build corelib gui
MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
MKDIR="${MKDIR}"
Index: chinese/qt4-codecs-cn/Makefile
===================================================================
--- chinese/qt4-codecs-cn/Makefile
+++ chinese/qt4-codecs-cn/Makefile
@@ -11,8 +11,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt GB 18030 codec plugin
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
HAS_CONFIGURE= yes
Index: chinese/qt4-codecs-tw/Makefile
===================================================================
--- chinese/qt4-codecs-tw/Makefile
+++ chinese/qt4-codecs-tw/Makefile
@@ -11,8 +11,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Big-5 codec plugin
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
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= qt:4 tar:bzip2 cmake perl5
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,18 @@
OPENSSL_CMAKE_ON= -DQTERM_ENABLE_SSH:BOOL=TRUE
OPENSSL_CMAKE_OFF= -DQTERM_ENABLE_SSH:BOOL=FALSE
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+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_USES= qt:4
+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_USES= qt:4
+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/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 <bsd.port.mk>
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
@@ -46,7 +46,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 fortran iconv perl5 pkgconfig pyqt:4 python:2.7 shebangfix
+USES= cmake:outsource compiler:c11 fortran iconv perl5 pkgconfig pyqt:4 python:2.7 qt:4 shebangfix
SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in \
gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
@@ -65,7 +65,7 @@
USE_GNOME= pygtk2
USE_PYQT= core gui opengl
USE_WX= 3.0+
-USE_QT4= corelib gui xml qmake moc_build rcc_build uic_build
+USE_QT= corelib gui xml qmake moc_build rcc_build uic_build
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
@@ -24,13 +24,13 @@
libboost_system.so:devel/boost-libs \
libboost_program_options.so:devel/boost-libs
-USES= pkgconfig qmake
+USES= pkgconfig qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= csete
USE_GL= gl
-USE_QT5= buildtools_build core gui svg network widgets
+USE_QT= buildtools_build core gui svg network widgets
OPTIONS_RADIO= AUDIO
AUDIO_DESC= Audio backend
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 <bsd.port.mk>
Index: comms/inspectrum/Makefile
===================================================================
--- comms/inspectrum/Makefile
+++ comms/inspectrum/Makefile
@@ -22,8 +22,8 @@
GH_ACCOUNT= miek
GH_TAGNAME= 11853b64062bda4f81926613f15d1d9654c227c8
-USE_QT5= core buildtools_build concurrent widgets
-USES= cmake pkgconfig qmake
+USE_QT= core buildtools_build concurrent widgets
+USES= cmake pkgconfig qmake qt:5
USE_LDCONFIG= yes
.include <bsd.port.mk>
Index: comms/jsdr/Makefile
===================================================================
--- comms/jsdr/Makefile
+++ comms/jsdr/Makefile
@@ -23,8 +23,8 @@
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= qmake 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,8 +11,8 @@
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake
-USE_QT5= buildtools_build core gui linguisttools_build multimedia network \
+USES= qmake qt:5
+USE_QT= buildtools_build core gui linguisttools_build multimedia network \
printsupport sql sql-sqlite3_run widgets
DESKTOP_ENTRIES= "KLog" "Simple Amateur Radio Logging Program" \
"" "klog" "Network;HamRadio;" \
Index: comms/kremotecontrol-kde4/Makefile
===================================================================
--- comms/kremotecontrol-kde4/Makefile
+++ comms/kremotecontrol-kde4/Makefile
@@ -10,9 +10,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 widgets
+USES= cmake pkgconfig qt:5
USE_LDCONFIG= yes
.include <bsd.port.mk>
Index: comms/linpsk/Makefile
===================================================================
--- comms/linpsk/Makefile
+++ comms/linpsk/Makefile
@@ -12,8 +12,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= qmake 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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -22,8 +22,8 @@
libv4l2.so:multimedia/libv4l
BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat
-USES= qmake
-USE_QT5= buildtools core gui network widgets xml
+USES= qmake qt:5
+USE_QT= buildtools core gui network widgets xml
USE_GL+= gl
OPTIONS_DEFINE= DOCS
Index: comms/qt5-connectivity/Makefile
===================================================================
--- comms/qt5-connectivity/Makefile
+++ comms/qt5-connectivity/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt connectivity (Bluetooth/NFC) module
-USE_QT5= concurrent core qml quick buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= concurrent core qml quick buildtools_build
+USES= qmake qt-dist:5,connectivity
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: comms/qt5-sensors/Makefile
===================================================================
--- comms/qt5-sensors/Makefile
+++ comms/qt5-sensors/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt sensors module
-USE_QT5= core qml quick buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USE_QT= core qml quick buildtools_build
+USES= qmake:norecursive qt-dist:5,sensors
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: comms/qt5-serialbus/Makefile
===================================================================
--- comms/qt5-serialbus/Makefile
+++ comms/qt5-serialbus/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt functions to access industrial bus systems
-USE_QT5= core network serialport buildtools_build
-QT_DIST= serialbus
-USES= compiler:c++11-lib qmake
+USE_QT= core network serialport buildtools_build
+USES= compiler:c++11-lib qmake qt-dist:5,serialbus
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
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
-QT_DIST= serialport
-USES= qmake
+USE_QT= core buildtools_build
+USES= qmake qt-dist:5,serialport
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: comms/qtel/Makefile
===================================================================
--- comms/qtel/Makefile
+++ comms/qtel/Makefile
@@ -14,7 +14,8 @@
libgsm.so:audio/gsm
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 qmake_build linguist_build moc_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
+USE_QT= core buildtools_build qmake webkit widgets
+USES= cmake:outsource compiler:gcc-c++11-lib fortran pkgconfig qt:5
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
@@ -26,7 +26,7 @@
GH_ACCOUNT= sm0svx
GH_PROJECT= svxlink
-USES= cmake tcl groff
+USES+= cmake tcl groff
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
@@ -23,8 +23,8 @@
MAKE_JOBS_UNSAFE= yes
USE_GL= yes
-USE_QT5= gui buildtools qmake_build widgets multimedia concurrent printsupport serialport
-USES= cmake compiler:c++11-lib dos2unix fortran pkgconfig tar:tgz
+USE_QT= gui buildtools qmake_build widgets multimedia concurrent printsupport serialport
+USES= cmake compiler:c++11-lib dos2unix fortran pkgconfig qt:5 tar:tgz
CMAKE_ARGS+= -DPORT_BUILDING::STRING="ON" \
-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
-DLOCALBASE::STRING="${LOCALBASE}"
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
# Qt from 5.7.0 on requires c++11.
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
Index: databases/akonadi-kde4/Makefile
===================================================================
--- databases/akonadi-kde4/Makefile
+++ databases/akonadi-kde4/Makefile
@@ -18,10 +18,10 @@
# Let process generate meaningful backtrace on core dump.
BUILD_DEPENDS= xsltproc:textproc/libxslt
-USES= cmake:outsource kde:4 shared-mime-info \
+USES= cmake:outsource kde:4 qt:4 shared-mime-info \
compiler:c++11-lang pathfix 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 \
@@ -33,15 +33,16 @@
OPTIONS_SUB= yes # SQLITE
MYSQL_DESC= Install MySQL Qt plugin and server
-MYSQL_USE= QT4=sql-mysql_run
-MYSQL_USES= mysql:server
+MYSQL_USE= QT=sql-mysql_run
+MYSQL_USES= mysql:server qt:4
PGSQL_DESC= Install PostgreSQL Qt plugin
# Do not add a dependency on PostgreSQL server as someone preferring
# 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_USES= qt:4
+PGSQL_USE= QT=sql-pgsql_run
SQLITE_DESC= Enable SQLite backend
SQLITE_USES= sqlite:3
Index: databases/akonadi/Makefile
===================================================================
--- databases/akonadi/Makefile
+++ databases/akonadi/Makefile
@@ -16,13 +16,13 @@
CONFLICTS= akonadi-[0-9]* akonadi-kf5-git-[0-9]*
USES= cmake:outsource compiler:c++11-lib gettext kde:5 \
- shared-mime-info tar:xz
+ qt:5 shared-mime-info tar:xz
USE_GNOME= libxml2
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemmodels itemviews \
kio service windowsystem widgetsaddons xmlgui \
designerplugin_build designerplugin_run
-USE_QT5= core dbus designer gui network sql testlib widgets xml \
+USE_QT= core dbus designer gui network sql testlib widgets xml \
buildtools_build qmake_build
CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
@@ -33,18 +33,20 @@
OPTIONS_SUB= yes
MYSQL_DESC= Install MySQL Qt plugin and server
-MYSQL_USE= MYSQL=server QT5=sql-mysql_run
+MYSQL_USES= qt:5
+MYSQL_USE= MYSQL=server QT=sql-mysql_run
PGSQL_DESC= Install PostgreSQL Qt plugin
# Do not add a dependency on PostgreSQL server as someone preferring
# it over MySQL might like to use some advanced configuration, like a
# remote server.
#PGSQL_USE= PGSQL=server
-PGSQL_USE= QT5=sql-pgsql_run
+PGSQL_USES= qt:5
+PGSQL_USE= QT=sql-pgsql_run
SQLITE_DESC= Enable SQLite backend
-SQLITE_USES= sqlite:3
-SQLITE_USE= QT5=sql-sqlite3_run
+SQLITE_USES= qt:5 sqlite:3
+SQLITE_USE= QT=sql-sqlite3_run
SQLITE_CMAKE_ON= -DAKONADI_BUILD_QSQLITE:BOOL=ON
SQLITE_CMAKE_OFF= -DAKONADI_BUILD_QSQLITE:BOOL=OFF
Index: databases/kbibtex/Makefile
===================================================================
--- databases/kbibtex/Makefile
+++ databases/kbibtex/Makefile
@@ -14,10 +14,10 @@
libqca.so:devel/qca@qt4 \
libqoauth.so:net/qoauth
-USES= cmake gettext iconv kde:4 shared-mime-info tar:xz
+USES= cmake gettext iconv kde:4 qt:4 shared-mime-info 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/kdb/Makefile
===================================================================
--- databases/kdb/Makefile
+++ databases/kdb/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libicuuc.so:devel/icu
-USES= cmake:outsource gettext kde:5 python:2.7 tar:xz
+USES= cmake:outsource gettext kde:5 python:2.7 qt:5 tar:xz
USE_KDE= coreaddons ecm i18n
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
# In the future, these options will be moved into slave ports
Index: databases/kexi/Makefile
===================================================================
--- databases/kexi/Makefile
+++ databases/kexi/Makefile
@@ -14,14 +14,14 @@
libKReport3.so:textproc/kreport
USES= cmake:outsource desktop-file-utils gettext iconv \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= glib20
USE_KDE= auth bookmarks codecs completion config \
configwidgets coreaddons crash ecm guiaddons i18n \
iconthemes itemviews jobwidgets kio parts service \
solid sonnet texteditor textwidgets widgetsaddons \
xmlgui breeze-icons_build
-USE_QT5= core dbus gui network printsupport webkit widgets xml \
+USE_QT= core dbus gui network printsupport webkit widgets xml \
buildtools_build qmake_build qml
CONFLICTS_INSTALL= calligra-2*
Index: databases/pgmodeler/Makefile
===================================================================
--- databases/pgmodeler/Makefile
+++ databases/pgmodeler/Makefile
@@ -13,11 +13,11 @@
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++11-lib pgsql qmake pkgconfig gmake
+USES= compiler:c++11-lib pgsql qmake pkgconfig gmake qt:5
USE_GITHUB= yes
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 buildtools_build uitools testlib
USE_GL= gl
USE_XORG= x11 xext
Index: databases/py-qt4-sql/Makefile
===================================================================
--- databases/py-qt4-sql/Makefile
+++ databases/py-qt4-sql/Makefile
@@ -12,10 +12,10 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL database integration module
-USE_QT4= qmake_build moc_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: databases/qt5-sql/Makefile
===================================================================
--- databases/qt5-sql/Makefile
+++ databases/qt5-sql/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL database integration module
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: databases/redisdesktopmanager/Makefile
===================================================================
--- databases/redisdesktopmanager/Makefile
+++ databases/redisdesktopmanager/Makefile
@@ -12,7 +12,7 @@
LIB_DEPENDS= libssh2.so:security/libssh2
-USES= dos2unix kde:5 qmake ssl
+USES= dos2unix kde:5 qmake qt:5 ssl
DOS2UNIX_FILES= 3rdparty/3rdparty.pri
USE_GL= gl
USE_GITHUB= yes
@@ -30,7 +30,7 @@
uglide:qredisclient:34f1c5a:qredisclient/3rdparty/qredisclient \
sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis
-USE_QT5= buildtools_build charts concurrent core gui network qmake_build qml quick widgets
+USE_QT= buildtools_build charts concurrent core gui network qmake_build qml quick widgets
post-patch:
@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h
Index: databases/sqlitebrowser/Makefile
===================================================================
--- databases/sqlitebrowser/Makefile
+++ databases/sqlitebrowser/Makefile
@@ -17,9 +17,9 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:devel/antlr
LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
-USES= cmake desktop-file-utils sqlite
+USES= cmake desktop-file-utils qt:5 sqlite
CMAKE_ARGS+= -DQT_INCLUDE_DIR=${QT_INCDIR} -DQT_LIBRARY_DIR=${QT_LIBDIR}
-USE_QT5= core gui network printsupport testlib widgets \
+USE_QT= core gui network printsupport testlib widgets \
buildtools_build linguisttools_build qmake_build
USE_GITHUB= yes
Index: databases/sqliteman/Makefile
===================================================================
--- databases/sqliteman/Makefile
+++ databases/sqliteman/Makefile
@@ -12,8 +12,8 @@
LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
-USES= cmake sqlite
-USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql
+USES= cmake qt:4 sqlite
+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
@@ -38,9 +38,9 @@
WRKSRC= ${WRKDIR}/SQLiteStudio3
-USES= compiler:c++11-lib gmake ncurses qmake readline sqlite
+USES= compiler:c++11-lib gmake ncurses qmake qt:5 readline sqlite
USE_CXXSTD= c++11
-USE_QT5= core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
+USE_QT= core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
uitools buildtools_build linguisttools_build
USE_GL= gl
USE_LDCONFIG= yes
@@ -64,7 +64,7 @@
PLUGIN_HTML_EXPORT_VARS= PLUGIN_DIRS+=HtmlExport
PLUGIN_JSON_EXPORT_VARS= PLUGIN_DIRS+=JsonExport
PLUGIN_PDF_EXPORT_VARS= PLUGIN_DIRS+=PdfExport
-PLUGIN_PRINTING_VARS= PLUGIN_DIRS+=Printing USE_QT5+=printsupport
+PLUGIN_PRINTING_VARS= PLUGIN_DIRS+=Printing USE_QT+=printsupport
PLUGIN_REGEXP_IMPORT_VARS= PLUGIN_DIRS+=RegExpImport
PLUGIN_SQL_ENTERPRISE_FORMATTER_VARS= PLUGIN_DIRS+=SqlEnterpriseFormatter
PLUGIN_SQL_EXPORT_VARS= PLUGIN_DIRS+=SqlExport
Index: databases/tora/Makefile
===================================================================
--- databases/tora/Makefile
+++ databases/tora/Makefile
@@ -20,8 +20,8 @@
OPTIONS_DEFINE= PGSQL MYSQL DOCS
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 qmake:no_configure qt:4
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pcre=${LOCALBASE}
LDFLAGS+= -L${LOCALBASE}/lib
@@ -32,8 +32,8 @@
DOCS_USES= makeinfo
DOCS_INFO= tora
-MYSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:databases/qt4-mysql-plugin
-PGSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:databases/qt4-pgsql-plugin
+MYSQL_USE= QT=sql-mysql_run
+PGSQL_USE= QT=sql-pgsql_run
post-patch-DOCS-on:
@${REINPLACE_CMD} 's|/etc/torarc|${PREFIX}/etc/torarc|' \
Index: deskutils/akonadi-calendar-tools/Makefile
===================================================================
--- deskutils/akonadi-calendar-tools/Makefile
+++ deskutils/akonadi-calendar-tools/Makefile
@@ -9,7 +9,7 @@
LIB_DEPENDS= libical.so:devel/libical
-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 ecm guiaddons i18n iconthemes itemmodels \
itemviews jobwidgets kdelibs4support kio notifications parts \
@@ -18,7 +18,7 @@
# pim components
USE_KDE+= akonadi akonadicalendar calendarsupport calendarcore calendarutils \
identitymanagement libkdepim mime pimtextedit
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/akonadi-import-wizard/Makefile
===================================================================
--- deskutils/akonadi-import-wizard/Makefile
+++ deskutils/akonadi-import-wizard/Makefile
@@ -13,7 +13,7 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-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= archive auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm i18n itemmodels kio service wallet \
widgetsaddons xmlgui
@@ -21,7 +21,7 @@
USE_KDE+= akonadi akonadicontacts akonadimime contacts identitymanagement \
libkdepim libkleo mailcommon mailimporter mailtransport \
messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/akonadiconsole/Makefile
===================================================================
--- deskutils/akonadiconsole/Makefile
+++ deskutils/akonadiconsole/Makefile
@@ -17,7 +17,7 @@
libical.so:devel/libical \
libxapian.so:databases/xapian-core
-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 ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kdelibs4support kio \
@@ -28,7 +28,7 @@
akonadisearch calendarcore calendarsupport contacts \
identitymanagement libkdepim libkleo messagelib mime \
pimcommon pimtextedit
-USE_QT5= core dbus gui network printsupport sql widgets xml \
+USE_QT= core dbus gui network printsupport sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/akregator/Makefile
===================================================================
--- deskutils/akregator/Makefile
+++ deskutils/akregator/Makefile
@@ -15,7 +15,7 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n iconthemes itemmodels jobwidgets kcmutils kio \
notifications notifyconfig parts service sonnet texteditor\
@@ -23,7 +23,7 @@
# pim components
USE_KDE+= akonadi akonadimime contacts grantleetheme kontactinterface \
libkdepim libkleo messagelib mime pimcommon pimtextedit syndication
-USE_QT5= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus gui location network printsupport qml quick \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
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 kdelibs qimageblitz
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
USE_CXXSTD= gnu++98
Index: deskutils/cairo-dock-plugins/Makefile
===================================================================
--- deskutils/cairo-dock-plugins/Makefile
+++ deskutils/cairo-dock-plugins/Makefile
@@ -87,8 +87,8 @@
IMPULSE_CMAKE_BOOL= enable-impulse
#KDE_INTEGRATION_LIB_DEPENDS=
-KDE_INTEGRATION_USE_QT4= corelib
-KDE_INTEGRATION_USES= kde:4
+KDE_INTEGRATION_USE_QT= corelib
+KDE_INTEGRATION_USES= kde:4 qt:4
KDE_INTEGRATION_USE= KDE=kdelibs
KDE_INTEGRATION_CMAKE_BOOL= enable-kde-integration
Index: deskutils/calibre/Makefile
===================================================================
--- deskutils/calibre/Makefile
+++ deskutils/calibre/Makefile
@@ -48,13 +48,13 @@
pdftohtml:graphics/poppler-utils
USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \
- python:2.7 pyqt:5 shared-mime-info shebangfix ssl tar:xz
+ python:2.7 pyqt:5 qt:5 shared-mime-info shebangfix ssl tar:xz
USE_RC_SUBR= calibre
EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f
SHEBANG_GLOB= *.sh *.py
python_OLD_CMD= "/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2
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,8 @@
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 qmake:norecursive qt:4 tar:bzip2
+USE_QT= corelib gui xml linguisttools_build moc_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
@@ -14,7 +14,7 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource compiler:c++11-lib
+USES= cmake:outsource compiler:c++11-lib qt:5
# Use bundled keychain; the keychain is only used for KDAB-internal
# features not available or configurable in the port.
CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION} \
@@ -24,7 +24,7 @@
GH_ACCOUNT= KDAB
GH_PROJECT= Charm
-USE_QT5= core dbus gui \
+USE_QT= core dbus gui \
network printsupport script sql sql-sqlite3 \
testlib widgets xml \
buildtools_build qmake_build
Index: deskutils/copyq/Makefile
===================================================================
--- deskutils/copyq/Makefile
+++ deskutils/copyq/Makefile
@@ -11,9 +11,9 @@
LICENSE= GPLv3
-USES= qmake
+USES= qmake qt:5
USE_XORG= x11 xfixes xtst
-USE_QT5= core gui network svg multimedia imageformats \
+USE_QT= core gui network svg multimedia imageformats \
buildtools_build x11extras concurrent widgets xml \
script
USE_GL= gl
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= qmake qt:4 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,rcc_build,uic_build,xml
+QT5_USES= qt:5
+QT5_USE= QT=buildtools_build,core,xml GL=gl
.include <bsd.port.options.mk>
@@ -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/flameshot/Makefile
===================================================================
--- deskutils/flameshot/Makefile
+++ deskutils/flameshot/Makefile
@@ -17,10 +17,10 @@
INSTALL_ICONS= yes
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
USE_GL= gl
-USE_QT5= core dbus gui linguist network widgets \
+USE_QT= core dbus gui linguist network widgets \
buildtools_build
post-patch:
Index: deskutils/grantlee-editor/Makefile
===================================================================
--- deskutils/grantlee-editor/Makefile
+++ deskutils/grantlee-editor/Makefile
@@ -16,7 +16,7 @@
libqgpgme.so:security/gpgme-qt5
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 \
- kde:5 tar:xz
+ kde:5 qt:5 tar:xz
USE_KDE= archive attica auth codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n itemmodels jobwidgets \
kio newstuff service syntaxhighlighting texteditor \
@@ -24,7 +24,7 @@
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \
kdepim-apps-libs libkleo messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus gui location network qml quick webchannel webengine \
+USE_QT= core dbus gui location network qml quick webchannel webengine \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/grantleetheme/Makefile
===================================================================
--- deskutils/grantleetheme/Makefile
+++ deskutils/grantleetheme/Makefile
@@ -10,10 +10,10 @@
LICENSE= LGPL21
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons ecm i18n \
iconthemes newstuff service widgetsaddons xmlgui
-USE_QT5= core dbus gui network testlib widgets xml \
+USE_QT= core dbus gui network testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
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/kaddressbook/Makefile
===================================================================
--- deskutils/kaddressbook/Makefile
+++ deskutils/kaddressbook/Makefile
@@ -14,14 +14,14 @@
libqgpgme.so:security/gpgme-qt5
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- tar:xz
+ qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n iconthemes itemmodels jobwidgets kcmutils kio parts \
prison service sonnet textwidgets widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi akonadicontacts akonadisearch contacts grantleetheme \
kdepim-apps-libs kontactinterface libkdepim pimcommon
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kalarm/Makefile
===================================================================
--- deskutils/kalarm/Makefile
+++ deskutils/kalarm/Makefile
@@ -9,7 +9,7 @@
LIB_DEPENDS= libical.so:devel/libical
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 shebangfix tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -20,7 +20,7 @@
calendarutils contacts holidays identitymanagement \
kdepim-apps-libs libkdepim mailcommon mailtransport mime \
pimcommon pimtextedit imap
-USE_QT5= core dbus gui network phonon4 printsupport widgets x11extras xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kcharselect-kde4/Makefile
===================================================================
--- deskutils/kcharselect-kde4/Makefile
+++ deskutils/kcharselect-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: deskutils/kcharselect/Makefile
===================================================================
--- deskutils/kcharselect/Makefile
+++ deskutils/kcharselect/Makefile
@@ -10,8 +10,8 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= ecm bookmarks doctools i18n widgetsaddons xmlgui
-USE_QT5= buildtools_build qmake_build widgets
+USE_QT= buildtools_build qmake_build widgets
.include <bsd.port.mk>
Index: deskutils/kchmviewer/Makefile
===================================================================
--- deskutils/kchmviewer/Makefile
+++ deskutils/kchmviewer/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libchm.so:misc/chmlib \
libzip.so:archivers/libzip
-USES= dos2unix qmake:outsource
-USE_QT5= core dbus gui network printsupport webkit widgets xml \
+USES= dos2unix qmake:outsource qt:5
+USE_QT= core dbus gui network printsupport webkit widgets xml \
buildtools_build qmake_build
USE_XORG= x11
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:noninja compiler:c++0x gettext kde:4 tar:xz
+USES= cmake:noninja 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 <bsd.port.mk>
Index: deskutils/kdepim-addons/Makefile
===================================================================
--- deskutils/kdepim-addons/Makefile
+++ deskutils/kdepim-addons/Makefile
@@ -16,7 +16,7 @@
libqgpgme.so:security/gpgme-qt5
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemmodels itemviews jobwidgets \
kdeclarative khtml kio prison service sonnet syntaxhighlighting \
@@ -29,7 +29,7 @@
kdepim-apps-libs libkdepim libkleo libksieve mailcommon \
mailimporter mailtransport messagelib mime pimcommon \
pimtextedit tnef
-USE_QT5= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus gui location network printsupport qml quick testlib \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kdepim-apps-libs/Makefile
===================================================================
--- deskutils/kdepim-apps-libs/Makefile
+++ deskutils/kdepim-apps-libs/Makefile
@@ -15,14 +15,14 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemmodels jobwidgets \
kdewebkit kio service sonnet widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi akonadicontacts contacts grantleetheme libkleo mime \
pimcommon pimtextedit
-USE_QT5= core dbus gui network testlib uitools webkit widgets xml \
+USE_QT= core dbus gui network testlib uitools webkit widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kdepim-kde4/Makefile
===================================================================
--- deskutils/kdepim-kde4/Makefile
+++ deskutils/kdepim-kde4/Makefile
@@ -25,12 +25,12 @@
USE_GNOME= libxml2 libxslt:build
USE_KDE= kdelibs pimlibs kactivities \
akonadi automoc4 soprano nepomuk-widgets baloo
-USES= cmake:outsource grantlee:4 iconv kde:4 shebangfix tar:xz
+USES= cmake:outsource grantlee:4 iconv kde:4 qt:4 shebangfix 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/kdepim-runtime-kde4/Makefile
===================================================================
--- deskutils/kdepim-runtime-kde4/Makefile
+++ deskutils/kdepim-runtime-kde4/Makefile
@@ -21,11 +21,11 @@
CONFLICTS_INSTALL= kdepim-runtime44-4.*
-USES= cmake:outsource kde:4 shared-mime-info tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info 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/kdepim-runtime/Makefile
===================================================================
--- deskutils/kdepim-runtime/Makefile
+++ deskutils/kdepim-runtime/Makefile
@@ -15,7 +15,7 @@
libsasl2.so:security/cyrus-sasl2 \
libxerces-c-3.2.so:textproc/xerces-c3
-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 guiaddons holidays i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -28,7 +28,7 @@
calendarutils contacts gapi identitymanagement imap \
kontactinterface kpimdav mailtransport mbox mime pimcommon \
pimtextedit syndication
-USE_QT5= core dbus gui location network printsupport qml quick speech \
+USE_QT= core dbus gui location network printsupport qml quick speech \
script webchannel webengine widgets xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kdepimlibs-kde4/Makefile
===================================================================
--- deskutils/kdepimlibs-kde4/Makefile
+++ deskutils/kdepimlibs-kde4/Makefile
@@ -21,12 +21,12 @@
libprison.so:graphics/prison \
libqjson.so:devel/qjson@qt4
-USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info shebangfix 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-kde4/Makefile
===================================================================
--- deskutils/kdeplasma-addons-kde4/Makefile
+++ deskutils/kdeplasma-addons-kde4/Makefile
@@ -15,10 +15,10 @@
libqjson.so:devel/qjson@qt4
CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].*
-USES= cmake:outsource eigen:2 kde:4 pkgconfig shared-mime-info tar:xz
+USES= cmake:outsource eigen:2 kde:4 pkgconfig qt:4 shared-mime-info 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/keditbookmarks/Makefile
===================================================================
--- deskutils/keditbookmarks/Makefile
+++ deskutils/keditbookmarks/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Bookmark Organizer and Editor
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n iconthemes jobwidgets kio parts service \
sonnet textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: deskutils/kfind/Makefile
===================================================================
--- deskutils/kfind/Makefile
+++ deskutils/kfind/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Find files and folders
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio notifications parts service \
solid sonnet textwidgets unitconversion widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: deskutils/kmail-account-wizard/Makefile
===================================================================
--- deskutils/kmail-account-wizard/Makefile
+++ deskutils/kmail-account-wizard/Makefile
@@ -13,7 +13,7 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-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= attica auth codecs config configwidgets coreaddons crash \
dbusaddons ecm i18n itemmodels itemviews kcmutils kio kross \
newstuff notifications notifyconfig service texteditor wallet \
@@ -21,7 +21,7 @@
# pim components
USE_KDE+= akonadi akonadimime identitymanagement ldap libkdepim libkleo \
mailtransport mime pimcommon pimtextedit
-USE_QT5= core dbus gui network script widgets xml \
+USE_QT= core dbus gui network script widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kmail/Makefile
===================================================================
--- deskutils/kmail/Makefile
+++ deskutils/kmail/Makefile
@@ -20,7 +20,7 @@
mboximporter:deskutils/mbox-importer \
sieveeditor:deskutils/pim-sieve-editor
-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 ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -33,7 +33,7 @@
identitymanagement libkdepim libkleo libksieve \
kontactinterface ldap mailcommon mailtransport messagelib \
mime pimcommon pimtextedit tnef
-USE_QT5= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus gui location network printsupport qml quick \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/knotes/Makefile
===================================================================
--- deskutils/knotes/Makefile
+++ deskutils/knotes/Makefile
@@ -11,7 +11,7 @@
LIB_DEPENDS= libical.so:devel/libical
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons dnssd globalaccel guiaddons i18n \
iconthemes itemmodels itemviews jobwidgets kcmutils \
@@ -22,7 +22,7 @@
USE_KDE+= akonadi akonadicontacts akonadinotes akonadisearch \
calendarcore calendarutils contacts kontactinterface libkdepim \
mime pimcommon pimtextedit
-USE_QT5= core dbus gui network printsupport widgets x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
USE_LDCONFIG= yes
Index: deskutils/kontact/Makefile
===================================================================
--- deskutils/kontact/Makefile
+++ deskutils/kontact/Makefile
@@ -9,13 +9,13 @@
LICENSE= LGPL21
-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 crash \
ecm i18n iconthemes itemmodels jobwidgets kcmutils kio parts \
service sonnet textwidgets widgetsaddons windowsystem xmlgui
# pim components
USE_KDE+= akonadi grantleetheme kdepim-apps-libs kontactinterface libkdepim
-USE_QT5= core dbus gui location network qml quick webchannel webengine \
+USE_QT= core dbus gui location network qml quick webchannel webengine \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/korganizer/Makefile
===================================================================
--- deskutils/korganizer/Makefile
+++ deskutils/korganizer/Makefile
@@ -9,7 +9,7 @@
LIB_DEPENDS= libical.so:devel/libical
-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= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -21,7 +21,7 @@
calendarutils contacts eventviews holidays identitymanagement \
incidenceeditor kdepim-apps-libs kontactinterface ldap \
libkdepim mailtransport mime pimcommon pimtextedit
-USE_QT5= core dbus gui network phonon4 printsupport widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/kruler-kde4/Makefile
===================================================================
--- deskutils/kruler-kde4/Makefile
+++ deskutils/kruler-kde4/Makefile
@@ -8,9 +8,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 <bsd.port.mk>
Index: deskutils/kruler/Makefile
===================================================================
--- deskutils/kruler/Makefile
+++ deskutils/kruler/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE screen ruler
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm doctools i18n \
notifications widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui widgets x11extras xml \
+USE_QT= core dbus gui widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xcb
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/latte-dock/Makefile
===================================================================
--- deskutils/latte-dock/Makefile
+++ deskutils/latte-dock/Makefile
@@ -13,13 +13,13 @@
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= activities archive auth codecs config configwidgets \
coreaddons crash dbusaddons globalaccel i18n iconthemes \
kdeclarative notifications package plasma-framework service \
wayland widgetsaddons windowsystem xmlgui \
ecm_build
-USE_QT5= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus gui network qml quick widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xext
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 qmake qt:4
DOS2UNIX_FILES= readme.lyx readme.txt
-USE_QT4= moc_build rcc_build uic_build gui network
+USE_QT= moc_build rcc_build uic_build gui network
LDFLAGS+= -lX11
PORTDOCS= *
Index: deskutils/libkdepim/Makefile
===================================================================
--- deskutils/libkdepim/Makefile
+++ deskutils/libkdepim/Makefile
@@ -11,13 +11,13 @@
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= cmake:outsource gettext compiler:c++11-lib kde:5 tar:xz
+USES= cmake:outsource gettext compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons ecm \
i18n iconthemes itemmodels itemviews jobwidgets kcmutils \
kio service wallet widgetsaddons
# pim components
USE_KDE+= akonadi akonadicontacts akonadisearch contacts ldap mime
-USE_QT5= core dbus designer gui network testlib uiplugin uitools \
+USE_QT= core dbus designer gui network testlib uiplugin uitools \
widgets xml \
buildtools_build qmake_build
Index: deskutils/lumina-archiver/Makefile
===================================================================
--- deskutils/lumina-archiver/Makefile
+++ deskutils/lumina-archiver/Makefile
@@ -22,8 +22,8 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -32,7 +32,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-calculator/Makefile
===================================================================
--- deskutils/lumina-calculator/Makefile
+++ deskutils/lumina-calculator/Makefile
@@ -27,10 +27,10 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
USE_XORG= x11 xdamage xcb
-USE_QT5= core gui widgets network svg \
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -39,7 +39,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-fileinfo/Makefile
===================================================================
--- deskutils/lumina-fileinfo/Makefile
+++ deskutils/lumina-fileinfo/Makefile
@@ -22,8 +22,8 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -32,7 +32,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-fm/Makefile
===================================================================
--- deskutils/lumina-fm/Makefile
+++ deskutils/lumina-fm/Makefile
@@ -22,9 +22,9 @@
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg imageformats \
+USE_QT= core gui widgets network svg imageformats \
buildtools_build x11extras multimedia concurrent
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -32,7 +32,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguisttools_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-mediaplayer/Makefile
===================================================================
--- deskutils/lumina-mediaplayer/Makefile
+++ deskutils/lumina-mediaplayer/Makefile
@@ -24,8 +24,8 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras multimedia concurrent
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -34,7 +34,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-notify/Makefile
===================================================================
--- deskutils/lumina-notify/Makefile
+++ deskutils/lumina-notify/Makefile
@@ -18,8 +18,8 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -28,7 +28,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-pdf/Makefile
===================================================================
--- deskutils/lumina-pdf/Makefile
+++ deskutils/lumina-pdf/Makefile
@@ -23,9 +23,9 @@
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg multimedia \
+USE_QT= core gui widgets network svg multimedia \
buildtools_build x11extras concurrent printsupport
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -33,7 +33,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-screenshot/Makefile
===================================================================
--- deskutils/lumina-screenshot/Makefile
+++ deskutils/lumina-screenshot/Makefile
@@ -22,9 +22,9 @@
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg \
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -32,7 +32,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-textedit/Makefile
===================================================================
--- deskutils/lumina-textedit/Makefile
+++ deskutils/lumina-textedit/Makefile
@@ -23,9 +23,9 @@
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg printsupport \
+USE_QT= core gui widgets network svg printsupport \
buildtools_build x11extras concurrent multimedia
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -33,7 +33,7 @@
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: deskutils/lumina-xdg-entry/Makefile
===================================================================
--- deskutils/lumina-xdg-entry/Makefile
+++ deskutils/lumina-xdg-entry/Makefile
@@ -20,16 +20,16 @@
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg \
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+= CONFIG+=WITH_I18N
.endif
Index: deskutils/mbox-importer/Makefile
===================================================================
--- deskutils/mbox-importer/Makefile
+++ deskutils/mbox-importer/Makefile
@@ -13,14 +13,14 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-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= archive auth codecs completion config configwidgets coreaddons \
crash ecm i18n itemmodels kio service widgetsaddons
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime contacts \
identitymanagement libkleo mailcommon mailimporter messagelib \
mime pimcommon pimtextedit
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/nextcloudclient/Makefile
===================================================================
--- deskutils/nextcloudclient/Makefile
+++ deskutils/nextcloudclient/Makefile
@@ -16,8 +16,8 @@
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:outsource,noninja 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/owncloudclient/Makefile
===================================================================
--- deskutils/owncloudclient/Makefile
+++ deskutils/owncloudclient/Makefile
@@ -16,8 +16,8 @@
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:outsource,noninja compiler:c++11-lib gmake iconv kde:5 \
- localbase:ldflags pkgconfig sqlite
-USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \
+ localbase:ldflags pkgconfig qt:5 sqlite
+USE_QT= buildtools_build concurrent core dbus gui linguist_build network \
qmake_build sql webkit widgets xml
USE_KDE= completion config coreaddons jobwidgets kio service widgetsaddons
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \
Index: deskutils/pim-data-exporter/Makefile
===================================================================
--- deskutils/pim-data-exporter/Makefile
+++ deskutils/pim-data-exporter/Makefile
@@ -13,7 +13,7 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-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= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n itemmodels itemviews \
jobwidgets kio notifications service solid wallet \
@@ -22,7 +22,7 @@
USE_KDE+= akonadi akonadicontacts akonadimime contacts \
identitymanagement libkdepim libkleo mailcommon mailtransport \
messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/pim-sieve-editor/Makefile
===================================================================
--- deskutils/pim-sieve-editor/Makefile
+++ deskutils/pim-sieve-editor/Makefile
@@ -7,14 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Mail sieve editor
-
- 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 config configwidgets coreaddons crash \
dbusaddons ecm i18n iconthemes kio service wallet \
widgetsaddons xmlgui
# pim components
USE_KDE+= libksieve mailtransport pimcommon
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: deskutils/plasma-applet-cwp/Makefile
===================================================================
--- deskutils/plasma-applet-cwp/Makefile
+++ deskutils/plasma-applet-cwp/Makefile
@@ -14,9 +14,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
@@ -14,9 +14,9 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake gettext kde:4
+USES= cmake gettext kde:4 qt:4
USE_KDE= automoc4 kdelibs workspace
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
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-qstardict/Makefile
===================================================================
--- deskutils/plasma-applet-qstardict/Makefile
+++ deskutils/plasma-applet-qstardict/Makefile
@@ -15,8 +15,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
@@ -13,9 +13,9 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE-GPL2
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_KDE= automoc4 kdelibs workspace
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
Index: deskutils/plasma5-milou/Makefile
===================================================================
--- deskutils/plasma5-milou/Makefile
+++ deskutils/plasma5-milou/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 Plasmoid for search
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config coreaddons i18n kdeclarative package \
plasma-framework runner service
-USE_QT5= core gui network qml quick script testlib widgets \
+USE_QT= core gui network qml quick script testlib widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: deskutils/plasma5-sddm-kcm/Makefile
===================================================================
--- deskutils/plasma5-sddm-kcm/Makefile
+++ deskutils/plasma5-sddm-kcm/Makefile
@@ -8,11 +8,11 @@
COMMENT= Plasma5 config module for SDDM
USES= cmake:outsource compiler:c++11-lib gettext kde:5 cpe pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= auth archive attica codecs completion config configwidgets \
coreaddons ecm i18n jobwidgets kio newstuff service \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus designer gui network qml quick uiplugin widgets \
+USE_QT= concurrent core dbus designer gui network qml quick uiplugin widgets \
x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xfixes
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= qmake qt:4
+USE_QT= corelib gui network moc_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
@@ -13,8 +13,8 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= qmake tar:tgz
-USE_QT4= gui network corelib uic_build moc_build rcc_build
+USES= qmake qt:4 tar:tgz
+USE_QT= gui network corelib uic_build moc_build rcc_build
SUB_FILES= qRFCView
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 ssl
-USE_QT4= corelib dbus gui network xml \
+USES= cmake qt:4 tar:bzip2 ssl
+USE_QT= corelib dbus gui network xml \
moc_build qmake_build rcc_build uic_build
CMAKE_ARGS= -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
-DMANPAGE_DIRECTORY:STRING="${MANPREFIX}/man/man1" \
Index: deskutils/recoll/Makefile
===================================================================
--- deskutils/recoll/Makefile
+++ deskutils/recoll/Makefile
@@ -55,9 +55,10 @@
LATEX_USE= tex=dvipsk:run,latex:run
PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils
PS_RUN_DEPENDS= pstotext:print/pstotext
-QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \
- qt4=iconengines_run,imageformats_run \
- qt4=corelib,gui,xml,webkit
+QT4_USES= qt:4
+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
@@ -12,12 +12,12 @@
LICENSE= GPLv3
-USES= kde:4 pkgconfig python:2.7 shebangfix tar:bzip2 waf \
+USES= kde:4 pkgconfig python:2.7 qt:4 shebangfix tar:bzip2 waf \
gettext shared-mime-info
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-kde4
-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
@@ -13,7 +13,8 @@
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 uic_build qmake_build rcc_build
USE_LDCONFIG= yes
.include <${.CURDIR}/../strigi/Makefile.common>
Index: deskutils/superkaramba-kde4/Makefile
===================================================================
--- deskutils/superkaramba-kde4/Makefile
+++ deskutils/superkaramba-kde4/Makefile
@@ -8,9 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Widget framework for KDE
-USES= cmake:outsource kde:4 python:2.7 tar:xz
+USES= cmake:outsource kde:4 python:2.7 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
USE_CXXSTD= gnu++98
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= qmake qt:4
+USE_QT= gui xml moc_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= qmake qt:4 shebangfix tar:bzip2
SHEBANG_FILES= scripts/makedist-vym scripts/vivym
-USE_QT4= uic_build moc_build qt3support_build \
+USE_QT= uic_build moc_build qt3support_build \
network xml dbus svg
QMAKE_ARGS= DATADIR=${DATADIR:C,/vym$,,} \
DOCDIR=${DOCSDIR}
@@ -28,7 +28,8 @@
OPTIONS_DEFINE= NLS DOCS
OPTIONS_SUB= yes
-NLS_USE= QT4=linguist_build
+NLS_USES= qt:4
+NLS_USE= QT=linguist_build
.include <bsd.port.options.mk>
Index: deskutils/znotes/Makefile
===================================================================
--- deskutils/znotes/Makefile
+++ deskutils/znotes/Makefile
@@ -24,9 +24,11 @@
GH_TAGNAME= 6423c5e
. if ${FLAVOR} == qt4
-USE_QT4= uic_build moc_build rcc_build linguisttools_build corelib gui network xml
+USES+= qt:4
+USE_QT= uic_build moc_build rcc_build linguisttools_build corelib gui network xml
. else
-USE_QT5= buildtools_build linguisttools_build core gui network printsupport widgets xml
+USES+= qt:5
+USE_QT= buildtools_build linguisttools_build core gui network printsupport widgets xml
. endif
DESKTOP_ENTRIES="zNotes" "Notes managment" \
Index: devel/RStudio/Makefile
===================================================================
--- devel/RStudio/Makefile
+++ devel/RStudio/Makefile
@@ -32,8 +32,8 @@
libinotify.so:devel/libinotify \
libuuid.so:misc/e2fsprogs-libuuid
-USES= cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info
-USE_QT5= core dbus gui location network opengl printsupport qml quick sensors \
+USES= cmake:outsource desktop-file-utils fortran pkgconfig qt:5 shared-mime-info
+USE_QT= core dbus gui location network opengl printsupport qml quick sensors \
sql svg webchannel webkit widgets xml xmlpatterns buildtools_build qmake_build
USE_JAVA= yes
JAVA_BUILD= yes
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/apitrace/Makefile
===================================================================
--- devel/apitrace/Makefile
+++ devel/apitrace/Makefile
@@ -24,7 +24,8 @@
OPTIONS_SUB= yes
QT5_CMAKE_BOOL= ENABLE_GUI
-QT5_USE= qt5=core,gui,network,widgets,buildtools_build,qmake_build
+QT5_USES= qt:5
+QT5_USE= qt=core,gui,network,widgets,buildtools_build,qmake_build
post-install:
${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
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 <bsd.port.mk>
Index: devel/cervisia-kde4/Makefile
===================================================================
--- devel/cervisia-kde4/Makefile
+++ devel/cervisia-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: devel/cervisia/Makefile
===================================================================
--- devel/cervisia/Makefile
+++ devel/cervisia/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= CVS Frontend for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= dbusaddons doctools ecm iconthemes init itemviews kdesu \
notifications parts widgetsaddons
-USE_QT5= core dbus gui widgets \
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/cmake-doc/Makefile
===================================================================
--- devel/cmake-doc/Makefile
+++ devel/cmake-doc/Makefile
@@ -17,8 +17,8 @@
DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo
NO_ARCH= yes
-USES= cmake:outsource
-USE_QT5= help_build
+USES= cmake:outsource qt:5
+USE_QT= help_build
CMAKE_OFF= SPHINX_MAN
CMAKE_ON= SPHINX_HTML SPHINX_QTHELP
Index: devel/cmake-gui/Makefile
===================================================================
--- devel/cmake-gui/Makefile
+++ devel/cmake-gui/Makefile
@@ -19,9 +19,9 @@
libuv.so:devel/libuv \
librhash.so:security/rhash
-USE_QT5= core gui widgets buildtools_build qmake_build
+USE_QT= core gui widgets buildtools_build qmake_build
USES= cmake:run desktop-file-utils libarchive \
- shared-mime-info
+ qt:5 shared-mime-info
CMAKE_OFF= BUILD_CursesDialog \
CMake_SPHINX_DEPEND_ON_EXECUTABLES
CMAKE_ON= BUILD_QtDialog \
Index: devel/codequery/Makefile
===================================================================
--- devel/codequery/Makefile
+++ devel/codequery/Makefile
@@ -14,12 +14,12 @@
LICENSE_FILE_MPL20= ${WRKSRC}/LICENSE.md
LICENSE_FILE_MIT= ${WRKSRC}/querylib/README.txt
-USES= cmake ninja sqlite
+USES= cmake ninja qt:4 sqlite
USE_GITHUB= yes
GH_ACCOUNT= ruben2020
-USE_QT4= linguisttools_build moc_build rcc_build uic_build \
+USE_QT= linguisttools_build moc_build rcc_build uic_build \
corelib gui qmake xml
PLIST_FILES= bin/codequery \
Index: devel/cppcheck/Makefile
===================================================================
--- devel/cppcheck/Makefile
+++ devel/cppcheck/Makefile
@@ -20,7 +20,8 @@
RUN_DEPENDS= cppcheck:devel/cppcheck
CMAKE_ARGS= -DBUILD_GUI=TRUE
-USE_QT5= core gui widgets printsupport qmake_build buildtools_build linguisttools_build
+USES+= qt:5
+USE_QT= core gui widgets printsupport qmake_build buildtools_build linguisttools_build
BUILD_WRKSRC= ${WRKSRC}/gui
INSTALL_WRKSRC= ${WRKSRC}/gui
Index: devel/dolphin-plugins-kde4/Makefile
===================================================================
--- devel/dolphin-plugins-kde4/Makefile
+++ devel/dolphin-plugins-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: devel/dolphin-plugins/Makefile
===================================================================
--- devel/dolphin-plugins/Makefile
+++ devel/dolphin-plugins/Makefile
@@ -10,13 +10,13 @@
BUILD_DEPENDS= dolphin:x11-fm/dolphin
RUN_DEPENDS= dolphin:x11-fm/dolphin
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews jobwidgets \
kdelibs4support kio notifications parts service solid sonnet \
texteditor textwidgets unitconversion widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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= qmake qt:4 tar:tgz
+USE_QT= gui network xml moc_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
@@ -19,8 +19,10 @@
OPTIONS_DEFAULT= QT5
USES= qmake shebangfix
-QT4_USE= QT4=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build
-QT5_USE= QT5=core,gui,network,webkit,widgets,buildtools_build,linguisttools_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build
+QT5_USES= qt:5
+QT5_USE= QT=core,gui,network,webkit,widgets,buildtools_build,linguisttools_build
SHEBANG_FILES= intl/convert.sh
PLIST_FILES= bin/fuel share/applications/fuel.desktop \
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
@@ -15,8 +15,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
@@ -59,15 +59,17 @@
. elif ${SLAVEPORT}=="gtk3"
USE_GNOME+= cairo gdkpixbuf2 gtk30
. 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} \
--with-qt4-moc=${MOC} \
--with-qt4-uic=${UIC}
. elif ${SLAVEPORT}=="qt5"
+USES+= qt:5
USE_GL= gl
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \
Index: devel/heimdall/Makefile
===================================================================
--- devel/heimdall/Makefile
+++ devel/heimdall/Makefile
@@ -19,7 +19,8 @@
OPTIONS_DEFAULT=GUI
OPTIONS_SUB= yes
-GUI_USE= QT5=buildtools_build,core,gui,qmake_build,widgets
+GUI_USES= qt:5
+GUI_USE= QT=buildtools_build,core,gui,qmake_build,widgets
GUI_CMAKE_OFF= -DDISABLE_FRONTEND=YES
GH_ACCOUNT= Benjamin-Dobell
Index: devel/injeqt/Makefile
===================================================================
--- devel/injeqt/Makefile
+++ devel/injeqt/Makefile
@@ -15,8 +15,8 @@
USE_GITHUB= yes
GH_ACCOUNT= vogel
-USES= cmake compiler:c++11-lib pathfix
-USE_QT5= core buildtools_build qmake_build testlib_build
+USES= cmake compiler:c++11-lib pathfix qt:5
+USE_QT= core buildtools_build qmake_build testlib_build
USE_LDCONFIG= yes
CMAKE_ARGS= -DDISABLE_EXAMPLES:BOOL=ON \
Index: devel/kapptemplate-kde4/Makefile
===================================================================
--- devel/kapptemplate-kde4/Makefile
+++ devel/kapptemplate-kde4/Makefile
@@ -8,9 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE template generator
-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 dbus declarative
.include <bsd.port.mk>
Index: devel/kapptemplate/Makefile
===================================================================
--- devel/kapptemplate/Makefile
+++ devel/kapptemplate/Makefile
@@ -10,10 +10,10 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth archive codecs completion config configwidgets coreaddons \
doctools ecm i18n jobwidgets kio newstuff service widgetsaddons
-USE_QT5= core gui network testlib widgets xml \
+USE_QT= core gui network testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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= qmake qt:4 tar:tgz
+USE_QT= qt3support moc_build
INFO= kaptain
PORTDOCS= *
Index: devel/kcachegrind-kde4/Makefile
===================================================================
--- devel/kcachegrind-kde4/Makefile
+++ devel/kcachegrind-kde4/Makefile
@@ -9,9 +9,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Profiler frontend for KDE
-USES= cmake:outsource kde:4 python:run tar:xz shebangfix
+USES= cmake:outsource kde:4 python:run qt:4 tar:xz shebangfix
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/kcachegrind/Makefile
===================================================================
--- devel/kcachegrind/Makefile
+++ devel/kcachegrind/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Profiler frontend for KDE
-USES= cmake:outsource kde:5 python:run shebangfix tar:xz
+USES= cmake:outsource kde:5 python:run qt:5 shebangfix tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio service solid \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= converters/hotshot2calltree.cmake \
Index: devel/kdbg/Makefile
===================================================================
--- devel/kdbg/Makefile
+++ devel/kdbg/Makefile
@@ -12,9 +12,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 network xml dbus corelib gui svg
+USE_QT= moc_build qmake_build rcc_build uic_build network xml dbus corelib gui svg
INSTALLS_ICONS= yes
OPTIONS_DEFINE= NLS
Index: devel/kde-dev-scripts-kde4/Makefile
===================================================================
--- devel/kde-dev-scripts-kde4/Makefile
+++ devel/kde-dev-scripts-kde4/Makefile
@@ -8,9 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development scripts
-USES= cmake:outsource kde:4 python:run shebangfix tar:xz
+USES= cmake:outsource kde:4 python:run qt:4 shebangfix 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-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:5 perl5 python:run shebangfix tar:xz
+USES= cmake:outsource kde:5 perl5 python:run qt:5 shebangfix tar:xz
USE_KDE= doctools ecm
-USE_QT5= buildtools_build qmake_build
+USE_QT= buildtools_build qmake_build
SHEBANG_FILES= cxxmetric \
draw_lib_dependencies \
Index: devel/kde-dev-utils-kde4/Makefile
===================================================================
--- devel/kde-dev-utils-kde4/Makefile
+++ devel/kde-dev-utils-kde4/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 <bsd.port.mk>
Index: devel/kde-dev-utils/Makefile
===================================================================
--- devel/kde-dev-utils/Makefile
+++ devel/kde-dev-utils/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development utilities
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio parts service \
solid sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus designer gui network widgets xml \
+USE_QT= core dbus designer gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/kdesdk-kioslaves-kde4/Makefile
===================================================================
--- devel/kdesdk-kioslaves-kde4/Makefile
+++ devel/kdesdk-kioslaves-kde4/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libsvn_client-1.so:devel/subversion
-USES= cmake:outsource kde:4 perl5 shebangfix tar:xz
+USES= cmake:outsource kde:4 perl5 qt:4 shebangfix 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/kdesdk-strigi-analyzers-kde4/Makefile
===================================================================
--- devel/kdesdk-strigi-analyzers-kde4/Makefile
+++ devel/kdesdk-strigi-analyzers-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: devel/kdesdk-thumbnailers-kde4/Makefile
===================================================================
--- devel/kdesdk-thumbnailers-kde4/Makefile
+++ devel/kdesdk-thumbnailers-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: devel/kdesdk-thumbnailers/Makefile
===================================================================
--- devel/kdesdk-thumbnailers/Makefile
+++ devel/kdesdk-thumbnailers/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE thumbnail generator for gettext po files
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config ecm i18n kio
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/kdesdk/Makefile
===================================================================
--- devel/kdesdk/Makefile
+++ devel/kdesdk/Makefile
@@ -7,8 +7,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Software Development Kit
-USES= kde:5 metaport
-USE_QT5= #
+USES= kde:5 metaport qt:5
+USE_QT= #
OPTIONS_DEFINE= CERVISIA \
DEVUTILS \
@@ -24,7 +24,7 @@
THUMBNAILER \
UMBRELLO
-# Remove dolphin from the default list, as it conflicts with the metaport x11/kde4
+# Remove dolphin from the default list, as it conflicts with the metaport qt:5 x11/kde4
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NDOLPHIN}
CERVISIA_DESC= CVS frontend
Index: devel/kdesvn-kde4/Makefile
===================================================================
--- devel/kdesvn-kde4/Makefile
+++ devel/kdesvn-kde4/Makefile
@@ -25,10 +25,10 @@
CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
-DMAN_INSTALL_DIR=${MANPREFIX}/man
-USES= cmake:outsource compiler:c11 bdb kde:4 tar:xz
+USES= cmake:outsource compiler:c11 bdb kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs soprano baseapps_run
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/kdesvn/Makefile
===================================================================
--- devel/kdesvn/Makefile
+++ devel/kdesvn/Makefile
@@ -20,12 +20,12 @@
CONFLICTS_INSTALL= kdesvn-kde4 \
qsvn-[0-9]*
-USES= bdb cmake:outsource kde:5 tar:xz
+USES= bdb cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons dbusaddons ecm i18n iconthemes itemviews jobwidgets \
kio notifications parts service sonnet texteditor textwidgets \
wallet widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network sql widgets xml \
+USE_QT= concurrent core dbus gui network sql widgets xml \
buildtools_build qmake_build
post-patch:
Index: devel/kdev-php/Makefile
===================================================================
--- devel/kdev-php/Makefile
+++ devel/kdev-php/Makefile
@@ -12,11 +12,11 @@
BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt
LIB_DEPENDS= libkdevcmakecommon.so:devel/kdevelop
-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 completion config configwidgets coreaddons ecm \
i18n jobwidgets kcmutils kio parts service sonnet \
texteditor textwidgets threadweaver widgetsaddons xmlgui
-USE_QT5= core dbus gui network webkit widgets xml \
+USE_QT= core dbus gui network webkit widgets xml \
buildtools_build qmake_build
# Does not build with jobs.
Index: devel/kdev-python/Makefile
===================================================================
--- devel/kdev-python/Makefile
+++ devel/kdev-python/Makefile
@@ -12,11 +12,11 @@
BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt
LIB_DEPENDS= libkdevcmakecommon.so:devel/kdevelop
-USES= cmake:outsource compiler:c++11-lib kde:5 python:3.4+ tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 python:3.4+ qt:5 tar:xz
USE_KDE= attica auth codecs completion config coreaddons \
ecm i18n jobwidgets kio parts service \
sonnet texteditor textwidgets threadweaver widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
# Does not build with jobs.
Index: devel/kdevelop-kde4/Makefile
===================================================================
--- devel/kdevelop-kde4/Makefile
+++ devel/kdevelop-kde4/Makefile
@@ -16,9 +16,9 @@
RUN_DEPENDS= gmake:devel/gmake
USES= cmake:outsource compiler:c++11-lib kde:4 \
- shared-mime-info tar:xz
+ qt:4 shared-mime-info tar:xz
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-kde4/Makefile
===================================================================
--- devel/kdevelop-pg-qt-kde4/Makefile
+++ devel/kdevelop-pg-qt-kde4/Makefile
@@ -14,8 +14,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 <bsd.port.mk>
Index: devel/kdevelop-pg-qt/Makefile
===================================================================
--- devel/kdevelop-pg-qt/Makefile
+++ devel/kdevelop-pg-qt/Makefile
@@ -15,9 +15,9 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex
-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= core testlib \
+USE_QT= core testlib \
buildtools_build qmake_build
CONFLICTS= kdevelop-pg-qt-1.0*
Index: devel/kdevelop-php-docs-kde4/Makefile
===================================================================
--- devel/kdevelop-php-docs-kde4/Makefile
+++ devel/kdevelop-php-docs-kde4/Makefile
@@ -13,9 +13,9 @@
LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4
-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= moc_build qmake_build rcc_build uic_build webkit
+USE_QT= moc_build qmake_build rcc_build uic_build webkit
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
Index: devel/kdevelop-php-kde4/Makefile
===================================================================
--- devel/kdevelop-php-kde4/Makefile
+++ devel/kdevelop-php-kde4/Makefile
@@ -14,9 +14,9 @@
LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4
BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt-kde4
-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= 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/kdevelop/Makefile
===================================================================
--- devel/kdevelop/Makefile
+++ devel/kdevelop/Makefile
@@ -21,7 +21,7 @@
RUN_DEPENDS= gmake:devel/gmake
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- gettext grantlee:5 kde:5 shared-mime-info shebangfix tar:xz
+ gettext grantlee:5 kde:5 qt:5 shared-mime-info shebangfix tar:xz
USE_KDE= archive attica auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons emoticons i18n iconthemes init \
itemmodels itemviews jobwidgets kcmutils kdeclarative \
@@ -29,7 +29,7 @@
notifyconfig package parts plasma-desktop plasma-framework \
runner service solid sonnet texteditor textwidgets threadweaver \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui help network qml quick \
+USE_QT= concurrent core dbus gui help network qml quick \
script widgets xml buildtools_build qmake_build
CONFLICTS= kdevelop-kde4-4* kdevelop-4* kdevplatform-kde4-4* kdevplatform-4*
SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \
@@ -37,7 +37,8 @@
OPTIONS_DEFINE= WEBENGINE
WEBENGINE_DESC= Use WebEngine as help reader
-WEBENGINE_USE= QT5=location,webchannel,webengine
+WEBENGINE_USES= qt:5
+WEBENGINE_USE= QT=location,webchannel,webengine
WEBENGINE_USE_OFF= QT5=webkit
WEBENGINE_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets:BOOL=TRUE
Index: devel/kdevplatform-kde4/Makefile
===================================================================
--- devel/kdevplatform-kde4/Makefile
+++ devel/kdevplatform-kde4/Makefile
@@ -16,10 +16,10 @@
libboost_thread.so:devel/boost-libs \
libqjson.so:devel/qjson@qt4
-USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 shebangfix \
+USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 qt:4 shebangfix \
tar:xz
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,13 @@
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
+USE_QT= #
-HELP_USE= QT5=help_build # qt5-help is only used to build a .qch file.
-TEST_USE= QT5=buildtools_build,linguisttools_build,qmake_build
+HELP_USES= qt:5
+HELP_USE= QT=help_build # qt5-help is only used to build a .qch file.
+TEST_USES= qt:5
+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
@@ -10,9 +10,9 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
USE_PYTHON= py3kplist
NO_ARCH= yes
Index: devel/kf5-kauth/Makefile
===================================================================
--- devel/kf5-kauth/Makefile
+++ devel/kf5-kauth/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@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 <bsd.port.mk>
Index: devel/kf5-kbookmarks/Makefile
===================================================================
--- devel/kf5-kbookmarks/Makefile
+++ devel/kf5-kbookmarks/Makefile
@@ -7,10 +7,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 <bsd.port.mk>
Index: devel/kf5-kcmutils/Makefile
===================================================================
--- devel/kf5-kcmutils/Makefile
+++ devel/kf5-kcmutils/Makefile
@@ -7,11 +7,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 <bsd.port.mk>
Index: devel/kf5-kconfig/Makefile
===================================================================
--- devel/kf5-kconfig/Makefile
+++ devel/kf5-kconfig/Makefile
@@ -11,9 +11,9 @@
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-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 <bsd.port.mk>
Index: devel/kf5-kcoreaddons/Makefile
===================================================================
--- devel/kf5-kcoreaddons/Makefile
+++ devel/kf5-kcoreaddons/Makefile
@@ -12,9 +12,9 @@
LICENSE_FILE_LGPL21+= ${WRKSRC}/COPYING.LIB
LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS
-USES= cmake:outsource compiler:c++11-lib kde:5 shared-mime-info tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 shared-mime-info 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
@@ -7,9 +7,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 <bsd.port.mk>
Index: devel/kf5-kdbusaddons/Makefile
===================================================================
--- devel/kf5-kdbusaddons/Makefile
+++ devel/kf5-kdbusaddons/Makefile
@@ -10,9 +10,9 @@
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-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 <bsd.port.mk>
Index: devel/kf5-kdeclarative/Makefile
===================================================================
--- devel/kf5-kdeclarative/Makefile
+++ devel/kf5-kdeclarative/Makefile
@@ -10,11 +10,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 <bsd.port.mk>
Index: devel/kf5-kdoctools/Makefile
===================================================================
--- devel/kf5-kdoctools/Makefile
+++ devel/kf5-kdoctools/Makefile
@@ -13,9 +13,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 <bsd.port.mk>
Index: devel/kf5-kfilemetadata/Makefile
===================================================================
--- devel/kf5-kfilemetadata/Makefile
+++ devel/kf5-kfilemetadata/Makefile
@@ -15,9 +15,9 @@
# 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
# Frameworks ports install localization files that conflict with some
# KDE4 localization ports
Index: devel/kf5-ki18n/Makefile
===================================================================
--- devel/kf5-ki18n/Makefile
+++ devel/kf5-ki18n/Makefile
@@ -8,8 +8,8 @@
COMMENT= KF5 advanced internationalization framework
USES= cmake:outsource compiler:c++11-lib gettext-runtime \
- gettext-tools:build,run kde:5 tar:xz
+ gettext-tools:build,run 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 <bsd.port.mk>
Index: devel/kf5-kidletime/Makefile
===================================================================
--- devel/kf5-kidletime/Makefile
+++ devel/kf5-kidletime/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: devel/kf5-kio/Makefile
===================================================================
--- devel/kf5-kio/Makefile
+++ devel/kf5-kio/Makefile
@@ -8,14 +8,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 <bsd.port.mk>
Index: devel/kf5-kitemmodels/Makefile
===================================================================
--- devel/kf5-kitemmodels/Makefile
+++ devel/kf5-kitemmodels/Makefile
@@ -7,8 +7,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 testlib_build
+USE_QT= buildtools_build core qmake_build testlib_build
.include <bsd.port.mk>
Index: devel/kf5-knewstuff/Makefile
===================================================================
--- devel/kf5-knewstuff/Makefile
+++ devel/kf5-knewstuff/Makefile
@@ -7,12 +7,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 \
quick widgets xml
.include <bsd.port.mk>
Index: devel/kf5-knotifications/Makefile
===================================================================
--- devel/kf5-knotifications/Makefile
+++ devel/kf5-knotifications/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@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
@@ -7,10 +7,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 <bsd.port.mk>
Index: devel/kf5-kpackage/Makefile
===================================================================
--- devel/kf5-kpackage/Makefile
+++ devel/kf5-kpackage/Makefile
@@ -7,8 +7,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 <bsd.port.mk>
Index: devel/kf5-kparts/Makefile
===================================================================
--- devel/kf5-kparts/Makefile
+++ devel/kf5-kparts/Makefile
@@ -7,11 +7,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 <bsd.port.mk>
Index: devel/kf5-kpeople/Makefile
===================================================================
--- devel/kf5-kpeople/Makefile
+++ devel/kf5-kpeople/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: devel/kf5-kpty/Makefile
===================================================================
--- devel/kf5-kpty/Makefile
+++ devel/kf5-kpty/Makefile
@@ -7,8 +7,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 <bsd.port.mk>
Index: devel/kf5-kservice/Makefile
===================================================================
--- devel/kf5-kservice/Makefile
+++ devel/kf5-kservice/Makefile
@@ -7,10 +7,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
# Make the applications.menu file not conflict with KDE4.
CMAKE_ARGS= -DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu"
Index: devel/kf5-ktexteditor/Makefile
===================================================================
--- devel/kf5-ktexteditor/Makefile
+++ devel/kf5-ktexteditor/Makefile
@@ -9,12 +9,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 syntaxhighlighting \
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 <bsd.port.mk>
Index: devel/kf5-kunitconversion/Makefile
===================================================================
--- devel/kf5-kunitconversion/Makefile
+++ devel/kf5-kunitconversion/Makefile
@@ -7,8 +7,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 <bsd.port.mk>
Index: devel/kf5-solid/Makefile
===================================================================
--- devel/kf5-solid/Makefile
+++ devel/kf5-solid/Makefile
@@ -7,9 +7,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
OPTIONS_DEFINE= BSDISKS
Index: devel/kf5-threadweaver/Makefile
===================================================================
--- devel/kf5-threadweaver/Makefile
+++ devel/kf5-threadweaver/Makefile
@@ -7,8 +7,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 <bsd.port.mk>
Index: devel/kio-extras/Makefile
===================================================================
--- devel/kio-extras/Makefile
+++ devel/kio-extras/Makefile
@@ -11,14 +11,14 @@
libHalf.so:graphics/ilmbase
USES= cmake:outsource compiler:c++11-lib gettext gperf kde:5 \
- pkgconfig shared-mime-info shebangfix tar:xz
+ pkgconfig qt:5 shared-mime-info shebangfix tar:xz
USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons dnssd doctools ecm \
emoticons guiaddons i18n iconthemes init itemmodels itemviews \
jobwidgets js kdelibs4support khtml kio notifications parts \
pty service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui location network phonon4 printsupport qml quick \
+USE_QT= core dbus gui location network phonon4 printsupport qml quick \
sql svg testlib webchannel widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= info/kde-info2html
@@ -58,7 +58,8 @@
WEBENGINE_DESC= Needed to build the html thumbnailer
WEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidget
-WEBENGINE_USE= QT5=webengine
+WEBENGINE_USES= qt:5
+WEBENGINE_USE= QT=webengine
.include <bsd.port.mk>
Index: devel/libdbusmenu-qt/Makefile
===================================================================
--- devel/libdbusmenu-qt/Makefile
+++ devel/libdbusmenu-qt/Makefile
@@ -22,13 +22,15 @@
USE_LDCONFIG= yes
. if ${FLAVOR} == qt4
-USE_QT4= corelib dbus gui \
+USES+= qt:4
+USE_QT= corelib dbus gui \
moc_build qmake_build rcc_build uic_build
CMAKE_ON= USE_QT4
CMAKE_OFF= USE_QT5
QTVER_SUFFIX= # empty
. else
-USE_QT5= core dbus gui widgets \
+USES+= qt:5
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
CMAKE_ON= USE_QT5
CMAKE_OFF= USE_QT4
Index: devel/libkgapi-kde4/Makefile
===================================================================
--- devel/libkgapi-kde4/Makefile
+++ devel/libkgapi-kde4/Makefile
@@ -15,10 +15,10 @@
LIB_DEPENDS= libqjson.so:devel/qjson@qt4
-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
@@ -17,8 +17,8 @@
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
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= buildtools 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 \
+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 <bsd.port.mk>
Index: devel/liteide/Makefile
===================================================================
--- devel/liteide/Makefile
+++ devel/liteide/Makefile
@@ -31,8 +31,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,rcc_build,uic_build
+QT5_USES= qt:5
+QT5_USE= QT=core,gui,network,printsupport,widgets,xml,buildtools_build
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
Index: devel/lokalize-kde4/Makefile
===================================================================
--- devel/lokalize-kde4/Makefile
+++ devel/lokalize-kde4/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libhunspell-1.6.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 <bsd.port.mk>
Index: devel/lokalize/Makefile
===================================================================
--- devel/lokalize/Makefile
+++ devel/lokalize/Makefile
@@ -9,12 +9,12 @@
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
-USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n itemviews \
jobwidgets kio kross notifications parts service solid sonnet \
textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network script sql widgets xml \
+USE_QT= core dbus gui network script sql widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/lxqt-build-tools/Makefile
===================================================================
--- devel/lxqt-build-tools/Makefile
+++ devel/lxqt-build-tools/Makefile
@@ -12,8 +12,8 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/BSD-3-Clause
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= qmake_build buildtools_build core
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= qmake_build buildtools_build core
USE_GNOME= glib20
.include <bsd.port.mk>
Index: devel/okteta-kde4/Makefile
===================================================================
--- devel/okteta-kde4/Makefile
+++ devel/okteta-kde4/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libqca.so:devel/qca@qt4
-USES= cmake:outsource kde:4 shared-mime-info tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info 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/okteta/Makefile
===================================================================
--- devel/okteta/Makefile
+++ devel/okteta/Makefile
@@ -9,13 +9,13 @@
LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
-USES= cmake:outsource gettext kde:5 shared-mime-info tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 shared-mime-info tar:xz
USE_KDE= attica auth bookmarks codecs completion crash \
config configwidgets coreaddons dbusaddons doctools \
ecm i18n iconthemes itemviews jobwidgets kcmutils kio \
newstuff parts service solid sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus designer gui network printsupport script scripttools \
+USE_QT= core dbus designer gui network printsupport script scripttools \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: devel/p5-perlkde-kde4/Makefile
===================================================================
--- devel/p5-perlkde-kde4/Makefile
+++ devel/p5-perlkde-kde4/Makefile
@@ -9,9 +9,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-kde4/Makefile
===================================================================
--- devel/p5-perlqt-kde4/Makefile
+++ devel/p5-perlqt-kde4/Makefile
@@ -12,9 +12,9 @@
LIB_DEPENDS= libqscintilla2_qt4.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
USE_CXXSTD= gnu++98
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 qt:4 readline dos2unix tar:bzip2
USE_CXXSTD= gnu++98
OPTIONS_DEFINE= KDE4
Index: devel/plasma5-khotkeys/Makefile
===================================================================
--- devel/plasma5-khotkeys/Makefile
+++ devel/plasma5-khotkeys/Makefile
@@ -7,14 +7,14 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 library for hotkeys
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm emoticons globalaccel \
guiaddons i18n iconthemes init itemmodels itemviews jobwidgets \
kcmutils kdelibs4support kio notifications parts \
plasma-framework plasma-workspace service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xtst
Index: devel/plasma5-kwrited/Makefile
===================================================================
--- devel/plasma5-kwrited/Makefile
+++ devel/plasma5-kwrited/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 daemon listening for wall and write messages
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= coreaddons dbusaddons ecm i18n notifications pty
-USE_QT5= core dbus gui widgets \
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/plasma5-plasma-sdk/Makefile
===================================================================
--- devel/plasma5-plasma-sdk/Makefile
+++ devel/plasma5-plasma-sdk/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 applications useful for Plasma development
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= archive attica auth codecs completion config configwidgets \
coreaddons dbusaddons ecm i18n iconthemes itemmodels \
jobwidgets kdeclarative kio kirigami2 newstuff package parts \
plasma-framework service sonnet texteditor textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network qml quick webkit widgets x11extras xml \
+USE_QT= concurrent core dbus gui network qml quick webkit widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/poxml-kde4/Makefile
===================================================================
--- devel/poxml-kde4/Makefile
+++ devel/poxml-kde4/Makefile
@@ -10,9 +10,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 <bsd.port.mk>
Index: devel/poxml/Makefile
===================================================================
--- devel/poxml/Makefile
+++ devel/poxml/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Tools to translate Docbook XML using gettext
-USES= cmake:outsource gettext-tools:build,run kde:5 tar:xz
+USES= cmake:outsource gettext-tools:build,run kde:5 qt:5 tar:xz
USE_KDE= doctools ecm
-USE_QT5= core xml \
+USE_QT= core xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: devel/py-krosspython-kde4/Makefile
===================================================================
--- devel/py-krosspython-kde4/Makefile
+++ devel/py-krosspython-kde4/Makefile
@@ -10,9 +10,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Kross Python scripting library
-USES= cmake:outsource kde:4 python:2.7 tar:xz
+USES= cmake:outsource kde:4 python:2.7 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-kde4/Makefile
===================================================================
--- devel/py-pykde4-kde4/Makefile
+++ devel/py-pykde4-kde4/Makefile
@@ -11,14 +11,14 @@
LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5
-USES= cmake:outsource kde:4 python:2.7 pyqt:4 tar:xz
+USES= cmake:outsource kde:4 python:2.7 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_PYTHON= flavors
-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
USE_CXXSTD= gnu++98
Index: devel/py-pykdeuic4-kde4/Makefile
===================================================================
--- devel/py-pykdeuic4-kde4/Makefile
+++ devel/py-pykdeuic4-kde4/Makefile
@@ -10,9 +10,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Enhanced version of pyuic4
-USES= cmake:outsource python:2.7 kde:4 shebangfix tar:xz
+USES= cmake:outsource python:2.7 kde:4 qt:4 shebangfix 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-kde4/distinfo
NO_ARCH= yes
Index: devel/py-qt4-assistant/Makefile
===================================================================
--- devel/py-qt4-assistant/Makefile
+++ devel/py-qt4-assistant/Makefile
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtAssistant
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYTHON= py3kplist flavors
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
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtDBus
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
-USES= pkgconfig python pyqt:4
+USES= pkgconfig python pyqt:4 qt:4
USE_PYQT= sip_build
USE_PYTHON= flavors
-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
@@ -10,10 +10,10 @@
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_PYTHON= flavors
-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
@@ -12,10 +12,10 @@
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_PYTHON= flavors
-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,10 +15,10 @@
CONFIGURE_ARGS= --enable QtDesigner
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build
USE_PYTHON= flavors
-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
@@ -10,10 +10,10 @@
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_PYTHON= flavors
-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,10 +20,10 @@
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_PYTHON= flavors
-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
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtScript
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -11,10 +11,10 @@
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_PYTHON= flavors
-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
@@ -12,10 +12,10 @@
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_PYTHON= flavors
-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-qt5-core/Makefile
===================================================================
--- devel/py-qt5-core/Makefile
+++ devel/py-qt5-core/Makefile
@@ -13,10 +13,10 @@
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_PYTHON= py3kplist flavors
USE_PYQT= sip_build
-USE_QT5= core buildtools_build qmake_build
+USE_QT= core buildtools_build 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
@@ -10,10 +10,10 @@
CONFIGURE_ARGS= --enable QtDBus
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -13,10 +13,10 @@
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
-USES= pkgconfig python pyqt:5
+USES= pkgconfig python pyqt:5 qt:5
USE_PYQT= sip_build
USE_PYTHON= flavors
-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,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -14,11 +14,11 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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,11 +18,11 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-USE_QT5= core gui testlib widgets \
+USE_QT= core gui testlib widgets \
buildtools_build qmake_build
OPTIONS_DEFINE= API DEBUG
Index: devel/pyside-tools/Makefile
===================================================================
--- devel/pyside-tools/Makefile
+++ devel/pyside-tools/Makefile
@@ -21,8 +21,8 @@
GH_ACCOUNT= PySide
GH_PROJECT= Tools
-USES= cmake python:2.7 shebangfix
+USES= cmake python:2.7 qt:4 shebangfix
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 <bsd.port.mk>
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.7 tar:bzip2
+USES= cmake python:2.7 qt:4 tar:bzip2
USE_PYTHON= flavors
USE_LDCONFIG= yes
Index: devel/qbs/Makefile
===================================================================
--- devel/qbs/Makefile
+++ devel/qbs/Makefile
@@ -13,10 +13,10 @@
LICENSE= GPLv3 LGPL21
LICENSE_COMB= dual
-USES= compiler:c++11-lib python:run qmake:outsource shebangfix
+USES= compiler:c++11-lib python:run qmake:outsource qt:5 shebangfix
USE_GL= gl
USE_LDCONFIG= yes
-USE_QT5= buildtools_build core concurrent gui network script testlib \
+USE_QT= buildtools_build core concurrent gui network script testlib \
widgets xml
SHEBANG_FILES= src/3rdparty/python/bin/dmgbuild
@@ -26,7 +26,8 @@
QMAKE_SOURCE_PATH= ${WRKSRC}/qbs.pro
OPTIONS_DEFINE= DOCS
-DOCS_USE= QT5=help_build,qdoc_build,sql-sqlite3_build
+DOCS_USES= qt:5
+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
@@ -20,10 +20,10 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= gettext pyqt:4 python:2.7
+USES= gettext pyqt:4 python:2.7 qt:4
USE_PYQT= core
USE_PYTHON= distutils autoplist
-USE_QT4= # empty
+USE_QT= # empty
INSTALLS_ICONS= yes
.include <bsd.port.mk>
Index: devel/qca/Makefile
===================================================================
--- devel/qca/Makefile
+++ devel/qca/Makefile
@@ -27,10 +27,12 @@
. if ${FLAVOR} == qt4
CMAKE_ON= QT4_BUILD
-USE_QT4= corelib moc_build qmake_build rcc_build
+USES+= qt:4
+USE_QT= corelib moc_build qmake_build rcc_build
. else
CMAKE_ARGS+= -DQCA_SUFFIX=qt5
-USE_QT5= core buildtools_build qmake_build
+USES+= qt:5
+USE_QT= core buildtools_build qmake_build
. endif
qt4_PLIST= ${.CURDIR}/pkg-plist.qt4
qt5_PLIST= ${.CURDIR}/pkg-plist.qt5
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 rcc_build
+USES= qt:4 tar:bzip2
+USE_QT= corelib xml moc_build qmake_build rcc_build
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}"
Index: devel/qdevelop/Makefile
===================================================================
--- devel/qdevelop/Makefile
+++ devel/qdevelop/Makefile
@@ -16,9 +16,9 @@
RUN_DEPENDS= exctags:devel/ctags
-USE_QT4= corelib gui sql network xml designer sql-sqlite3_run \
+USE_QT= corelib gui sql network xml designer sql-sqlite3_run \
moc_build uic_build rcc_build
-USES= qmake
+USES= qmake qt:4
DESKTOP_ENTRIES= "QDevelop" \
"Qt 4 development environment" \
@@ -30,10 +30,11 @@
OPTIONS_DEFINE= TOOLS DOCS NLS
OPTIONS_DEFAULT:= ${OPTIONS_DEFINE}
OPTIONS_SUB= yes
-NLS_USE= QT4=linguisttools_build
+NLS_USES= qt:4
+NLS_USE= QT=linguisttools_build
TOOLS_DESC= Install Qt 4 development tools (qmake, moc, etc.)
TOOLS_USE= ${_TOOLS:C|.*|QT4=&_run|}
-_TOOLS= assistant linguisttools moc qmake rcc uic
+_TOOLS= assistant linguisttools moc qmake qt:4 rcc uic
post-patch:
@${REINPLACE_CMD} -e "s|\"qmake\"|\"qmake-qt4\"|g" \
Index: devel/qgit/Makefile
===================================================================
--- devel/qgit/Makefile
+++ devel/qgit/Makefile
@@ -11,8 +11,8 @@
LICENSE= GPLv2
-USES= cmake:outsource
-USE_QT5= core gui widgets \
+USES= cmake:outsource qt:5
+USE_QT= core gui widgets \
buildtools_build qmake_build
USE_GITHUB= yes
Index: devel/qjson/Makefile
===================================================================
--- devel/qjson/Makefile
+++ devel/qjson/Makefile
@@ -21,11 +21,13 @@
USE_LDCONFIG= yes
. if ${FLAVOR} == qt4
-USE_QT4= corelib moc_build qmake_build rcc_build uic_build
+USES+= qt:4
+USE_QT= corelib moc_build qmake_build rcc_build uic_build
CMAKE_ON= QT4_BUILD
PLIST_SUB= QT5="@comment " NO_QT5=""
. else
-USE_QT5= core buildtools_build qmake_build
+USES+= qt:5
+USE_QT= core buildtools_build qmake_build
CMAKE_OFF= QT4_BUILD
PLIST_SUB= QT5="" NO_QT5="@comment "
QT_SUFFIX= -qt5
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= qmake qt:4 tar:tgz
+USE_QT= moc_build gui network
WRKSRC= ${WRKDIR}/QProg
Index: devel/qross/Makefile
===================================================================
--- devel/qross/Makefile
+++ devel/qross/Makefile
@@ -11,9 +11,9 @@
LICENSE= LGPL20+
-USES= cmake
+USES= cmake qt:4
USE_LDCONFIG= yes
-USE_QT4= corelib designer gui network xml qmake_build uic_build moc_build \
+USE_QT= corelib 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= qmake 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_qt4.so:devel/qscintilla2
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
-USES= qmake pyqt:4
-USE_QT4= qmake_build moc_build gui xml designer
+USES= qmake 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= qmake pyqt:5 qt:5
USE_GL= gl
USE_PYQT= #
-USE_QT5= buildtools_build core gui printsupport widgets
+USE_QT= buildtools_build core 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= compiler:c++11-lib qmake pyqt:4
+USES= compiler:c++11-lib qmake pyqt:4 qt:4
USE_PYQT= #
-USE_QT4= moc_build corelib gui xml designer
+USE_QT= moc_build corelib 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
@@ -11,11 +11,12 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= qt:5
USE_GITHUB= yes
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 \
+USE_QT= moc_build rcc_build uic_build corelib \
gui network xml doc dbus
-USES= qmake
+USES= qmake qt:4
QMAKE_ARGS= QT_CONFIG+="dbus" QT_PRODUCT="OpenSource"
ALL_TARGET= first
Index: devel/qt4-assistant/Makefile
===================================================================
--- devel/qt4-assistant/Makefile
+++ devel/qt4-assistant/Makefile
@@ -10,10 +10,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 documentation browser
-USE_QT4= qmake_build moc_build rcc_build uic_build \
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build \
corelib gui help network sql webkit xml \
doc_run sql-sqlite3_run
-QT_DIST= yes
HAS_CONFIGURE= yes
Index: devel/qt4-corelib/Makefile
===================================================================
--- devel/qt4-corelib/Makefile
+++ devel/qt4-corelib/Makefile
@@ -13,9 +13,8 @@
LIB_DEPENDS= libicui18n.so:devel/icu
USE_GNOME= glib20
-USE_QT4= qmake_build moc_build
-QT_DIST= yes
-USES= iconv pkgconfig
+USE_QT= moc_build
+USES= iconv pkgconfig qmake:no_env qt-dist:4
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt4-dbus/Makefile
===================================================================
--- devel/qt4-dbus/Makefile
+++ devel/qt4-dbus/Makefile
@@ -14,9 +14,8 @@
BROKEN_sparc64= fails to compile: invalid conversion
-USES= pkgconfig
-USE_QT4= qmake_build moc_build rcc_build corelib xml
-QT_DIST= yes
+USES= pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build corelib xml
MAKE_JOBS_UNSAFE= yes
HAS_CONFIGURE= yes
Index: devel/qt4-designer/Makefile
===================================================================
--- devel/qt4-designer/Makefile
+++ devel/qt4-designer/Makefile
@@ -10,10 +10,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 graphical user interface designer
-USE_QT4= qmake_build moc_build rcc_build uic_build assistant_run \
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build assistant_run \
qt3support corelib declarative gui network script sql xml \
webkit
-QT_DIST= yes
HAS_CONFIGURE= yes
# Try to fix linking when previous version is installed
Index: devel/qt4-help-tools/Makefile
===================================================================
--- devel/qt4-help-tools/Makefile
+++ devel/qt4-help-tools/Makefile
@@ -11,9 +11,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt utilities for generating documentation
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build corelib \
gui sql xml doc help
-QT_DIST= yes
HAS_CONFIGURE= yes
Index: devel/qt4-help/Makefile
===================================================================
--- devel/qt4-help/Makefile
+++ devel/qt4-help/Makefile
@@ -10,9 +10,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt online help integration module
-USE_QT4= qmake_build moc_build rcc_build corelib clucene \
+USES= qmake:no_env qt-dist:4
+USE_QT= 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}
Index: devel/qt4-libqtassistantclient/Makefile
===================================================================
--- devel/qt4-libqtassistantclient/Makefile
+++ devel/qt4-libqtassistantclient/Makefile
@@ -13,8 +13,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser integration module
-USE_QT4= moc_build rcc_build corelib gui network
-USES= qmake
+USE_QT= moc_build rcc_build corelib gui network
+USES= qmake qt:4
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
@@ -10,9 +10,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 localization tools
-USE_QT4= qmake_build designer_build moc_build rcc_build uic_build \
+USES= qmake:no_env qt-dist:4
+USE_QT= designer_build moc_build rcc_build uic_build \
assistant_run gui linguisttools_run network xml
-QT_DIST= yes
HAS_CONFIGURE= yes
Index: devel/qt4-linguisttools/Makefile
===================================================================
--- devel/qt4-linguisttools/Makefile
+++ devel/qt4-linguisttools/Makefile
@@ -9,8 +9,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 localization tools
-USE_QT4= qmake_build xml
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= xml
HAS_CONFIGURE= yes
Index: devel/qt4-makeqpf/Makefile
===================================================================
--- devel/qt4-makeqpf/Makefile
+++ devel/qt4-makeqpf/Makefile
@@ -12,8 +12,8 @@
BROKEN_sparc64= does not compile
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build corelib gui
HAS_CONFIGURE= yes
Index: devel/qt4-moc/Makefile
===================================================================
--- devel/qt4-moc/Makefile
+++ devel/qt4-moc/Makefile
@@ -10,8 +10,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Meta-Object Compiler
-USE_QT4= qmake_build
-QT_DIST= yes
+USES= qt-dist:4 qmake:no_env
HAS_CONFIGURE= yes
Index: devel/qt4-porting/Makefile
===================================================================
--- devel/qt4-porting/Makefile
+++ devel/qt4-porting/Makefile
@@ -10,8 +10,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
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build corelib xml
HAS_CONFIGURE= yes
Index: devel/qt4-qdbusviewer/Makefile
===================================================================
--- devel/qt4-qdbusviewer/Makefile
+++ devel/qt4-qdbusviewer/Makefile
@@ -12,10 +12,9 @@
LIB_DEPENDS= libdbus-1.so:devel/dbus
-USES= pkgconfig
-USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \
+USES= pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build corelib dbus gui xml \
clucene
-QT_DIST= yes
HAS_CONFIGURE= yes
Index: devel/qt4-qdoc3/Makefile
===================================================================
--- devel/qt4-qdoc3/Makefile
+++ devel/qt4-qdoc3/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation generator
-USE_QT4= qmake_build corelib gui xml
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib gui xml
HAS_CONFIGURE= yes
Index: devel/qt4-qmake/Makefile
===================================================================
--- devel/qt4-qmake/Makefile
+++ devel/qt4-qmake/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Makefile generator
-USE_QT4= # empty
-QT_DIST= yes
+USES= qt-dist:4
+USE_QT= # empty
REINPLACE_ARGS= -i ""
WRKSRC_SUBDIR= ${PORTNAME}
MAKEFILE= ${FILESDIR}/Makefile.bsd
Index: devel/qt4-qmlviewer/Makefile
===================================================================
--- devel/qt4-qmlviewer/Makefile
+++ devel/qt4-qmlviewer/Makefile
@@ -10,9 +10,9 @@
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= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build declarative script \
svg xmlpatterns sql opengl network corelib
-QT_DIST= yes
HAS_CONFIGURE= yes
Index: devel/qt4-qt3support/Makefile
===================================================================
--- devel/qt4-qt3support/Makefile
+++ devel/qt4-qt3support/Makefile
@@ -10,9 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 3 compatibility module
-USE_QT4= qmake_build moc_build corelib gui network sql xml
-QT_DIST= yes
-USES= pkgconfig
+USE_QT= moc_build corelib gui network sql xml
+USES= pkgconfig qmake:no_env qt-dist:4
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
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= qmake qt:4
+USE_QT?= moc_build rcc_build uic_build gui network
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,8 @@
MASTERDIR= ${.CURDIR}/../qt4-qtsolutions-singleapplication
-USE_QT4= qmake_build moc_build rcc_build uic_build network xml gui
+USES= qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build network xml gui
.include "${MASTERDIR}/Makefile"
Index: devel/qt4-qvfb/Makefile
===================================================================
--- devel/qt4-qvfb/Makefile
+++ devel/qt4-qvfb/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 virtual framebuffer utility
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui opengl
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build corelib gui opengl
USE_XORG= xtst
HAS_CONFIGURE= yes
Index: devel/qt4-rcc/Makefile
===================================================================
--- devel/qt4-rcc/Makefile
+++ devel/qt4-rcc/Makefile
@@ -10,8 +10,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Resource Compiler
-USE_QT4= qmake_build
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
HAS_CONFIGURE= yes
Index: devel/qt4-script/Makefile
===================================================================
--- devel/qt4-script/Makefile
+++ devel/qt4-script/Makefile
@@ -10,9 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt scripting module
-USES= pkgconfig
-USE_QT4= qmake_build moc_build corelib
-QT_DIST= yes
+USES= pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt4-scripttools/Makefile
===================================================================
--- devel/qt4-scripttools/Makefile
+++ devel/qt4-scripttools/Makefile
@@ -9,8 +9,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Script additional components
-USE_QT4= qmake_build moc_build rcc_build gui script
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build gui script
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt4-testlib/Makefile
===================================================================
--- devel/qt4-testlib/Makefile
+++ devel/qt4-testlib/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt unit testing module
-USE_QT4= qmake_build moc_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt4-uic/Makefile
===================================================================
--- devel/qt4-uic/Makefile
+++ devel/qt4-uic/Makefile
@@ -10,8 +10,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt User Interface Compiler
-USE_QT4= qmake_build
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
HAS_CONFIGURE= yes
Index: devel/qt4-uic3/Makefile
===================================================================
--- devel/qt4-uic3/Makefile
+++ devel/qt4-uic3/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 3-compatible User Interface Compiler
-USE_QT4= qmake_build qt3support corelib gui network sql xml porting
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= qt3support corelib gui network sql xml porting
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}
Index: devel/qt4/Makefile.sqldrivers
===================================================================
--- devel/qt4/Makefile.sqldrivers
+++ devel/qt4/Makefile.sqldrivers
@@ -10,9 +10,8 @@
EXTRA_PATCHES= # empty
-USE_QT4= corelib sql moc_build qmake_build
-QT_DIST= yes
-USES+= qmake:outsource
+USE_QT= corelib sql moc_build qmake_build
+USES+= qmake:outsource qt-dist:4
CXXFLAGS+= -I${WRKSRC}/include # For private QtSql headers.
Index: devel/qt5-assistant/Makefile
===================================================================
--- devel/qt5-assistant/Makefile
+++ devel/qt5-assistant/Makefile
@@ -8,10 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 documentation browser
-USE_QT5= core gui help network printsupport sql widgets \
+USE_QT= core gui help network printsupport sql widgets \
buildtools_build sql-sqlite3_run
-QT_DIST= tools
-USES= qmake
+USES= qmake qt-dist:5,tools
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,9 +8,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt build tools
-USE_QT5= qmake_build
-QT_DIST= base
-USES= perl5
+USES= perl5 qmake:no_env qt-dist:5,base
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt5-concurrent/Makefile
===================================================================
--- devel/qt5-concurrent/Makefile
+++ devel/qt5-concurrent/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt multi-threading module
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt5-core/Makefile
===================================================================
--- devel/qt5-core/Makefile
+++ devel/qt5-core/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libicui18n.so:devel/icu \
libpcre2-posix.so:devel/pcre2
+USES= qmake:no_env qt-dist:5,base
USE_GNOME= glib20
-USE_QT5= qmake_build buildtools_build
-QT_DIST= base
+USE_QT= qmake_build buildtools_build
HAS_CONFIGURE= yes
# Disable (almost) everything to install minimal qconfig.h.
# -no-feature-* adds QT_NO_* (for features which have no switch or
Index: devel/qt5-dbus/Makefile
===================================================================
--- devel/qt5-dbus/Makefile
+++ devel/qt5-dbus/Makefile
@@ -10,8 +10,8 @@
LIB_DEPENDS= libdbus-1.so:devel/dbus
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt5-designer/Makefile
===================================================================
--- devel/qt5-designer/Makefile
+++ devel/qt5-designer/Makefile
@@ -8,10 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 graphical user interface designer
-USE_QT5= assistant_run core gui network printsupport quick uiplugin \
+USE_QT= assistant_run core gui network printsupport quick uiplugin \
widgets xml buildtools_build
-QT_DIST= tools
-USES= qmake
+USES= qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
DESKTOP_ENTRIES="Qt 5 Designer" "" \
@@ -26,7 +25,8 @@
OPTIONS_SUB= yes
WEBKIT_DESC= Build WebKit-based WebView widget
WEBKIT_QMAKE_ON= CONFIG+=use_webkit
-WEBKIT_USE= QT5=webkit
+WEBKIT_USES= qt-dist:5,tools
+WEBKIT_USE= QT=webkit
post-patch:
# uiplugin is built in x11-toolkits/qt5-uiplugin.
Index: devel/qt5-help/Makefile
===================================================================
--- devel/qt5-help/Makefile
+++ devel/qt5-help/Makefile
@@ -8,10 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt online help integration module
-USE_QT5= core gui network sql widgets \
+USE_QT= core gui network sql widgets \
buildtools_build sql-sqlite3_run
-QT_DIST= tools
-USES= qmake
+USES= qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/assistant
Index: devel/qt5-linguist/Makefile
===================================================================
--- devel/qt5-linguist/Makefile
+++ devel/qt5-linguist/Makefile
@@ -8,11 +8,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 translation tool
-USE_QT5= core gui printsupport widgets xml \
+USE_QT= core gui printsupport widgets xml \
assistant_run linguisttools_run \
buildtools_build designer_build uitools_build
-QT_DIST= tools
-USES= qmake
+USES= qmake qt-dist:5,tools
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,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localization tools
-USE_QT5= core xml buildtools_build qml_build
-QT_DIST= tools
-USES= qmake
+USE_QT= core xml buildtools_build qml_build
+USES= qmake qt-dist:5,tools
BUILD_WRKSRC= ${WRKSRC}/src/linguist
INSTALL_WRKSRC= ${WRKSRC}/src/linguist
Index: devel/qt5-location/Makefile
===================================================================
--- devel/qt5-location/Makefile
+++ devel/qt5-location/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt location module
-USE_QT5= concurrent core dbus gui network qml quick buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USE_QT= concurrent core dbus gui network qml quick buildtools_build
+USES= qmake:norecursive qt-dist:5,location
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt5-qdbus/Makefile
===================================================================
--- devel/qt5-qdbus/Makefile
+++ devel/qt5-qdbus/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt command-line interface to D-Bus
-USE_QT5= core dbus xml buildtools_build
-QT_DIST= tools
-USES= qmake
+USES= qmake qt-dist:5,tools
+USE_QT= core dbus xml buildtools_build
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,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 graphical interface to D-Bus
-USE_QT5= core dbus gui widgets xml buildtools_build
-QT_DIST= tools
-USES= qmake
+USE_QT= core dbus gui widgets xml buildtools_build
+USES= qmake qt-dist:5,tools
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,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation generator
-USE_QT5= core qml buildtools_build qdoc-data_run
-QT_DIST= tools
-USES= qmake
+USE_QT= core qml buildtools_build qdoc-data_run
+USES= qmake qt-dist:5,tools
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
Index: devel/qt5-qmake/Makefile
===================================================================
--- devel/qt5-qmake/Makefile
+++ devel/qt5-qmake/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Makefile generator
-USE_QT5= # empty
USES= compiler:c++11-lib gmake pkgconfig \
- python:build shebangfix
+ python:build qmake:no_env qt-dist:5,base shebangfix
SHEBANG_FILES= util/harfbuzz/update-harfbuzz \
util/unicode/x11/makeencodings \
src/3rdparty/freetype/src/tools/afblue.pl \
@@ -18,7 +17,6 @@
mkspecs/features/uikit/devices.py \
mkspecs/features/uikit/device_destinations.sh
-QT_DIST= base
REINPLACE_ARGS= -i ""
HAS_CONFIGURE= yes
# Disable everything to install minimal qconfig.pri.
Index: devel/qt5-script/Makefile
===================================================================
--- devel/qt5-script/Makefile
+++ devel/qt5-script/Makefile
@@ -10,9 +10,8 @@
BROKEN_powerpc64= Does not build
-USE_QT5= core buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= core buildtools_build
+USES= qmake qt-dist:5,script
# Keep make(1) from descending into src/script/obj/ (qmake:outsource
# doesn't work).
MAKE_ENV= MAKEOBJDIR=.
Index: devel/qt5-scripttools/Makefile
===================================================================
--- devel/qt5-scripttools/Makefile
+++ devel/qt5-scripttools/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Script additional components
-USE_QT5= core gui script widgets buildtools_build
-QT_DIST= script
-USES= qmake
+USE_QT= core gui script widgets buildtools_build
+USES= qmake qt-dist:5,script
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
Index: devel/qt5-scxml/Makefile
===================================================================
--- devel/qt5-scxml/Makefile
+++ devel/qt5-scxml/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt5 SXCML module
-USE_QT5= core network qml buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= core network qml buildtools_build
+USES= qmake qt-dist:5,scxml
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: devel/qt5-testlib/Makefile
===================================================================
--- devel/qt5-testlib/Makefile
+++ devel/qt5-testlib/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt unit testing module
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: devel/qt5-uitools/Makefile
===================================================================
--- devel/qt5-uitools/Makefile
+++ devel/qt5-uitools/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Designer UI forms support module
-USE_QT5= core gui uiplugin widgets buildtools_build
-QT_DIST= tools
-USES= qmake
+USE_QT= core gui uiplugin widgets buildtools_build
+USES= qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
Index: devel/qt5/Makefile
===================================================================
--- devel/qt5/Makefile
+++ devel/qt5/Makefile
@@ -10,7 +10,7 @@
# * phonon4 is not part of Qt itself.
# * we don't want to pull in wayland just yet.
-USE_QT5= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:S/$/_run/}
-USES= metaport
+USE_QT= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:S/$/_run/}
+USES= metaport qt:5
.include <bsd.port.mk>
Index: devel/qt5/Makefile.sqldrivers
===================================================================
--- devel/qt5/Makefile.sqldrivers
+++ devel/qt5/Makefile.sqldrivers
@@ -8,8 +8,8 @@
MAINTAINER?= kde@FreeBSD.org
COMMENT?= Qt ${DB_DESC} database plugin
-USE_QT5+= core sql qmake_build buildtools_build
-QT_DIST?= base
+USES+= qmake:no_env qt-dist:5,base
+USE_QT+= core sql qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=-no-gui -no-xcb
Index: devel/qtcreator/Makefile
===================================================================
--- devel/qtcreator/Makefile
+++ devel/qtcreator/Makefile
@@ -14,10 +14,10 @@
# depend on the split out qbs
LIB_DEPENDS= libqbscore.so:devel/qbs
-USES= qmake compiler:c++14-lang tar:xz
+USES= qmake compiler:c++14-lang qt:5 tar:xz
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
USE_GL= gl
-USE_QT5= buildtools concurrent core designer gui help \
+USE_QT= buildtools concurrent core designer gui help \
linguist location network printsupport qdoc qmake qml quick \
quickcontrols script script sql svg webchannel webengine \
widgets xml xmlpatterns
@@ -42,9 +42,11 @@
OPTIONS_DEFINE= DOCS EXAMPLES
DOCS_DESC= Install the Qt5 api documentation
-DOCS_USE= QT5=doc_run
+DOCS_USES= qt:5
+DOCS_USE= QT=doc_run
EXAMPLES_DESC= Install the Qt5 example projects
-EXAMPLES_USE= QT5=examples_run
+EXAMPLES_USES= qt:5
+EXAMPLES_USE= QT=examples_run
OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
ALL_TARGET= all
Index: devel/qtscriptgenerator/Makefile
===================================================================
--- devel/qtscriptgenerator/Makefile
+++ devel/qtscriptgenerator/Makefile
@@ -20,8 +20,8 @@
PHONON_DESC= Build Phonon support
OPTIONS_DEFAULT= PHONON
-USES= gmake qmake
-USE_QT4= corelib declarative designer doc help help-tools gui \
+USES= gmake qmake 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 \
@@ -32,7 +32,7 @@
.include <bsd.port.options.mk>
.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-kde4/Makefile
===================================================================
--- devel/ruby-korundum-kde4/Makefile
+++ devel/ruby-korundum-kde4/Makefile
@@ -9,11 +9,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-kde4/Makefile
===================================================================
--- devel/ruby-krossruby-kde4/Makefile
+++ devel/ruby-krossruby-kde4/Makefile
@@ -10,9 +10,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-kde4/Makefile
===================================================================
--- devel/ruby-qtruby-kde4/Makefile
+++ devel/ruby-qtruby-kde4/Makefile
@@ -12,9 +12,9 @@
LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 \
libqscintilla2_qt4.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:2.7 tar:bzip2
+USES= cmake python:2.7 qt:4 tar:bzip2
USE_LDCONFIG= yes
ALL_TARGET= all
Index: devel/smokegen-kde4/Makefile
===================================================================
--- devel/smokegen-kde4/Makefile
+++ devel/smokegen-kde4/Makefile
@@ -7,8 +7,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-kde4/Makefile
===================================================================
--- devel/smokekde-kde4/Makefile
+++ devel/smokekde-kde4/Makefile
@@ -8,10 +8,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
USE_CXXSTD= gnu++98
Index: devel/smokeqt-kde4/Makefile
===================================================================
--- devel/smokeqt-kde4/Makefile
+++ devel/smokeqt-kde4/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libqscintilla2_qt4.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 ssl
+USES= autoreconf gmake dos2unix qt:4 ssl
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
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include \
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
+USES= qmake qt:4
USE_GITHUB= yes
-USE_QT4= corelib
+USE_QT= corelib
GH_ACCOUNT= svn-all-fast-export
GH_TAGNAME= d4ff0b2
Index: devel/umbrello-kde4/Makefile
===================================================================
--- devel/umbrello-kde4/Makefile
+++ devel/umbrello-kde4/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 <bsd.port.mk>
Index: devel/umbrello/Makefile
===================================================================
--- devel/umbrello/Makefile
+++ devel/umbrello/Makefile
@@ -9,14 +9,14 @@
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_GNOME= libxml2 libxslt
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio notifications parts service \
solid sonnet texteditor textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport svg webkit widgets xml \
+USE_QT= core dbus gui network printsupport svg webkit widgets xml \
buildtools_build qmake_build
# Build the KDE Frameworks 5 based version.
Index: devel/universalindentgui/Makefile
===================================================================
--- devel/universalindentgui/Makefile
+++ devel/universalindentgui/Makefile
@@ -15,9 +15,9 @@
LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
-USES= dos2unix qmake python:run shebangfix
+USES= dos2unix qmake python:run qt:4 shebangfix
SHEBANG_FILES= indenters/*.py indenters/*.rb
-USE_QT4= corelib moc_build uic_build rcc_build \
+USE_QT= corelib moc_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
@@ -15,11 +15,11 @@
libxcb-keysyms.so:x11/xcb-util-keysyms
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- kde:5 libarchive pkgconfig sqlite
+ kde:5 libarchive pkgconfig qt:5 sqlite
USE_GL= gl # Dependency added by qt5-gui.
USE_GITHUB= yes
USE_KDE= ecm
-USE_QT5= concurrent core gui network webkit widgets x11extras \
+USE_QT= concurrent core gui network webkit widgets x11extras \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xext
Index: dns/kf5-kdnssd/Makefile
===================================================================
--- dns/kf5-kdnssd/Makefile
+++ dns/kf5-kdnssd/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 abstraction to system DNSSD features
-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 linguisttools network qmake_build
+USE_QT= buildtools_build core linguisttools network qmake_build
OPTIONS_DEFAULT=AVAHI
OPTIONS_RADIO=ZEROCONF
@@ -20,11 +20,13 @@
AVAHI_BUILD_DEPENDS= ${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h:net/avahi-libdns
AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns
AVAHI_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Avahi
-AVAHI_USE= QT5=dbus
+AVAHI_USES= qt:5
+AVAHI_USE= QT=dbus
MDNSRESPONDER_BUILD_DEPENDS= ${LOCALBASE}/include/dns_sd.h:net/mDNSResponder
MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder
MDNSRESPONDER_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_DNSSD
-MDNSRESPONDER_USE= QT5=dbus
+MDNSRESPONDER_USES= qt:5
+MDNSRESPONDER_USE= QT=dbus
.include <bsd.port.mk>
Index: editors/calligra/Makefile
===================================================================
--- editors/calligra/Makefile
+++ editors/calligra/Makefile
@@ -37,7 +37,7 @@
USES= cmake:outsource cpe compiler:c++11-lib desktop-file-utils eigen:3 \
gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 pkgconfig \
- shared-mime-info sqlite tar:xz
+ qt:5 shared-mime-info sqlite tar:xz
USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons doctools ecm \
emoticons guiaddons i18n iconthemes init itemmodels itemviews \
@@ -46,7 +46,7 @@
texteditor textwidgets threadweaver unitconversion wallet \
widgetsaddons windowsystem xmlgui \
calendarcore okular
-USE_QT5= buildtools_build core dbus gui network opengl \
+USE_QT= buildtools_build core dbus gui network opengl \
phonon4 printsupport qmake_build qml \
quick script sql svg testlib webkit widgets x11extras xml
USE_XORG= ice sm x11 xext
Index: editors/calligraplan/Makefile
===================================================================
--- editors/calligraplan/Makefile
+++ editors/calligraplan/Makefile
@@ -12,14 +12,14 @@
LIB_DEPENDS= libKChart.so:graphics/kdiagram
USES= cmake:outsource cpe compiler:c++11-lib desktop-file-utils kde:5 \
- tar:xz
+ qt:5 tar:xz
USE_KDE= activities akonadi archive auth bookmarks codecs completion config \
configwidgets coreaddons dbusaddons ecm guiaddons holidays i18n \
iconthemes itemmodels itemviews jobwidgets js khtml kio \
notifications parts service solid sonnet textwidgets wallet \
widgetsaddons windowsystem xmlgui \
akonadicontacts calendarcore contacts
-USE_QT5= core dbus gui network printsupport widgets x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
Index: editors/encryptpad/Makefile
===================================================================
--- editors/encryptpad/Makefile
+++ editors/encryptpad/Makefile
@@ -19,11 +19,11 @@
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libbotan-2.so:security/botan2
-USES= desktop-file-utils gmake pkgconfig shared-mime-info
+USES= desktop-file-utils gmake pkgconfig qt:5 shared-mime-info
USE_GITHUB= yes
GH_ACCOUNT= evpo
GH_PROJECT= EncryptPad
-USE_QT5= core gui widgets buildtools_build qmake_build
+USE_QT= core gui widgets buildtools_build qmake_build
USE_GL= gl
OPTIONS_DEFINE= DOCS
Index: editors/focuswriter/Makefile
===================================================================
--- editors/focuswriter/Makefile
+++ editors/focuswriter/Makefile
@@ -16,11 +16,11 @@
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
-USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake
+USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= gottcode
USE_GL= gl
-USE_QT5= concurrent core gui multimedia network printsupport widgets \
+USE_QT= concurrent core gui multimedia network printsupport widgets \
buildtools_build linguisttools_build
PORTDATA= *
Index: editors/kate-kde4/Makefile
===================================================================
--- editors/kate-kde4/Makefile
+++ editors/kate-kde4/Makefile
@@ -11,10 +11,10 @@
LIB_DEPENDS= libqjson.so:devel/qjson@qt4
-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/kate-plugin-pate-kde4/Makefile
===================================================================
--- editors/kate-plugin-pate-kde4/Makefile
+++ editors/kate-plugin-pate-kde4/Makefile
@@ -9,10 +9,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Support for Python plugins in Kate
-USES= cmake:outsource,noninja kde:4 python:2.7 tar:xz
+USES= cmake:outsource,noninja kde:4 python:2.7 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-kde4/distinfo
Index: editors/kate/Makefile
===================================================================
--- editors/kate/Makefile
+++ editors/kate/Makefile
@@ -11,14 +11,14 @@
docbook-xml>0:textproc/docbook-xml
LIB_DEPENDS= libgit2.so:devel/libgit2
-USES= cmake:outsource desktop-file-utils gettext pkgconfig kde:5 tar:xz
+USES= cmake:outsource desktop-file-utils gettext pkgconfig kde:5 qt:5 tar:xz
USE_KDE= activities attica auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons doctools ecm \
guiaddons i18n iconthemes init itemmodels itemviews \
jobwidgets kio newstuff package parts plasma-framework \
service solid sonnet texteditor textwidgets threadweaver \
wallet widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network script sql widgets xml \
+USE_QT= core dbus gui network script sql widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: editors/kile-kde4/Makefile
===================================================================
--- editors/kile-kde4/Makefile
+++ editors/kile-kde4/Makefile
@@ -16,8 +16,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 qt:4 shared-mime-info tar:bzip2
+USE_QT= qmake_build moc_build rcc_build uic_build
USE_KDE= kdelibs automoc4 kate_run
USE_TEX= latex
Index: editors/kile/Makefile
===================================================================
--- editors/kile/Makefile
+++ editors/kile/Makefile
@@ -14,13 +14,13 @@
LIB_DEPENDS= libpoppler.so:graphics/poppler \
libpoppler-qt5.so:graphics/poppler-qt5
-USES= cmake:outsource kde:5
+USES= cmake:outsource kde:5 qt:5
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
init itemviews jobwidgets js khtml kio parts service solid \
sonnet texteditor textwidgets widgetsaddons windowsystem xmlgui \
okular
-USE_QT5= concurrent core dbus gui network script widgets xml \
+USE_QT= concurrent core dbus gui network script widgets xml \
buildtools_build qmake_build
USE_GITHUB= yes
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 <bsd.port.mk>
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 qmake qt:4
+USE_QT= corelib gui moc_build rcc_build
WRKSRC_SUBDIR= src
Index: editors/libreoffice/Makefile
===================================================================
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -107,7 +107,6 @@
USE_GL= gl glew glu
USE_OPENLDAP= yes
USE_PERL5= build
-USE_QT4= # empty but required
USE_XORG= ice sm x11 xaw xext xinerama xrandr xrender
USES= autoreconf:build bison compiler:c++14-lang cpe gmake jpeg \
perl5 pkgconfig python shebangfix shared-mime-info ssl tar:xz
@@ -195,8 +194,8 @@
QT4DIR="${PREFIX}" \
QT4INC="${QT_INCDIR}" \
QT4LIB="${QT_LIBDIR}"
-KDE4_USES= kde:4
-KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build
+KDE4_USES= kde:4 qt:4
+KDE4_USE= KDE=kdelibs QT=moc_build,qmake_build
MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0
MMEDIA_USE= GSTREAMER1=yes
Index: editors/neovim-qt/Makefile
===================================================================
--- editors/neovim-qt/Makefile
+++ editors/neovim-qt/Makefile
@@ -15,10 +15,10 @@
LIB_DEPENDS= libmsgpackc.so:devel/msgpack
RUN_DEPENDS= neovim>=0:editors/neovim
-USES= cmake:outsource desktop-file-utils
+USES= cmake:outsource desktop-file-utils qt:5
USE_GITHUB= yes
GH_ACCOUNT= equalsraf
-USE_QT5= core gui testlib network widgets buildtools_build qmake_build
+USE_QT= core gui testlib network widgets buildtools_build qmake_build
CMAKE_ON= USE_SYSTEM_MSGPACK
CMAKE_OFF= ENABLE_TESTS
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 qmake qt:4 shared-mime-info tar:xz
+USE_QT= corelib gui moc_build qmake_build rcc_build uic_build webkit
QMAKE_ARGS= ${WRKSRC}/plume-creator.pro
.include <bsd.port.mk>
Index: editors/tea/Makefile
===================================================================
--- editors/tea/Makefile
+++ editors/tea/Makefile
@@ -22,8 +22,10 @@
USE_GL= gl
USE_LOCALE= en_US.UTF-8
-QT4_USE= qt4=corelib,gui,moc_build,network,rcc_build
-QT5_USE= qt5=buildtools_build,core,gui,network,widgets,printsupport,qml,quick
+QT4_USES= qt:4
+QT4_USE= qt=corelib,gui,moc_build,network,rcc_build
+QT5_USES= qt:5
+QT5_USE= qt=buildtools_build,core,gui,network,widgets,printsupport,qml,quick
LDFLAGS+= -lz
PLIST_FILES= bin/tea share/pixmaps/tea_icon_v2.png
Index: editors/texmacs/Makefile
===================================================================
--- editors/texmacs/Makefile
+++ editors/texmacs/Makefile
@@ -56,8 +56,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
@@ -31,9 +31,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 <bsd.port.mk>
Index: editors/texstudio/Makefile
===================================================================
--- editors/texstudio/Makefile
+++ editors/texstudio/Makefile
@@ -37,12 +37,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
+QT4_USE= ${_USE_QT4:S/^/QT=/}
QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4 \
libquazip.so:archivers/quazip@qt4
QT4_QMAKE_ON= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
QUAZIP_LIB="-lquazip"
-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 \
libquazip5.so:archivers/quazip@qt5
QT5_QMAKE_ON= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
Index: editors/textroom/Makefile
===================================================================
--- editors/textroom/Makefile
+++ editors/textroom/Makefile
@@ -16,11 +16,11 @@
libhunspell-1.6.so:textproc/hunspell \
libxml++-2.6.so:textproc/libxml++26
-USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake
+USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:4
USE_CXXSTD= c++11
USE_GL= gl
USE_SDL= mixer
-USE_QT4= moc_build rcc_build uic_build \
+USE_QT= moc_build rcc_build uic_build \
corelib gui opengl qt3support svg xml
post-patch:
Index: editors/texworks/Makefile
===================================================================
--- editors/texworks/Makefile
+++ editors/texworks/Makefile
@@ -18,10 +18,10 @@
BUILD_DEPENDS= hunspell:textproc/hunspell
LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-USES= pkgconfig qmake
+USES= pkgconfig qmake 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 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= qt:4 tar:bzip2 cmake gettext perl5 lua:51
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}" \
@@ -32,8 +32,8 @@
OPTIONS_DEFINE= KYZIS NYZIS DOXYGEN
OPTIONS_SUB= yes
KYZIS_DESC= Build kyzis and Yzis kpart
-KYZIS_USES= kde:4
-KYZIS_USE= KDE=kdeprefix,kdelibs,automoc4 QT4=phonon
+KYZIS_USES= kde:4 qt:4
+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
@@ -13,8 +13,8 @@
LIB_DEPENDS= libvncclient.so:net/libvncserver
-USES= cmake:noninja
-USE_QT5= buildtools_build linguisttools_build qmake_build \
+USES= cmake:noninja qt:5
+USE_QT= buildtools_build linguisttools_build qmake_build \
core dbus gui network printsupport testlib widgets
USE_GITHUB= yes
Index: emulators/citra/Makefile
===================================================================
--- emulators/citra/Makefile
+++ emulators/citra/Makefile
@@ -57,8 +57,8 @@
bin/${PORTNAME}-room \
man/man6/${PORTNAME}.6.gz
-QT5_USES= desktop-file-utils shared-mime-info
-QT5_USE= QT5=qmake_build,buildtools_build,concurrent_build,core,gui,multimedia,opengl,widgets
+QT5_USES= desktop-file-utils qt:5 shared-mime-info
+QT5_USE= QT=qmake_build,buildtools_build,concurrent_build,core,gui,multimedia,opengl,widgets
QT5_CMAKE_BOOL= ENABLE_QT
QT5_PLIST_FILES=bin/${PORTNAME}-qt \
"@comment bin/${PORTNAME}-room" \
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= qmake qt:4 tar:bzip2
PLIST_FILES= bin/dboxfe \
bin/dboxfetray \
Index: emulators/mame/Makefile
===================================================================
--- emulators/mame/Makefile
+++ emulators/mame/Makefile
@@ -19,7 +19,7 @@
libfreetype.so:print/freetype2
RUN_DEPENDS= liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
-USES= compiler:c++14-lang gmake jpeg pkgconfig python:2.7,build shebangfix
+USES= compiler:c++14-lang gmake jpeg pkgconfig python:2.7,build qt:5 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= mamedev
@@ -35,7 +35,7 @@
USE_XORG= x11 xext xi xinerama xrender
USE_GL= gl
USE_SDL= sdl2 ttf2
-USE_QT5= buildtools core gui qmake_build widgets
+USE_QT= buildtools core gui qmake_build widgets
MTARGET?= mame
MSUBTARGET?= mame
CFLAGS+= -I${LOCALBASE}/include
Index: emulators/mupen64plus-qt/Makefile
===================================================================
--- emulators/mupen64plus-qt/Makefile
+++ emulators/mupen64plus-qt/Makefile
@@ -17,9 +17,9 @@
${LOCALBASE}/lib/mupen64plus/mupen64plus-video-rice.so:emulators/mupen64plus-video-rice \
mupen64plus:emulators/mupen64plus-ui-console
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
-USE_QT5= core gui network sql widgets xml \
+USE_QT= core gui network sql widgets xml \
buildtools_build \
sql-sqlite3_run
Index: emulators/ppsspp/Makefile
===================================================================
--- emulators/ppsspp/Makefile
+++ emulators/ppsspp/Makefile
@@ -58,7 +58,8 @@
OLDJOY_DESC= Old joystick support with fixed button mappings (deprecated)
OLDJOY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old-joy
-QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets
+QT5_USES= qt:5
+QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets
QT5_CMAKE_BOOL= USING_QT_UI
QT5_VARS= EXENAME=PPSSPPQt
SDL_BUILD_DEPENDS= png>=1.6: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,8 @@
DBUS_CMAKE_ON= -DWITH_DBUS:BOOL=ON
DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
.include <bsd.port.options.mk>
Index: emulators/qmc2/Makefile
===================================================================
--- emulators/qmc2/Makefile
+++ emulators/qmc2/Makefile
@@ -16,10 +16,10 @@
NO_WRKSUBDIR= yes
-USES= gmake tar:bzip2
+USES= gmake qt:5 tar:bzip2
USE_XORG= x11 xmu
USE_GL= gl glu
-USE_QT5= buildtools_build core gui multimedia \
+USE_QT= buildtools_build core gui multimedia \
network opengl quick qmake_build qml \
testlib script scripttools sql svg \
webkit widgets xml xmlpatterns
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= qmake qt:4 tar:bzip2
+USE_QT= gui xml uic_build moc_build rcc_build
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \
@@ -22,7 +22,8 @@
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
-NLS_USE= QT4=linguisttools_build
+NLS_USES= qt:4
+NLS_USE= QT=linguisttools_build
post-configure-NLS-on:
(cd ${WRKSRC} && ${LRELEASE} qtemu.pro)
Index: emulators/rpcs3/Makefile
===================================================================
--- emulators/rpcs3/Makefile
+++ emulators/rpcs3/Makefile
@@ -35,9 +35,9 @@
zeux:pugixml:v1.8.1-148-g257fbb4:pugixml/3rdparty/pugixml
USES= cmake:outsource compiler:c++14-lang iconv:wchar_t localbase:ldflags \
- openal:soft pkgconfig
+ openal:soft pkgconfig qt:5
USE_GL= gl glew
-USE_QT5= qmake_build buildtools_build core dbus gui network widgets qml
+USE_QT= qmake_build buildtools_build core dbus gui network widgets qml
USE_XORG= x11
CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
CMAKE_OFF= USE_NATIVE_INSTRUCTIONS
Index: emulators/swine/Makefile
===================================================================
--- emulators/swine/Makefile
+++ emulators/swine/Makefile
@@ -22,11 +22,11 @@
GH_ACCOUNT= dswd
GH_PROJECT= Swine
-USES= gmake python:2.7 shebangfix pyqt:4
+USES= gmake python:2.7 qt:4 shebangfix pyqt:4
SHEBANG_FILES= *.py
NO_BUILD= yes
USE_PYQT= gui_run xml_build
-USE_QT4= linguist_build
+USE_QT= linguist_build
ONLY_FOR_ARCHS= i386 amd64
NO_ARCH= yes
Index: emulators/virtualbox-ose/Makefile
===================================================================
--- emulators/virtualbox-ose/Makefile
+++ emulators/virtualbox-ose/Makefile
@@ -28,7 +28,7 @@
WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
ONLY_FOR_ARCHS= i386 amd64
-USES= compiler:c++14-lang cpe iconv pkgconfig ssl tar:bzip2
+USES= compiler:c++14-lang cpe iconv pkgconfig qt:5 ssl tar:bzip2
USE_GNOME= libidl libxml2
HAS_CONFIGURE= yes
@@ -158,8 +158,8 @@
PLIST_SUB+= QT=""
QT_NONSTANDARD= yes
USE_GL= gl
-USE_QT5= buildtools_build core dbus gui linguisttools_build opengl
-USE_QT5+= printsupport widgets x11extras
+USE_QT= buildtools_build core dbus gui linguisttools_build opengl
+USE_QT+= printsupport widgets x11extras
USE_XORG= xcb
INSTALLS_ICONS= yes
VBOX_PROGS+= VirtualBox
Index: finance/alkimia/Makefile
===================================================================
--- finance/alkimia/Makefile
+++ finance/alkimia/Makefile
@@ -20,14 +20,16 @@
SLAVE?= qt5
.if ${SLAVE} == qt4
-USE_QT4= corelib dbus \
+USES+= qt:4
+USE_QT= corelib dbus \
moc_build qmake_build rcc_build
# BUILD_QT4 must be set to "1" due to comparison used in src/LibAlkimiaConfig.cmake.in
CMAKE_ARGS+= -DBUILD_QT4=1
CMAKE_OFF+= KDE_INSTALL_USE_QT_SYS_PATHS
INCLUDE_SUBDIR= Qt4
.else
-USE_QT5= core dbus \
+USES+= qt:5
+USE_QT= core dbus \
buildtools_build qmake_build
CMAKE_ON+= KDE_INSTALL_USE_QT_SYS_PATHS
INCLUDE_SUBDIR= Qt5
@@ -52,9 +54,10 @@
MPIR_LIB_DEPENDS= libmpir.so:math/mpir
.if ${SLAVE} == qt4
-TEST_USE= QT4=qtestlib
+TEST_USES= qt:4 qt:5
+TEST_USE= QT=qtestlib
.else
-TEST_USE= QT5=testlib
+TEST_USE= QT=testlib
.endif
TEST_CMAKE_BOOL= BUILD_TESTING
TEST_TEST_TARGET= test
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 qt:4 shared-mime-info shebangfix 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/kmymoney/Makefile
===================================================================
--- finance/kmymoney/Makefile
+++ finance/kmymoney/Makefile
@@ -15,8 +15,8 @@
libKChart.so:graphics/kdiagram
USES= cmake compiler:c++14-lang desktop-file-utils gettext kde:5 \
- pkgconfig shared-mime-info shebangfix tar:xz
-USE_QT5= buildtools_build core dbus gui network printsupport qmake_build \
+ pkgconfig qt:5 shared-mime-info shebangfix tar:xz
+USE_QT= buildtools_build core dbus gui network printsupport qmake_build \
sql testlib_build xml webkit widgets
USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons doctools_build ecm_build i18n \
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@qt4
-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 qmake:norecursive qt:4 tar:tgz
+USE_QT= corelib gui sql moc_build rcc_build uic_build
USE_CXXSTD= c++11
USE_LDCONFIG= yes
Index: finance/skrooge/Makefile
===================================================================
--- finance/skrooge/Makefile
+++ finance/skrooge/Makefile
@@ -18,7 +18,7 @@
libsqlcipher.so:databases/sqlcipher
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- gettext grantlee:5 kde:5 pkgconfig python:3.4+ shared-mime-info \
+ gettext grantlee:5 kde:5 pkgconfig python:3.4+ qt:5 shared-mime-info \
shebangfix sqlite:3 tar:xz
USE_KDE= activities archive attica5 auth bookmarks codecs completion \
config configwidgets coreaddons crash dbusaddons \
@@ -28,7 +28,7 @@
package parts plasma-framework runner service solid sonnet \
textwidgets unitconversion wallet widgetsaddons windowsystem \
xmlgui
-USE_QT5= concurrent core dbus designer gui network printsupport qml \
+USE_QT= concurrent core dbus designer gui network printsupport qml \
quick script sql svg webkit widgets xml \
qmake_build buildtools_build
SHEBANG_FILES= plugins/import/skrooge_import_backend/skrooge-sabb.py \
Index: french/aster/Makefile
===================================================================
--- french/aster/Makefile
+++ french/aster/Makefile
@@ -51,9 +51,9 @@
${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \
astk-serveur>0:cad/astk-serveur
-USES= bison fortran gettext python:2.7 tk
+USES= bison fortran gettext python:2.7 qt:4 tk
USE_BINUTILS= yes
-USE_QT4= linguisttools_build
+USE_QT= linguisttools_build
.if defined(WITH_ATLAS)
USES+= blaslapack:atlas
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= qmake qt:4
+USE_QT= gui network corelib uic_build moc_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,8 @@
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 qmake qt:5
+USE_QT= core gui network widgets qml quick buildtools_build quickcontrols
PLIST_FILES= bin/2048-qt ${DESKTOPDIR}/${PORTNAME}.desktop \
share/pixmaps/${PORTNAME}.png
Index: games/anki/Makefile
===================================================================
--- games/anki/Makefile
+++ games/anki/Makefile
@@ -23,10 +23,10 @@
${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}
-USES= desktop-file-utils pyqt:4 python:2.7 shared-mime-info shebangfix tar:tgz
+USES= desktop-file-utils pyqt:4 python:2.7 qt:4 shared-mime-info shebangfix tar:tgz
SHEBANG_FILES= tools/build_ui.sh tools/tests.sh anki/anki runanki
USE_PYQT= network_run webkit_run
-USE_QT4= network_run webkit_run
+USE_QT= network_run webkit_run
NO_ARCH= yes
OPTIONS_DEFINE= NLS
Index: games/auralquiz/Makefile
===================================================================
--- games/auralquiz/Makefile
+++ games/auralquiz/Makefile
@@ -15,9 +15,9 @@
LIB_DEPENDS= libtag.so:audio/taglib
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
-USE_QT5= core gui widgets phonon4 qmake_build buildtools_build
+USE_QT= core gui widgets phonon4 qmake_build buildtools_build
PORTDOCS= CHANGELOG README TODO
Index: games/blinken-kde4/Makefile
===================================================================
--- games/blinken-kde4/Makefile
+++ games/blinken-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: games/blinken/Makefile
===================================================================
--- games/blinken/Makefile
+++ games/blinken/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Memory enhancement game for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
doctools ecm guiaddons i18n widgetsaddons xmlgui
-USE_QT5= core dbus gui phonon4 svg widgets xml \
+USE_QT= core dbus gui phonon4 svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: games/bomber-kde4/Makefile
===================================================================
--- games/bomber-kde4/Makefile
+++ games/bomber-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/bomber/Makefile
===================================================================
--- games/bomber/Makefile
+++ games/bomber/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kio libkdegames widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets phonon4 qml quick xml \
+USE_QT= core dbus gui network widgets phonon4 qml quick xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/bovo-kde4/Makefile
===================================================================
--- games/bovo-kde4/Makefile
+++ games/bovo-kde4/Makefile
@@ -8,9 +8,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_CXXSTD= gnu++98
.include <${.CURDIR}/../kdegames-kde4/Makefile.common>
Index: games/bovo/Makefile
===================================================================
--- games/bovo/Makefile
+++ games/bovo/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kdeclarative libkdegames newstuff widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network qml quick svg widgets xml \
+USE_QT= concurrent core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/bubble-chains/Makefile
===================================================================
--- games/bubble-chains/Makefile
+++ games/bubble-chains/Makefile
@@ -16,12 +16,12 @@
USE_GITHUB= yes
GH_ACCOUNT= SanskritFritz
-USES= dos2unix qmake
+USES= dos2unix qmake 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 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,9 @@
WRKSRC= ${WRKDIR}/CapiCity_${PORTVERSION}
-USES= iconv qmake
+USES= iconv qmake 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 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,9 @@
WRKSRC= ${WRKDIR}/Capitalism-${PORTVERSION}
-USES= iconv qmake
+USES= iconv qmake 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 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 qmake qt:4 shared-mime-info 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
@@ -14,8 +14,8 @@
LIB_DEPENDS= libprotobuf.so:devel/protobuf
-USES= cmake compiler:c++11-lib
-USE_QT5= buildtools concurrent core network qmake widgets
+USES= cmake compiler:c++11-lib qt:5
+USE_QT= buildtools concurrent core network qmake widgets
USE_GITHUB= yes
GH_TAGNAME= 2018-04-16-Release-2.5.1
@@ -35,8 +35,8 @@
COCKATRICE_CMAKE_ON= -DWITH_CLIENT=ON -DWITH_ORACLE=ON
COCKATRICE_CMAKE_OFF= -DWITH_CLIENT=OFF -DWITH_ORACLE=OFF
-COCKATRICE_USE= qt5=multimedia,printsupport,svg,linguisttools,gui
-SERVATRICE_USE= qt5=sql,sql-mysql,websockets
+COCKATRICE_USE= qt=multimedia,printsupport,svg,linguisttools,gui
+SERVATRICE_USE= qt=sql,sql-mysql,websockets
SERVATRICE_USE+= RC_SUBR=servatrice
MYSQL_USES+= mysql:server
Index: games/colorcode/Makefile
===================================================================
--- games/colorcode/Makefile
+++ games/colorcode/Makefile
@@ -12,8 +12,8 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_QT5= core gui widgets buildtools_build
-USES= qmake
+USE_QT= core gui widgets buildtools_build
+USES= qmake qt:5
WRKSRC= ${WRKDIR}/ColorCode-${PORTVERSION}
DESKTOP_ENTRIES=ColorCode \
Index: games/connectagram/Makefile
===================================================================
--- games/connectagram/Makefile
+++ games/connectagram/Makefile
@@ -13,9 +13,9 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= compiler:c++11-lib qmake tar:bzip2
+USES= compiler:c++11-lib qmake qt:5 tar:bzip2
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build network widgets
+USE_QT= buildtools_build core gui linguisttools_build network widgets
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: games/cutemaze/Makefile
===================================================================
--- games/cutemaze/Makefile
+++ games/cutemaze/Makefile
@@ -13,9 +13,9 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
+USES= qmake qt:5 tar:bzip2
USE_GL= gl
-USE_QT5= core gui svg imageformats_run widgets \
+USE_QT= core gui svg imageformats_run widgets \
linguisttools_build buildtools_build
PORTDOCS= ChangeLog NEWS README
Index: games/doomsday/Makefile
===================================================================
--- games/doomsday/Makefile
+++ games/doomsday/Makefile
@@ -17,12 +17,12 @@
libfluidsynth.so:audio/fluidsynth
RUN_DEPENDS= timidity:audio/timidity
-USES= cmake:outsource compiler:c++11-lib localbase:ldflags ninja openal pkgconfig python:2.7,build
+USES= cmake:outsource compiler:c++11-lib localbase:ldflags ninja openal pkgconfig python:2.7,build qt:5
USE_GL= gl glu
USE_LDCONFIG= yes
USE_SDL= sdl2 mixer2
USE_XORG= x11 sm ice xext xrandr xxf86vm
-USE_QT5= buildtools_build core gui network widgets qmake opengl x11extras
+USE_QT= buildtools_build core gui network widgets qmake opengl x11extras
CMAKE_ARGS+= -DDENG_ENABLE_COTIRE=OFF -DDENG_ASSIMP_EMBEDDED=OFF
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
Index: games/dustrac/Makefile
===================================================================
--- games/dustrac/Makefile
+++ games/dustrac/Makefile
@@ -10,9 +10,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
@@ -48,7 +48,8 @@
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,qml,quick,widgets
+QT5_USES= qt:5
+QT5_USE= QT=core,buildtools,gui,qmake,qml,quick,widgets
.include <bsd.port.pre.mk>
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= qmake qt:4
+USE_QT= multimedia network moc_build rcc_build
DESKTOP_ENTRIES= Flukz "" ${PORTNAME} \
${PORTNAME} "Game;ArcadeGame;" true
Index: games/gcompris-qt/Makefile
===================================================================
--- games/gcompris-qt/Makefile
+++ games/gcompris-qt/Makefile
@@ -13,9 +13,9 @@
LIB_DEPENDS= libBox2D.so:x11-toolkits/qml-box2d
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= doctools
-USE_QT5= core gui multimedia network qml quick sensors svg widgets \
+USE_QT= core gui multimedia network qml quick sensors svg widgets \
xml xmlpatterns \
buildtools_build linguisttools_build qmake_build
Index: games/goldencheetah/Makefile
===================================================================
--- games/goldencheetah/Makefile
+++ games/goldencheetah/Makefile
@@ -27,9 +27,9 @@
"Education;Sports;" \
false
-USES= bison gmake qmake
+USES= bison gmake qmake qt:4
USE_GL= gl glu
-USE_QT4= corelib gui linguist moc_build network opengl \
+USE_QT= corelib gui linguist moc_build network opengl \
qmake rcc script sql svg uic webkit xml
INFO= GC3-FAQ GC3-Release GC31-Release
Index: games/gottet/Makefile
===================================================================
--- games/gottet/Makefile
+++ games/gottet/Makefile
@@ -13,9 +13,9 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= compiler:c++11-lib qmake tar:bzip2
+USES= compiler:c++11-lib qmake qt:5 tar:bzip2
USE_GL= gl
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build linguisttools_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: games/granatier-kde4/Makefile
===================================================================
--- games/granatier-kde4/Makefile
+++ games/granatier-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/granatier/Makefile
===================================================================
--- games/granatier/Makefile
+++ games/granatier/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames newstuff notifyconfig service widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/hedgewars/Makefile
===================================================================
--- games/hedgewars/Makefile
+++ games/hedgewars/Makefile
@@ -17,10 +17,10 @@
LIB_DEPENDS= libphysfs.so:devel/physfs \
libpng.so:graphics/png
-USES= cmake:noninja desktop-file-utils fpc lua:51 tar:bzip2 pkgconfig
+USES= cmake:noninja desktop-file-utils fpc lua:51 qt:5 tar:bzip2 pkgconfig
USE_SDL= sdl2 mixer2 image2 ttf2 net2
USE_FPC= opengl libpng rtl-objpas
-USE_QT5= core gui widgets network \
+USE_QT= core gui widgets network \
qmake_build buildtools_build \
linguisttools_build
USE_LDCONFIG= yes
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 qmake qt:5 tar:bzip2
+USE_QT= core gui widgets buildtools_build linguisttools_build
USE_GL= gl
INSTALLS_ICONS= yes
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 qmake qt:4 zip
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 rcc_build \
corelib svg xml opengl network
PLIST_FILES= bin/${PORTNAME}
Index: games/kajongg-kde4/Makefile
===================================================================
--- games/kajongg-kde4/Makefile
+++ games/kajongg-kde4/Makefile
@@ -11,9 +11,9 @@
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
-USES= cmake:outsource kde:4 python:2.7 tar:xz shebangfix sqlite
+USES= cmake:outsource kde:4 python:2.7 qt:4 tar:xz shebangfix sqlite
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
SHEBANG_FILES= src/kajongg.py \
Index: games/kajongg/Makefile
===================================================================
--- games/kajongg/Makefile
+++ games/kajongg/Makefile
@@ -11,11 +11,11 @@
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
-USES= cmake:outsource pkgconfig python:3 pyqt:5 kde:5 tar:xz \
+USES= cmake:outsource pkgconfig python:3 pyqt:5 kde:5 qt:5 tar:xz \
sqlite
USE_KDE= config doctools ecm
USE_PYQT= core gui svg widgets
-USE_QT5= core gui svg widgets \
+USE_QT= core gui svg widgets \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kanagram-kde4/Makefile
===================================================================
--- games/kanagram-kde4/Makefile
+++ games/kanagram-kde4/Makefile
@@ -8,9 +8,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 libkeduvocdocument 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 <bsd.port.mk>
Index: games/kanagram/Makefile
===================================================================
--- games/kanagram/Makefile
+++ games/kanagram/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Letter order game for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
doctools ecm i18n kdeclarative kio libkeduvocdocument newstuff \
package service sonnet widgetsaddons xmlgui
-USE_QT5= core dbus gui network opengl qml quick speech svg widgets xml \
+USE_QT= core dbus gui network opengl qml quick speech svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: games/kapman-kde4/Makefile
===================================================================
--- games/kapman-kde4/Makefile
+++ games/kapman-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/kapman/Makefile
===================================================================
--- games/kapman/Makefile
+++ games/kapman/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm i18n libkdegames notifyconfig widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kardsgt/Makefile
===================================================================
--- games/kardsgt/Makefile
+++ games/kardsgt/Makefile
@@ -13,8 +13,8 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake
-USE_QT4= assistantclient corelib gui network \
+USES= qmake qt:4
+USE_QT= assistantclient corelib gui network \
moc_build rcc_build uic_build
ALL_TARGET= qmake release
MAKE_JOBS_UNSAFE= yes
Index: games/katomic-kde4/Makefile
===================================================================
--- games/katomic-kde4/Makefile
+++ games/katomic-kde4/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 qt:4 shebangfix 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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/katomic/Makefile
===================================================================
--- games/katomic/Makefile
+++ games/katomic/Makefile
@@ -6,11 +6,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 shebangfix tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 shebangfix tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames newstuff notifyconfig service widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= katomic-levelset-upd.pl
Index: games/kblackbox-kde4/Makefile
===================================================================
--- games/kblackbox-kde4/Makefile
+++ games/kblackbox-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/kblackbox/Makefile
===================================================================
--- games/kblackbox/Makefile
+++ games/kblackbox/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes libkdegames sonnet \
textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kblocks-kde4/Makefile
===================================================================
--- games/kblocks-kde4/Makefile
+++ games/kblocks-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/kblocks/Makefile
===================================================================
--- games/kblocks/Makefile
+++ games/kblocks/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons i18n itemmodels kio libkdegames newstuff \
notifyconfig textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 qml quick svg testlib widgets xml \
+USE_QT= core dbus gui network phonon4 qml quick svg testlib widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kbounce-kde4/Makefile
===================================================================
--- games/kbounce-kde4/Makefile
+++ games/kbounce-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kbounce/Makefile
===================================================================
--- games/kbounce/Makefile
+++ games/kbounce/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes jobwidgets kio \
libkdegames notifyconfig service textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 qml quick svg testlib widgets xml \
+USE_QT= core dbus gui network phonon4 qml quick svg testlib widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kbreakout-kde4/Makefile
===================================================================
--- games/kbreakout-kde4/Makefile
+++ games/kbreakout-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/kbreakout/Makefile
===================================================================
--- games/kbreakout/Makefile
+++ games/kbreakout/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes jobwidgets kio libkdegames \
service widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/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= qmake qt:4
+USE_QT= corelib gui moc_build rcc_build
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common.h
Index: games/kdiamond-kde4/Makefile
===================================================================
--- games/kdiamond-kde4/Makefile
+++ games/kdiamond-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kdiamond/Makefile
===================================================================
--- games/kdiamond/Makefile
+++ games/kdiamond/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
doctools ecm guiaddons i18n iconthemes libkdegames \
notifications notifyconfig widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kfourinline-kde4/Makefile
===================================================================
--- games/kfourinline-kde4/Makefile
+++ games/kfourinline-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kfourinline/Makefile
===================================================================
--- games/kfourinline/Makefile
+++ games/kfourinline/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons dnssd ecm i18n iconthemes itemmodels itemviews \
kdeclarative kdelibs4support kio libkdegames notifyconfig \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kgoldrunner-kde4/Makefile
===================================================================
--- games/kgoldrunner-kde4/Makefile
+++ games/kgoldrunner-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kgoldrunner/Makefile
===================================================================
--- games/kgoldrunner/Makefile
+++ games/kgoldrunner/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm i18n kio libkdegames service \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/khangman-kde4/Makefile
===================================================================
--- games/khangman-kde4/Makefile
+++ games/khangman-kde4/Makefile
@@ -8,9 +8,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 libkeduvocdocument 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/khangman/Makefile
===================================================================
--- games/khangman/Makefile
+++ games/khangman/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Hangman game for KDE 4
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n kdeclarative libkeduvocdocument \
newstuff notifications package service widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: games/kigo-kde4/Makefile
===================================================================
--- games/kigo-kde4/Makefile
+++ games/kigo-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kigo/Makefile
===================================================================
--- games/kigo/Makefile
+++ games/kigo/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n jobwidgets kio \
libkdegames newstuff notifyconfig service sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/killbots-kde4/Makefile
===================================================================
--- games/killbots-kde4/Makefile
+++ games/killbots-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/killbots/Makefile
===================================================================
--- games/killbots/Makefile
+++ games/killbots/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames notifyconfig widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kiriki-kde4/Makefile
===================================================================
--- games/kiriki-kde4/Makefile
+++ games/kiriki-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kiriki/Makefile
===================================================================
--- games/kiriki/Makefile
+++ games/kiriki/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm guiaddons i18n iconthemes kio libkdegames widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport qml quick svg widgets xml \
+USE_QT= core dbus gui network printsupport qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kjumpingcube-kde4/Makefile
===================================================================
--- games/kjumpingcube-kde4/Makefile
+++ games/kjumpingcube-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kjumpingcube/Makefile
===================================================================
--- games/kjumpingcube/Makefile
+++ games/kjumpingcube/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews jobwidgets \
kio libkdegames newstuff notifyconfig service widgetsaddons \
xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/klickety-kde4/Makefile
===================================================================
--- games/klickety-kde4/Makefile
+++ games/klickety-kde4/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 qt:4 shebangfix 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}/../kdegames-kde4/Makefile.common>
Index: games/klickety/Makefile
===================================================================
--- games/klickety/Makefile
+++ games/klickety/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 shebangfix tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 shebangfix tar:xz
SHEBANG_FILES= klickety-2.0-inherit-ksame-highscore.pl
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n itemviews \
jobwidgets kio libkdegames notifications notifyconfig service \
solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/klines-kde4/Makefile
===================================================================
--- games/klines-kde4/Makefile
+++ games/klines-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/klines/Makefile
===================================================================
--- games/klines/Makefile
+++ games/klines/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm guiaddons i18n iconthemes itemviews kio libkdegames \
newstuff service widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kmahjongg-kde4/Makefile
===================================================================
--- games/kmahjongg-kde4/Makefile
+++ games/kmahjongg-kde4/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libkmahjongglib.so:games/libkmahjongg-kde4
-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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kmahjongg/Makefile
===================================================================
--- games/kmahjongg/Makefile
+++ games/kmahjongg/Makefile
@@ -9,11 +9,11 @@
LIB_DEPENDS= libKF5KMahjongglib.so:games/libkmahjongg
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons doctools ecm i18n kdeclarative libkdegames newstuff \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kmines-kde4/Makefile
===================================================================
--- games/kmines-kde4/Makefile
+++ games/kmines-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kmines/Makefile
===================================================================
--- games/kmines/Makefile
+++ games/kmines/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kio libkdegames notifyconfig sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/knavalbattle-kde4/Makefile
===================================================================
--- games/knavalbattle-kde4/Makefile
+++ games/knavalbattle-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/knavalbattle/Makefile
===================================================================
--- games/knavalbattle/Makefile
+++ games/knavalbattle/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons dnssd doctools ecm i18n libkdegames sonnet \
textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/knetwalk-kde4/Makefile
===================================================================
--- games/knetwalk-kde4/Makefile
+++ games/knetwalk-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/knetwalk/Makefile
===================================================================
--- games/knetwalk/Makefile
+++ games/knetwalk/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm guiaddons i18n iconthemes itemviews kio libkdegames \
notifyconfig sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
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-kde4/Makefile
===================================================================
--- games/kolf-kde4/Makefile
+++ games/kolf-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/kolf/Makefile
===================================================================
--- games/kolf/Makefile
+++ games/kolf/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemviews jobwidgets kdelibs4support kio libkdegames \
notifications parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport qml quick \
+USE_QT= core dbus gui network phonon4 printsupport qml quick \
widgets xml \
buildtools_build qmake_build
Index: games/kollision-kde4/Makefile
===================================================================
--- games/kollision-kde4/Makefile
+++ games/kollision-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kollision/Makefile
===================================================================
--- games/kollision/Makefile
+++ games/kollision/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kio libkdegames newstuff notifyconfig textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 qml quick svg widgets xml \
+USE_QT= core dbus gui network phonon4 qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/konquest-kde4/Makefile
===================================================================
--- games/konquest-kde4/Makefile
+++ games/konquest-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/konquest/Makefile
===================================================================
--- games/konquest/Makefile
+++ games/konquest/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n libkdegames widgetsaddons \
xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kpat-kde4/Makefile
===================================================================
--- games/kpat-kde4/Makefile
+++ games/kpat-kde4/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 qt:4 shared-mime-info 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/kpat/Makefile
===================================================================
--- games/kpat/Makefile
+++ games/kpat/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 shared-mime-info tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 shared-mime-info tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm guiaddons i18n iconthemes itemviews \
kdeclarative kio libkdegames newstuff notifyconfig service \
textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 qml quick svg widgets xml \
+USE_QT= core dbus gui network phonon4 qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kreversi-kde4/Makefile
===================================================================
--- games/kreversi-kde4/Makefile
+++ games/kreversi-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kreversi/Makefile
===================================================================
--- games/kreversi/Makefile
+++ games/kreversi/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemviews \
jobwidgets kdeclarative kio libkdegames package service \
solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kshisen-kde4/Makefile
===================================================================
--- games/kshisen-kde4/Makefile
+++ games/kshisen-kde4/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libkmahjongglib.so:games/libkmahjongg-kde4
-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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kshisen/Makefile
===================================================================
--- games/kshisen/Makefile
+++ games/kshisen/Makefile
@@ -9,11 +9,11 @@
LIB_DEPENDS= libKF5KMahjongglib.so:games/libkmahjongg
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons dnssd ecm i18n kdeclarative kio libkdegames \
newstuff widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/ksirk-kde4/Makefile
===================================================================
--- games/ksirk-kde4/Makefile
+++ games/ksirk-kde4/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libqca.so:devel/qca@qt4
-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/ksirk/Makefile
===================================================================
--- games/ksirk/Makefile
+++ games/ksirk/Makefile
@@ -9,11 +9,11 @@
LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets \
coreaddons crash i18n iconthemes kio libkdegames newstuff \
service wallet widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 qml quick svg widgets xml \
+USE_QT= core dbus gui network phonon4 qml quick svg widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: games/ksnakeduel-kde4/Makefile
===================================================================
--- games/ksnakeduel-kde4/Makefile
+++ games/ksnakeduel-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/ksnakeduel/Makefile
===================================================================
--- games/ksnakeduel/Makefile
+++ games/ksnakeduel/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm guiaddons i18n libkdegames \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/kspaceduel-kde4/Makefile
===================================================================
--- games/kspaceduel-kde4/Makefile
+++ games/kspaceduel-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/kspaceduel/Makefile
===================================================================
--- games/kspaceduel/Makefile
+++ games/kspaceduel/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm i18n libkdegames widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/ksquares-kde4/Makefile
===================================================================
--- games/ksquares-kde4/Makefile
+++ games/ksquares-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/ksquares/Makefile
===================================================================
--- games/ksquares/Makefile
+++ games/ksquares/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames notifyconfig widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/ksudoku-kde4/Makefile
===================================================================
--- games/ksudoku-kde4/Makefile
+++ games/ksudoku-kde4/Makefile
@@ -8,10 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/ksudoku/Makefile
===================================================================
--- games/ksudoku/Makefile
+++ games/ksudoku/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_GL= gl glu
USE_KDE= archive auth codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n jobwidgets kio \
libkdegames service widgetsaddons xmlgui
-USE_QT5= core dbus gui network opengl printsupport qml quick \
+USE_QT= core dbus gui network opengl printsupport qml quick \
svg widgets xml \
buildtools_build qmake_build
Index: games/ktuberling-kde4/Makefile
===================================================================
--- games/ktuberling-kde4/Makefile
+++ games/ktuberling-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
.include <bsd.port.mk>
Index: games/ktuberling/Makefile
===================================================================
--- games/ktuberling/Makefile
+++ games/ktuberling/Makefile
@@ -7,14 +7,14 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm emoticons guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio libkdegames newstuff notifications \
notifyconfig parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui multimedia network phonon4 printsupport qml \
+USE_QT= core dbus gui multimedia network phonon4 printsupport qml \
quick svg testlib widgets xml \
buildtools_build qmake_build
Index: games/kubrick-kde4/Makefile
===================================================================
--- games/kubrick-kde4/Makefile
+++ games/kubrick-kde4/Makefile
@@ -8,10 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/kubrick/Makefile
===================================================================
--- games/kubrick/Makefile
+++ games/kubrick/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_GL= gl glu
USE_KDE= auth codecs config configwidgets coreaddons crash ecm \
i18n kio libkdegames service widgetsaddons xmlgui
-USE_QT5= core dbus gui network opengl qml quick svg widgets xml \
+USE_QT= core dbus gui network opengl qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/libkdegames-kde4/Makefile
===================================================================
--- games/libkdegames-kde4/Makefile
+++ games/libkdegames-kde4/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/libkdegames/Makefile
===================================================================
--- games/libkdegames/Makefile
+++ games/libkdegames/Makefile
@@ -9,13 +9,13 @@
LIB_DEPENDS= libsndfile.so:audio/libsndfile
-USES= cmake:outsource gettext kde:5 openal tar:xz
+USES= cmake:outsource gettext kde:5 openal qt:5 tar:xz
USE_KDE= archive attica auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons dnssd ecm emoticons \
globalaccel guiaddons i18n iconthemes init itemmodels \
itemviews jobwidgets kdeclarative kdelibs4support kio newstuff \
package service textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= core dbus gui network qml quick svg testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: games/libkmahjongg-kde4/Makefile
===================================================================
--- games/libkmahjongg-kde4/Makefile
+++ games/libkmahjongg-kde4/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 <bsd.port.mk>
Index: games/libkmahjongg/Makefile
===================================================================
--- games/libkmahjongg/Makefile
+++ games/libkmahjongg/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Library for the Mahjongg Solitaire for KDE 5
-USES= cmake:outsource compiler:c++11-lang gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= completion config configwidgets coreaddons ecm i18n widgetsaddons
-USE_QT5= core gui svg widgets \
+USE_QT= core gui svg widgets \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: games/lskat-kde4/Makefile
===================================================================
--- games/lskat-kde4/Makefile
+++ games/lskat-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/lskat/Makefile
===================================================================
--- games/lskat/Makefile
+++ games/lskat/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash ecm \
guiaddons i18n libkdegames notifyconfig widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus gui network qml quick svg widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/openmw/Makefile
===================================================================
--- games/openmw/Makefile
+++ games/openmw/Makefile
@@ -23,9 +23,9 @@
USE_GITHUB= yes
GH_ACCOUNT= OpenMW
-USES= cmake:outsource compiler:c++14-lang openal pkgconfig
+USES= cmake:outsource compiler:c++14-lang 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= qmake qt:4
+USE_QT= corelib gui moc_build rcc_build uic_build
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/${PORTNAME} \
Index: games/pairs-kde4/Makefile
===================================================================
--- games/pairs-kde4/Makefile
+++ games/pairs-kde4/Makefile
@@ -11,9 +11,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 <bsd.port.mk>
Index: games/palapeli-kde4/Makefile
===================================================================
--- games/palapeli-kde4/Makefile
+++ games/palapeli-kde4/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 qt:4 shared-mime-info 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/palapeli/Makefile
===================================================================
--- games/palapeli/Makefile
+++ games/palapeli/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource kde:5 shared-mime-info tar:xz
+USES= cmake:outsource kde:5 qt:5 shared-mime-info tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
crash i18n itemviews jobwidgets kio libkdegames notifications service \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network svg widgets xml \
+USE_QT= concurrent core dbus gui network svg widgets xml \
buildtools_build qmake_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 qmake qt:5 tar:bzip2
+USE_QT= core gui widgets qmake_build buildtools_build linguisttools_build
USE_GL= gl
INSTALLS_ICONS= yes
Index: games/pentobi/Makefile
===================================================================
--- games/pentobi/Makefile
+++ games/pentobi/Makefile
@@ -12,8 +12,8 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake desktop-file-utils shared-mime-info tar:xz
-USE_QT5= core gui widgets svg concurrent \
+USES= cmake desktop-file-utils qt:5 shared-mime-info tar:xz
+USE_QT= core gui widgets svg concurrent \
qmake_build buildtools_build linguisttools_build
PORTDOCS= NEWS
Index: games/picmi-kde4/Makefile
===================================================================
--- games/picmi-kde4/Makefile
+++ games/picmi-kde4/Makefile
@@ -8,9 +8,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}/../kdegames-kde4/Makefile.common>
Index: games/picmi/Makefile
===================================================================
--- games/picmi/Makefile
+++ games/picmi/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons doctools ecm i18n jobwidgets kdeclarative kio \
libkdegames newstuff service widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= core dbus gui network qml quick svg testlib widgets xml \
buildtools_build qmake_build
.include <${.CURDIR}/../kdegames/Makefile.common>
Index: games/pokerth/Makefile
===================================================================
--- games/pokerth/Makefile
+++ games/pokerth/Makefile
@@ -23,8 +23,8 @@
BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient \
protoc:devel/protobuf
-USES= iconv gmake qmake sqlite ssl
-USE_QT4= gui corelib network sql sql-sqlite3 \
+USES= iconv gmake qmake qt:4 sqlite ssl
+USE_QT= gui corelib network sql sql-sqlite3 \
moc_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 qmake qt:4 tar:bzip2
+USE_QT= gui network qtestlib moc_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= qmake qt:4
+USE_QT= corelib gui moc_build rcc_build
USE_SDL= mixer
PLIST_FILES= bin/qnetwalk \
Index: games/qtads/Makefile
===================================================================
--- games/qtads/Makefile
+++ games/qtads/Makefile
@@ -11,8 +11,8 @@
LICENSE= GPLv2
-USES= gmake pkgconfig qmake tar:bzip2
-USE_QT4= gui moc_build network rcc_build uic_build
+USES= gmake pkgconfig qmake qt:4 tar:bzip2
+USE_QT= gui moc_build network 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
@@ -14,8 +14,8 @@
USE_GITHUB= yes
-USES= compiler:c++11-lib gmake qmake
-USE_QT4= corelib gui moc_build
+USES= compiler:c++11-lib gmake qmake qt:4
+USE_QT= corelib gui moc_build
BUILD_WRKSRC= ${WRKSRC}/quacker
Index: games/simsu/Makefile
===================================================================
--- games/simsu/Makefile
+++ games/simsu/Makefile
@@ -16,9 +16,9 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= compiler:c++11-lib qmake tar:bzip2
+USES= compiler:c++11-lib qmake qt:5 tar:bzip2
USE_GL= gl
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build linguisttools_build
PORTDOCS= *
Index: games/solarus-quest-editor/Makefile
===================================================================
--- games/solarus-quest-editor/Makefile
+++ games/solarus-quest-editor/Makefile
@@ -25,8 +25,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 core gui linguist qmake 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
@@ -21,10 +21,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 widgets
USE_SDL= sdl2 ttf2 image2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= cmake:noninja qmake compiler:c++11-lib openal
+USES= cmake:noninja qmake compiler:c++11-lib openal qt:5
USE_LDCONFIG= yes
.include <bsd.port.mk>
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 qmake qt:4
USE_GNOME= glib20
-USE_QT4= corelib gui moc_build rcc_build uic_build
+USE_QT= corelib gui moc_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,8 @@
WRKSRC= ${WRKDIR}/SudokuSenseiSources
-USES= qmake
-USE_QT4= moc_build uic_build corelib gui iconengines_run imageformats_run
+USES= qmake qt:4
+USE_QT= moc_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,9 +14,9 @@
LICENSE_FILE= ${WRKSRC}/COPYING
USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake \
- shared-mime-info tar:bzip2
+ qt:5 shared-mime-info tar:bzip2
USE_GL= gl
-USE_QT5= buildtools_build linguisttools_build core gui widgets
+USE_QT= buildtools_build linguisttools_build core gui widgets
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: games/tbe/Makefile
===================================================================
--- games/tbe/Makefile
+++ games/tbe/Makefile
@@ -18,8 +18,8 @@
USE_GITHUB= yes
GH_ACCOUNT= kaa-ching
-USES= cmake compiler:c++11-lib
-USE_QT4= corelib gui linguisttools_build moc_build qmake_build rcc_build \
+USES= cmake compiler:c++11-lib qt:4
+USE_QT= corelib gui linguisttools_build moc_build qmake_build rcc_build \
svg uic_build xml
PORTDOCS= *
Index: games/tetzle/Makefile
===================================================================
--- games/tetzle/Makefile
+++ games/tetzle/Makefile
@@ -14,8 +14,8 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-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 qmake qt:5 tar:bzip2
+USE_QT= core gui widgets buildtools_build linguisttools_build
USE_GL= gl
INSTALLS_ICONS= yes
Index: games/warzone2100/Makefile
===================================================================
--- games/warzone2100/Makefile
+++ games/warzone2100/Makefile
@@ -24,12 +24,12 @@
libharfbuzz.so:print/harfbuzz
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 qt:5 ssl 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: games/xptools/Makefile
===================================================================
--- games/xptools/Makefile
+++ games/xptools/Makefile
@@ -34,7 +34,7 @@
libGLw.so:graphics/libGLw \
libGLU.so:graphics/libGLU
-USES= eigen:3 gmake jpeg sqlite ssl
+USES= eigen:3 gmake jpeg qt:4 sqlite ssl
USE_GITHUB= yes
GH_ACCOUNT= X-Plane
@@ -43,7 +43,7 @@
USE_CXXSTD= c++11
USE_BINUTILS= yes
-USE_QT4= corelib gui moc opengl
+USE_QT= corelib gui moc opengl
USE_GL+= gl
BINARIES= DDSTool DSFTool MeshTool ObjConverter ObjView RenderFarm RenderFarmUI WED XGrinder XPlaneSupportLin.p
Index: german/tipp10/Makefile
===================================================================
--- german/tipp10/Makefile
+++ german/tipp10/Makefile
@@ -14,9 +14,9 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/license_en.txt
-USES= qmake dos2unix zip
+USES= qmake dos2unix qt:4 zip
DOS2UNIX_GLOB= *.pro *.cpp
-USE_QT4= gui sql corelib network script qtestlib \
+USE_QT= gui sql corelib network script qtestlib \
rcc_build uic_build moc_build \
sql-sqlite2_run sql-sqlite3_run
QMAKE_ARGS+= DATADIR="${DATADIR}"
Index: graphics/appleseed/Makefile
===================================================================
--- graphics/appleseed/Makefile
+++ graphics/appleseed/Makefile
@@ -57,7 +57,8 @@
DISNEY_LIB_DEPENDS= libSeExpr.so:graphics/seexpr
DISNEY_CMAKE_ON= -DWITH_DISNEY_MATERIAL:BOOL=ON
-STUDIO_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,opengl
+STUDIO_USES= qt:4
+STUDIO_USE= QT=moc_build,qmake_build,rcc_build,uic_build,opengl
STUDIO_CMAKE_OFF= -DWITH_STUDIO:BOOL=OFF
.include <bsd.port.pre.mk>
Index: graphics/aqsis/Makefile
===================================================================
--- graphics/aqsis/Makefile
+++ graphics/aqsis/Makefile
@@ -27,12 +27,12 @@
USE_LDCONFIG= yes
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- shared-mime-info shebangfix
+ qt:4 shared-mime-info shebangfix
USE_CXXSTD= gnu++11
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+
LICENSE_FILE= ${WRKSRC}/docs/license.txt
-USES= dos2unix qmake zip
+USES= dos2unix qmake qt:4 zip
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
PORTDOCS= 3DQformat.txt ChangeLog.txt
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= qmake qt:4
+USE_QT= gui uic_build moc_build rcc_build \
imageformats_run
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: graphics/cloudcompare/Makefile
===================================================================
--- graphics/cloudcompare/Makefile
+++ graphics/cloudcompare/Makefile
@@ -15,12 +15,12 @@
BROKEN_FreeBSD_10= error: "SSE instruction set not enabled"
-USES= cmake:outsource localbase:ldflags
+USES= cmake:outsource localbase:ldflags qt:5
USE_GITHUB= yes
GH_ACCOUNT= CloudCompare
GH_PROJECT= ${GH_ACCOUNT}
GH_TAGNAME= 5d41227deb30c445ccbaa2d789a4363b57948a5d
-USE_QT5= concurrent core gui opengl printsupport widgets buildtools_build qmake_build
+USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= DXFLIB GAMEPAD GDAL PDAL SHAPELIB PLUGINS
@@ -35,7 +35,8 @@
DXFLIB_CMAKE_BOOL= OPTION_USE_DXF_LIB
-GAMEPAD_USE= QT5=gamepad
+GAMEPAD_USES= qt:5
+GAMEPAD_USE= QT=gamepad
GAMEPAD_CMAKE_BOOL= OPTION_SUPPORT_GAMEPADS
GDAL_CMAKE_BOOL= OPTION_USE_GDAL
Index: graphics/colmap/Makefile
===================================================================
--- graphics/colmap/Makefile
+++ graphics/colmap/Makefile
@@ -24,10 +24,10 @@
libfreeimage.so:graphics/freeimage \
libceres.so:math/ceres-solver
-USES= cmake compiler:${OPENMP}c++11-lib eigen:3 fortran localbase sqlite
+USES= cmake compiler:${OPENMP}c++11-lib eigen:3 fortran localbase qt:5 sqlite
USE_GITHUB= yes
USE_GL= gl glew
-USE_QT5= qmake_build buildtools_build core gui opengl_build widgets
+USE_QT= qmake_build buildtools_build core gui opengl_build widgets
EXCLUDE= SQLite
EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude src/ext/,}
CMAKE_OFF= BOOST_STATIC CUDA_ENABLED
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 qt:5 tar:bzip2 compiler:c++11-lang
+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= qmake qt:4
+USE_QT= gui linguisttools_build moc_build rcc_build uic_build
PORTDOCS= changelog
PLIST_FILES= bin/darknock share/pixmaps/darknock.png
Index: graphics/diffpdf/Makefile
===================================================================
--- graphics/diffpdf/Makefile
+++ graphics/diffpdf/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-USES= qmake
-USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build
+USES= qmake qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build linguist_build
PLIST_FILES= bin/diffpdf
Index: graphics/digikam-kde4/Makefile
===================================================================
--- graphics/digikam-kde4/Makefile
+++ graphics/digikam-kde4/Makefile
@@ -24,9 +24,9 @@
libkgeomap.so:astro/libkgeomap-kde4 \
libboost_graph.so:devel/boost-libs
-USES+= eigen:3 pkgconfig shebangfix
+USES+= eigen:3 pkgconfig qt:4 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 -DENABLE_OPENCV3:BOOL=true
@@ -52,7 +52,8 @@
PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
-MYSQL_USE= MYSQL=server QT4=sql-mysql_run
+MYSQL_USES= qt:4
+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
@@ -114,12 +114,12 @@
LICENSE?= GPLv2
-USES+= tar:bzip2
+USES+= qt:4 tar:bzip2
.if !defined(NO_BUILD)
USES+= cmake:noninja kde: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/digikam/Makefile
===================================================================
--- graphics/digikam/Makefile
+++ graphics/digikam/Makefile
@@ -31,7 +31,7 @@
libtiff.so:graphics/tiff
USES= cmake:outsource compiler:c++11-lib eigen:3 jpeg kde:5 pkgconfig \
- shebangfix tar:xz
+ qt:5 shebangfix tar:xz
USE_GNOME= glib20 libxml2 libxslt
USE_KDE= archive auth bookmarks calendarcore codecs completion config \
configwidgets coreaddons crash doctools ecm filemetadata \
@@ -39,7 +39,7 @@
kio marble libkipi notifications notifyconfig parts service \
solid sonnet textwidgets threadweaver unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network opengl printsupport sql \
+USE_QT= concurrent core dbus gui network opengl printsupport sql \
webkit widgets x11extras xml \
sql-sqlite3_run \
buildtools_build qmake_build
@@ -66,7 +66,8 @@
MULTIMEDIA_CMAKE_BOOL= ENABLE_MEDIAPLAYER
MULTIMEDIA_LIB_DEPENDS= libQtAV.so:multimedia/QtAV
-MYSQL_USE= MYSQL=server QT5=sql-mysql_run
+MYSQL_USES= qt:5
+MYSQL_USE= MYSQL=server QT=sql-mysql_run
MYSQL_CMAKE_BOOL= ENABLE_INTERNALMYSQL \
ENABLE_MYSQLSUPPORT
MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
Index: graphics/dilay/Makefile
===================================================================
--- graphics/dilay/Makefile
+++ graphics/dilay/Makefile
@@ -13,12 +13,12 @@
BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm
-USES= compiler:c++14-lang gmake qmake
+USES= compiler:c++14-lang gmake qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= abau
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
MAKE_JOBS_UNSAFE= yes # Workaround for: https://github.com/abau/dilay/issues/19 parallel build fails (still a problem despite having been closed)
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/drawpile/Makefile
===================================================================
--- graphics/drawpile/Makefile
+++ graphics/drawpile/Makefile
@@ -16,10 +16,10 @@
libminiupnpc.so:net/miniupnpc \
libsodium.so:security/libsodium
-USES= cmake:outsource desktop-file-utils kde:5 pkgconfig shared-mime-info
+USES= cmake:outsource desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME:tl}
-USE_QT5= core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
+USE_QT= core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
USE_KDE= archive
OPTIONS_DEFINE= DOCS
Index: graphics/dspdfviewer/Makefile
===================================================================
--- graphics/dspdfviewer/Makefile
+++ graphics/dspdfviewer/Makefile
@@ -19,8 +19,8 @@
CONFIGURE_WRKSRC= ${WRKSRC}/build
INSTALL_WRKSRC= ${WRKSRC}/build
-USES= cmake pkgconfig
-USE_QT5= buildtools_build core gui qmake_build linguisttools widgets xml
+USES= cmake pkgconfig qt:5
+USE_QT= buildtools_build core gui qmake_build linguisttools widgets xml
CMAKE_ARGS= -DPOPPLER_LIBRARIES=${LOCALBASE}/lib/libpoppler-qt5.so -DBuildTests=OFF
USE_LDCONFIG= yes
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= qmake qt:4
+USE_QT= gui xml uic_build moc_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 qmake qt:4
+USE_QT= corelib gui xml moc_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
@@ -13,8 +13,8 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
-USE_QT4= corelib gui opengl xml uic_build moc_build rcc_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= corelib gui opengl xml uic_build moc_build rcc_build
USE_GL= gl glu
OPTIONS_DEFINE= SSE2
Index: graphics/gle-graphics/Makefile
===================================================================
--- graphics/gle-graphics/Makefile
+++ graphics/gle-graphics/Makefile
@@ -44,8 +44,8 @@
USE_GL= yes
USE_LDCONFIG= yes
-USE_QT4= corelib gui moc network opengl rcc qmake_build
-USES= gmake ncurses pathfix
+USE_QT= corelib gui moc network opengl rcc qmake_build
+USES= gmake ncurses pathfix qt:4
CPPFLAGS+= -I${NCURSESINC}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
Index: graphics/gmic-qt/Makefile
===================================================================
--- graphics/gmic-qt/Makefile
+++ graphics/gmic-qt/Makefile
@@ -20,8 +20,8 @@
libfftw3.so:math/fftw3 \
libpng.so:graphics/png
-USES= cmake:outsource compiler:c++14-lang pkgconfig
-USE_QT5= core gui network widgets \
+USES= cmake:outsource compiler:c++14-lang pkgconfig qt:5
+USE_QT= core gui network widgets \
buildtools_build linguisttools_build qmake_build
USE_XORG= ice sm x11 xext
Index: graphics/gnash/Makefile
===================================================================
--- graphics/gnash/Makefile
+++ graphics/gnash/Makefile
@@ -74,7 +74,7 @@
GSTREAMER_DESC= GStreamer media handler
VAAPI_DESC= VAAPI support (requires FFMPEG)
-KDE4_USES= kde:4
+KDE4_USES= kde:4 qt:4
CYGNAL_CONFIGURE_ENABLE= cygnal
.include <bsd.port.options.mk>
@@ -131,7 +131,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/gpxsee/Makefile
===================================================================
--- graphics/gpxsee/Makefile
+++ graphics/gpxsee/Makefile
@@ -23,10 +23,11 @@
OPTIONS_DEFINE= NLS TIFF
OPTIONS_DEFAULT= TIFF
OPTIONS_SUB= yes
-NLS_USE= QT5=linguisttools_build
-NLS_USES= gettext-runtime
+NLS_USE= QT=linguisttools_build
+NLS_USES= gettext-runtime qt:5
TIFF_DESC= Support for TIFF
-TIFF_USE= QT5=imageformats_run
+TIFF_USES= qt:5
+TIFF_USE= QT=imageformats_run
do-patch:
@${REINPLACE_CMD} -e "s|/usr/share/gpxsee|${DATADIR}|" ${WRKSRC}/src/config.h
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 <bsd.port.mk>
Index: graphics/gwenview/Makefile
===================================================================
--- graphics/gwenview/Makefile
+++ graphics/gwenview/Makefile
@@ -13,14 +13,14 @@
liblcms2.so:graphics/lcms2 \
libpng16.so:graphics/png
-USES= cmake:outsource gettext jpeg pkgconfig kde:5 tar:xz
+USES= cmake:outsource gettext jpeg pkgconfig kde:5 qt:5 tar:xz
USE_KDE= activities auth baloo bookmarks codecs completion config \
configwidgets coreaddons ecm emoticons filemetadata i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kimageformats kio libkdcraw libkipi \
notifications parts service solid sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network opengl phonon4 printsupport \
+USE_QT= concurrent core dbus gui network opengl phonon4 printsupport \
svg widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11
Index: graphics/ipe/Makefile
===================================================================
--- graphics/ipe/Makefile
+++ graphics/ipe/Makefile
@@ -19,9 +19,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 qmake_build widgets
USE_TEX= pdftex
MAKE_ENV= DL_LIBS="" \
INSTALL_DIR="${MKDIR}" \
Index: graphics/kamera-kde4/Makefile
===================================================================
--- graphics/kamera-kde4/Makefile
+++ graphics/kamera-kde4/Makefile
@@ -10,8 +10,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 <bsd.port.mk>
Index: graphics/kamera/Makefile
===================================================================
--- graphics/kamera/Makefile
+++ graphics/kamera/Makefile
@@ -9,10 +9,10 @@
LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons doctools ecm i18n \
kio service widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: graphics/kcolorchooser-kde4/Makefile
===================================================================
--- graphics/kcolorchooser-kde4/Makefile
+++ graphics/kcolorchooser-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: graphics/kcolorchooser/Makefile
===================================================================
--- graphics/kcolorchooser/Makefile
+++ graphics/kcolorchooser/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE application to select colors from the screen or from a palette
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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/kdegraphics-mobipocket-kde4/Makefile
===================================================================
--- graphics/kdegraphics-mobipocket-kde4/Makefile
+++ graphics/kdegraphics-mobipocket-kde4/Makefile
@@ -9,9 +9,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 <bsd.port.mk>
Index: graphics/kdegraphics-mobipocket/Makefile
===================================================================
--- graphics/kdegraphics-mobipocket/Makefile
+++ graphics/kdegraphics-mobipocket/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Mobipocket plugins for Strigi indexing and thumbnails
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons ecm jobwidgets kio service \
widgetsaddons
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: graphics/kdegraphics-strigi-analyzer-kde4/Makefile
===================================================================
--- graphics/kdegraphics-strigi-analyzer-kde4/Makefile
+++ graphics/kdegraphics-strigi-analyzer-kde4/Makefile
@@ -11,8 +11,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 <bsd.port.mk>
Index: graphics/kdegraphics-svgpart-kde4/Makefile
===================================================================
--- graphics/kdegraphics-svgpart-kde4/Makefile
+++ graphics/kdegraphics-svgpart-kde4/Makefile
@@ -10,8 +10,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 <bsd.port.mk>
Index: graphics/kdegraphics-svgpart/Makefile
===================================================================
--- graphics/kdegraphics-svgpart/Makefile
+++ graphics/kdegraphics-svgpart/Makefile
@@ -8,11 +8,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= SVG KPart
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource 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= core dbus gui network svg widgets xml \
+USE_QT= core dbus gui network svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: graphics/kdegraphics-thumbnailers-kde4/Makefile
===================================================================
--- graphics/kdegraphics-thumbnailers-kde4/Makefile
+++ graphics/kdegraphics-thumbnailers-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: graphics/kdegraphics-thumbnailers/Makefile
===================================================================
--- graphics/kdegraphics-thumbnailers/Makefile
+++ graphics/kdegraphics-thumbnailers/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Thumbnailers for various graphics file formats
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons ecm jobwidgets libkdcraw \
libkexiv2 kio service widgetsaddons
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: graphics/kdegraphics/Makefile
===================================================================
--- graphics/kdegraphics/Makefile
+++ graphics/kdegraphics/Makefile
@@ -7,8 +7,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Graphics utilities for KDE (meta port)
-USES= kde:5 metaport
-USE_QT5= #
+USES= kde:5 metaport qt:5
+USE_QT= #
OPTIONS_DEFINE= GPHOTO \
GWENVIEW \
Index: graphics/kdiagram/Makefile
===================================================================
--- graphics/kdiagram/Makefile
+++ graphics/kdiagram/Makefile
@@ -12,9 +12,9 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL.txt
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= core gui linguisttools printsupport sql svg widgets \
+USE_QT= core gui linguisttools printsupport sql svg widgets \
buildtools_build qmake_build
PLIST_SUB= SHLIB_VER="${PORTVERSION}" \
Index: graphics/kf5-kimageformats/Makefile
===================================================================
--- graphics/kf5-kimageformats/Makefile
+++ graphics/kf5-kimageformats/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= 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= archive ecm
-USE_QT5= buildtools_build core gui printsupport qmake_build widgets
+USE_QT= buildtools_build core gui printsupport qmake_build widgets
OPTIONS_DEFINE= OPENEXR
OPTIONS_DEFAULT= OPENEXR
Index: graphics/kf5-kplotting/Makefile
===================================================================
--- graphics/kf5-kplotting/Makefile
+++ graphics/kf5-kplotting/Makefile
@@ -7,8 +7,8 @@
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= buildtools_build core gui qmake_build testlib widgets
+USE_QT= buildtools_build core gui qmake_build testlib widgets
.include <bsd.port.mk>
Index: graphics/kf5-prison/Makefile
===================================================================
--- graphics/kf5-prison/Makefile
+++ graphics/kf5-prison/Makefile
@@ -10,8 +10,8 @@
LIB_DEPENDS= libdmtx.so:graphics/libdmtx \
libqrencode.so:graphics/libqrencode
-USES= cmake:outsource compiler:c++11-lang kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lang kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build core gui qmake_build testlib widgets
+USE_QT= buildtools_build core gui qmake_build testlib widgets
.include <bsd.port.mk>
Index: graphics/kgraphviewer/Makefile
===================================================================
--- graphics/kgraphviewer/Makefile
+++ graphics/kgraphviewer/Makefile
@@ -14,12 +14,12 @@
LIB_DEPENDS= libgvc.so:graphics/graphviz
-USES= cmake:outsource desktop-file-utils kde:5 tar:xz pkgconfig
+USES= cmake:outsource desktop-file-utils kde:5 qt:5 tar:xz pkgconfig
USE_KDE= auth codecs completion config configwidgets \
coreaddons i18n iconthemes jobwidgets kio parts service \
sonnet textwidgets widgetsaddons xmlgui \
ecm_build
-USE_QT5= core dbus gui network printsupport svg widgets xml \
+USE_QT= core dbus gui network printsupport svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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/kimagemapeditor/Makefile
===================================================================
--- graphics/kimagemapeditor/Makefile
+++ graphics/kimagemapeditor/Makefile
@@ -8,13 +8,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE generator of HTML image maps
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews \
jobwidgets js kdelibs4support khtml kio notifications \
parts service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: graphics/kipiplugins/Makefile
===================================================================
--- graphics/kipiplugins/Makefile
+++ graphics/kipiplugins/Makefile
@@ -12,11 +12,11 @@
LIB_DEPENDS= libdigikamcore.so:graphics/digikam
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio libkipi service \
solid widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml xmlpatterns \
+USE_QT= core dbus gui network printsupport widgets xml xmlpatterns \
buildtools_build qmake_build
CMAKE_ON= DIGIKAMSC_COMPILE_KIPIPLUGINS
Index: graphics/klatexformula/Makefile
===================================================================
--- graphics/klatexformula/Makefile
+++ graphics/klatexformula/Makefile
@@ -14,8 +14,8 @@
BUILD_DEPENDS= help2man:misc/help2man
USES= cmake:outsource desktop-file-utils ghostscript:run \
- shared-mime-info localbase
-USE_QT4= gui xml dbus designer_build linguisttools_build \
+ qt:4 shared-mime-info localbase
+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-kde4/Makefile
===================================================================
--- graphics/kolourpaint-kde4/Makefile
+++ graphics/kolourpaint-kde4/Makefile
@@ -8,9 +8,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 <bsd.port.mk>
Index: graphics/kolourpaint/Makefile
===================================================================
--- graphics/kolourpaint/Makefile
+++ graphics/kolourpaint/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE paint program
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm emoticons guiaddons i18n iconthemes init \
itemmodels itemviews jobwidgets kdelibs4support kio libkexiv2 \
libksane notifications parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= dbus core gui network printsupport widgets xml \
+USE_QT= dbus core gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: graphics/kphotoalbum-kde4/Makefile
===================================================================
--- graphics/kphotoalbum-kde4/Makefile
+++ graphics/kphotoalbum-kde4/Makefile
@@ -16,9 +16,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 qt:4 shebangfix 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/kphotoalbum/Makefile
===================================================================
--- graphics/kphotoalbum/Makefile
+++ graphics/kphotoalbum/Makefile
@@ -14,12 +14,12 @@
libKF5KGeoMap.so:astro/libkgeomap \
libKF5Kipi.so:graphics/libkipi
-USES= cmake:outsource jpeg kde:5 pkgconfig shebangfix tar:xz
+USES= cmake:outsource jpeg kde:5 pkgconfig qt:5 shebangfix tar:xz
USE_KDE= archive auth codecs completion config \
configwidgets coreaddons ecm i18n \
iconthemes jobwidgets kio marble service \
sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 sql webkit \
+USE_QT= core dbus gui network phonon4 sql webkit \
widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= scripts/open-raw.pl scripts/kpa-backup.sh
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-kde4/Makefile
===================================================================
--- graphics/kqtquickcharts-kde4/Makefile
+++ graphics/kqtquickcharts-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: graphics/krita/Makefile
===================================================================
--- graphics/krita/Makefile
+++ graphics/krita/Makefile
@@ -31,10 +31,10 @@
libxcb-util.so:x11/xcb-util
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- eigen:3 gettext jpeg kde:5 pkgconfig shared-mime-info
+ eigen:3 gettext jpeg kde:5 pkgconfig qt:5 shared-mime-info
USE_KDE= archive completion config coreaddons crash guiaddons i18n \
itemmodels itemviews kio service widgetsaddons windowsystem
-USE_QT5= concurrent core dbus gui multimedia network printsupport \
+USE_QT= concurrent core dbus gui multimedia network printsupport \
qml quick svg testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm xcb xext xi
Index: graphics/ksaneplugin-kde4/Makefile
===================================================================
--- graphics/ksaneplugin-kde4/Makefile
+++ graphics/ksaneplugin-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: graphics/ksnapshot-kde4/Makefile
===================================================================
--- graphics/ksnapshot-kde4/Makefile
+++ graphics/ksnapshot-kde4/Makefile
@@ -8,9 +8,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 <bsd.port.mk>
Index: graphics/libQGLViewer/Makefile
===================================================================
--- graphics/libQGLViewer/Makefile
+++ graphics/libQGLViewer/Makefile
@@ -12,9 +12,9 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENCE
-USES= qmake
+USES= qmake qt:5
USE_GL= gl glu
-USE_QT5= core designer gui opengl widgets xml buildtools_build
+USE_QT= core designer gui opengl widgets xml buildtools_build
USE_LDCONFIG= yes
PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:C/\.[0-9]$//} SHL1=${DISTVERSION:C/\.[0-9]\.[0-9]$//}
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/libkdcraw/Makefile
===================================================================
--- graphics/libkdcraw/Makefile
+++ graphics/libkdcraw/Makefile
@@ -15,9 +15,9 @@
CMAKE_ARGS+= -DWITH_OpenMP:BOOL=False \
-DENABLE_RAWSPEED=True
-USES= cmake:outsource compiler:c++11-lang jpeg kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lang jpeg kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= core gui \
+USE_QT= core gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
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/libkexiv2/Makefile
===================================================================
--- graphics/libkexiv2/Makefile
+++ graphics/libkexiv2/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= libexiv2.so:graphics/exiv2
-USES= cmake:outsource compiler:c++11-lang kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= core gui \
+USE_QT= core gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: graphics/libkface/Makefile
===================================================================
--- graphics/libkface/Makefile
+++ graphics/libkface/Makefile
@@ -19,9 +19,9 @@
LIB_DEPENDS= libopencv_ml.so:graphics/opencv
-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 <bsd.port.mk>
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/libkipi/Makefile
===================================================================
--- graphics/libkipi/Makefile
+++ graphics/libkipi/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Image Plugin Interface
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
libkdcraw libkexiv2 service widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: graphics/libksane-kde4/Makefile
===================================================================
--- graphics/libksane-kde4/Makefile
+++ graphics/libksane-kde4/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/libksane/Makefile
===================================================================
--- graphics/libksane/Makefile
+++ graphics/libksane/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= libsane.so:graphics/sane-backends
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config ecm i18n sonnet textwidgets wallet widgetsaddons
-USE_QT5= core gui testlib widgets \
+USE_QT= core gui testlib widgets \
buildtools_build qmake_build
USE_LDCONFIG= yes
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
WRKSRC= ${WRKDIR}/${PORTNAME}
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 gui printsupport sql webkit xml \
+USES= cmake:outsource jpeg pkgconfig qt:5 tar:bzip2
+USE_QT= concurrent 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
@@ -23,8 +23,8 @@
BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-msse2"
-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
@@ -16,9 +16,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 linguisttools \
+USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
network printsupport svg widgets x11extras
USE_LXQT= buildtools libfmqt
USE_XORG= ice sm x11 xcb xext xfixes
Index: graphics/lximageqt-l10n/Makefile
===================================================================
--- graphics/lximageqt-l10n/Makefile
+++ graphics/lximageqt-l10n/Makefile
@@ -17,8 +17,8 @@
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
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
@@ -26,9 +26,9 @@
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= uses SSE instructions
-USES= cmake eigen:3 jpeg tar:bzip2
+USES= cmake eigen:3 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/natron/Makefile
===================================================================
--- graphics/natron/Makefile
+++ graphics/natron/Makefile
@@ -25,7 +25,7 @@
libpyside-${PYTHON_VERSION}.so:devel/pyside \
libfreetype.so:print/freetype2
-USES= pkgconfig python qmake shebangfix desktop-file-utils shared-mime-info \
+USES= pkgconfig python qmake qt:4 shebangfix desktop-file-utils shared-mime-info \
gettext-runtime
USE_GITHUB= yes
GH_ACCOUNT= MrKepzie
@@ -37,7 +37,7 @@
MrKepzie:tinydir:60f0905:tinydir/libs/SequenceParsing/tinydir \
devernay:openfx:3056fd6:openfx/libs/OpenFX
-USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build network opengl
+USE_QT= corelib gui moc_build qmake_build rcc_build uic_build network opengl
USE_XORG= x11 pixman
USE_GL= gl
Index: graphics/nomacs/Makefile
===================================================================
--- graphics/nomacs/Makefile
+++ graphics/nomacs/Makefile
@@ -17,8 +17,8 @@
liblcms2.so:graphics/lcms2 \
libtbb.so:devel/tbb
-USES= cmake desktop-file-utils dos2unix pkgconfig tar:bzip2
-USE_QT5= concurrent core gui network printsupport svg widgets \
+USES= cmake desktop-file-utils dos2unix pkgconfig qt:5 tar:bzip2
+USE_QT= concurrent core gui network printsupport svg widgets \
buildtools_build linguisttools_build qmake_build
DOS2UNIX_REGEX= .*\.(cpp|h|txt)
Index: graphics/okular-kde4/Makefile
===================================================================
--- graphics/okular-kde4/Makefile
+++ graphics/okular-kde4/Makefile
@@ -19,10 +19,10 @@
libepub.so:textproc/ebook-tools \
libqmobipocket.so:graphics/kdegraphics-mobipocket-kde4
-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/okular/Makefile
===================================================================
--- graphics/okular/Makefile
+++ graphics/okular/Makefile
@@ -24,14 +24,14 @@
libzip.so:archivers/libzip
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- gettext jpeg kde:5 pkgconfig tar:xz
+ gettext jpeg kde:5 pkgconfig qt:5 tar:xz
USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons dbusaddons ecm emoticons i18n \
iconthemes init itemmodels itemviews jobwidgets js \
kdelibs4support khtml kio libkexiv2 parts pty \
service solid sonnet textwidgets threadweaver wallet \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport qml quick speech \
+USE_QT= core dbus gui network phonon4 printsupport qml quick speech \
svg widgets xml \
buildtools_build qmake_build
Index: graphics/opencsg/Makefile
===================================================================
--- graphics/opencsg/Makefile
+++ graphics/opencsg/Makefile
@@ -14,9 +14,9 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/../license.txt
-USES= compiler:c++11-lang qmake
+USES= compiler:c++11-lang qmake qt:4
USE_GL= gl glew
-USE_QT4= qmake_build
+USE_QT= qmake_build
WRKSRC= ${WRKDIR}/${DISTNAME}/src
PLIST_SUB= PORTVERSION=${PORTVERSION}
Index: graphics/openorienteering-mapper/Makefile
===================================================================
--- graphics/openorienteering-mapper/Makefile
+++ graphics/openorienteering-mapper/Makefile
@@ -16,8 +16,8 @@
libproj.so:graphics/proj
USES= cmake:outsource,noninja compiler:c++14-lang \
- desktop-file-utils gmake shared-mime-info
-USE_QT5= buildtools_build help qmake_build core gui \
+ desktop-file-utils gmake qt:5 shared-mime-info
+USE_QT= buildtools_build help qmake_build core gui \
location network printsupport sensors widgets
USE_GITHUB= yes
GH_ACCOUNT= OpenOrienteering
@@ -32,19 +32,22 @@
OPTIONS_SUB= yes
DOCS_CMAKE_BOOL= Mapper_WITH_DOCS
DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
-DOCS_USE= QT5=assistant_run
+DOCS_USES= qt:5
+DOCS_USE= QT=assistant_run
EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES
GDAL_DESC= Use the GDAL library
GDAL_CMAKE_BOOL= Mapper_USE_GDAL
GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal
NLS_CMAKE_BOOL= Mapper_WITH_NLS
NLS_BUILD_DEPENDS= gsed:textproc/gsed
-NLS_USE= QT5=linguisttools_build
-NLS_USES= gettext-runtime
+NLS_USE= QT=linguisttools_build
+NLS_USES= gettext-runtime qt:5
TEST_CMAKE_BOOL= Mapper_WITH_TEST
-TEST_USE= QT5=testlib_build
+TEST_USES= qt:5
+TEST_USE= QT=testlib_build
TEST_TEST_TARGET= test
TIFF_DESC= Support for TIFF
-TIFF_USE= QT5=imageformats
+TIFF_USES= qt:5
+TIFF_USE= QT=imageformats
.include <bsd.port.mk>
Index: graphics/oyranos/Makefile
===================================================================
--- graphics/oyranos/Makefile
+++ graphics/oyranos/Makefile
@@ -30,11 +30,11 @@
USE_GITHUB= yes
GH_ACCOUNT= oyranos-cms
-USES= cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig
+USES= cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig qt:4
USE_GL= gl
USE_LDCONFIG= yes
USE_GNOME= libxml2
-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= ice sm x11 xcursor xext xfixes xinerama xrandr xft 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
@@ -19,8 +19,8 @@
LIB_DEPENDS= libming.so:graphics/ming \
libpng.so:graphics/png
-USES= qmake zip
-USE_QT4= gui opengl xml moc_build rcc_build
+USES= qmake qt:4 zip
+USE_QT= gui opengl xml moc_build rcc_build
USE_GL= gl
QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/ming
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
Index: graphics/photivo/Makefile
===================================================================
--- graphics/photivo/Makefile
+++ graphics/photivo/Makefile
@@ -37,8 +37,10 @@
OPTIONS_DEFINE= QT4
QT4_DESC= Build against Qt 4 instead of Qt 5
-QT4_USE= QT4=${_QT4_DEPS:ts,}
-QT4_USE_OFF= QT5=${_QT5_DEPS:ts,}
+QT4_USES= qt:4
+QT4_USES_OFF= qt:5
+QT4_USE= QT=${_QT4_DEPS:ts,}
+QT4_USE_OFF= QT=${_QT5_DEPS:ts,}
QT4_CMAKE_ON= -DFORCE_QT4:BOOL=true
post-patch:
Index: graphics/photoqt/Makefile
===================================================================
--- graphics/photoqt/Makefile
+++ graphics/photoqt/Makefile
@@ -11,8 +11,8 @@
LICENSE= GPLv2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- localbase:ldflags
-USE_QT5= core graphicaleffects gui multimedia network qml quick \
+ localbase:ldflags qt:5
+USE_QT= core graphicaleffects gui multimedia network qml quick \
quickcontrols sql svg widgets xml \
buildtools_build linguisttools_build qmake_build
Index: graphics/phototonic/Makefile
===================================================================
--- graphics/phototonic/Makefile
+++ graphics/phototonic/Makefile
@@ -15,11 +15,11 @@
LIB_DEPENDS= libexiv2.so:graphics/exiv2
-USES= desktop-file-utils gettext qmake
+USES= desktop-file-utils gettext qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= oferkv
USE_GL= gl
-USE_QT5= core gui imageformats svg widgets buildtools_build
+USE_QT= core gui imageformats svg widgets buildtools_build
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
Index: graphics/poppler/Makefile
===================================================================
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -64,7 +64,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
@@ -74,7 +75,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
# Qt from 5.7.0 on requires c++11.
USE_CXXSTD= c++11
BUILD_WRKSRC= ${WRKSRC}/qt5
Index: graphics/prison/Makefile
===================================================================
--- graphics/prison/Makefile
+++ graphics/prison/Makefile
@@ -17,8 +17,8 @@
LIB_DEPENDS= libdmtx.so:graphics/libdmtx \
libqrencode.so:graphics/libqrencode
-USES= cmake:outsource tar:xz
-USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build
+USES= cmake:outsource qt:4 tar:xz
+USE_QT= corelib gui qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
Index: graphics/py-qt4-svg/Makefile
===================================================================
--- graphics/py-qt4-svg/Makefile
+++ graphics/py-qt4-svg/Makefile
@@ -12,10 +12,10 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -27,11 +27,11 @@
libxerces-c.so:textproc/xerces-c3
USES= bison cmake compiler:features cpe desktop-file-utils \
- fortran gmake pyqt:4 python:2.7 sqlite:3
+ fortran gmake pyqt:4 python:2.7 qt:4 sqlite:3
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tu}
USE_PYQT= core gui network qscintilla2 sip sql svg xml webkit_run
-USE_QT4= corelib designer doc gui linguist_build moc_build \
+USE_QT= corelib designer doc gui linguist_build moc_build \
network qmake_build rcc_build script sql sql-pgsql \
sql-sqlite3 svg testlib uic_build webkit xml
USE_LDCONFIG= yes
Index: graphics/qt4-iconengines/Makefile
===================================================================
--- graphics/qt4-iconengines/Makefile
+++ graphics/qt4-iconengines/Makefile
@@ -10,9 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG icon engine
-USES= pkgconfig
-USE_QT4= qmake_build moc_build corelib gui svg xml
-QT_DIST= yes
+USES= pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui svg xml
HAS_CONFIGURE= yes
Index: graphics/qt4-imageformats/Makefile
===================================================================
--- graphics/qt4-imageformats/Makefile
+++ graphics/qt4-imageformats/Makefile
@@ -14,9 +14,8 @@
libpng.so:graphics/png \
libtiff.so:graphics/tiff
-USES= jpeg pkgconfig
-USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml
-QT_DIST= yes
+USES= jpeg pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build corelib gui svg xml
HAS_CONFIGURE= yes
Index: graphics/qt4-opengl/Makefile
===================================================================
--- graphics/qt4-opengl/Makefile
+++ graphics/qt4-opengl/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt OpenGL support module
-USE_QT4= qmake_build moc_build corelib gui
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: graphics/qt4-pixeltool/Makefile
===================================================================
--- graphics/qt4-pixeltool/Makefile
+++ graphics/qt4-pixeltool/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 screen magnifier
-USE_QT4= qmake_build moc_build corelib gui network
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui network
HAS_CONFIGURE= yes
Index: graphics/qt4-svg/Makefile
===================================================================
--- graphics/qt4-svg/Makefile
+++ graphics/qt4-svg/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG support module
-USE_QT4= qmake_build moc_build corelib gui
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: graphics/qt5-3d/Makefile
===================================================================
--- graphics/qt5-3d/Makefile
+++ graphics/qt5-3d/Makefile
@@ -10,9 +10,8 @@
LIB_DEPENDS= libassimp.so:multimedia/assimp
-USES= pkgconfig qmake:norecursive
-USE_QT5= concurrent core gui network qml quick buildtools_build
-QT_DIST= ${PORTNAME}
+USES= pkgconfig qmake:norecursive qt-dist:5,3d
+USE_QT= concurrent core gui network qml quick buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: graphics/qt5-graphicaleffects/Makefile
===================================================================
--- graphics/qt5-graphicaleffects/Makefile
+++ graphics/qt5-graphicaleffects/Makefile
@@ -8,8 +8,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Quick graphical effects
-USE_QT5= buildtools_build core gui quick qml
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= buildtools_build core gui quick qml
+USES= qmake qt-dist:5,graphicaleffects
.include <bsd.port.mk>
Index: graphics/qt5-imageformats/Makefile
===================================================================
--- graphics/qt5-imageformats/Makefile
+++ graphics/qt5-imageformats/Makefile
@@ -13,8 +13,7 @@
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp
-USE_QT5= core gui buildtools_build
-QT_DIST= ${PORTNAME}
-USES= localbase qmake
+USE_QT= core gui buildtools_build
+USES= localbase qmake qt-dist:5,imageformats
.include <bsd.port.mk>
Index: graphics/qt5-opengl/Makefile
===================================================================
--- graphics/qt5-opengl/Makefile
+++ graphics/qt5-opengl/Makefile
@@ -8,9 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5-compatible OpenGL support module
+USES= qmake:no_env qt-dist:5,base
USE_GL= gl
-USE_QT5= core gui widgets qmake_build buildtools_build
-QT_DIST= base
+USE_QT= core gui widgets qmake_build buildtools_build
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: graphics/qt5-pixeltool/Makefile
===================================================================
--- graphics/qt5-pixeltool/Makefile
+++ graphics/qt5-pixeltool/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 screen magnifier
-USE_QT5= core gui widgets buildtools_build
-QT_DIST= tools
-USES= qmake
+USE_QT= core gui widgets buildtools_build
+USES= qmake qt-dist:5,tools
# 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
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= core gui widgets buildtools_build
+USES= qmake qt-dist:5,svg
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: graphics/qt5-wayland/Makefile
===================================================================
--- graphics/qt5-wayland/Makefile
+++ graphics/qt5-wayland/Makefile
@@ -13,13 +13,12 @@
libwayland-client.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon
-USES= pkgconfig qmake:norecursive
+USES= pkgconfig qmake:norecursive qt-dist:5,wayland
USE_GL= egl gl
USE_GNOME= glib20
-USE_QT5= core dbus gui qml quick \
+USE_QT= core dbus gui qml quick \
buildtools_build qmake_build
USE_XORG= x11 xcomposite
-QT_DIST= ${PORTNAME}
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: graphics/qtawesome/Makefile
===================================================================
--- graphics/qtawesome/Makefile
+++ graphics/qtawesome/Makefile
@@ -21,8 +21,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_SUBDIR= QtAwesome
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= qmake qt:4 tar:bzip2
+USE_QT= corelib gui moc_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/seexpr/Makefile
===================================================================
--- graphics/seexpr/Makefile
+++ graphics/seexpr/Makefile
@@ -16,9 +16,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,11 +13,11 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource kde:5 tar:bzip2
+USES= cmake:outsource kde:5 qt:5 tar:bzip2
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio service solid \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network xml widgets \
+USE_QT= core dbus gui network xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: graphics/skanlite-kde4/Makefile
===================================================================
--- graphics/skanlite-kde4/Makefile
+++ graphics/skanlite-kde4/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libksane.so:graphics/libksane-kde4
-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 <bsd.port.mk>
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= qmake qt:4 zip
+USE_QT= qmake_build moc_build rcc_build uic_build gui
WRKSRC= ${WRKDIR}/${DISTNAME}/SmillaEnlargerSrc
Index: graphics/spectacle/Makefile
===================================================================
--- graphics/spectacle/Makefile
+++ graphics/spectacle/Makefile
@@ -11,12 +11,12 @@
libxcb-image.so:x11/xcb-util-image \
libxcb-util.so:x11/xcb-util
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
dbusaddons doctools ecm i18n jobwidgets kdeclarative kio \
libkipi newstuff notifications package service widgetsaddons \
windowsystem xmlgui
-USE_QT5= core concurrent dbus gui network printsupport qml quick \
+USE_QT= core concurrent dbus gui network printsupport qml quick \
widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xcb xext xfixes
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= qmake qt:4 zip dos2unix
USE_GL= glu
-USE_QT4= corelib gui opengl moc_build rcc_build xml script
+USE_QT= corelib gui opengl moc_build rcc_build xml script
WRKSRC= ${WRKDIR}/structure-synth
DOS2UNIX_GLOB= *.cpp *.h
Index: graphics/tiled/Makefile
===================================================================
--- graphics/tiled/Makefile
+++ graphics/tiled/Makefile
@@ -15,8 +15,8 @@
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 \
+USES= compiler:c++11-lib desktop-file-utils qmake qt:5 shared-mime-info
+USE_QT= core gui widgets opengl network \
buildtools_build linguisttools_build
USE_GL= gl
USE_LDCONFIG= yes
Index: graphics/tulip/Makefile
===================================================================
--- graphics/tulip/Makefile
+++ graphics/tulip/Makefile
@@ -47,12 +47,14 @@
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
-QT5_USE= qt5=core,gui,network,opengl,webkit,widgets \
- qt5=xml,xmlpatterns \
- qt5=buildtools_build,qmake_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
+QT_USES= qt:5
+QT5_USE= qt=core,gui,network,opengl,webkit,widgets \
+ qt=xml,xmlpatterns \
+ qt=buildtools_build,qmake_build
QT5_CMAKE_BOOL= USE_QT5_IF_INSTALLED
post-build:
Index: graphics/xpdf4/Makefile
===================================================================
--- graphics/xpdf4/Makefile
+++ graphics/xpdf4/Makefile
@@ -45,9 +45,9 @@
GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE
GUI_DESC= QT5 interface
GUI_CMAKE_ARGS+= -DNO_TEXT_SELECT:BOOL=OFF
-GUI_USE= QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg
+GUI_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg
GUI_PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}"
-GUI_USES= desktop-file-utils
+GUI_USES= desktop-file-utils qt:5
PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON
PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF
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/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
@@ -40,12 +40,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 <bsd.port.mk>
Index: irc/konversation/Makefile
===================================================================
--- irc/konversation/Makefile
+++ irc/konversation/Makefile
@@ -15,14 +15,14 @@
LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
-USES= cmake:outsource desktop-file-utils gettext kde:5 python:run shebangfix tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 python:run qt:5 shebangfix tar:xz
USE_KDE= archive auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons doctools ecm \
emoticons globalaccel i18n iconthemes idletime itemviews \
jobwidgets kio notifications notifyconfig parts service solid \
sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \
init_run
-USE_QT5= core dbus gui network phonon4 widgets xml \
+USE_QT= core dbus gui network phonon4 widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= data/scripts/bug \
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 qt:4 ssl tar:bzip2
CMAKE_ARGS= -DWANT_ESD=no -DWANT_DOXYGEN=no \
-DMANDIR=${MANPREFIX}
USE_LDCONFIG= yes
@@ -56,11 +56,13 @@
OPTIONS_DEFINE+= PHONON WEBKIT
PHONON_DESC= Build with Phonon support
-PHONON_USE= QT4=phonon
+PHONON_USES= qt:4
+PHONON_USE= QT=phonon
PHONON_CMAKE_OFF= -DWITHOUT_PHONON=yes
WEBKIT_DESC= Build with QtWebkit support
-WEBKIT_USE= QT4=webkit
+WEBKIT_USES= qt:4
+WEBKIT_USE= QT=webkit
WEBKIT_CMAKE_OFF= -DWITHOUT_QTWEBKIT=yes
.else #defined(PKGNAMESUFFIX)
CONFLICTS_INSTALL= kvirc-qt4-4.*
Index: irc/quassel/Makefile
===================================================================
--- irc/quassel/Makefile
+++ irc/quassel/Makefile
@@ -12,12 +12,12 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource compiler:c++11-lib cpe pkgconfig tar:bzip2
+USES= cmake:outsource compiler:c++11-lib cpe pkgconfig qt:5 tar:bzip2
CPE_VENDOR= quassel-irc
CPE_PRODUCT= quassel_irc
-USE_QT5= buildtools_build core network qmake_build
+USE_QT= buildtools_build core network qmake_build
CMAKE_ARGS= -DWITH_KDE=off \
-DUSE_QT5=on
@@ -32,12 +32,12 @@
CLIENT_DESC= Quassel client (for use with core)
CLIENT_CMAKE_BOOL= WANT_QTCLIENT
-CLIENT_USE= qt5=dbus,gui,phonon4,webkit,widgets
+CLIENT_USE= qt=dbus,gui,phonon4,webkit,widgets
CLIENT_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5
CORE_DESC= Quassel core server (for use with client)
CORE_CMAKE_BOOL= WANT_CORE
-CORE_USE= qt5=script,sql
+CORE_USE= qt=script,sql
CORE_LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
CORE_SUB_FILES= pkg-message
CORE_VARS= use_rc_subr=quasselcore \
@@ -48,14 +48,15 @@
MONO_DESC= Quassel standalone (monolithic binary: core+client combined)
MONO_CMAKE_BOOL= WANT_MONO
-MONO_USE= qt5=script,sql
+MONO_USE= qt=script,sql
MONO_LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+NLS_USE= QT=linguisttools_build
-PGSQL_USE= qt5=sql-pgsql
+PGSQL_USE= qt=sql-pgsql
-SQLITE3_USE= qt5=sql-sqlite3_run
+SQLITE3_USE= qt=sql-sqlite3_run
post-patch-NLS-off:
${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \
Index: japanese/fcitx-skk/Makefile
===================================================================
--- japanese/fcitx-skk/Makefile
+++ japanese/fcitx-skk/Makefile
@@ -16,7 +16,7 @@
LIB_DEPENDS= libfcitx-config.so:chinese/fcitx \
libskk.so:japanese/libskk
-USES= tar:xz compiler:c++11-lang cmake gettext pkgconfig
+USES= qt:4 tar:xz compiler:c++11-lang cmake gettext pkgconfig
INSTALLS_ICONS= yes
CMAKE_ARGS+= -DSKK_DEFAULT_PATH=${LOCALBASE}/share/skk/SKK-JISYO.L
@@ -27,7 +27,7 @@
.include <bsd.port.options.mk>
.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-kde4/Makefile
===================================================================
--- japanese/kiten-kde4/Makefile
+++ japanese/kiten-kde4/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 <bsd.port.mk>
Index: japanese/kiten/Makefile
===================================================================
--- japanese/kiten/Makefile
+++ japanese/kiten/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Japanese reference/study tool for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth archive codecs completion config configwidgets coreaddons \
crash doctools ecm i18n jobwidgets js khtml kio parts service \
sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: japanese/mozc-server/Makefile
===================================================================
--- japanese/mozc-server/Makefile
+++ japanese/mozc-server/Makefile
@@ -48,8 +48,9 @@
LICENSE_FILE_NAISTL= ${WRKSRC}/src/data/dictionary_oss/README.txt
LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
+USES+= qt:5
USE_GNOME= glib20 gtk20
-USE_QT5= buildtools core gui widgets
+USE_QT= buildtools core gui widgets
.elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
USES+= gettext-runtime
USE_XORG= xcb
Index: japanese/qt4-codecs-jp/Makefile
===================================================================
--- japanese/qt4-codecs-jp/Makefile
+++ japanese/qt4-codecs-jp/Makefile
@@ -11,8 +11,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-JP/JIS codec plugins
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
HAS_CONFIGURE= yes
Index: java/classpath/Makefile
===================================================================
--- java/classpath/Makefile
+++ java/classpath/Makefile
@@ -115,7 +115,8 @@
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
+USES+= qt:4
+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
@@ -11,8 +11,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-KR codec plugin
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
HAS_CONFIGURE= yes
Index: lang/basic256/Makefile
===================================================================
--- lang/basic256/Makefile
+++ lang/basic256/Makefile
@@ -18,9 +18,9 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= bison dos2unix qmake
+USES= bison dos2unix qmake qt:5
USE_SDL= sdl mixer
-USE_QT5= buildtools core gui multimedia network printsupport sql widgets serialport
+USE_QT= buildtools 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
@@ -7,12 +7,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 <bsd.port.mk>
Index: lang/kross-interpreters/Makefile
===================================================================
--- lang/kross-interpreters/Makefile
+++ lang/kross-interpreters/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Language interpreters to enable in-process scripting with Kross
-USES= cmake:outsource gettext kde:5 python:2.7 tar:xz
+USES= cmake:outsource gettext kde:5 python:2.7 qt:5 tar:xz
USE_KDE= ecm kross
-USE_QT5= core gui script widgets xml \
+USE_QT= core gui script widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= RUBY
Index: lang/kturtle-kde4/Makefile
===================================================================
--- lang/kturtle-kde4/Makefile
+++ lang/kturtle-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: lang/kturtle/Makefile
===================================================================
--- lang/kturtle/Makefile
+++ lang/kturtle/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Educational programming environment for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash ecm \
emoticons i18n init itemmodels kdelibs4support kio newstuff \
service sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport svg widgets xml \
+USE_QT= core dbus gui network printsupport svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: lang/py-qt5-qml/Makefile
===================================================================
--- lang/py-qt5-qml/Makefile
+++ lang/py-qt5-qml/Makefile
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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,9 +10,8 @@
BROKEN_powerpc64= Does not build
-USE_QT5= core network buildtools_build
-QT_DIST= declarative
-USES= python:build qmake
+USE_QT= core network buildtools_build
+USES= python:build qmake qt-dist:5,declarative
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src
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:4
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
@@ -9,8 +9,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= qmake qt:4 tar:tgz
+USE_QT= moc_build uic_build gui network xml rcc_build
USE_GITHUB= yes
GH_ACCOUNT= eteran
Index: mail/trojita/Makefile
===================================================================
--- mail/trojita/Makefile
+++ mail/trojita/Makefile
@@ -26,8 +26,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 <bsd.port.mk>
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/acalc/Makefile
===================================================================
--- math/acalc/Makefile
+++ math/acalc/Makefile
@@ -15,8 +15,8 @@
USE_GITHUB= yes
GH_ACCOUNT= anpp
-USES= qmake
-USE_QT4= corelib gui moc_build rcc_build uic_build
+USES= qmake qt:4
+USE_QT= corelib gui moc_build rcc_build uic_build
WRKSRC_SUBDIR= aCalc/aCalc
PLIST_FILES= bin/acalc share/pixmaps/Calculator-50.png
Index: math/analitza-kde4/Makefile
===================================================================
--- math/analitza-kde4/Makefile
+++ math/analitza-kde4/Makefile
@@ -13,9 +13,9 @@
LICENSE_FILE_GFDL= ${WRKSRC}/COPYING.DOC
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
-USES= cmake:outsource ncurses kde:4 readline tar:xz
+USES= cmake:outsource ncurses kde:4 qt:4 readline tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= corelib dbus gui opengl svg xml \
+USE_QT= corelib dbus gui opengl svg xml \
moc_build qmake_build rcc_build uic_build
USE_GL= glu
USE_LDCONFIG= yes
Index: math/analitza/Makefile
===================================================================
--- math/analitza/Makefile
+++ math/analitza/Makefile
@@ -12,10 +12,10 @@
LICENSE_FILE_GFDL= ${WRKSRC}/COPYING.DOC
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_GL= glu
USE_KDE= ecm
-USE_QT5= core gui network opengl printsupport qml quick svg widgets xml \
+USE_QT= core gui network opengl printsupport qml quick svg widgets xml \
buildtools_build linguisttools_build qmake_build
USE_LDCONFIG= yes
Index: math/cantor-kde4/Makefile
===================================================================
--- math/cantor-kde4/Makefile
+++ math/cantor-kde4/Makefile
@@ -12,9 +12,9 @@
libqalculate.so:math/libqalculate \
libanalitza.so:math/analitza-kde4
-USES= cmake:outsource kde:4 pkgconfig python:2.7 tar:xz
+USES= cmake:outsource kde:4 pkgconfig python:2.7 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/cantor/Makefile
===================================================================
--- math/cantor/Makefile
+++ math/cantor/Makefile
@@ -14,13 +14,13 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 pkgconfig python:3.4+ tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig python:3.4+ qt:5 tar:xz
USE_KDE= attica auth archive bookmarks codecs completion config \
configwidgets coreaddons crash ecm emoticons i18n iconthemes \
itemmodels itemviews init jobwidgets kdelibs4support kio \
newstuff parts pty service solid sonnet texteditor textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml xmlpatterns \
+USE_QT= core dbus gui network printsupport widgets xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: math/cgal/Makefile
===================================================================
--- math/cgal/Makefile
+++ math/cgal/Makefile
@@ -38,8 +38,9 @@
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT5}
+USES+= qt:5
CMAKE_ARGS+= -DWITH_CGAL_Qt5=ON
-USE_QT5+= core gui opengl widgets svg buildtools_build qmake_build
+USE_QT+= core gui opengl widgets svg buildtools_build qmake_build
USE_GL+= gl glu
.else
CMAKE_ARGS+= -DWITH_CGAL_Qt5=OFF
Index: math/freemat/Makefile
===================================================================
--- math/freemat/Makefile
+++ math/freemat/Makefile
@@ -27,9 +27,9 @@
libportaudio.so:audio/portaudio \
libumfpack.so:math/suitesparse
-USES= blaslapack cmake:outsource dos2unix fortran pkgconfig python:2.7,build
+USES= blaslapack cmake:outsource dos2unix fortran pkgconfig python:2.7,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/g2o/Makefile
===================================================================
--- math/g2o/Makefile
+++ math/g2o/Makefile
@@ -15,11 +15,11 @@
LIB_DEPENDS= libcxsparse.so:math/suitesparse \
libQGLViewer-qt5.so:graphics/libQGLViewer
-USES= cmake:outsource eigen:3
+USES= cmake:outsource eigen:3 qt:5
USE_GITHUB= yes
GH_ACCOUNT= RainerKuemmerle
USE_GL= gl glu
-USE_QT5= core gui opengl xml widgets buildtools_build qmake_build
+USE_QT= core gui opengl xml widgets buildtools_build qmake_build
USE_LDCONFIG= yes
CMAKE_OFF= DO_SSE_AUTODETECT
Index: math/kalgebra-kde4/Makefile
===================================================================
--- math/kalgebra-kde4/Makefile
+++ math/kalgebra-kde4/Makefile
@@ -12,10 +12,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 libkeduvocdocument automoc4
-USE_QT4= corelib declarative gui opengl \
+USE_QT= corelib declarative gui opengl \
moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
Index: math/kalgebra/Makefile
===================================================================
--- math/kalgebra/Makefile
+++ math/kalgebra/Makefile
@@ -12,11 +12,11 @@
docbook-xml>0:textproc/docbook-xml
CMAKE_ARGS= -DBUILD_mobile:BOOL=FALSE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_GL= glu
USE_KDE= auth codecs config configwidgets coreaddons doctools ecm i18n \
kio service widgetsaddons xmlgui
-USE_QT5= core dbus gui location network opengl printsupport qml quick \
+USE_QT= core dbus gui location network opengl printsupport qml quick \
svg testlib webchannel webengine widgets xml \
buildtools_build qmake_build
Index: math/kbruch-kde4/Makefile
===================================================================
--- math/kbruch-kde4/Makefile
+++ math/kbruch-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: math/kbruch/Makefile
===================================================================
--- math/kbruch/Makefile
+++ math/kbruch/Makefile
@@ -10,10 +10,10 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth config crash codecs configwidgets coreaddons doctools ecm \
i18n widgetsaddons xmlgui
-USE_QT5= core dbus gui xml widgets \
+USE_QT= core dbus gui xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: math/kcalc-kde4/Makefile
===================================================================
--- math/kcalc-kde4/Makefile
+++ math/kcalc-kde4/Makefile
@@ -11,8 +11,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 <bsd.port.mk>
Index: math/kcalc/Makefile
===================================================================
--- math/kcalc/Makefile
+++ math/kcalc/Makefile
@@ -12,10 +12,10 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs coreaddons ecm config configwidgets doctools \
guiaddons i18n init notifications widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: math/kig-kde4/Makefile
===================================================================
--- math/kig-kde4/Makefile
+++ math/kig-kde4/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= ${PY_BOOST}
USES= cmake:outsource compiler:c++11-lib kde:4 python:2.7,run \
- shebangfix tar:xz
+ qt:4 shebangfix tar:xz
USE_KDE= kdelibs soprano automoc4
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
moc_build qmake_build rcc_build uic_build
SHEBANG_FILES= pykig/pykig.py
Index: math/kig/Makefile
===================================================================
--- math/kig/Makefile
+++ math/kig/Makefile
@@ -10,12 +10,12 @@
LIB_DEPENDS= ${PY_BOOST}
USES= cmake:outsource gettext compiler:c++11-lib kde:5 \
- python:2.7,run shebangfix tar:xz
+ python:2.7,run qt:5 shebangfix tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
crash doctools ecm emoticons i18n iconthemes init itemmodels \
jobwidgets kdelibs4support kio parts service sonnet texteditor \
textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport svg widgets xml xmlpatterns \
+USE_QT= core dbus gui network printsupport svg widgets xml xmlpatterns \
buildtools_build qmake_build
SHEBANG_FILES= pykig/pykig.py
Index: math/kmplot-kde4/Makefile
===================================================================
--- math/kmplot-kde4/Makefile
+++ math/kmplot-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: math/kmplot/Makefile
===================================================================
--- math/kmplot/Makefile
+++ math/kmplot/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Mathematical function plotter for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm emoticons guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio notifications parts service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport svg widgets xml \
+USE_QT= core dbus gui network printsupport svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: math/labplot/Makefile
===================================================================
--- math/labplot/Makefile
+++ math/labplot/Makefile
@@ -31,13 +31,13 @@
NETCDF_CMAKE_BOOL= ENABLE_NETCDF
NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf
-USES= cmake:outsource desktop-file-utils kde:5 shared-mime-info tar:xz
+USES= cmake:outsource desktop-file-utils kde:5 qt:5 shared-mime-info tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio newstuff notifications parts \
service solid sonnet textwidgets unitconversion widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport svg widgets xml \
+USE_QT= core dbus gui network printsupport svg widgets xml \
buildtools_build qmake_build
DATADIR= ${PREFIX}/share/labplot2
Index: math/mathgl/Makefile
===================================================================
--- math/mathgl/Makefile
+++ math/mathgl/Makefile
@@ -53,8 +53,8 @@
MPI_LIB_DEPENDS= libmpi.so:net/openmpi
QT5_CMAKE_BOOL= enable-qt5
-QT5_USE= QT5=core,gui,opengl,printsupport,widgets,buildtools_build,qmake_build
-QT5_USES= desktop-file-utils shared-mime-info
+QT5_USE= QT=core,gui,opengl,printsupport,widgets,buildtools_build,qmake_build
+QT5_USES= desktop-file-utils qt:5 shared-mime-info
FLTK_CMAKE_BOOL= enable-fltk
FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
FLTK_USE= XORG=ice,sm,x11,xext
Index: math/mathmod/Makefile
===================================================================
--- math/mathmod/Makefile
+++ math/mathmod/Makefile
@@ -12,9 +12,9 @@
LICENSE= GPLv2
-USES= dos2unix qmake zip
+USES= dos2unix qmake qt:5 zip
USE_GL= gl
-USE_QT5= buildtools_build core gui opengl qmake_build widgets
+USE_QT= buildtools_build core gui opengl qmake_build widgets
BR_NUM= 482
Index: math/octave/Makefile
===================================================================
--- math/octave/Makefile
+++ math/octave/Makefile
@@ -40,7 +40,7 @@
libOSMesa.so:graphics/libosmesa \
libsundials_arkode.so:math/sundials
-USES= charsetfix fortran gmake libtool perl5 pkgconfig readline \
+USES= charsetfix fortran gmake libtool perl5 pkgconfig qt:5 readline \
tar:xz compiler:c++14-lang
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
USE_PERL5= build
@@ -48,7 +48,7 @@
GNU_CONFIGURE= yes
USE_JAVA= yes
JAVA_VERSION= 1.7+
-USE_QT5= core gui help network opengl \
+USE_QT= core gui help network opengl \
qmake_build buildtools_build linguist_build
USE_XORG= x11 xext xfixes xft
USE_GL= gl glu
Index: math/qtiplot/Makefile
===================================================================
--- math/qtiplot/Makefile
+++ math/qtiplot/Makefile
@@ -17,8 +17,8 @@
# qwt.5:x11-toolkits/qwt5 \
# qwtplot3d-qt4:math/qwtplot3d-qt4
-USES= dos2unix gmake qmake tar:bzip2
-USE_QT4= gui opengl svg qt3support network assistantclient \
+USES= dos2unix gmake qmake qt:4 tar:bzip2
+USE_QT= gui opengl svg qt3support network assistantclient \
moc_build rcc_build
USE_GL= glu
QMAKE_ARGS+= LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD}
@@ -34,7 +34,8 @@
DOCS_DESC= Install the QtiPlot Handbook
DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc
-DOCS_USE= QT4=assistant-adp_run
+DOCS_USES= qt:4
+DOCS_USE= QT=assistant-adp_run
PYTHON_DESC= Python scripting support
PYTHON_USES= pyqt:4 python:2.7
@@ -42,7 +43,8 @@
PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
PYTHON_VERSION=${PYTHON_VERSION}
-NLS_USE= QT4=linguisttools_build
+NLS_USES= qt:4
+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 qmake qt:4 tar:tgz
+USE_QT= gui moc_build opengl
USE_GL= glu
USE_LDCONFIG= yes
Index: math/rkward-kde/Makefile
===================================================================
--- math/rkward-kde/Makefile
+++ math/rkward-kde/Makefile
@@ -15,8 +15,8 @@
LIB_DEPENDS= libR.so:math/R \
libsoprano.so:textproc/soprano
-USES= cmake desktop-file-utils gettext fortran kde:5 php:cli shared-mime-info
-USE_QT5= buildtools core dbus gui network printsupport qmake script webkit \
+USES= cmake desktop-file-utils gettext fortran kde:5 php:cli qt:5 shared-mime-info
+USE_QT= buildtools core dbus gui network printsupport qmake script webkit \
widgets xml
USE_XORG= x11
USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons crash \
Index: math/rocs-kde4/Makefile
===================================================================
--- math/rocs-kde4/Makefile
+++ math/rocs-kde4/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/rocs/Makefile
===================================================================
--- math/rocs/Makefile
+++ math/rocs/Makefile
@@ -9,12 +9,12 @@
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= cmake:outsource gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n itemviews jobwidgets kdeclarative \
kio package parts service sonnet texteditor textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml script quick scripttools svg webkit \
+USE_QT= core dbus gui network qml script quick scripttools svg webkit \
widgets xml xmlpatterns \
buildtools_build qmake_build
Index: math/speedcrunch/Makefile
===================================================================
--- math/speedcrunch/Makefile
+++ math/speedcrunch/Makefile
@@ -12,7 +12,7 @@
LICENSE= GPLv2+
-USES= cmake:outsource
+USES= cmake:outsource qt:5
BB_ACCOUNT= heldercorreia
BB_PROJECT= ${PORTNAME}
@@ -20,7 +20,7 @@
WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
CMAKE_SOURCE_PATH= ${WRKSRC}/src
-USE_QT5= buildtools core gui help qmake_build qml widgets
+USE_QT= buildtools core gui help qmake_build qml widgets
USE_XORG= x11
post-patch:
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
@@ -118,7 +118,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,7 +126,8 @@
.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"
@@ -134,7 +135,8 @@
.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
@@ -151,9 +153,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: misc/artikulate-kde4/Makefile
===================================================================
--- misc/artikulate-kde4/Makefile
+++ misc/artikulate-kde4/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 libkeduvocdocument 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 <bsd.port.mk>
Index: misc/artikulate/Makefile
===================================================================
--- misc/artikulate/Makefile
+++ misc/artikulate/Makefile
@@ -10,11 +10,11 @@
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive attica auth codecs config configwidgets coreaddons \
crash doctools ecm i18n kdeclarative newstuff service \
widgetsaddons xmlgui
-USE_QT5= core dbus gui multimedia network qml quick sql testlib widgets \
+USE_QT= core dbus gui multimedia network qml quick sql testlib widgets \
xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: misc/bibletime/Makefile
===================================================================
--- misc/bibletime/Makefile
+++ misc/bibletime/Makefile
@@ -14,8 +14,8 @@
LIB_DEPENDS= libclucene-core.so:textproc/clucene \
libsword.so:misc/sword
-USES= cmake:outsource tar:xz ssl
-USE_QT4= corelib dbus gui iconengines network phonon qtestlib script \
+USES= cmake:outsource qt:4 tar:xz ssl
+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/crosti/Makefile
===================================================================
--- misc/crosti/Makefile
+++ misc/crosti/Makefile
@@ -12,9 +12,9 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/gpl.txt
-USES= desktop-file-utils dos2unix qmake shared-mime-info zip
+USES= desktop-file-utils dos2unix qmake qt:5 shared-mime-info zip
USE_GL= gl
-USE_QT5= concurrent core gui printsupport svg widgets buildtools_build
+USE_QT= concurrent core gui printsupport svg widgets buildtools_build
DOS2UNIX_FILES= ${PORTNAME}.pro
NO_WRKSUBDIR= yes
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
@@ -12,9 +12,9 @@
PORTSCOUT= limit:^1\.0
-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
@@ -10,9 +10,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
@@ -7,9 +7,9 @@
kf5-kdelibs4support-5.* \
kf5-kfilemetadata-5.*
-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 qt:4 tar:xz
# Support for spelling dictionaries
Index: misc/kdeedu-data/Makefile
===================================================================
--- misc/kdeedu-data/Makefile
+++ misc/kdeedu-data/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE edu data files
-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
+USE_QT= buildtools_build qmake_build
# The qmake dependency is only needed so that kf5-e-c-m can query qmake for
# some installation directories.
Index: misc/kf5-purpose/Makefile
===================================================================
--- misc/kf5-purpose/Makefile
+++ misc/kf5-purpose/Makefile
@@ -8,10 +8,10 @@
COMMENT= Offers available actions for a specific purpose
USES= cmake:outsource compiler:c++11-lang gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= intltool
USE_KDE= config coreaddons ecm i18n kdeclarative kio service widgetsaddons
-USE_QT5= concurrent core dbus gui network qml widgets xml \
+USE_QT= concurrent core dbus gui network qml widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: misc/kgeography-kde4/Makefile
===================================================================
--- misc/kgeography-kde4/Makefile
+++ misc/kgeography-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: misc/kgeography/Makefile
===================================================================
--- misc/kgeography/Makefile
+++ misc/kgeography/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE geography trainer
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash doctools ecm \
i18n iconthemes itemviews service widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: misc/klettres-kde4/Makefile
===================================================================
--- misc/klettres-kde4/Makefile
+++ misc/klettres-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: misc/klettres/Makefile
===================================================================
--- misc/klettres/Makefile
+++ misc/klettres/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Alphabet learning tool for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm emoticons i18n init itemmodels \
kdelibs4support newstuff service widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 svg widgets xml \
+USE_QT= core dbus gui network phonon4 svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: misc/krecipes-kde4/Makefile
===================================================================
--- misc/krecipes-kde4/Makefile
+++ misc/krecipes-kde4/Makefile
@@ -12,9 +12,9 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake gettext kde:4 shared-mime-info
+USES= cmake gettext kde:4 qt:4 shared-mime-info
USE_GNOME= libxml2 libxslt
-USE_QT4= corelib dbus gui qt3support sql webkit xml \
+USE_QT= corelib dbus gui qt3support sql webkit xml \
moc_build qmake_build rcc_build uic_build
USE_KDE= automoc4 kdelibs qimageblitz
@@ -24,14 +24,14 @@
OPTIONS_MULTI_DB= SQLITE MYSQL PGSQL
OPTIONS_DEFAULT= SQLITE
-SQLITE_USES= sqlite
-SQLITE_USE= QT4=sql-sqlite3_run
+SQLITE_USES= qt:4 sqlite
+SQLITE_USE= QT=sql-sqlite3_run
SQLITE_CMAKE_BOOL= WITH_Sqlite
-MYSQL_USES= mysql
-MYSQL_USE= QT4=sql-mysql_run
+MYSQL_USES= mysql qt:4
+MYSQL_USE= QT=sql-mysql_run
-PGSQL_USES= pgsql
-PGSQL_USE= QT4=sql-pgsql_run
+PGSQL_USES= pgsql qt:4
+PGSQL_USE= QT=sql-pgsql_run
.include <bsd.port.mk>
Index: misc/ktouch-kde4/Makefile
===================================================================
--- misc/ktouch-kde4/Makefile
+++ misc/ktouch-kde4/Makefile
@@ -10,9 +10,9 @@
RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts-kde4
-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/ktouch/Makefile
===================================================================
--- misc/ktouch/Makefile
+++ misc/ktouch/Makefile
@@ -7,12 +7,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Touch typing tutor for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons doctools \
ecm i18n itemviews kcmutils kdeclarative kio newstuff package \
parts service sonnet texteditor textwidgets widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network qml quick script sql testlib widgets \
+USE_QT= core dbus gui network qml quick script sql testlib widgets \
x11extras xml xmlpatterns \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xext xkbfile
Index: misc/kwordquiz-kde4/Makefile
===================================================================
--- misc/kwordquiz-kde4/Makefile
+++ misc/kwordquiz-kde4/Makefile
@@ -8,8 +8,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 libkeduvocdocument automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
Index: misc/kwordquiz/Makefile
===================================================================
--- misc/kwordquiz/Makefile
+++ misc/kwordquiz/Makefile
@@ -7,14 +7,14 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Flash card trainer for KDE Applications
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash doctools ecm emoticons guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets kdeclarative \
kdelibs4support kio libkeduvocdocument newstuff notifications \
notifyconfig parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: misc/libkdeedu-kde4/Makefile
===================================================================
--- misc/libkdeedu-kde4/Makefile
+++ misc/libkdeedu-kde4/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 <bsd.port.mk>
Index: misc/libkeduvocdocument/Makefile
===================================================================
--- misc/libkeduvocdocument/Makefile
+++ misc/libkeduvocdocument/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Library for reading and writing vocabulary files
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive config coreaddons ecm i18n kio service
-USE_QT5= core gui xml \
+USE_QT= core gui xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: misc/openmvg/Makefile
===================================================================
--- misc/openmvg/Makefile
+++ misc/openmvg/Makefile
@@ -19,14 +19,14 @@
libpng16.so:graphics/png \
libtiff.so:graphics/tiff
-USES= cmake:outsource eigen:3 jpeg
+USES= cmake:outsource eigen:3 jpeg qt:5
USE_GITHUB= yes
GH_ACCOUNT= openMVG
GH_PROJECT= openMVG
GH_TUPLE= openMVG-thirdparty:cereal:37fca60:cereal/dependencies/cereal \
openMVG-thirdparty:osi_clp:a25a980:osi/dependencies/osi_clp
WRKSRC_SUBDIR= src
-USE_QT5= core gui opengl svg widgets buildtools_build qmake_build
+USE_QT= core gui opengl svg widgets buildtools_build qmake_build
USE_LDCONFIG= yes
CMAKE_ARGS= -DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
Index: misc/parley-kde4/Makefile
===================================================================
--- misc/parley-kde4/Makefile
+++ misc/parley-kde4/Makefile
@@ -8,10 +8,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 libkeduvocdocument 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 <bsd.port.mk>
Index: misc/parley/Makefile
===================================================================
--- misc/parley/Makefile
+++ misc/parley/Makefile
@@ -10,14 +10,14 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_GNOME= libxml2 libxslt
USE_KDE= attica auth codecs completion configwidgets coreaddons config \
crash doctools ecm i18n jobwidgets kcmutils kio newstuff \
notifications kross khtml service sonnet textwidgets \
widgetsaddons xmlgui \
libkeduvocdocument
-USE_QT5= concurrent core dbus gui location network multimedia qml quick \
+USE_QT= concurrent core dbus gui location network multimedia qml quick \
script svg webchannel webengine widgets xml \
buildtools_build qmake_build
USE_XORG= x11 xrender
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= qmake qt:4
+USE_QT= moc_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 qmake qt:4 zip
INSTALLS_ICONS= yes
-USE_QT4= gui xml uic_build moc_build multimedia \
+USE_QT= gui xml uic_build moc_build multimedia \
rcc_build
LDFLAGS= -lz
DOS2UNIX_FILES= rc/alarm.pri
Index: misc/qt4-doc/Makefile
===================================================================
--- misc/qt4-doc/Makefile
+++ misc/qt4-doc/Makefile
@@ -10,8 +10,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation
-USE_QT4= # empty
-QT_DIST= yes
+USES= qmake:no_configure qt-dist:4
NO_BUILD= yes
EXTRACT_AFTER_ARGS= '${DISTNAME}/doc'
Index: misc/qt4-l10n/Makefile
===================================================================
--- misc/qt4-l10n/Makefile
+++ misc/qt4-l10n/Makefile
@@ -9,8 +9,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localized messages
-USE_QT4= linguisttools_build
-QT_DIST= yes
+USES= qmake:no_configure qt-dist:4
+USE_QT= linguisttools_build
NO_ARCH= yes
Index: misc/qt4-qtconfig/Makefile
===================================================================
--- misc/qt4-qtconfig/Makefile
+++ misc/qt4-qtconfig/Makefile
@@ -10,10 +10,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 graphical configuration utility
-USES= pkgconfig
-USE_QT4= qmake_build moc_build rcc_build uic_build \
+USES= pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build uic_build \
corelib dbus gui xml
-QT_DIST= yes
HAS_CONFIGURE= yes
@@ -42,7 +41,8 @@
OPTIONS_DEFAULT=PHONON
PHONON_DESC= Phonon multimedia framework support (implies GStreamer)
-PHONON_USE= GSTREAMER=yes QT4=phonon,phonon-gst
+PHONON_USES= qt-dist:4
+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
@@ -10,13 +10,12 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 demonstration and example applications
-USES= pkgconfig
+USES= pkgconfig qmake:no_env qt-dist:4
USE_GSTREAMER= yes
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib designer \
+USE_QT= 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
-QT_DIST= yes
HAS_CONFIGURE= yes
Index: misc/qt5-doc/Makefile
===================================================================
--- misc/qt5-doc/Makefile
+++ misc/qt5-doc/Makefile
@@ -18,8 +18,8 @@
# tar: Damaged 7-Zip archive
# Depend on p7zip across all versions because Uses/7z.mk does not work if
# included after bsd.port.pre.mk.
-USES= 7z:p7zip
-USE_QT5= # we just need access to QT5_VERSION and other variables.
+USES= 7z:p7zip qt:5
+USE_QT= # we just need access to QT5_VERSION and other variables.
DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr
NO_ARCH= yes
Index: misc/qt5-examples/Makefile
===================================================================
--- misc/qt5-examples/Makefile
+++ misc/qt5-examples/Makefile
@@ -15,8 +15,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}/distinfo
Index: misc/qt5-l10n/Makefile
===================================================================
--- misc/qt5-l10n/Makefile
+++ misc/qt5-l10n/Makefile
@@ -8,8 +8,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localized messages
-USES= qmake
-USE_QT5= qmake_build linguisttools_build
-QT_DIST= translations
+USES= qmake qt-dist:5,translations
+USE_QT= qmake_build linguisttools_build
.include <bsd.port.mk>
Index: misc/qt5ct/Makefile
===================================================================
--- misc/qt5ct/Makefile
+++ misc/qt5ct/Makefile
@@ -13,8 +13,8 @@
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 \
+USES= gettext-runtime qmake qt:5 tar:bz2
+USE_QT= core dbus gui svg widgets buildtools_build \
linguisttools_build
USE_GL= egl gl
USE_XORG= x11 xext xrender
Index: misc/saaghar/Makefile
===================================================================
--- misc/saaghar/Makefile
+++ misc/saaghar/Makefile
@@ -18,8 +18,8 @@
OPTIONS_DEFINE= DEBUG
-USES= qmake dos2unix
-USE_QT4= gui network sql xml sql-sqlite3_run \
+USES= qmake dos2unix qt:4
+USE_QT= gui network sql xml sql-sqlite3_run \
moc_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
@@ -21,11 +21,11 @@
libyaz.so:net/yaz
USES= cmake gettext kde:4 pkgconfig python:run \
- shared-mime-info shebangfix tar:bzip2
+ qt:4 shared-mime-info shebangfix tar:bzip2
USE_GNOME= libxml2 libxslt
USE_KDE= kdelibs libksane pimlibs soprano \
automoc4 qimageblitz libkcddb libkcompactdisc
-USE_QT4= corelib dbus gui network phonon svg xml \
+USE_QT= corelib dbus gui network phonon svg xml \
qmake_build moc_build uic_build rcc_build
SHEBANG_FILES= src/fetch/scripts/bedetheque.py \
Index: multimedia/2mandvd/Makefile
===================================================================
--- multimedia/2mandvd/Makefile
+++ multimedia/2mandvd/Makefile
@@ -30,9 +30,9 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= desktop-file-utils gmake perl5 qmake:norecursive shebangfix
+USES= desktop-file-utils gmake perl5 qmake:norecursive qt:4 shebangfix
SHEBANG_FILES= fake.pl
-USE_QT4= corelib gui opengl \
+USE_QT= corelib gui opengl \
linguisttools_build moc_build rcc_build uic_build
USE_GL= glu
USE_SDL= sdl
Index: multimedia/QtAV/Makefile
===================================================================
--- multimedia/QtAV/Makefile
+++ multimedia/QtAV/Makefile
@@ -16,9 +16,9 @@
LIB_DEPENDS= libass.so:multimedia/libass \
libavcodec.so:multimedia/ffmpeg
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_GL= gl
-USE_QT5= core gui network opengl qml quick sql widgets \
+USE_QT= core gui network opengl qml quick sql widgets \
buildtools_build qmake_build
USE_XORG= x11 xext xv
Index: multimedia/abby/Makefile
===================================================================
--- multimedia/abby/Makefile
+++ multimedia/abby/Makefile
@@ -13,8 +13,8 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
-USE_QT4= gui network xml moc_build rcc_build uic_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= gui network xml moc_build rcc_build uic_build
PLIST_FILES= bin/abby
Index: multimedia/avidemux/Makefile.common
===================================================================
--- multimedia/avidemux/Makefile.common
+++ multimedia/avidemux/Makefile.common
@@ -14,7 +14,6 @@
LICENSE= GPLv2
USE_GNOME= libxml2
-USE_QT4= # empty
OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
@@ -96,7 +95,8 @@
.endif
.if ${PORT_OPTIONS:MQT4}
-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
@@ -17,15 +17,16 @@
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 qmake 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_USES= qt:5
+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/bino/Makefile
===================================================================
--- multimedia/bino/Makefile
+++ multimedia/bino/Makefile
@@ -17,11 +17,11 @@
libavformat.so:multimedia/ffmpeg \
libopenal.so:audio/openal-soft
-USES= autoreconf desktop-file-utils gmake iconv pkgconfig tar:xz
+USES= autoreconf desktop-file-utils gmake iconv pkgconfig qt:5 tar:xz
USE_GL= gl glu glew
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_QT5= buildtools_build core gui opengl widgets
+USE_QT= buildtools_build core gui opengl widgets
USE_CXXSTD= c++11
# no port fow equalizer now, lirc detecting not working
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= qmake qt:4 tar:bzip2
+USE_QT= gui xml uic_build moc_build \
rcc_build network dbus webkit
PLIST_FILES= bin/${PORTNAME} \
Index: multimedia/dragon-kde4/Makefile
===================================================================
--- multimedia/dragon-kde4/Makefile
+++ multimedia/dragon-kde4/Makefile
@@ -11,8 +11,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 <bsd.port.mk>
Index: multimedia/dragon/Makefile
===================================================================
--- multimedia/dragon/Makefile
+++ multimedia/dragon/Makefile
@@ -10,12 +10,12 @@
LICENSE= GPLv2
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons doctools ecm kio service sonnet textwidgets i18n \
iconthemes jobwidgets notifications parts solid widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 widgets xml \
+USE_QT= core dbus gui network phonon4 widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: multimedia/dvbcut/Makefile
===================================================================
--- multimedia/dvbcut/Makefile
+++ multimedia/dvbcut/Makefile
@@ -39,8 +39,10 @@
OPTIONS_RADIO_QT= QT4 QT5
OPTIONS_DEFAULT= QT5
-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
+QT4_USE= QT=corelib,gui,xml,qt3support,linguisttools_build,moc_build,rcc_build,uic_build
+QT5_USES= qt:5
+QT5_USE= QT=core,gui,widgets,xml,buildtools_build,linguisttools_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:noninja gmake kde:4 pathfix pkgconfig tar:bzip2
+USES= bison cmake:noninja 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-qt/Makefile
===================================================================
--- multimedia/gstreamer1-qt/Makefile
+++ multimedia/gstreamer1-qt/Makefile
@@ -30,11 +30,13 @@
CMAKE_ARGS= -DQT_VERSION=${FLAVOR:C/qt//}
. if ${FLAVOR} == qt4
-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 localbase
+USES= cmake gettext kde:4 localbase 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
LLD_UNSAFE= yes
OPTIONS_DEFINE= MENCODER MPLAYER DVDAUTHOR
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 sql-sqlite2
USE_XORG= xscrnsaver
Index: multimedia/kamoso/Makefile
===================================================================
--- multimedia/kamoso/Makefile
+++ multimedia/kamoso/Makefile
@@ -9,13 +9,13 @@
LICENSE= GPLv2
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= glib20
USE_GSTREAMER1= yes
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio purpose \
service solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: multimedia/kdemultimedia-ffmpegthumbs-kde4/Makefile
===================================================================
--- multimedia/kdemultimedia-ffmpegthumbs-kde4/Makefile
+++ multimedia/kdemultimedia-ffmpegthumbs-kde4/Makefile
@@ -15,9 +15,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 <bsd.port.mk>
Index: multimedia/kdemultimedia-ffmpegthumbs/Makefile
===================================================================
--- multimedia/kdemultimedia-ffmpegthumbs/Makefile
+++ multimedia/kdemultimedia-ffmpegthumbs/Makefile
@@ -12,9 +12,9 @@
LIB_DEPENDS= libswscale.so:multimedia/ffmpeg
-USES= cmake:outsource kde:5 pkgconfig tar:xz
+USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz
USE_KDE= completion config coreaddons jobwidgets kio service widgetsaddons
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
===================================================================
--- multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
+++ multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
@@ -15,8 +15,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 <bsd.port.mk>
Index: multimedia/kdemultimedia/Makefile
===================================================================
--- multimedia/kdemultimedia/Makefile
+++ multimedia/kdemultimedia/Makefile
@@ -7,8 +7,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Multimedia applications (meta port)
-USES= kde:5 metaport
-USE_QT5= #
+USES= kde:5 metaport qt:5
+USE_QT= #
OPTIONS_DEFINE= DRAGON FFMPEG AUDIOCD_KIO KMIX
OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
Index: multimedia/kdenlive-kde4/Makefile
===================================================================
--- multimedia/kdenlive-kde4/Makefile
+++ multimedia/kdenlive-kde4/Makefile
@@ -17,9 +17,9 @@
RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \
${LOCALBASE}/lib/mlt/libmltqt.so:multimedia/mlt-qt4
-USES= cmake kde:4 pkgconfig shared-mime-info tar:bzip2
+USES= cmake kde:4 pkgconfig qt:4 shared-mime-info 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/kdenlive/Makefile
===================================================================
--- multimedia/kdenlive/Makefile
+++ multimedia/kdenlive/Makefile
@@ -15,12 +15,12 @@
${LOCALBASE}/lib/mlt/libmltqt.so:multimedia/mlt-qt5
USES= cmake:outsource desktop-file-utils gettext-tools pkgconfig \
- shared-mime-info kde:5 tar:xz
+ qt:5 shared-mime-info kde:5 tar:xz
USE_KDE= archive bookmarks config configwidgets coreaddons crash \
dbusaddons ecm filemetadata guiaddons iconthemes \
init_run kio newstuff notifications notifyconfig \
textwidgets widgetsaddons xmlgui
-USE_QT5= buildtools_build concurrent core dbus gui qmake_build \
+USE_QT= buildtools_build concurrent core dbus gui qmake_build \
qml quick quickcontrols_run script svg webkit widgets
USE_XORG= x11
CFLAGS+= -I${LOCALBASE}/include # linux/input.h
Index: multimedia/kf5-kmediaplayer/Makefile
===================================================================
--- multimedia/kf5-kmediaplayer/Makefile
+++ multimedia/kf5-kmediaplayer/Makefile
@@ -7,11 +7,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 <bsd.port.mk>
Index: multimedia/kmplayer-kde4/Makefile
===================================================================
--- multimedia/kmplayer-kde4/Makefile
+++ multimedia/kmplayer-kde4/Makefile
@@ -21,9 +21,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= qmake 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 \
rcc_build uic_build webkit xml xmlpatterns
QMAKEPRO= ${PORTNAME}.pro
PLIST_FILES= bin/${PORTNAME}
Index: multimedia/minitube/Makefile
===================================================================
--- multimedia/minitube/Makefile
+++ multimedia/minitube/Makefile
@@ -10,18 +10,19 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= flaviotordini
USE_GL= gl
-USE_QT5= core dbus gui network phonon4 qml script sql widgets \
+USE_QT= core dbus gui network phonon4 qml script sql widgets \
buildtools_build imageformats_run sql-sqlite3_run
QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} \
DEFINES+=APP_GOOGLE_API_KEY="${MINITUBE_GOOGLE_API_KEY}"
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+NLS_USE= QT=linguisttools_build
pre-everything::
@${CAT} ${PKGMESSAGE}
Index: multimedia/mkvtoolnix/Makefile
===================================================================
--- multimedia/mkvtoolnix/Makefile
+++ multimedia/mkvtoolnix/Makefile
@@ -49,8 +49,8 @@
NLS_CONFIGURE_WITH= gettext
QT5_DESC= Build and install GUI application (Qt 5)
-QT5_USES= desktop-file-utils shared-mime-info
-QT5_USE= QT5=buildtools_build,concurrent,core,gui,multimedia,network,quick,widgets
+QT5_USES= desktop-file-utils qt:5 shared-mime-info
+QT5_USE= QT=buildtools_build,concurrent,core,gui,multimedia,network,quick,widgets
QT5_CONFIGURE_ENABLE= qt
QT5_BUILD_DEPENDS= qmake:devel/qt5-qmake
QT5_LIB_DEPENDS= libcmark.so:textproc/cmark
Index: multimedia/mlt-qt4/Makefile
===================================================================
--- multimedia/mlt-qt4/Makefile
+++ multimedia/mlt-qt4/Makefile
@@ -4,7 +4,8 @@
CONFLICTS_INSTALL= ${PORTNAME}-qt5-*
-USE_QT4= corelib gui opengl svg xml
+USES= qt:4
+USE_QT= corelib gui opengl svg xml
MASTERDIR= ${.CURDIR:H}/mlt
SLAVEPORT= qt4
Index: multimedia/mpc-qt/Makefile
===================================================================
--- multimedia/mpc-qt/Makefile
+++ multimedia/mpc-qt/Makefile
@@ -17,8 +17,8 @@
GH_ACCOUNT= cmdrkotori
GH_TUPLE= Argon-:mpv-stats:1.1-28-gf42aa68:mpv_stats/external/mpv-stats
-USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake
-USE_QT5= qmake_build buildtools_build linguisttools_build \
+USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
+USE_QT= qmake_build buildtools_build linguisttools_build \
core dbus gui network svg_run widgets x11extras
USE_GL= gl
CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
Index: multimedia/mythtv/Makefile
===================================================================
--- multimedia/mythtv/Makefile
+++ multimedia/mythtv/Makefile
@@ -27,12 +27,12 @@
libxml2.so:textproc/libxml2
BUILD_DEPENDS= yasm:devel/yasm
-USES= gmake iconv libtool pkgconfig pathfix ssl
+USES= gmake iconv libtool pkgconfig pathfix qt:5 ssl
USE_GITHUB= yes
GH_ACCOUNT= MythTV
USE_GL= gl
USE_LDCONFIG= yes
-USE_QT5= buildtools_build core dbus gui imageformats_run \
+USE_QT= buildtools_build core dbus gui imageformats_run \
linguist_build network opengl qmake_build script sql \
sql-mysql_run webkit widgets xml
QT_NONSTANDARD= yes
Index: multimedia/obs-studio/Makefile
===================================================================
--- multimedia/obs-studio/Makefile
+++ multimedia/obs-studio/Makefile
@@ -28,10 +28,10 @@
libv4l2.so:multimedia/libv4l \
libx264.so:multimedia/libx264
-USES= cmake:outsource compiler:c++11-lib lua pkgconfig python:3.4+
+USES= cmake:outsource compiler:c++11-lib lua pkgconfig python:3.4+ qt:5
USE_GITHUB= yes
GH_ACCOUNT= obsproject
-USE_QT5= core gui widgets x11extras buildtools_build imageformats_run qmake_build
+USE_QT= core gui widgets x11extras buildtools_build imageformats_run qmake_build
USE_GL= gl
USE_XORG= ice sm x11 xcb xcomposite xext xfixes xinerama xrandr
USE_LDCONFIG= yes
Index: multimedia/phonon-designerplugin/Makefile
===================================================================
--- multimedia/phonon-designerplugin/Makefile
+++ multimedia/phonon-designerplugin/Makefile
@@ -12,9 +12,9 @@
LICENSE= LGPL21
-USE_QT4= corelib designer gui phonon \
+USE_QT= corelib designer gui phonon \
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
@@ -17,12 +17,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
@@ -17,9 +17,9 @@
LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4
-USES= cmake:outsource kde:4 pkgconfig tar:xz
+USES= cmake:outsource 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
@@ -15,9 +15,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 declarative gui testlib\
+USE_QT= corelib dbus declarative gui testlib\
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
@@ -25,12 +25,12 @@
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
unoconv:textproc/unoconv
-USES= desktop-file-utils pyqt:4 python:2.7
+USES= desktop-file-utils pyqt:4 python:2.7 qt:4
USE_PYQT= core gui \
network_run opengl_run phonon_run svg_run test_run webkit_run
USE_PYTHON= distutils autoplist
USE_GSTREAMER= good bad ugly
-USE_QT4= linguist phonon-gst
+USE_QT= linguist phonon-gst
QT_LRELEASE= ${LRELEASE}
NO_ARCH= yes
Index: multimedia/py-qt4-multimedia/Makefile
===================================================================
--- multimedia/py-qt4-multimedia/Makefile
+++ multimedia/py-qt4-multimedia/Makefile
@@ -11,10 +11,10 @@
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_PYTHON= flavors
-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
@@ -10,10 +10,10 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -20,8 +20,8 @@
CONFLICTS= ${PORTNAME}-0.*
PORTSCOUT= limit:^1\..*
-USES= cmake:outsource pkgconfig tar:bzip2
-USE_QT5= core gui widgets \
+USES= cmake:outsource pkgconfig qt:5 tar:bzip2
+USE_QT= core gui widgets \
buildtools_build linguisttools_build qmake_build
USE_LDCONFIG= yes
@@ -53,7 +53,8 @@
GOOMASM_CMAKE_BOOL= GOOM_ASM
HISTORY_DESC= Information about listened tracks
-HISTORY_USE= QT5=sql
+HISTORY_USES= qt:5
+HISTORY_USE= QT=sql
HISTORY_CMAKE_BOOL= USE_HISTORY
MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 \
Index: multimedia/qmmp-plugin-pack/Makefile
===================================================================
--- multimedia/qmmp-plugin-pack/Makefile
+++ multimedia/qmmp-plugin-pack/Makefile
@@ -19,8 +19,8 @@
CONFLICTS= ${PORTNAME}-qt5-1.*
PORTSCOUT= limit:^0.*
-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
@@ -51,12 +51,14 @@
GOOMASM_CMAKE_BOOL= GOOM_ASM
HISTORY_DESC= Information about listened tracks
-HISTORY_USE= QT4=sql,uic_build
+HISTORY_USES= qt:4
+HISTORY_USE= QT=sql,uic_build
HISTORY_CMAKE_BOOL= USE_HISTORY
MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 \
libtag.so:audio/taglib
-MPG123_USE= QT4=uic_build
+MPG123_USES= qt:4
+MPG123_USE= QT=uic_build
MPG123_CMAKE_BOOL= USE_MPG123
SRCONV_DESC= Support the sample rate converter
Index: multimedia/qmmp-qt5/Makefile
===================================================================
--- multimedia/qmmp-qt5/Makefile
+++ multimedia/qmmp-qt5/Makefile
@@ -17,8 +17,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 qt:5 tar:bzip2
+USE_QT= core gui network widgets xml \
buildtools_build linguisttools_build qmake_build
USE_LDCONFIG= yes
@@ -72,7 +72,8 @@
QSUI_CMAKE_BOOL= USE_QSUI
SKINNEDUI_DESC= Skinned GUI
-SKINNEDUI_USE= QT5=x11extras XORG=x11
+SKINNEDUI_USES= qt:5
+SKINNEDUI_USE= QT=x11extras XORG=x11
SKINNEDUI_CMAKE_BOOL= USE_SKINNED
DIR_ASSOC_DESC= inode/directory mime type association
@@ -95,7 +96,8 @@
PULSEAUDIO_CMAKE_BOOL= USE_PULSE
QTMULTIMEDIA_DESC= Support to use Qt low-level multimedia API
-QTMULTIMEDIA_USE= QT5=multimedia
+QTMULTIMEDIA_USES= qt:5
+QTMULTIMEDIA_USE= QT=multimedia
QTMULTIMEDIA_CMAKE_BOOL= USE_QTMULTIMEDIA
SHOUTCAST_LIB_DEPENDS= libogg.so:audio/libogg \
@@ -221,7 +223,8 @@
COPYPASTE_CMAKE_BOOL= USE_COPYPASTE
MPRIS_DESC= Support the Media Player Remote
-MPRIS_USE= QT5=dbus
+MPRIS_USES= qt:5
+MPRIS_USE= QT=dbus
MPRIS_CMAKE_BOOL= USE_MPRIS
SCROBBLER_DESC= Support Libre.fm/Last.fm scrobbler feature
@@ -243,15 +246,18 @@
LYRICS_DESC= Support to show lyrics using lyrics.wikia.com
LYRICS_CMAKE_BOOL= USE_LYRICS
-HAL_USE= QT5=dbus
+HAL_USES= qt:5
+HAL_USE= QT=dbus
HAL_CMAKE_BOOL= USE_HAL
HOTKEY_DESC= Support global shortcut keys
-HOTKEY_USE= QT5=x11extras XORG=x11
+HOTKEY_USES= qt:5
+HOTKEY_USE= QT=x11extras XORG=x11
HOTKEY_CMAKE_BOOL= USE_HOTKEY
GNOMEHOTKEY_DESC= Support GNOME/Cinnamon shortcut keys
-GNOMEHOTKEY_USE= QT5=dbus
+GNOMEHOTKEY_USES= qt:5
+GNOMEHOTKEY_USE= QT=dbus
GNOMEHOTKEY_CMAKE_BOOL= USE_GNOMEHOTKEY
FILEOPS_DESC= Support file operation
@@ -261,7 +267,8 @@
COVER_CMAKE_BOOL= USE_COVER
KDENOTIFY_DESC= Support to popup notifier for KDE
-KDENOTIFY_USE= QT5=dbus
+KDENOTIFY_USES= qt:5
+KDENOTIFY_USE= QT=dbus
KDENOTIFY_CMAKE_BOOL= USE_KDENOTIFY
TRACKCHANGE_DESC= Enable to run external command each track
@@ -269,7 +276,8 @@
UDISKS2_DESC= Support removable disc detection using UDisks
UDISKS2_RUN_DEPENDS= bsdisks:sysutils/bsdisks
-UDISKS2_USE= QT5=dbus
+UDISKS2_USES= qt:5
+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
@@ -16,8 +16,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
@@ -68,7 +68,8 @@
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
QSUI_DESC= Simple UI based on standard widgets set
-QSUI_USE= QT4=uic_build
+QSUI_USES= qt:4
+QSUI_USE= QT=uic_build
QSUI_CMAKE_BOOL= USE_QSUI
SKINNEDUI_DESC= Skinned GUI
@@ -95,7 +96,8 @@
PULSEAUDIO_CMAKE_BOOL= USE_PULSE
QTMULTIMEDIA_DESC= Support to use Qt low-level multimedia API
-QTMULTIMEDIA_USE= QT4=multimedia
+QTMULTIMEDIA_USES= qt:4
+QTMULTIMEDIA_USE= QT=multimedia
QTMULTIMEDIA_CMAKE_BOOL= USE_QTMULTIMEDIA
SHOUTCAST_LIB_DEPENDS= libogg.so:audio/libogg \
@@ -145,7 +147,8 @@
PROJECTM_DESC= Support the projectM music visualiser
PROJECTM_LIB_DEPENDS= libprojectM.so.2:graphics/libprojectm
-PROJECTM_USE= GL=gl QT4=opengl
+PROJECTM_USES= qt:4
+PROJECTM_USE= GL=gl QT=opengl
PROJECTM_CMAKE_BOOL= USE_PROJECTM
OSS_CMAKE_BOOL= USE_OSS
@@ -221,7 +224,8 @@
COPYPASTE_CMAKE_BOOL= USE_COPYPASTE
MPRIS_DESC= Support the Media Player Remote
-MPRIS_USE= QT4=dbus
+MPRIS_USES= qt:4
+MPRIS_USE= QT=dbus
MPRIS_CMAKE_BOOL= USE_MPRIS
SCROBBLER_DESC= Support Libre.fm/Last.fm scrobbler feature
@@ -243,7 +247,8 @@
LYRICS_DESC= Support to show lyrics using lyrics.wikia.com
LYRICS_CMAKE_BOOL= USE_LYRICS
-HAL_USE= QT4=dbus
+HAL_USES= qt:4
+HAL_USE= QT=dbus
HAL_CMAKE_BOOL= USE_HAL
HOTKEY_DESC= Support global shortcut keys
@@ -251,7 +256,8 @@
HOTKEY_CMAKE_BOOL= USE_HOTKEY
GNOMEHOTKEY_DESC= Support GNOME/Cinnamon shortcut keys
-GNOMEHOTKEY_USE= QT4=dbus
+GNOMEHOTKEY_USES= qt:4
+GNOMEHOTKEY_USE= QT=dbus
GNOMEHOTKEY_CMAKE_BOOL= USE_GNOMEHOTKEY
FILEOPS_DESC= Support file operation
@@ -261,7 +267,8 @@
COVER_CMAKE_BOOL= USE_COVER
KDENOTIFY_DESC= Support to popup notifier for KDE
-KDENOTIFY_USE= QT4=dbus
+KDENOTIFY_USES= qt:4
+KDENOTIFY_USE= QT=dbus
KDENOTIFY_CMAKE_BOOL= USE_KDENOTIFY
TRACKCHANGE_DESC= Enable to run external command each track
@@ -270,8 +277,10 @@
UDISKS_DESC= Support removable disc detection (obsolete)
UDISKS2_DESC= Support removable disc detection using UDisks
UDISKS2_RUN_DEPENDS= bsdisks:sysutils/bsdisks
-UDISKS_USE= QT4=dbus
-UDISKS2_USE= QT4=dbus
+UDISKS_USES= qt:4
+UDISKS_USE= QT=dbus
+UDISKS2_USES= qt:4
+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
@@ -18,9 +18,9 @@
LIB_DEPENDS= libblkid.so:misc/e2fsprogs-libblkid
DATE= 20130703
-USES= pkgconfig qmake shebangfix tar:xz
+USES= pkgconfig qmake qt:4 shebangfix 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 rcc_build
USE_LDCONFIG= yes
MOBILITY_MODS=
Index: multimedia/qt4-multimedia/Makefile
===================================================================
--- multimedia/qt4-multimedia/Makefile
+++ multimedia/qt4-multimedia/Makefile
@@ -9,8 +9,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt low-level multimedia API
-USE_QT4= qmake_build moc_build uic_build corelib gui
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build uic_build corelib gui
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: multimedia/qt5-multimedia/Makefile
===================================================================
--- multimedia/qt5-multimedia/Makefile
+++ multimedia/qt5-multimedia/Makefile
@@ -10,12 +10,11 @@
# LICENSE set via USES_QT5 (bsd.qt.mk)
-USES= pkgconfig qmake:norecursive
+USES= pkgconfig qmake:norecursive qt-dist:5,multimedia
USE_GL= gl
USE_GNOME= glib20
-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
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
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= core designer gui phonon4 widgets xml \
+USE_QT= core designer gui phonon4 widgets xml \
buildtools_build qmake_build
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
@@ -18,12 +18,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
@@ -18,9 +18,9 @@
LIB_DEPENDS= libvlc.so:multimedia/vlc
-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
@@ -14,9 +14,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/shotcut/Makefile
===================================================================
--- multimedia/shotcut/Makefile
+++ multimedia/shotcut/Makefile
@@ -21,8 +21,8 @@
# Needed to be able to correctly check for updates in-app.
FULLVERSION= 17.02.01
-USES= pkgconfig qmake
-USE_QT5= buildtools_build concurrent_build core \
+USES= pkgconfig qmake qt:5
+USE_QT= buildtools_build concurrent_build core \
graphicaleffects_run gui multimedia network opengl \
printsupport qml quick quickcontrols_run sql \
sql-sqlite3_run webkit websockets widgets x11extras xml
@@ -45,7 +45,8 @@
LADSPA_RUN_DEPENDS= swhplugins>=0:audio/swhplugins
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+NLS_USE= QT=linguisttools_build
WEBVFX_RUN_DEPENDS= ${LOCALBASE}/lib/mlt/libmltwebvfx.so:multimedia/webvfx-qt5
Index: multimedia/simplescreenrecorder/Makefile
===================================================================
--- multimedia/simplescreenrecorder/Makefile
+++ multimedia/simplescreenrecorder/Makefile
@@ -13,11 +13,11 @@
LIB_DEPENDS= libasound.so:audio/alsa-lib \
libavformat.so:multimedia/ffmpeg
-USES= cmake:outsource pkgconfig
+USES= cmake:outsource pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= MaartenBaert
GH_PROJECT= ssr
-USE_QT5= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
+USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
USE_XORG= x11 xext xfixes xi
CMAKE_ON= WITH_QT5
Index: multimedia/smplayer-skins/Makefile
===================================================================
--- multimedia/smplayer-skins/Makefile
+++ multimedia/smplayer-skins/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= multimedia@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
@@ -40,11 +40,13 @@
SKINS_DESC= Install additional skins
THEMES_DESC= Install additional themes
-QT4_USE= qt4=moc_build,linguisttools_build,rcc_build,uic_build
-QT4_USE+= qt4=corelib,dbus,gui,network,script,xml
+QT4_USES= qt:4
+QT4_USE= qt=moc_build,linguisttools_build,rcc_build,uic_build
+QT4_USE+= qt=corelib,dbus,gui,network,script,xml
-QT5_USE= qt5=buildtools_build,linguisttools_build
-QT5_USE+= qt5=core,dbus,gui,network,script,widgets,xml
+QT5_USES= qt:5
+QT5_USE= qt=buildtools_build,linguisttools_build
+QT5_USE+= qt=core,dbus,gui,network,script,widgets,xml
MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer
MPLAYER_QMAKE_OFF= "DEFINES_DISABLED+=MPLAYER_SUPPORT"
Index: multimedia/smtube/Makefile
===================================================================
--- multimedia/smtube/Makefile
+++ multimedia/smtube/Makefile
@@ -34,11 +34,13 @@
SMPLAYER_DESC= SMPlayer dependency for video playback
VLC_DESC= VLC dependency for video playback
-QT4_USE= qt4=qmake_build,moc_build,rcc_build,uic_build
-QT4_USE+= qt4=corelib,network,script,gui,webkit,linguisttools_build
+QT4_USES= qt:4
+QT4_USE= qt=qmake_build,moc_build,rcc_build,uic_build
+QT4_USE+= qt=corelib,network,script,gui,webkit,linguisttools_build
-QT5_USE= qt5=qmake_build,buildtools_build,linguisttools_build
-QT5_USE+= qt5=core,network,script,gui,webkit,widgets gl=gl
+QT5_USES= qt:5
+QT5_USE= qt=qmake_build,buildtools_build,linguisttools_build
+QT5_USE+= qt=core,network,script,gui,webkit,widgets gl=gl
MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer
MPV_RUN_DEPENDS= mpv:multimedia/mpv
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 qt:4 shared-mime-info
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_CXXSTD= gnu++98
USE_GITHUB= yes
Index: multimedia/umplayer/Makefile
===================================================================
--- multimedia/umplayer/Makefile
+++ multimedia/umplayer/Makefile
@@ -15,8 +15,8 @@
RUN_DEPENDS= mplayer:multimedia/mplayer
-USES= desktop-file-utils gmake qmake tar:xz
-USE_QT4= gui network xml moc_build rcc_build uic_build \
+USES= desktop-file-utils gmake qmake qt:4 tar:xz
+USE_QT= gui network xml moc_build rcc_build uic_build \
linguisttools_build
INSTALLS_ICONS= yes
MAKE_ARGS+= PREFIX=${PREFIX} DESTDIR=${STAGEDIR}
Index: multimedia/vlc/Makefile
===================================================================
--- multimedia/vlc/Makefile
+++ multimedia/vlc/Makefile
@@ -237,13 +237,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: multimedia/webcamoid/Makefile
===================================================================
--- multimedia/webcamoid/Makefile
+++ multimedia/webcamoid/Makefile
@@ -17,12 +17,12 @@
libpulse.so:audio/pulseaudio \
libv4l2.so:multimedia/libv4l
-USES= pkgconfig qmake
+USES= pkgconfig qmake qt:5
USE_GITHUB= yes
USE_GNOME= glib20
USE_GSTREAMER1= yes
USE_GL= gl
-USE_QT5= concurrent core gui multimedia network opengl qml quick svg widgets buildtools_build quickcontrols_run
+USE_QT= concurrent core gui multimedia network opengl qml quick svg widgets buildtools_build quickcontrols_run
MAKE_ENV= NOOSS=1 # NOOSS is because the OSS module attempts to use kevent on OSS devices, which is broken in the base
QMAKE_ARGS= INSTALLQMLDIR=${QT_QMLDIR} \
Index: multimedia/webvfx-qt5/Makefile
===================================================================
--- multimedia/webvfx-qt5/Makefile
+++ multimedia/webvfx-qt5/Makefile
@@ -18,8 +18,8 @@
GH_ACCOUNT= mltframework
GH_TAGNAME= e918ce4
-USES= pkgconfig qmake
-USE_QT5= 3d buildtools_build opengl qml quick webkit
+USES= pkgconfig qmake qt:5
+USE_QT= 3d buildtools_build opengl qml quick webkit
USE_LDCONFIG= yes
PORTEXAMPLES= *
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 ssl
-USE_QT5= qmake_build buildtools_build core qml quick sql xml multimedia \
+USES= qmake:outsource desktop-file-utils qt:5 ssl
+USE_QT= qmake_build buildtools_build core qml quick sql xml multimedia \
widgets dbus webkit quickcontrols graphicaleffects sql-sqlite3
QMAKE_ARGS= LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \
TELEGRAMQML_INCLUDE_PATH="${LOCALBASE}/include/telegramqml"
Index: net-im/diligent/Makefile
===================================================================
--- net-im/diligent/Makefile
+++ net-im/diligent/Makefile
@@ -13,10 +13,10 @@
LICENSE= LGPL3
USE_LDCONFIG= yes
-USE_QT5= core gui linguist network svg \
+USE_QT= core gui linguist network svg \
webkit widgets x11extras buildtools_build
USE_GL= gl
-USES= compiler:c++11-lang qmake
+USES= compiler:c++11-lang qmake qt:5
QMAKE_ARGS= CONFIG+="configure"
Index: net-im/ekiga/Makefile
===================================================================
--- net-im/ekiga/Makefile
+++ net-im/ekiga/Makefile
@@ -56,8 +56,9 @@
PLIST_SUB+= VERSION=${PORTVERSION}
.if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB}
+USES+= qt:4
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/gitterdone/Makefile
===================================================================
--- net-im/gitterdone/Makefile
+++ net-im/gitterdone/Makefile
@@ -14,8 +14,8 @@
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
-USES= qmake shebangfix tar:xz
-USE_QT5= core gui network linguist_build \
+USES= qmake qt:5 shebangfix tar:xz
+USE_QT= core gui network linguist_build \
buildtools_build widgets webkit svg
USE_GL+= gl
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:2.7
+USES= cmake gettext kde:4 python:2.7 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/kaccounts-integration/Makefile
===================================================================
--- net-im/kaccounts-integration/Makefile
+++ net-im/kaccounts-integration/Makefile
@@ -14,11 +14,11 @@
libkeyring-kwallet.so:sysutils/signon-kwallet-extension
RUN_DEPENDS= signon-ui:sysutils/signon-ui
-USES= cmake:outsource gettext pkgconfig kde:5 tar:xz
+USES= cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
i18n iconthemes kcmutils kio service wallet widgetsaddons \
akonadi
-USE_QT5= dbus core gui network qml widgets xml \
+USE_QT= dbus core gui network qml widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/kaccounts-providers/Makefile
===================================================================
--- net-im/kaccounts-providers/Makefile
+++ net-im/kaccounts-providers/Makefile
@@ -12,10 +12,10 @@
libaccounts-qt5.so:net-im/libaccounts-qt5 \
libsignon-qt5.so:sysutils/signon-qt5
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= intltool
USE_KDE= config coreaddons i18n kdeclarative kio package service
-USE_QT5= core gui network qml xml \
+USE_QT= core gui network qml xml \
buildtools_build qmake_build
#install to ${LOCALBASE}:
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@qt4 \
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 <bsd.port.mk>
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 \
+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/kopete/Makefile
===================================================================
--- net-im/kopete/Makefile
+++ net-im/kopete/Makefile
@@ -14,7 +14,7 @@
libqca-qt5.so:devel/qca@qt5 \
libv4l2.so:multimedia/libv4l
-USES= cmake:outsource jpeg kde:5 shebangfix tar:xz
+USES= cmake:outsource jpeg kde:5 qt:5 shebangfix tar:xz
USE_GNOME= libxml2 libxslt
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons dnssd ecm emoticons guiaddons i18n \
@@ -24,7 +24,7 @@
windowsystem xmlgui
# KDE PIM components
USE_KDE+= contacts identitymanagement libkleo pimtextedit
-USE_QT5= core dbus gui network phonon4 printsupport sql widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport sql widgets xml \
buildtools_build qmake_build
Index: net-im/ktp-accounts-kcm-kde4/Makefile
===================================================================
--- net-im/ktp-accounts-kcm-kde4/Makefile
+++ net-im/ktp-accounts-kcm-kde4/Makefile
@@ -15,9 +15,9 @@
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
-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-accounts-kcm/Makefile
===================================================================
--- net-im/ktp-accounts-kcm/Makefile
+++ net-im/ktp-accounts-kcm/Makefile
@@ -18,12 +18,12 @@
RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list \
${QT_PLUGINDIR}/kaccounts/ui/owncloud_plugin_kaccounts.so:net-im/kaccounts-providers
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= intltool
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
iconthemes itemviews kcmutils kio notifications notifyconfig \
service texteditor wallet widgetsaddons windowsystem
-USE_QT5= core dbus gui network qml sql widgets xml \
+USE_QT= core dbus gui network qml sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net-im/ktp-approver-kde4/Makefile
===================================================================
--- net-im/ktp-approver-kde4/Makefile
+++ net-im/ktp-approver-kde4/Makefile
@@ -14,8 +14,8 @@
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-approver/Makefile
===================================================================
--- net-im/ktp-approver/Makefile
+++ net-im/ktp-approver/Makefile
@@ -11,9 +11,9 @@
libKTpCommonInternals.so:net-im/ktp-common-internals
RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm dbusaddons service i18n notifications
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-auth-handler-kde4/Makefile
===================================================================
--- net-im/ktp-auth-handler-kde4/Makefile
+++ net-im/ktp-auth-handler-kde4/Makefile
@@ -15,9 +15,9 @@
libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-auth-handler/Makefile
===================================================================
--- net-im/ktp-auth-handler/Makefile
+++ net-im/ktp-auth-handler/Makefile
@@ -14,10 +14,10 @@
libkaccounts.so:net-im/kaccounts-integration \
libsignon-qt5.so:sysutils/signon-qt5
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= completion config coreaddons ecm i18n jobwidgets kdewebkit \
kio wallet service widgetsaddons
-USE_QT5= core dbus gui network webkit widgets xml \
+USE_QT= core dbus gui network webkit widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-call-ui/Makefile
===================================================================
--- net-im/ktp-call-ui/Makefile
+++ net-im/ktp-call-ui/Makefile
@@ -16,12 +16,12 @@
libtelepathy-qt5-farstream.so:net-im/telepathy-qt5
USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \
- python:2.7 tar:xz
+ python:2.7 qt:5 tar:xz
USE_GNOME= glib20
USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \
i18n kcmutils kdeclarative notifications package service \
wallet widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net-im/ktp-common-internals-kde4/Makefile
===================================================================
--- net-im/ktp-common-internals-kde4/Makefile
+++ net-im/ktp-common-internals-kde4/Makefile
@@ -14,9 +14,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-common-internals/Makefile
===================================================================
--- net-im/ktp-common-internals/Makefile
+++ net-im/ktp-common-internals/Makefile
@@ -17,13 +17,13 @@
RUN_DEPENDS= ${LOCALBASE}/lib/mission-control-plugins.0/mcp-account-manager-accounts-sso.so:net-im/telepathy-accounts-signon \
${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control
-USES= cmake:outsource gettext pkgconfig kde:5 tar:xz
+USES= cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n iconthemes itemviews jobwidgets kcmutils \
kio notifications notifyconfig parts people service solid \
sonnet texteditor textwidgets wallet widgetsaddons windowsystem \
xmlgui
-USE_QT5= core dbus gui network qml sql widgets xml \
+USE_QT= core dbus gui network qml sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net-im/ktp-contact-list-kde4/Makefile
===================================================================
--- net-im/ktp-contact-list-kde4/Makefile
+++ net-im/ktp-contact-list-kde4/Makefile
@@ -14,8 +14,8 @@
libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-contact-list/Makefile
===================================================================
--- net-im/ktp-contact-list/Makefile
+++ net-im/ktp-contact-list/Makefile
@@ -11,12 +11,12 @@
libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \
libKTpCommonInternals.so:net-im/ktp-common-internals
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes jobwidgets kcmutils kio \
notifications notifyconfig people service wallet widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-contact-runner-kde4/Makefile
===================================================================
--- net-im/ktp-contact-runner-kde4/Makefile
+++ net-im/ktp-contact-runner-kde4/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-contact-runner/Makefile
===================================================================
--- net-im/ktp-contact-runner/Makefile
+++ net-im/ktp-contact-runner/Makefile
@@ -10,10 +10,10 @@
LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \
libKTpCommonInternals.so:net-im/ktp-common-internals
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n package plasma-framework runner \
service wallet
-USE_QT5= core dbus gui network widgets xml\
+USE_QT= core dbus gui network widgets xml\
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-desktop-applets-kde4/Makefile
===================================================================
--- net-im/ktp-desktop-applets-kde4/Makefile
+++ net-im/ktp-desktop-applets-kde4/Makefile
@@ -12,8 +12,8 @@
LIB_DEPENDS= libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-desktop-applets/Makefile
===================================================================
--- net-im/ktp-desktop-applets/Makefile
+++ net-im/ktp-desktop-applets/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= ecm plasma-framework windowsystem
-USE_QT5= core dbus gui network qml widgets \
+USE_QT= core dbus gui network qml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-filetransfer-handler-kde4/Makefile
===================================================================
--- net-im/ktp-filetransfer-handler-kde4/Makefile
+++ net-im/ktp-filetransfer-handler-kde4/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-filetransfer-handler/Makefile
===================================================================
--- net-im/ktp-filetransfer-handler/Makefile
+++ net-im/ktp-filetransfer-handler/Makefile
@@ -10,11 +10,11 @@
LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \
libKTpCommonInternals.so:net-im/ktp-common-internals
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio service solid \
wallet widgetsaddons xmlgui
-USE_QT5= core dbus gui network xml widgets \
+USE_QT= core dbus gui network xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-kded-integration-module-kde4/Makefile
===================================================================
--- net-im/ktp-kded-integration-module-kde4/Makefile
+++ net-im/ktp-kded-integration-module-kde4/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-kded-module/Makefile
===================================================================
--- net-im/ktp-kded-module/Makefile
+++ net-im/ktp-kded-module/Makefile
@@ -10,11 +10,11 @@
LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \
libKTpCommonInternals.so:net-im/ktp-common-internals
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= activities auth codecs completion config configwidgets coreaddons \
dbusaddons i18n idletime jobwidgets kcmutils kio notifications \
service wallet widgetsaddons
-USE_QT5= concurrent core dbus gui network sql widgets xml \
+USE_QT= concurrent core dbus gui network sql widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-send-file-kde4/Makefile
===================================================================
--- net-im/ktp-send-file-kde4/Makefile
+++ net-im/ktp-send-file-kde4/Makefile
@@ -15,8 +15,8 @@
RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler-kde4 \
${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
-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 <bsd.port.mk>
Index: net-im/ktp-send-file/Makefile
===================================================================
--- net-im/ktp-send-file/Makefile
+++ net-im/ktp-send-file/Makefile
@@ -12,11 +12,11 @@
RUN_DEPENDS= ${KDE_PREFIX}/lib/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons ecm \
i18n iconthemes jobwidgets kcmutils kio service wallet \
widgetsaddons
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-im/ktp-text-ui-kde4/Makefile
===================================================================
--- net-im/ktp-text-ui-kde4/Makefile
+++ net-im/ktp-text-ui-kde4/Makefile
@@ -15,9 +15,9 @@
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
-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/ktp-text-ui/Makefile
===================================================================
--- net-im/ktp-text-ui/Makefile
+++ net-im/ktp-text-ui/Makefile
@@ -12,13 +12,13 @@
libKTpCommonInternals.so:net-im/ktp-common-internals
RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
-USES= cmake:outsource compiler:c++11-lang gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
dbusaddons ecm emoticons i18n iconthemes itemviews jobwidgets \
kcmutils kdewebkit kio notifications notifyconfig people \
service sonnet textwidgets wallet widgetsaddons windowsystem \
xmlgui
-USE_QT5= core dbus gui location network qml quick speech webchannel \
+USE_QT= core dbus gui location network qml quick speech webchannel \
webengine widgets xml \
buildtools_build qmake_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 qmake pathfix pkgconfig python qt:5 tar:bz2
+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
@@ -21,9 +21,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
@@ -18,8 +18,8 @@
GH_ACCOUNT= Aseman-Land
GH_PROJECT= libqtelegram-aseman-edition
-USES= qmake:outsource ssl
-USE_QT5= qmake_build buildtools_build core gui network multimedia
+USES= qmake:outsource qt:5 ssl
+USE_QT= qmake_build buildtools_build core gui network multimedia
USE_LDCONFIG= yes
post-patch:
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 sm
-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 network dbus svg
OPTIONS_DEFINE= HUNSPELL KDE4
Index: net-im/plasma-applet-ktp-kde4/Makefile
===================================================================
--- net-im/plasma-applet-ktp-kde4/Makefile
+++ net-im/plasma-applet-ktp-kde4/Makefile
@@ -15,9 +15,9 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
-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 <bsd.port.mk>
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,8 @@
DEBUG_CONFIGURE_ON= --debug
DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+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
@@ -27,10 +27,10 @@
libtoxcore.so:net-im/tox \
libvpx.so:multimedia/libvpx
-USES= cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig
+USES= cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig qt:5
USE_GITHUB= yes
USE_GNOME= gtk20 gdkpixbuf2 cairo
-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_build buildtools_build linguisttools_build qmake_build testlib_build
CMAKE_ARGS= -DGIT_DESCRIBE:STRING=${FULLVERSION}
CMAKE_OFF= USE_CCACHE
Index: net-im/qxmpp/Makefile
===================================================================
--- net-im/qxmpp/Makefile
+++ net-im/qxmpp/Makefile
@@ -16,10 +16,12 @@
USES= qmake 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
PLIST_SUB= QDNS="@comment "
.else
-USE_QT4= corelib gui network qtestlib xml uic_build moc_build \
+USES+= qt:4
+USE_QT= corelib gui network qtestlib xml uic_build moc_build \
rcc_build
PLIST_SUB= QDNS=""
.endif
Index: net-im/ramblercontacts/Makefile
===================================================================
--- net-im/ramblercontacts/Makefile
+++ net-im/ramblercontacts/Makefile
@@ -13,10 +13,10 @@
LICENSE= GPLv3
-USES= qmake dos2unix
+USES= qmake 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 rcc_build uic_build designer_build \
webkit
USE_LDCONFIG= yes
Index: net-im/ricochet/Makefile
===================================================================
--- net-im/ricochet/Makefile
+++ net-im/ricochet/Makefile
@@ -17,10 +17,10 @@
LIB_DEPENDS= libprotobuf.so:devel/protobuf
-USES= compiler:c++11-lib gmake pkgconfig qmake ssl
+USES= compiler:c++11-lib gmake pkgconfig qmake qt:5 ssl
USE_GITHUB= yes
GH_ACCOUNT= ricochet-im
-USE_QT5= core gui multimedia network qml quick quickcontrols widgets \
+USE_QT= core gui multimedia network qml quick quickcontrols widgets \
buildtools_build linguisttools_build
USE_GL= gl
QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}
Index: net-im/teamwords/Makefile
===================================================================
--- net-im/teamwords/Makefile
+++ net-im/teamwords/Makefile
@@ -12,9 +12,9 @@
LICENSE= LGPL3
-USES= compiler:c++11-lang qmake
+USES= compiler:c++11-lang qmake qt:5
USE_LDCONFIG= yes
-USE_QT5= core gui widgets network svg linguist \
+USE_QT= core gui widgets network svg linguist \
webkit buildtools x11extras
USE_GL= gl
Index: net-im/telegram-desktop/Makefile
===================================================================
--- net-im/telegram-desktop/Makefile
+++ net-im/telegram-desktop/Makefile
@@ -23,7 +23,7 @@
libopenal.so:audio/openal-soft \
libopus.so:audio/opus
-USES= cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build ssl
+USES= cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build qt:5 ssl
USE_GITHUB= yes
GH_ACCOUNT= telegramdesktop
GH_PROJECT= tdesktop
@@ -33,7 +33,7 @@
telegramdesktop:libtgvoip:6e0e102:libtgvoip/Telegram/ThirdParty/libtgvoip \
telegramdesktop:crl:344cbde9:crl/Telegram/ThirdParty/crl
USE_GNOME= glib20 gtk30
-USE_QT5= core gui imageformats network widgets buildtools_build qmake_build dbus
+USE_QT= core gui imageformats network widgets buildtools_build qmake_build dbus
USE_XORG= x11 xcb
CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release
Index: net-im/telegramqml/Makefile
===================================================================
--- net-im/telegramqml/Makefile
+++ net-im/telegramqml/Makefile
@@ -19,8 +19,8 @@
GH_ACCOUNT= Aseman-Land
GH_PROJECT= TelegramQML
-USES= qmake:outsource ssl
-USE_QT5= qmake_build buildtools_build core qml quick sql xml multimedia
+USES= qmake:outsource qt:5 ssl
+USE_QT= qmake_build buildtools_build core qml quick sql xml multimedia
USE_LDCONFIG= yes
QMAKE_ARGS= BUILD_MODE+=lib \
LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae"
Index: net-im/telepathy-accounts-signon/Makefile
===================================================================
--- net-im/telepathy-accounts-signon/Makefile
+++ net-im/telepathy-accounts-signon/Makefile
@@ -15,8 +15,8 @@
libmission-control-plugins.so:net-im/telepathy-mission-control \
libsignon-glib.so:net-im/libsignon-glib
-USES= gettext pkgconfig qmake tar:bz2
-USE_QT5= buildtools_build core qmake_build
+USES= gettext pkgconfig qmake qt:5 tar:bz2
+USE_QT= buildtools_build core qmake_build
USE_LDCONFIG= YES
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:2.7,build tar:bzip2
+USES= bison:build cmake kde:4 pkgconfig python:2.7,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-logger-qt5/Makefile
===================================================================
--- net-im/telepathy-logger-qt5/Makefile
+++ net-im/telepathy-logger-qt5/Makefile
@@ -20,10 +20,10 @@
libtelepathy-logger.so:net-im/telepathy-logger \
libtelepathy-qt5.so:net-im/telepathy-qt5
-USES= bison:build cmake:outsource kde:5 pkgconfig python:2.7,build tar:xz
+USES= bison:build cmake:outsource kde:5 pkgconfig python:2.7,build qt:5 tar:xz
USE_GNOME= glib20 libxml2
USE_KDE= ecm
-USE_QT5= core buildtools_build dbus network qmake_build xml
+USE_QT= core buildtools_build dbus network qmake_build xml
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
@@ -16,10 +16,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= qmake qt:4 zip
+USE_QT= gui network corelib uic_build rcc_build moc_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= qmake qt:4 tar:bzip2
+USE_QT= gui xml uic_build moc_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
@@ -19,7 +19,7 @@
libevent.so:devel/libevent \
libuuid.so:misc/e2fsprogs-libuuid
-USES= compiler:c++11-lang cmake pkgconfig shebangfix ssl
+USES= compiler:c++11-lang cmake pkgconfig qt:5 shebangfix ssl
SHEBANG_FILES= extensions/*.sh scripts/*.sh fsplugin/*.sh \
scripts/*.py
@@ -28,7 +28,7 @@
GH_PROJECT= seafile-client
USE_GNOME= glib20
-USE_QT5= core gui network widgets \
+USE_QT= core gui network 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 <bsd.port.mk>
Index: net-p2p/bitcoin/Makefile
===================================================================
--- net-p2p/bitcoin/Makefile
+++ net-p2p/bitcoin/Makefile
@@ -17,7 +17,7 @@
BROKEN_powerpc64= fails to compile: util.cpp: undefined reference to boost::program_options::to_internal
-USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl
+USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig qt:5 shebangfix ssl
USE_GITHUB= yes
GNU_CONFIGURE= yes
@@ -25,13 +25,14 @@
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
USES+= desktop-file-utils
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build linguisttools_build qmake_build
BUILD_DEPENDS+= protoc:devel/protobuf
LIB_DEPENDS+= libprotobuf.so:devel/protobuf
-TESTS_USE= QT5=testlib
+TESTS_USES= qt:5
+TESTS_USE= QT=testlib
TESTS_PLIST_FILES= bin/test_bitcoin-qt \
bin/test_bitcoin
.endif
@@ -51,7 +52,8 @@
ZMQ_DESC= Block and transaction broadcasting with ZeroMQ
DBUS_CONFIGURE_WITH= dbus
-DBUS_USE= QT5=dbus
+DBUS_USES= qt:5
+DBUS_USE= QT=dbus
DEBUG_CONFIGURE_ENABLE= debug
DEBUG_INSTALL_TARGET_OFF= install-strip
Index: net-p2p/dogecoin/Makefile
===================================================================
--- net-p2p/dogecoin/Makefile
+++ net-p2p/dogecoin/Makefile
@@ -39,8 +39,8 @@
GUI_CONFIGURE_ARGS= --with-gui=qt5
GUI_CONFIGURE_OFF= --with-gui=no
-GUI_USE= QT5=buildtools,core,dbus,gui,linguist_build,network,printsupport,testlib,widgets
-GUI_USES= desktop-file-utils
+GUI_USE= QT=buildtools,core,dbus,gui,linguist_build,network,printsupport,testlib,widgets
+GUI_USES= desktop-file-utils qt:5
QRCODES_CONFIGURE_WITH= qrencode
QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode
Index: net-p2p/eiskaltdcpp-qt/Makefile
===================================================================
--- net-p2p/eiskaltdcpp-qt/Makefile
+++ net-p2p/eiskaltdcpp-qt/Makefile
@@ -16,8 +16,8 @@
MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib
-USES= cmake gettext compiler:c++11-lib desktop-file-utils ssl
-USE_QT4= gui xml network qmake_build uic_build \
+USES= cmake gettext compiler:c++11-lib desktop-file-utils qt:4 ssl
+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
@@ -41,17 +41,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-kde4/Makefile
===================================================================
--- net-p2p/ktorrent-kde4/Makefile
+++ net-p2p/ktorrent-kde4/Makefile
@@ -16,9 +16,9 @@
libgmp.so:math/gmp \
libktorrent.so:net-p2p/libktorrent-kde4
-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/ktorrent/Makefile
===================================================================
--- net-p2p/ktorrent/Makefile
+++ net-p2p/ktorrent/Makefile
@@ -10,7 +10,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= BitTorrent client for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
LIB_DEPENDS= libKF5Torrent.so:net-p2p/libktorrent \
libgcrypt.so:security/libgcrypt \
@@ -22,7 +22,7 @@
notifyconfig parts plotting service \
solid sonnet syndication textwidgets widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 script webkit widgets xml \
+USE_QT= core dbus gui network phonon4 script webkit widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net-p2p/libktorrent-kde4/Makefile
===================================================================
--- net-p2p/libktorrent-kde4/Makefile
+++ net-p2p/libktorrent-kde4/Makefile
@@ -15,9 +15,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/libktorrent/Makefile
===================================================================
--- net-p2p/libktorrent/Makefile
+++ net-p2p/libktorrent/Makefile
@@ -15,10 +15,10 @@
libgmp.so:math/gmp \
libqca-qt5.so:devel/qca@qt5
-USES= cmake:outsource gettext kde:5
+USES= cmake:outsource gettext kde:5 qt:5
USE_KDE= archive completion config coreaddons crash ecm i18n \
jobwidgets kio service solid widgetsaddons
-USE_QT5= core gui network testlib xml \
+USE_QT= core gui network testlib xml \
buildtools_build qmake_build
USE_GITHUB= yes
Index: net-p2p/litecoin/Makefile
===================================================================
--- net-p2p/litecoin/Makefile
+++ net-p2p/litecoin/Makefile
@@ -26,13 +26,14 @@
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
USES+= desktop-file-utils
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build linguisttools_build qmake_build
BUILD_DEPENDS+= protoc:devel/protobuf
LIB_DEPENDS+= libprotobuf.so:devel/protobuf
-TESTS_USE= QT5=testlib
+TESTS_USES= qt:5
+TESTS_USE= QT=testlib
TESTS_PLIST_FILES= bin/test_litecoin-qt \
bin/test_litecoin
.endif
@@ -48,7 +49,8 @@
ZMQ_DESC= Block and transaction broadcasting with ZeroMQ
DBUS_CONFIGURE_WITH= dbus
-DBUS_USE= QT5=dbus
+DBUS_USES= qt:5
+DBUS_USE= QT=dbus
DEBUG_CONFIGURE_ENABLE= debug
DEBUG_INSTALL_TARGET_OFF= install-strip
Index: net-p2p/namecoin/Makefile
===================================================================
--- net-p2p/namecoin/Makefile
+++ net-p2p/namecoin/Makefile
@@ -26,7 +26,7 @@
USE_GITHUB= yes
-USES= bdb:48 gmake compiler:c++11-lib ssl
+USES= bdb:48 gmake compiler:c++11-lib qt:4 ssl
MAKE_JOBS_UNSAFE=yes
CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
@@ -36,7 +36,7 @@
.include <bsd.port.options.mk>
.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
@@ -54,7 +54,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,9 +16,9 @@
LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
libboost_system.so:devel/boost-libs
-USES= compiler:c++11-lib pkgconfig tar:xz
+USES= compiler:c++11-lib pkgconfig qt:5 tar:xz
GNU_CONFIGURE= yes
-USE_QT5= core network xml qmake_build buildtools_build linguisttools_build
+USE_QT= core network xml qmake_build buildtools_build linguisttools_build
QT_NONSTANDARD= yes
DESTDIRNAME= INSTALL_ROOT
@@ -40,7 +40,7 @@
.if ${WITH_GUI} == "yes"
LIB_DEPENDS+= libGeoIP.so:net/GeoIP
USES+= desktop-file-utils
-USE_QT5+= concurrent gui widgets
+USE_QT+= concurrent gui widgets
USE_GL+= gl
OPTIONS_DEFAULT+= DBUS
.else
Index: net-p2p/qtum/Makefile
===================================================================
--- net-p2p/qtum/Makefile
+++ net-p2p/qtum/Makefile
@@ -37,8 +37,8 @@
--with-qrencode \
--without-libs
-USES= autoreconf bdb:5+ compiler:c++11-lib gmake libtool pkgconfig ssl
-USE_QT5= buildtools core dbus gui linguisttools network testlib widgets
+USES= autoreconf bdb:5+ compiler:c++11-lib gmake libtool pkgconfig qt:5 ssl
+USE_QT= buildtools core dbus gui linguisttools network testlib widgets
USE_GITHUB= yes
GH_TUPLE= qtumproject:qtum:${DISTVERSIONPREFIX}${PORTVERSION} \
qtumproject:cpp-eth-qtum:6e3173715867f5de56d6aa:cppeth/src/cpp-ethereum
Index: net-p2p/retroshare/Makefile
===================================================================
--- net-p2p/retroshare/Makefile
+++ net-p2p/retroshare/Makefile
@@ -25,13 +25,13 @@
libcurl.so:ftp/curl \
libmicrohttpd.so:www/libmicrohttpd
-USES= compiler:features desktop-file-utils dos2unix pkgconfig qmake ssl
+USES= compiler:features desktop-file-utils dos2unix pkgconfig qmake qt:5 ssl
USE_GITHUB= yes
GH_ACCOUNT= RetroShare
GH_PROJECT= RetroShare
USE_GNOME= libxml2 libxslt
USE_GL= gl
-USE_QT5= core gui multimedia printsupport network widgets xml \
+USE_QT= core gui multimedia printsupport network widgets xml \
buildtools_build uitools_build
DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro
Index: net-p2p/torrent-file-editor/Makefile
===================================================================
--- net-p2p/torrent-file-editor/Makefile
+++ net-p2p/torrent-file-editor/Makefile
@@ -27,8 +27,10 @@
DONATION_CMAKE_OFF= -DDISABLE_DONATION:BOOL=ON
-QT5_USE= QT5=${_QT5_DEPS:ts,}
-QT5_USE_OFF= QT4=${_QT4_DEPS:ts,}
+QT5_USES= qt:5
+QT5_USES_OFF= qt:4
+QT5_USE= QT=${_QT5_DEPS:ts,}
+QT5_USE_OFF= QT=${_QT4_DEPS:ts,}
QT5_LIB_DEPENDS_OFF= libqjson.so:devel/qjson@qt4
QT5_CMAKE_ON= -DQT5_BUILD:BOOL=ON
Index: net-p2p/transmission-qt4/Makefile
===================================================================
--- net-p2p/transmission-qt4/Makefile
+++ net-p2p/transmission-qt4/Makefile
@@ -18,9 +18,9 @@
SLAVEPORT= qt4
QT_NONSTANDARD= yes
-USE_QT4= moc_build qmake_build uic_build rcc_build \
+USE_QT= moc_build qmake_build uic_build rcc_build \
corelib gui dbus network xml
-USES= compiler:c++11-lib desktop-file-utils
+USES= compiler:c++11-lib desktop-file-utils qt:4
EXTRA_CONF_ARGS=--disable-cli \
--disable-daemon \
Index: net-p2p/transmission-qt5/Makefile
===================================================================
--- net-p2p/transmission-qt5/Makefile
+++ net-p2p/transmission-qt5/Makefile
@@ -18,8 +18,8 @@
SLAVEPORT= qt5
QT_NONSTANDARD= yes
-USE_QT5= buildtools_build qmake_build core dbus gui network widgets
-USES= compiler:c++11-lib desktop-file-utils
+USE_QT= buildtools_build qmake_build core dbus gui network widgets
+USES= compiler:c++11-lib desktop-file-utils qt:5
EXTRA_CONF_ARGS=--disable-cli \
--disable-daemon \
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
@@ -44,9 +44,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/akonadi-calendar/Makefile
===================================================================
--- net/akonadi-calendar/Makefile
+++ net/akonadi-calendar/Makefile
@@ -9,14 +9,14 @@
LICENSE= LGPL21
-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 kdelibs4support i18n iconthemes itemmodels \
jobwidgets kio service wallet widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime calendarcore calendarutils \
contacts identitymanagement mailtransport mime pimtextedit
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/akonadi-contacts/Makefile
===================================================================
--- net/akonadi-contacts/Makefile
+++ net/akonadi-contacts/Makefile
@@ -9,13 +9,13 @@
LICENSE= LGPL21
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- tar:xz
+ qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemmodels jobwidgets kio \
prison service sonnet textwidgets widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi akonadimime calendarcore contacts mime
-USE_QT5= dbus core gui network testlib webengine widgets xml \
+USE_QT= dbus core gui network testlib webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/akonadi-mime/Makefile
===================================================================
--- net/akonadi-mime/Makefile
+++ net/akonadi-mime/Makefile
@@ -9,12 +9,12 @@
LICENSE= LGPL21
-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 ecm \
i18n itemmodels kio service widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi mime
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/akonadi-notes/Makefile
===================================================================
--- net/akonadi-notes/Makefile
+++ net/akonadi-notes/Makefile
@@ -9,11 +9,11 @@
LICENSE= LGPL21
-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 i18n
# pim components
USE_KDE+= akonadi mime
-USE_QT5= core xml \
+USE_QT= core xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/akonadi-search/Makefile
===================================================================
--- net/akonadi-search/Makefile
+++ net/akonadi-search/Makefile
@@ -11,13 +11,13 @@
LIB_DEPENDS= libxapian.so:databases/xapian-core
-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 \
crash ecm i18n itemmodels kcmutils package plasma-framework \
runner service widgetsaddons
# pim components
USE_KDE+= akonadi akonadimime calendarcore contacts mime
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
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/cagibi/Makefile
===================================================================
--- net/cagibi/Makefile
+++ net/cagibi/Makefile
@@ -10,9 +10,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 <bsd.port.mk>
Index: net/calendarsupport/Makefile
===================================================================
--- net/calendarsupport/Makefile
+++ net/calendarsupport/Makefile
@@ -11,14 +11,14 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-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 \
guiaddons i18n iconthemes itemmodels jobwidgets kio service \
widgetsaddons
# pim components
USE_KDE+= akonadi akonadicalendar calendarcore calendarutils holidays \
identitymanagement kdepim-apps-libs mime pimcommon pimtextedit
-USE_QT5= core gui network printsupport testlib uitools widgets xml \
+USE_QT= core gui network printsupport testlib uitools widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/eventviews/Makefile
===================================================================
--- net/eventviews/Makefile
+++ net/eventviews/Makefile
@@ -12,14 +12,14 @@
LIB_DEPENDS= libKGantt.so:graphics/kdiagram \
libboost_system.so:devel/boost-libs
-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 \
guiaddons i18n iconthemes itemmodels service widgetsaddons
# pim components
USE_KDE+= akonadi akonadicalendar akonadicontacts calendarcore \
calendarsupport calendarutils contacts identitymanagement \
libkdepim mime pimtextedit
-USE_QT5= core gui printsupport testlib uitools widgets xml \
+USE_QT= core gui printsupport testlib uitools widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/hupnp/Makefile
===================================================================
--- net/hupnp/Makefile
+++ net/hupnp/Makefile
@@ -14,8 +14,8 @@
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/hupnp/LICENSE_LGPLv3.txt
-USES= gmake qmake zip
-USE_QT4= corelib network xml dbus gui \
+USES= gmake qmake qt:4 zip
+USE_QT= corelib network xml dbus gui \
moc_build rcc_build uic_build
USE_CXXSTD= gnu++98
Index: net/incidenceeditor/Makefile
===================================================================
--- net/incidenceeditor/Makefile
+++ net/incidenceeditor/Makefile
@@ -12,7 +12,7 @@
LIB_DEPENDS= libKGantt.so:graphics/kdiagram \
libboost_system.so:devel/boost-libs
-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 iconthemes itemmodels jobwidgets kio service sonnet \
textwidgets wallet widgetsaddons xmlgui
@@ -20,7 +20,7 @@
USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime calendarcore calendarsupport calendarutils \
contacts eventviews identitymanagement kdepim-apps-libs ldap \
libkdepim mailtransport mime pimtextedit
-USE_QT5= core dbus gui network printsupport testlib uitools webkit \
+USE_QT= core dbus gui network printsupport testlib uitools webkit \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kalarmcal/Makefile
===================================================================
--- net/kalarmcal/Makefile
+++ net/kalarmcal/Makefile
@@ -9,7 +9,7 @@
LICENSE= LGPL21
-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 ecm guiaddons holidays i18n iconthemes \
itemmodels itemviews jobwidgets kdelibs4support kio \
@@ -18,7 +18,7 @@
# pim components
USE_KDE+= akonadi calendarcore calendarutils holidays identitymanagement \
pimtextedit
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kblog/Makefile
===================================================================
--- net/kblog/Makefile
+++ net/kblog/Makefile
@@ -9,11 +9,11 @@
LICENSE= LGPL21
-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 kdelibs4support kio service xmlrpcclient
# pim components
USE_KDE+= calendarcore syndication
-USE_QT5= core gui webkit \
+USE_QT= core gui webkit \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kcalcore/Makefile
===================================================================
--- net/kcalcore/Makefile
+++ net/kcalcore/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libical.so:devel/libical
-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= ecm emoticons init itemmodels itemviews kdelibs4support
-USE_QT5= core gui \
+USE_QT= core gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kcalutils/Makefile
===================================================================
--- net/kcalutils/Makefile
+++ net/kcalutils/Makefile
@@ -9,12 +9,12 @@
LICENSE= LGPL21
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= codecs config coreaddons ecm i18n iconthemes kdelibs4support \
widgetsaddons
# pim components
USE_KDE+= calendarcore identitymanagement pimtextedit
-USE_QT5= core gui widgets xml \
+USE_QT= core gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kcontacts/Makefile
===================================================================
--- net/kcontacts/Makefile
+++ net/kcontacts/Makefile
@@ -9,9 +9,9 @@
LICENSE= LGPL21
-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 codecs config coreaddons i18n
-USE_QT5= core dbus gui \
+USE_QT= core dbus gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kdav/Makefile
===================================================================
--- net/kdav/Makefile
+++ net/kdav/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= A DAV protocol implementation with KJobs
-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 service
-USE_QT5= core gui network xml xmlpatterns \
+USE_QT= core gui network xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kdenetwork-filesharing-kde4/Makefile
===================================================================
--- net/kdenetwork-filesharing-kde4/Makefile
+++ net/kdenetwork-filesharing-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: net/kdenetwork-filesharing/Makefile
===================================================================
--- net/kdenetwork-filesharing/Makefile
+++ net/kdenetwork-filesharing/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Filesharing via Samba
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons doctools ecm i18n jobwidgets kio \
service widgetsaddons
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net/kdenetwork-strigi-analyzers-kde4/Makefile
===================================================================
--- net/kdenetwork-strigi-analyzers-kde4/Makefile
+++ net/kdenetwork-strigi-analyzers-kde4/Makefile
@@ -11,8 +11,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 <bsd.port.mk>
Index: net/kdenetwork/Makefile
===================================================================
--- net/kdenetwork/Makefile
+++ net/kdenetwork/Makefile
@@ -7,8 +7,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Network applications (meta port)
-USES= kde:5 metaport
-USE_QT5= #
+USES= kde:5 metaport qt:5
+USE_QT= #
OPTIONS_DEFINE= FILESHARING KRDC KRFB
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NKOPETE}
Index: net/kf5-kholidays/Makefile
===================================================================
--- net/kf5-kholidays/Makefile
+++ net/kf5-kholidays/Makefile
@@ -9,9 +9,9 @@
LICENSE= LGPL21
-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 emoticons kdelibs4support init itemmodels itemviews
-USE_QT5= core gui qml buildtools_build qmake_build
+USE_QT= core gui qml buildtools_build qmake_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
Index: net/kf5-kxmlrpcclient/Makefile
===================================================================
--- net/kf5-kxmlrpcclient/Makefile
+++ net/kf5-kxmlrpcclient/Makefile
@@ -7,8 +7,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 <bsd.port.mk>
Index: net/kget-kde4/Makefile
===================================================================
--- net/kget-kde4/Makefile
+++ net/kget-kde4/Makefile
@@ -14,12 +14,12 @@
libqca.so:devel/qca@qt4 \
libboost_thread.so:devel/boost-libs
-USES= cmake:outsource kde:4 shebangfix sqlite tar:xz
+USES= cmake:outsource kde:4 qt:4 shebangfix sqlite 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/kget/Makefile
===================================================================
--- net/kget/Makefile
+++ net/kget/Makefile
@@ -17,7 +17,7 @@
libqca-qt5.so:devel/qca@qt5 \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource kde:5 shebangfix sqlite tar:xz
+USES= cmake:outsource kde:5 qt:5 shebangfix sqlite tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons emoticons guiaddons i18n \
@@ -25,7 +25,7 @@
kdelibs4support kio notifications notifyconfig parts service \
solid sonnet textwidgets unitconversion wallet widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport sql widgets xml \
+USE_QT= core dbus gui network printsupport sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kidentitymanagement/Makefile
===================================================================
--- net/kidentitymanagement/Makefile
+++ net/kidentitymanagement/Makefile
@@ -9,13 +9,13 @@
LICENSE= LGPL21
-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 \
emoticons i18n init itemmodels itemviews jobwidgets \
kdelibs4support kio service widgetsaddons xmlgui
# pim components
USE_KDE+= pimtextedit
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kimap/Makefile
===================================================================
--- net/kimap/Makefile
+++ net/kimap/Makefile
@@ -12,11 +12,11 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libsasl2.so:security/cyrus-sasl2
-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 i18n kdelibs4support kio service
# pim components
USE_KDE+= mime
-USE_QT5= core \
+USE_QT= core \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kio-gdrive/Makefile
===================================================================
--- net/kio-gdrive/Makefile
+++ net/kio-gdrive/Makefile
@@ -17,12 +17,12 @@
libkaccounts.so:net-im/kaccounts-integration
RUN_DEPENDS= kaccounts-providers>=0:net-im/kaccounts-providers
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= intltool
USE_KDE= completion config coreaddons ecm i18n jobwidgets kio \
notifications service widgetsaddons \
gapi
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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/kldap/Makefile
===================================================================
--- net/kldap/Makefile
+++ net/kldap/Makefile
@@ -11,11 +11,11 @@
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-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 completion config coreaddons i18n kio widgetsaddons service
# pim components
USE_KDE+= mbox
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
USE_OPENLDAP= yes
USE_LDCONFIG= yes
Index: net/kmailtransport/Makefile
===================================================================
--- net/kmailtransport/Makefile
+++ net/kmailtransport/Makefile
@@ -11,12 +11,12 @@
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-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 \
itemmodels jobwidgets kcmutils kio service wallet widgetsaddons
# pim components
USE_KDE+= akonadi akonadimime ksmtp mime
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kmbox/Makefile
===================================================================
--- net/kmbox/Makefile
+++ net/kmbox/Makefile
@@ -9,11 +9,11 @@
LICENSE= LGPL21
-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
# pim components
USE_KDE+= mime
-USE_QT5= core gui \
+USE_QT= core gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kmime/Makefile
===================================================================
--- net/kmime/Makefile
+++ net/kmime/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-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 ecm emoticons i18n init itemmodels itemviews kdelibs4support
-USE_QT5= core \
+USE_QT= core \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/knemo-kde4/Makefile
===================================================================
--- net/knemo-kde4/Makefile
+++ net/knemo-kde4/Makefile
@@ -13,9 +13,9 @@
BROKEN_FreeBSD_11= does not build due to access to kernel-private structure (error: member access into incomplete type 'struct in6_ifaddr')
BROKEN_FreeBSD_12= does not build due to access to kernel-private structure (error: member access into incomplete type 'struct in6_ifaddr')
-USES= cmake gettext kde:4 shebangfix tar:xz
+USES= cmake gettext kde:4 qt:4 shebangfix 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/kontactinterface/Makefile
===================================================================
--- net/kontactinterface/Makefile
+++ net/kontactinterface/Makefile
@@ -9,12 +9,12 @@
LICENSE= LGPL21
-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 \
emoticons i18n iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio parts service sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/kpimtextedit/Makefile
===================================================================
--- net/kpimtextedit/Makefile
+++ net/kpimtextedit/Makefile
@@ -9,12 +9,12 @@
LICENSE= LGPL21
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons ecm \
emoticons i18n iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio service sonnet syntaxhighlighting textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network speech widgets xml \
+USE_QT= core dbus gui network speech widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/krdc-kde4/Makefile
===================================================================
--- net/krdc-kde4/Makefile
+++ net/krdc-kde4/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/krdc/Makefile
===================================================================
--- net/krdc/Makefile
+++ net/krdc/Makefile
@@ -9,12 +9,12 @@
LIB_DEPENDS= libvncserver.so:net/libvncserver
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons dnssd doctools ecm i18n iconthemes kcmutils \
notifications notifyconfig service wallet widgetsaddons \
xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/krfb-kde4/Makefile
===================================================================
--- net/krfb-kde4/Makefile
+++ net/krfb-kde4/Makefile
@@ -10,9 +10,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 <bsd.port.mk>
Index: net/krfb/Makefile
===================================================================
--- net/krfb/Makefile
+++ net/krfb/Makefile
@@ -11,11 +11,11 @@
libxcb-image.so:x11/xcb-util-image
USES= alias cmake:outsource compiler:c++11-lib gettext jpeg \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons dnssd doctools ecm i18n notifications \
wallet widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets x11extras xml \
+USE_QT= core dbus gui network widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xcb xdamage xext xtst
Index: net/ksmtp/Makefile
===================================================================
--- net/ksmtp/Makefile
+++ net/ksmtp/Makefile
@@ -10,11 +10,11 @@
LICENSE= LGPL21
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-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 i18n kio service
# pim components
USE_KDE+= mime
-USE_QT5= core network \
+USE_QT= core network \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/ktnef/Makefile
===================================================================
--- net/ktnef/Makefile
+++ net/ktnef/Makefile
@@ -9,11 +9,11 @@
LICENSE= LGPL21
-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 kdelibs4support
# pim components
USE_KDE+= calendarcore calendarutils contacts
-USE_QT5= core gui widgets xml \
+USE_QT= core gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
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/libgravatar/Makefile
===================================================================
--- net/libgravatar/Makefile
+++ net/libgravatar/Makefile
@@ -9,12 +9,12 @@
LICENSE= LGPL21
-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 kio \
service sonnet textwidgets widgetsaddons
# pim components
USE_KDE+= pimcommon
-USE_QT5= core gui network testlib widgets xml \
+USE_QT= core gui network testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/libkfbapi/Makefile
===================================================================
--- net/libkfbapi/Makefile
+++ net/libkfbapi/Makefile
@@ -14,10 +14,10 @@
LIB_DEPENDS= libqjson.so:devel/qjson@qt4
-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/libkgapi/Makefile
===================================================================
--- net/libkgapi/Makefile
+++ net/libkgapi/Makefile
@@ -11,7 +11,7 @@
LIB_DEPENDS= libical.so:devel/libical
-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 ecm emoticons guiaddons i18n iconthemes init \
itemmodels itemviews jobwidgets kdelibs4support kio \
@@ -19,7 +19,7 @@
widgetsaddons windowsystem xmlgui solid sonnet
# pim components
USE_KDE+= calendarcore contacts
-USE_QT5= core dbus gui location qml network printsupport quick webchannel \
+USE_QT= core dbus gui location qml network printsupport quick webchannel \
webengine widgets xml \
buildtools_build qmake_build
Index: net/libksieve/Makefile
===================================================================
--- net/libksieve/Makefile
+++ net/libksieve/Makefile
@@ -12,14 +12,14 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libsasl2.so:security/cyrus-sasl2
-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 attica auth codecs completion config configwidgets \
coreaddons ecm i18n iconthemes jobwidgets kio newstuff service \
sonnet syntaxhighlighting wallet widgetsaddons windowsystem xmlgui
# pim components
USE_KDE+= akonadi identitymanagement libkdepim mailtransport mime \
pimcommon pimtextedit
-USE_QT5= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus gui location network printsupport qml quick testlib \
uitools webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/libkvkontakte-kde4/Makefile
===================================================================
--- net/libkvkontakte-kde4/Makefile
+++ net/libkvkontakte-kde4/Makefile
@@ -16,8 +16,8 @@
LIB_DEPENDS= libqjson.so:devel/qjson@qt4
-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/libkvkontakte/Makefile
===================================================================
--- net/libkvkontakte/Makefile
+++ net/libkvkontakte/Makefile
@@ -13,9 +13,9 @@
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n kdewebkit kio service widgetsaddons
-USE_QT5= core gui network webkit widgets \
+USE_QT= core gui network webkit widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net/libmaia/Makefile
===================================================================
--- net/libmaia/Makefile
+++ net/libmaia/Makefile
@@ -10,10 +10,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= XML-RPC lib for Qt
-USES= gmake qmake
+USES= gmake qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= wiedi
-USE_QT5= buildtools_build network xml
+USE_QT= buildtools_build network xml
PLIST_FILES= include/maia/maiaObject.h \
include/maia/maiaXmlRpcClient.h \
Index: net/libmediawiki/Makefile
===================================================================
--- net/libmediawiki/Makefile
+++ net/libmediawiki/Makefile
@@ -12,9 +12,9 @@
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= coreaddons ecm
-USE_QT5= core network testlib \
+USE_QT= core network testlib \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: net/mailcommon/Makefile
===================================================================
--- net/mailcommon/Makefile
+++ net/mailcommon/Makefile
@@ -16,7 +16,7 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-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= archive auth codecs completion config configwidgets coreaddons \
ecm i18n iconthemes itemmodels itemviews jobwidgets kio \
service sonnet syntaxhighlighting textwidgets wallet \
@@ -24,7 +24,7 @@
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime contacts identitymanagement ldap libkdepim libkleo mailimporter \
mailtransport messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus network xml designer gui phonon4 testlib uiplugin \
+USE_QT= core dbus network xml designer gui phonon4 testlib uiplugin \
uitools webkit widgets \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/mailimporter/Makefile
===================================================================
--- net/mailimporter/Makefile
+++ net/mailimporter/Makefile
@@ -11,11 +11,11 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-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 ecm i18n itemmodels
# pim components
USE_KDE+= akonadi akonadimime libkdepim mime
-USE_QT5= core gui testlib uitools widgets xml \
+USE_QT= core gui testlib uitools widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/messagelib/Makefile
===================================================================
--- net/messagelib/Makefile
+++ net/messagelib/Makefile
@@ -16,7 +16,7 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n iconthemes itemmodels itemviews jobwidgets \
kdewebkit kio service solid sonnet syntaxhighlighting \
@@ -26,7 +26,7 @@
contacts grantleetheme gravatar identitymanagement \
kdepim-apps-libs ldap libkdepim libkleo mailtransport mbox \
mime pimcommon pimtextedit
-USE_QT5= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus gui location network printsupport qml quick testlib \
uitools webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
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= qmake qt:4
+USE_QT= corelib gui moc_build rcc_build uic_build network script \
xml
PLIST_FILES= bin/drone \
Index: net/pimcommon/Makefile
===================================================================
--- net/pimcommon/Makefile
+++ net/pimcommon/Makefile
@@ -11,7 +11,7 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= archive attica auth codecs completion config configwidgets \
dbusaddons ecm emoticons i18n init iconthemes itemmodels \
jobwidgets kdelibs4support kio newstuff service sonnet textwidgets \
@@ -19,7 +19,7 @@
# pim components
USE_KDE+= akonadi akonadicontacts contacts imap libkdepim mime \
pimtextedit
-USE_QT5= core dbus designer gui network printsupport script testlib \
+USE_QT= core dbus designer gui network printsupport script testlib \
uiplugin uitools webkit widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/py-qt4-network/Makefile
===================================================================
--- net/py-qt4-network/Makefile
+++ net/py-qt4-network/Makefile
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtNetwork
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -10,10 +10,10 @@
CONFIGURE_ARGS= --enable QtNetwork
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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= qmake qt:4
+USE_QT= moc_build network qtestlib_build rcc_build
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/devonit-qjsonrpc-adefe89b0c6f
Index: net/qoauth-qt5/Makefile
===================================================================
--- net/qoauth-qt5/Makefile
+++ net/qoauth-qt5/Makefile
@@ -16,9 +16,9 @@
LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_LDCONFIG= yes
-USE_QT5= core network testlib buildtools_build qmake_build
+USE_QT= core network testlib buildtools_build qmake_build
USE_GITHUB= yes
GH_ACCOUNT= ayoy
Index: net/qoauth/Makefile
===================================================================
--- net/qoauth/Makefile
+++ net/qoauth/Makefile
@@ -15,9 +15,9 @@
LIB_DEPENDS= libqca.so:devel/qca@qt4
-USES= qmake:outsource
+USES= qmake:outsource qt:4
USE_LDCONFIG= yes
-USE_QT4= corelib qtestlib network moc_build
+USE_QT= corelib qtestlib network moc_build
USE_GITHUB= yes
GH_ACCOUNT= ayoy
Index: net/qt4-network/Makefile
===================================================================
--- net/qt4-network/Makefile
+++ net/qt4-network/Makefile
@@ -18,9 +18,8 @@
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-USES= ssl
-USE_QT4= qmake_build moc_build rcc_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4 ssl
+USE_QT= moc_build rcc_build corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: net/qt5-network/Makefile
===================================================================
--- net/qt5-network/Makefile
+++ net/qt5-network/Makefile
@@ -13,9 +13,8 @@
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-USES= ssl
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base ssl
+USE_QT= core buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: net/qtweetlib/Makefile
===================================================================
--- net/qtweetlib/Makefile
+++ net/qtweetlib/Makefile
@@ -16,9 +16,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 <bsd.port.mk>
Index: net/quiterss/Makefile
===================================================================
--- net/quiterss/Makefile
+++ net/quiterss/Makefile
@@ -22,11 +22,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
+QT4_USES= qt:4 qt:4
+QT4_USE= QT=moc_build,rcc_build,uic_build,linguisttools_build
+QT4_USE+= QT=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
+QT5_USES= qt:5 qt:5
+QT5_USE= QT=buildtools_build,linguisttools_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
@@ -21,9 +21,9 @@
--enable-qt --with-qt-lib=${QT_LIBDIR} \
--with-qt-include=${QT_INCDIR}
INSTALL_TARGET= install-strip
-USES= gmake libtool shebangfix
+USES= gmake libtool qt:4 shebangfix
SHEBANG_FILES= rsplib/scriptingserviceexample
USE_LDCONFIG= yes
-USE_QT4= gui xml moc_build
+USE_QT= gui xml moc_build
.include <bsd.port.mk>
Index: net/smb4k-kde4/Makefile
===================================================================
--- net/smb4k-kde4/Makefile
+++ net/smb4k-kde4/Makefile
@@ -13,10 +13,10 @@
RUN_DEPENDS= sudo:security/sudo
-USES= cmake gettext kde:4 samba:run tar:bzip2
+USES= cmake gettext kde:4 qt:4 samba:run 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
@@ -18,7 +18,7 @@
PORTDOCS= README
-USES= compiler:c++11-lib
+USES= compiler:c++11-lib qt:5
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-development
@@ -29,7 +29,7 @@
.include <bsd.port.options.mk>
.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/syndication/Makefile
===================================================================
--- net/syndication/Makefile
+++ net/syndication/Makefile
@@ -9,9 +9,9 @@
LICENSE= LGPL21
-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 kio service
-USE_QT5= core gui xml \
+USE_QT= core gui xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: net/wireshark/Makefile
===================================================================
--- net/wireshark/Makefile
+++ net/wireshark/Makefile
@@ -86,7 +86,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 \
+USE_QT= corelib gui moc_build rcc_build uic_build \
imageformats_run
-USES= qmake
+USES= qmake qt:4
INSTALLS_ICONS= yes
OPTIONS_DEFINE= DEBUG
Index: net/x2goclient/Makefile
===================================================================
--- net/x2goclient/Makefile
+++ net/x2goclient/Makefile
@@ -19,9 +19,9 @@
RUN_DEPENDS= nxproxy:net/nxproxy \
x2goclient-cli:net/x2goclient-cli
-USES= qmake
+USES= qmake qt:4
USE_XORG= xpm
-USE_QT4= gui network svg \
+USE_QT= gui network svg \
linguisttools_build moc_build rcc_build uic_build
QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}"
Index: net/zeroconf-ioslave-kde4/Makefile
===================================================================
--- net/zeroconf-ioslave-kde4/Makefile
+++ net/zeroconf-ioslave-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: net/zeroconf-ioslave/Makefile
===================================================================
--- net/zeroconf-ioslave/Makefile
+++ net/zeroconf-ioslave/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Network monitor for DNS-SD services (Zeroconf)
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= config coreaddons dbusaddons dnssd i18n kio service
-USE_QT5= core dbus network \
+USE_QT= core dbus network \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: polish/kadu/Makefile
===================================================================
--- polish/kadu/Makefile
+++ polish/kadu/Makefile
@@ -37,10 +37,10 @@
GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz
USES= cmake compiler:c++11-lib 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 gui multimedia network \
+USE_QT= concurrent core dbus gui multimedia network \
qml quick script scripttools sql webkit widgets x11extras \
xml xmlpatterns buildtools_build linguisttools_build \
qmake_build imageformats_run sql-sqlite3_run
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= qmake qt:4
+USE_QT= uic_build moc_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
@@ -20,9 +20,9 @@
USE_GITHUB= yes
-USES= compiler:c++11-lib pkgconfig qmake
+USES= compiler:c++11-lib pkgconfig qmake qt:5
USE_GL= gl
-USE_QT5= buildtools_build core gui network widgets xml
+USE_QT= buildtools_build core gui network widgets xml
CXXFLAGS+= -I${LOCALBASE}/include/maia
Index: ports-mgmt/octopkg/Makefile
===================================================================
--- ports-mgmt/octopkg/Makefile
+++ ports-mgmt/octopkg/Makefile
@@ -16,9 +16,9 @@
USE_GITHUB= yes
GH_ACCOUNT= aarnt
-USE_QT5= core concurrent gui network xml widgets quick concurrent \
+USE_QT= core concurrent gui network xml widgets quick concurrent \
buildtools_build
-USES= qmake compiler:c++11-lib
+USES= qmake compiler:c++11-lib qt:5
PLIST_FILES= bin/${PORTNAME} share/pixmaps/octopi_green.png
Index: ports-mgmt/packagekit/Makefile
===================================================================
--- ports-mgmt/packagekit/Makefile
+++ ports-mgmt/packagekit/Makefile
@@ -79,7 +79,8 @@
CONFIGURE_ARGS+=--enable-qt
LIB_DEPENDS+= libcppunit.so:devel/cppunit
-USE_QT4+= dbus gui xml sql moc_build
+USES= qt:4
+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
@@ -20,9 +20,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 qmake qt:5 tar:bzip2
USE_CXXSTD= c++11
-USE_QT5= widgets buildtools_build
+USE_QT= widgets buildtools_build
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/portrac ${STAGEDIR}${PREFIX}/bin && \
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 qt:4 shared-mime-info 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 uic3_build
+USES= ghostscript:run qmake qt:4 zip
DESKTOP_ENTRIES= "KPDFTool" "${COMMENT}" "kpdftool" \
"kpdftool" "Qt;Utility;" true
Index: print/lyx/Makefile
===================================================================
--- print/lyx/Makefile
+++ print/lyx/Makefile
@@ -21,8 +21,8 @@
MINOR_VERSION= 0
USES= desktop-file-utils gmake iconv pkgconfig perl5 \
- python:2.7 shebangfix tar:xz
-USE_QT5= core concurrent gui svg widgets buildtools_build qmake_build
+ python:2.7 qt:5 shebangfix tar:xz
+USE_QT= core concurrent gui svg widgets buildtools_build qmake_build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-included-boost \
--without-included-mythes \
Index: print/print-manager-kde4/Makefile
===================================================================
--- print/print-manager-kde4/Makefile
+++ print/print-manager-kde4/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/print-manager/Makefile
===================================================================
--- print/print-manager/Makefile
+++ print/print-manager/Makefile
@@ -9,12 +9,12 @@
LIB_DEPENDS= libcups.so:print/cups
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemviews jobwidgets kcmutils \
kio notifications plasma-framework service widgetsaddons \
windowsystem
-USE_QT5= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: print/py-qt5-printsupport/Makefile
===================================================================
--- print/py-qt5-printsupport/Makefile
+++ print/py-qt5-printsupport/Makefile
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -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,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,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,8 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt print support module
-USE_QT5= core gui widgets qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core gui widgets qmake_build buildtools_build
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: print/scribus/Makefile
===================================================================
--- print/scribus/Makefile
+++ print/scribus/Makefile
@@ -31,8 +31,8 @@
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
USES= cmake:outsource desktop-file-utils ghostscript:run jpeg \
- pkgconfig python:2.7 shared-mime-info tar:xz
-USE_QT4= corelib gui linguist_build moc_build qmake_build rcc_build uic_build xml network
+ pkgconfig python:2.7 qt:4 shared-mime-info tar:xz
+USE_QT= corelib gui linguist_build moc_build qmake_build rcc_build uic_build xml network
USE_GNOME= libartlgpl2 libxml2
USE_LDCONFIG= yes
Index: science/avogadro/Makefile
===================================================================
--- science/avogadro/Makefile
+++ science/avogadro/Makefile
@@ -20,9 +20,9 @@
# We need to add a RUN_DEPENDS on eigen2, as the cmake file shiped with
# avogadro to use it, contains 'find_package(Eigen2 REQUIRED)'.
-USES= cmake desktop-file-utils eigen:2,build,run pkgconfig tar:bzip2
+USES= cmake desktop-file-utils eigen:2,build,run 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/iboview/Makefile
===================================================================
--- science/iboview/Makefile
+++ science/iboview/Makefile
@@ -20,9 +20,9 @@
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON_amd64= only builds and is supported on amd64
-USES= fortran blaslapack:openblas qmake:outsource tar:bz2
+USES= fortran blaslapack:openblas qmake:outsource qt:5 tar:bz2
USE_GL= gl glu
-USE_QT5= buildtools_build core gui widgets opengl script svg
+USE_QT= buildtools_build core gui widgets opengl script svg
PLIST_FILES= bin/iboview
Index: science/kalzium-kde4/Makefile
===================================================================
--- science/kalzium-kde4/Makefile
+++ science/kalzium-kde4/Makefile
@@ -14,11 +14,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 eigen:3 kde:4 pkgconfig tar:xz
+USES= cmake:outsource eigen:3 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/kalzium/Makefile
===================================================================
--- science/kalzium/Makefile
+++ science/kalzium/Makefile
@@ -13,7 +13,7 @@
${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 gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth archive bookmarks codecs completion config configwidgets \
coreaddons crash doctools ecm emoticons guiaddons i18n \
iconthemes itemmodels itemviews jobwidgets js kdelibs4support \
@@ -22,7 +22,7 @@
xmlgui
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_QT5= core dbus gui network opengl printsupport qml quick script svg \
+USE_QT= core dbus gui network opengl printsupport qml quick script svg \
widgets xml \
buildtools_build qmake_build
Index: science/kst2/Makefile
===================================================================
--- science/kst2/Makefile
+++ science/kst2/Makefile
@@ -50,8 +50,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/libgeodecomp/Makefile
===================================================================
--- science/libgeodecomp/Makefile
+++ science/libgeodecomp/Makefile
@@ -30,7 +30,8 @@
MPI_LIB_DEPENDS= libmpich.so:net/mpich2
MPI_CMAKE_BOOL= WITH_MPI
-QT4_USE= QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
QT4_CMAKE_BOOL= WITH_QT
SILO_DESC= Enable Silo dependend output
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,8 +33,8 @@
CONFLICTS_BUILD= protobuf*
-USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
-USE_QT4= qmake_build moc_build rcc_build uic_build \
+USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 qt:4 shebangfix
+USE_QT= qmake_build moc_build rcc_build uic_build \
linguisttools_build assistant_run qt3support \
corelib dbus designer gui help-tools network script \
sql svg xml webkit assistantclient clucene \
Index: science/pulseview/Makefile
===================================================================
--- science/pulseview/Makefile
+++ science/pulseview/Makefile
@@ -17,9 +17,9 @@
libsigrok.so:devel/libsigrok \
libsigrokdecode.so:devel/libsigrokdecode
-USES= cmake desktop-file-utils pkgconfig
+USES= cmake desktop-file-utils pkgconfig qt:5
USE_GNOME= glibmm glib20 libsigc++20
-USE_QT5= buildtools core gui qmake_build svg widgets
+USE_QT= buildtools core gui qmake_build svg widgets
CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
-DDISABLE_WERROR:BOOL=TRUE
INSTALLS_ICONS= yes
Index: science/py-veusz/Makefile
===================================================================
--- science/py-veusz/Makefile
+++ science/py-veusz/Makefile
@@ -17,10 +17,10 @@
RUN_DEPENDS= ${PYNUMPY}
BUILD_DEPENDS:= ${RUN_DEPENDS}
-USES= python pyqt:4 shebangfix
+USES= python pyqt:4 qt:4 shebangfix
USE_PYQT= gui svg
USE_PYTHON= distutils concurrent autoplist
-USE_QT4= corelib gui xml
+USE_QT= corelib gui xml
SHEBANG_FILES= examples/embedexample.py
post-patch:
Index: science/qtresistors/Makefile
===================================================================
--- science/qtresistors/Makefile
+++ science/qtresistors/Makefile
@@ -11,8 +11,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Calculate resistance of resistor by the colors on the resistor
-USES= qmake
-USE_QT4= gui uic_build moc_build
+USES= qmake qt:4
+USE_QT= gui uic_build moc_build
WRKSRC= ${WRKDIR}/qtResistors
Index: science/step-kde4/Makefile
===================================================================
--- science/step-kde4/Makefile
+++ science/step-kde4/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libqalculate.so:math/libqalculate \
libgsl.so:math/gsl
-USES= cmake:outsource eigen:2 kde:4 pkgconfig tar:xz
+USES= cmake:outsource eigen:2 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: science/step/Makefile
===================================================================
--- science/step/Makefile
+++ science/step/Makefile
@@ -11,14 +11,14 @@
libgsl.so:math/gsl \
libqalculate.so:math/libqalculate
-USES= cmake:outsource eigen:3 gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource eigen:3 gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash doctools ecm emoticons guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets js \
kdelibs4support khtml kio newstuff notifications parts \
plotting service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network opengl printsupport qml quick svg \
+USE_QT= core dbus gui network opengl printsupport qml quick svg \
widgets xml \
buildtools_build qmake_build
Index: security/fwbuilder/Makefile
===================================================================
--- security/fwbuilder/Makefile
+++ security/fwbuilder/Makefile
@@ -26,7 +26,7 @@
libnetsnmp.so:net-mgmt/net-snmp
PLIST_SUB= BUILD_VERSION=${PORTVERSION}.${BUILD}
-USE_QT4= corelib \
+USE_QT= corelib \
gui \
iconengines \
inputmethods \
@@ -40,7 +40,7 @@
QTDIR?= ${PREFIX}
-USES= autoreconf:build gmake libtool ssl
+USES= autoreconf:build gmake libtool qmake:no_configure qt:4 ssl
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
@@ -71,8 +71,8 @@
. if ${SLAVEPORT} == "qt5"
LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp
-USES+= compiler:c++11-lib pkgconfig
-USE_QT5= buildtools_build core
+USES+= compiler:c++11-lib pkgconfig qt:5
+USE_QT= buildtools_build core
CONFIGURE_ARGS+=--enable-languages="cpp qt"
DOCSDIR= ${PORTNAME}${PKGNAMESUFFIX}
Index: security/keepassx-devel/Makefile
===================================================================
--- security/keepassx-devel/Makefile
+++ security/keepassx-devel/Makefile
@@ -23,10 +23,10 @@
CONFLICTS_INSTALL= keepassx-0.* keepassx2-* keepassxc-*
-USES= cmake compiler:c++11-lib desktop-file-utils shared-mime-info
+USES= cmake compiler:c++11-lib desktop-file-utils qt:5 shared-mime-info
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 qmake qt:4 shared-mime-info
+USE_QT= moc_build uic_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-* keepassxc-*
-USES= cmake compiler:features desktop-file-utils shared-mime-info
+USES= cmake compiler:features desktop-file-utils qt:4 shared-mime-info
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/keepassxc/Makefile
===================================================================
--- security/keepassxc/Makefile
+++ security/keepassxc/Makefile
@@ -23,8 +23,8 @@
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error
-USES= cmake:outsource desktop-file-utils shared-mime-info tar:xz
-USE_QT5= buildtools_build concurrent core dbus gui linguisttools network \
+USES= cmake:outsource desktop-file-utils qt:5 shared-mime-info tar:xz
+USE_QT= buildtools_build concurrent core dbus gui linguisttools network \
qmake_build testlib widgets
USE_XORG= x11
USE_LDCONFIG= yes
@@ -41,7 +41,8 @@
AUTOTYPE_CMAKE_BOOL= WITH_XC_AUTOTYPE
AUTOTYPE_DESC= Auto-type passwords in input fields
-AUTOTYPE_USE= QT5=x11extras XORG=xi,xtst
+AUTOTYPE_USES= qt:5
+AUTOTYPE_USE= QT=x11extras XORG=xi,xtst
BROWSER_CMAKE_BOOL= WITH_XC_BROWSER
BROWSER_DESC= Browser integration with KeePassXC-Browser
Index: security/kf5-kdesu/Makefile
===================================================================
--- security/kf5-kdesu/Makefile
+++ security/kf5-kdesu/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: security/kgpg-kde4/Makefile
===================================================================
--- security/kgpg-kde4/Makefile
+++ security/kgpg-kde4/Makefile
@@ -11,8 +11,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 <bsd.port.mk>
Index: security/kgpg/Makefile
===================================================================
--- security/kgpg/Makefile
+++ security/kgpg/Makefile
@@ -9,13 +9,13 @@
RUN_DEPENDS= gpg2:security/gnupg
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= akonadi akonadicontacts archive auth bookmarks codecs \
completion config configwidgets contacts coreaddons crash \
dbusaddons doctools ecm i18n iconthemes itemmodels itemviews \
jobwidgets kio notifications service solid sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: security/kleopatra/Makefile
===================================================================
--- security/kleopatra/Makefile
+++ security/kleopatra/Makefile
@@ -14,12 +14,12 @@
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
doctools ecm i18n iconthemes itemmodels kcmutils notifications \
service sonnet textwidgets widgetsaddons windowsystem xmlgui \
libkleo mime
-USE_QT5= core dbus gui network printsupport testlib widgets xml \
+USE_QT= core dbus gui network printsupport testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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 qmake qt:4
+USE_QT= corelib network gui moc_build qtestlib_build
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
QMAKE_SOURCE_PATH= ${PORTNAME}.pro
Index: security/kwalletmanager-kde4/Makefile
===================================================================
--- security/kwalletmanager-kde4/Makefile
+++ security/kwalletmanager-kde4/Makefile
@@ -9,8 +9,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Password manager 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 <bsd.port.mk>
Index: security/kwalletmanager/Makefile
===================================================================
--- security/kwalletmanager/Makefile
+++ security/kwalletmanager/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Password manager for KDE
-USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs config configwidgets coreaddons crash \
dbusaddons doctools ecm emoticons i18n iconthemes init \
itemmodels itemviews kcmutils kdelibs4support kio \
jobwidgets notifications service wallet widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: security/libkleo/Makefile
===================================================================
--- security/libkleo/Makefile
+++ security/libkleo/Makefile
@@ -15,11 +15,11 @@
RUN_DEPENDS= ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= codecs completion config coreaddons i18n itemmodels \
widgetsaddons windowsystem \
pimtextedit
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
_CORETOOLS= md5sum sha1sum sha256sum sha512sum
Index: security/openconnect-gui/Makefile
===================================================================
--- security/openconnect-gui/Makefile
+++ security/openconnect-gui/Makefile
@@ -21,8 +21,8 @@
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME:C/-gui//}
-USES= cmake pkgconfig
-USE_QT5= buildtools_build concurrent core gui network qmake_build widgets
+USES= cmake pkgconfig qt:5
+USE_QT= buildtools_build concurrent core gui network qmake_build widgets
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
PLIST_FILES= bin/openconnect-gui
Index: security/ophcrack/Makefile
===================================================================
--- security/ophcrack/Makefile
+++ security/ophcrack/Makefile
@@ -27,7 +27,8 @@
X11_DESC= Build Qt 4 GUI frontend
GRAPH_DESC= Enable graph rendering via Qwt
-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_CONFIGURE_OFF= --disable-gui
GRAPH_LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5
Index: security/pinentry/Makefile
===================================================================
--- security/pinentry/Makefile
+++ security/pinentry/Makefile
@@ -94,14 +94,14 @@
.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= corelib 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/plasma5-kscreenlocker/Makefile
===================================================================
--- security/plasma5-kscreenlocker/Makefile
+++ security/plasma5-kscreenlocker/Makefile
@@ -13,13 +13,13 @@
dbus-send:devel/dbus
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- shebangfix tar:xz
+ qt:5 shebangfix tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash ecm \
emoticons globalaccel i18n idletime init itemmodels kcmutils \
kdeclarative kdelibs4support notifications package \
plasma-framework sonnet textwidgets wayland widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network qml quick testlib widgets x11extras xml \
+USE_QT= core dbus gui network qml quick testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xi
Index: security/plasma5-ksshaskpass/Makefile
===================================================================
--- security/plasma5-ksshaskpass/Makefile
+++ security/plasma5-ksshaskpass/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 ssh-add frontend
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= coreaddons doctools ecm i18n wallet widgetsaddons
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: security/plasma5-kwallet-pam/Makefile
===================================================================
--- security/plasma5-kwallet-pam/Makefile
+++ security/plasma5-kwallet-pam/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error
-USES= cmake:outsource cpe gettext kde:5 tar:xz
+USES= cmake:outsource cpe gettext kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build qmake_build
+USE_QT= buildtools_build qmake_build
# The qmake dependency is only needed so that kf5-e-c-m can query qmake for
# some installation directories.
Index: security/qtkeychain/Makefile
===================================================================
--- security/qtkeychain/Makefile
+++ security/qtkeychain/Makefile
@@ -24,12 +24,14 @@
PLIST_SUB+= VERSION=${PORTVERSION}
. if ${FLAVOR} == qt4
+USES+= qt:4
CMAKE_ON= BUILD_WITH_QT4
-USE_QT4= corelib dbus linguisttools_build moc_build rcc_build qmake_build
+USE_QT= corelib dbus linguisttools_build moc_build rcc_build qmake_build
PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
PLIST= ${PKGDIR}/pkg-plist.${FLAVOR}
. else
-USE_QT5= core dbus linguisttools_build buildtools_build qmake_build
+USES+= qt:5
+USE_QT= core dbus linguisttools_build buildtools_build qmake_build
PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
PLIST= ${PKGDIR}/pkg-plist.${FLAVOR}
. endif
Index: security/quantis/Makefile
===================================================================
--- security/quantis/Makefile
+++ security/quantis/Makefile
@@ -28,8 +28,7 @@
GUI_DESC= Build QT4 GUI for EasyQuantis application
EXTRACT_BEFORE_ARGS= -aqo
-USES= cmake compiler:c++11-lang zip:infozip
-USE_QT4= # empty but required
+USES= cmake compiler:c++11-lang qt:4 zip:infozip
USE_LDCONFIG= yes
SUB_FILES= pkg-message
@@ -74,7 +73,7 @@
CXXFLAGS+= -I${LOCALBASE}/include
. if ${PORT_OPTIONS:MGUI}
-USE_QT4+= gui moc_build uic_build rcc_build qmake_build
+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= qmake qt:4
+USE_QT= gui moc_build rcc_build uic_build
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= *
Index: security/yubikey-personalization-gui/Makefile
===================================================================
--- security/yubikey-personalization-gui/Makefile
+++ security/yubikey-personalization-gui/Makefile
@@ -17,8 +17,8 @@
USE_GITHUB= yes
GH_ACCOUNT= Yubico
-USES= pkgconfig qmake
-USE_QT4= corelib gui moc_build rcc_build testlib_build uic_build
+USES= pkgconfig qmake qt:4
+USE_QT= corelib gui moc_build rcc_build testlib_build uic_build
PLIST_FILES= bin/yubikey-personalization-gui \
man/man1/yubikey-personalization-gui.1.gz \
Index: sysutils/UEFITool/Makefile
===================================================================
--- sysutils/UEFITool/Makefile
+++ sysutils/UEFITool/Makefile
@@ -12,11 +12,11 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/../LICENSE.md
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_GITHUB= yes
GH_ACCOUNT= LongSoft
USE_GL= gl
-USE_QT5= core gui widgets buildtools_build qmake_build
+USE_QT= core gui widgets buildtools_build qmake_build
WRKSRC_SUBDIR= ${PORTNAME}
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/bacula9-bat/Makefile
===================================================================
--- sysutils/bacula9-bat/Makefile
+++ sysutils/bacula9-bat/Makefile
@@ -9,8 +9,8 @@
LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
libbac.so:sysutils/bacula9-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/baloo-kde4/Makefile
===================================================================
--- sysutils/baloo-kde4/Makefile
+++ sysutils/baloo-kde4/Makefile
@@ -14,10 +14,10 @@
LIB_DEPENDS= libxapian.so:databases/xapian-core \
libqjson.so:devel/qjson@qt4
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource 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 <bsd.port.mk>
Index: sysutils/baloo-widgets-kde4/Makefile
===================================================================
--- sysutils/baloo-widgets-kde4/Makefile
+++ sysutils/baloo-widgets-kde4/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 <bsd.port.mk>
Index: sysutils/baloo-widgets/Makefile
===================================================================
--- sysutils/baloo-widgets/Makefile
+++ sysutils/baloo-widgets/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= BalooWidgets library
-USES= cmake:outsource compiler:c++11-lang gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= baloo completion config coreaddons ecm emoticons filemetadata \
i18n init itemmodels jobwidgets kdelibs4support kio service \
widgetsaddons
-USE_QT5= core gui network testlib widgets xml \
+USE_QT= core gui network testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: sysutils/bareos-traymonitor/Makefile
===================================================================
--- sysutils/bareos-traymonitor/Makefile
+++ sysutils/bareos-traymonitor/Makefile
@@ -12,8 +12,8 @@
CONFLICTS= bacula*-bat-* bareos16-traymonitor-*
-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/bareos16-bat/Makefile
===================================================================
--- sysutils/bareos16-bat/Makefile
+++ sysutils/bareos16-bat/Makefile
@@ -11,8 +11,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/bareos16-traymonitor/Makefile
===================================================================
--- sysutils/bareos16-traymonitor/Makefile
+++ sysutils/bareos16-traymonitor/Makefile
@@ -12,8 +12,8 @@
CONFLICTS= bacula*-bat-* bareos-traymonitor-*
-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
@@ -11,8 +11,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 <bsd.port.mk>
Index: sysutils/dsbbatmon/Makefile
===================================================================
--- sysutils/dsbbatmon/Makefile
+++ sysutils/dsbbatmon/Makefile
@@ -11,9 +11,9 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:tgz qmake
+USES= qt:5 tar:tgz qmake
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build widgets
+USE_QT= buildtools_build core gui linguisttools_build widgets
.include <bsd.port.mk>
Index: sysutils/dsblogoutmgr/Makefile
===================================================================
--- sysutils/dsblogoutmgr/Makefile
+++ sysutils/dsblogoutmgr/Makefile
@@ -11,9 +11,9 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:tgz qmake
+USES= qt:5 tar:tgz qmake
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build widgets
+USE_QT= buildtools_build core gui linguisttools_build widgets
.include <bsd.port.mk>
Index: sysutils/filelight-kde4/Makefile
===================================================================
--- sysutils/filelight-kde4/Makefile
+++ sysutils/filelight-kde4/Makefile
@@ -12,8 +12,8 @@
CONFLICTS_INSTALL= ${PORTNAME}
-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 <bsd.port.mk>
Index: sysutils/filelight/Makefile
===================================================================
--- sysutils/filelight/Makefile
+++ sysutils/filelight/Makefile
@@ -12,11 +12,11 @@
CONFLICTS_INSTALL= ${PORTNAME}-kde4*
-USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons doctools \
ecm i18n jobwidgets kio parts service solid sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network script widgets xml \
+USE_QT= core dbus gui network script widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/glogg/Makefile
===================================================================
--- sysutils/glogg/Makefile
+++ sysutils/glogg/Makefile
@@ -15,8 +15,8 @@
LIB_DEPENDS= libboost_program_options.so:devel/boost-libs
-USES= qmake desktop-file-utils
-USE_QT5= core gui widgets dbus buildtools_build
+USES= qmake desktop-file-utils qt:5
+USE_QT= core gui widgets dbus buildtools_build
LDFLAGS+= -Wl,--as-needed # prevents stray USE_GL=gl, see bug#224488
PLIST_FILES= bin/glogg \
Index: sysutils/k3b-kde4/Makefile
===================================================================
--- sysutils/k3b-kde4/Makefile
+++ sysutils/k3b-kde4/Makefile
@@ -17,11 +17,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 qt:4 shared-mime-info 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/k3b/Makefile
===================================================================
--- sysutils/k3b/Makefile
+++ sysutils/k3b/Makefile
@@ -23,13 +23,13 @@
BUILD_DEPENDS= cdrecord:sysutils/cdrtools
USES= cmake:outsource desktop-file-utils gettext iconv kde:5 pkgconfig \
- shared-mime-info tar:xz
+ qt:5 shared-mime-info tar:xz
USE_KDE= archive attica auth bookmarks codecs completion config \
configwidgets coreaddons ecm filemetadata i18n iconthemes \
itemviews jobwidgets kcmutils kio newstuff notifications \
notifyconfig service solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network webkit widgets xml \
+USE_QT= core dbus gui network webkit widgets xml \
buildtools_build qmake_build
# The ffmpeg-plugin needs patching
Index: sysutils/kbackup/Makefile
===================================================================
--- sysutils/kbackup/Makefile
+++ sysutils/kbackup/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Backup program with an easy to use user interface
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n iconthemes itemviews jobwidgets kio \
notifications service solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
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@qt4
RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde
-USES= cmake kde:4 pkgconfig tar:bzip2
+USES= cmake 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-kde4/Makefile
===================================================================
--- sysutils/kcron-kde4/Makefile
+++ sysutils/kcron-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: sysutils/kcron/Makefile
===================================================================
--- sysutils/kcron/Makefile
+++ sysutils/kcron/Makefile
@@ -10,11 +10,11 @@
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons ecm \
doctools i18n iconthemes jobwidgets kio service widgetsaddons \
xmlgui
-USE_QT5= core gui network printsupport widgets xml \
+USE_QT= core gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/kdebugsettings/Makefile
===================================================================
--- sysutils/kdebugsettings/Makefile
+++ sysutils/kdebugsettings/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE application to enable/disable qCDebug
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= completion config configwidgets coreaddons dbusaddons \
ecm guiaddons i18n iconthemes itemviews kio widgetsaddons
-USE_QT5= core dbus gui testlib widgets \
+USE_QT= core dbus gui testlib widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/kdf-kde4/Makefile
===================================================================
--- sysutils/kdf-kde4/Makefile
+++ sysutils/kdf-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: sysutils/kdf/Makefile
===================================================================
--- sysutils/kdf/Makefile
+++ sysutils/kdf/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Shows free space of devices for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons doctools \
i18n iconthemes jobwidgets kcmutils kio notifications service \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/kdialog/Makefile
===================================================================
--- sysutils/kdialog/Makefile
+++ sysutils/kdialog/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Show nice dialog boxes from shell scripts
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemviews jobwidgets kdelibs4support kio notifications parts \
service solid sonnet textwidgets unitconversion widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_XORG= x11
Index: sysutils/kdirstat/Makefile
===================================================================
--- sysutils/kdirstat/Makefile
+++ sysutils/kdirstat/Makefile
@@ -16,10 +16,10 @@
WRKSRC= ${WRKDIR}/jeromerobert-k4dirstat-3a4663ee20e7
-USES= cmake cpe gettext-tools kde:4 tar:bzip2
+USES= cmake cpe gettext-tools kde:4 qt:4 tar:bzip2
CPE_VENDOR= kdirstat_project
USE_KDE= automoc4 kdelibs libkonq
-USE_QT4= corelib dbus gui network qt3support svg xml \
+USE_QT= corelib dbus gui network qt3support svg xml \
moc_build qmake_build rcc_build uic_build
post-patch:
Index: sysutils/kf5-baloo/Makefile
===================================================================
--- sysutils/kf5-baloo/Makefile
+++ sysutils/kf5-baloo/Makefile
@@ -10,11 +10,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 \
filemetadata 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
# Frameworks ports install localization files that conflict with some
Index: sysutils/kf5-kwallet/Makefile
===================================================================
--- sysutils/kf5-kwallet/Makefile
+++ sysutils/kf5-kwallet/Makefile
@@ -15,10 +15,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 <bsd.port.mk>
Index: sysutils/kfilemetadata-kde4/Makefile
===================================================================
--- sysutils/kfilemetadata-kde4/Makefile
+++ sysutils/kfilemetadata-kde4/Makefile
@@ -15,9 +15,9 @@
libepub.so:textproc/ebook-tools \
libqmobipocket.so:graphics/kdegraphics-mobipocket-kde4
-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 <bsd.port.mk>
Index: sysutils/kfloppy-kde4/Makefile
===================================================================
--- sysutils/kfloppy-kde4/Makefile
+++ sysutils/kfloppy-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: sysutils/kfloppy/Makefile
===================================================================
--- sysutils/kfloppy/Makefile
+++ sysutils/kfloppy/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Floppy disk formatter for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
doctools ecm emoticons i18n init itemmodels kdelibs4support \
kio widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/khelpcenter/Makefile
===================================================================
--- sysutils/khelpcenter/Makefile
+++ sysutils/khelpcenter/Makefile
@@ -10,14 +10,14 @@
LIB_DEPENDS= libxapian.so:databases/xapian-core
USES= cmake:outsource compiler:c++11-lib cpe gettext grantlee:5 \
- kde:5 shebangfix tar:xz
+ kde:5 qt:5 shebangfix tar:xz
USE_GNOME= libxml2
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons dbusaddons doctools ecm emoticons i18n init \
itemmodels itemviews jobwidgets js kcmutils kdelibs4support \
kio khtml parts service sonnet textwidgets widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= searchhandlers/khc_mansearch.pl
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 <bsd.port.mk>
Index: sysutils/krename/Makefile
===================================================================
--- sysutils/krename/Makefile
+++ sysutils/krename/Makefile
@@ -17,11 +17,11 @@
libpodofo.so:graphics/podofo \
libfreetype.so:print/freetype2
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash i18n iconthemes itemviews jobwidgets \
js kio service solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network xml widgets \
+USE_QT= core dbus gui network xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
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 qt:4 zip
+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-kde4/Makefile
===================================================================
--- sysutils/ksystemlog-kde4/Makefile
+++ sysutils/ksystemlog-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: sysutils/ksystemlog/Makefile
===================================================================
--- sysutils/ksystemlog/Makefile
+++ sysutils/ksystemlog/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE system log application
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
doctools ecm i18n iconthemes itemviews jobwidgets kio \
service sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport testlib widgets xml \
+USE_QT= core dbus gui network printsupport testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/kuser-kde4/Makefile
===================================================================
--- sysutils/kuser-kde4/Makefile
+++ sysutils/kuser-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: sysutils/luckybackup/Makefile
===================================================================
--- sysutils/luckybackup/Makefile
+++ sysutils/luckybackup/Makefile
@@ -13,10 +13,10 @@
RUN_DEPENDS= rsync:net/rsync
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
-USE_QT5= core gui network widgets buildtools_build
+USE_QT= core gui network widgets buildtools_build
post-patch:
${REINPLACE_CMD} -e 's|/usr|$$$${PREFIX}|g' -e '/INSTALLS/s|debianmenu ||' \
Index: sysutils/nepomuk-core-kde4/Makefile
===================================================================
--- sysutils/nepomuk-core-kde4/Makefile
+++ sysutils/nepomuk-core-kde4/Makefile
@@ -16,10 +16,10 @@
libepub.so:textproc/ebook-tools \
libqmobipocket.so:graphics/kdegraphics-mobipocket-kde4
-USES= cmake:outsource kde:4 python:run shebangfix tar:xz
+USES= cmake:outsource kde:4 python:run qt:4 shebangfix 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-kde4/Makefile
===================================================================
--- sysutils/nepomuk-widgets-kde4/Makefile
+++ sysutils/nepomuk-widgets-kde4/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 <bsd.port.mk>
Index: sysutils/pc-networkmanager/Makefile
===================================================================
--- sysutils/pc-networkmanager/Makefile
+++ sysutils/pc-networkmanager/Makefile
@@ -19,10 +19,10 @@
CONFLICTS= pcbsd-utils*
MAKE_JOBS_UNSAFE= yes
-USES= qmake shebangfix tar:xz
+USES= qmake qt:5 shebangfix tar:xz
SHEBANG_FILES= src/NetworkManager/resources/umts_stick
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
buildtools x11extras widgets
USE_GL+= gl
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
+USE_QT= core network buildtools qmake
+USES= pkgconfig qt:5
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 \
+USE_QT= core gui network svg linguist \
webkit buildtools x11extras
-USES= desktop-file-utils python qmake shebangfix
+USES= desktop-file-utils python qmake qt:5 shebangfix
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,8 @@
eject:sysutils/eject
WRKSRC_SUBDIR= src-sh/pcbsd-utils
-USE_QT5= core network buildtools qmake
-USES= pkgconfig
+USE_QT= core network buildtools qmake
+USES= pkgconfig qt:5
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
USE_GITHUB= yes
Index: sysutils/plasma5-discover/Makefile
===================================================================
--- sysutils/plasma5-discover/Makefile
+++ sysutils/plasma5-discover/Makefile
@@ -11,13 +11,13 @@
#LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt5
USES= cmake:outsource compiler:c++11-lib cpe desktop-file-utils \
- gettext kde:5 pkgconfig tar:xz
+ gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= archive attica auth codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemmodels \
itemviews jobwidgets kdeclarative kio kirigami2 newstuff \
notifications package plasma-framework service solid \
textwidgets wallet widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= concurrent core dbus gui network qml quick svg testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/plasma5-drkonqi/Makefile
===================================================================
--- sysutils/plasma5-drkonqi/Makefile
+++ sysutils/plasma5-drkonqi/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 crash handler
-USES= cmake:outsource kde:5 pkgconfig tar:xz
+USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash i18n idletime jobwidgets kio notifications \
service wallet widgetsaddons xmlrpcclient
-USE_QT5= concurrent core dbus gui network widgets x11extras xml \
+USE_QT= concurrent core dbus gui network widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/plasma5-kde-cli-tools/Makefile
===================================================================
--- sysutils/plasma5-kde-cli-tools/Makefile
+++ sysutils/plasma5-kde-cli-tools/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 non-interactive system tools
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= activities auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm emoticons guiaddons i18n iconthemes init \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kdesu \
kio notifications parts pty service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport svg testlib widgets x11extras xml \
+USE_QT= concurrent core dbus gui network printsupport svg testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11
Index: sysutils/plasma5-kinfocenter/Makefile
===================================================================
--- sysutils/plasma5-kinfocenter/Makefile
+++ sysutils/plasma5-kinfocenter/Makefile
@@ -10,7 +10,7 @@
LIB_DEPENDS= libpci.so:devel/libpci
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_GL= egl gl glu
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm emoticons guiaddons \
@@ -18,7 +18,7 @@
kdelibs4support kio notifications package parts init \
itemmodels itemviews service solid sonnet textwidgets \
unitconversion wayland wayland widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport widgets xml \
+USE_QT= concurrent core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
Index: sysutils/plasma5-kmenuedit/Makefile
===================================================================
--- sysutils/plasma5-kmenuedit/Makefile
+++ sysutils/plasma5-kmenuedit/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 menu editor
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons ecm emoticons hotkeys \
i18n iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio notifications parts service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml\
+USE_QT= core dbus gui network printsupport widgets xml\
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/plasma5-ksysguard/Makefile
===================================================================
--- sysutils/plasma5-ksysguard/Makefile
+++ sysutils/plasma5-ksysguard/Makefile
@@ -8,13 +8,13 @@
COMMENT= Plasma5 utility to track and control the running processes
USES= cmake:outsource compiler:c++11-lib cpe desktop-file-utils \
- gettext kde:5 tar:xz
+ gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
dbusaddons emoticons i18n iconthemes init itemmodels \
itemviews jobwidgets kdelibs4support kio libksysguard \
newstuff notifications service widgetsaddons windowsystem \
xmlgui
-USE_QT5= concurrent core dbus gui network widgets xml \
+USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= INOTIFY
Index: sysutils/plasma5-libksysguard/Makefile
===================================================================
--- sysutils/plasma5-libksysguard/Makefile
+++ sysutils/plasma5-libksysguard/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 library to track and control running processes
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons i18n \
iconthemes package plasma-framework service widgetsaddons \
windowsystem
-USE_QT5= core dbus gui network script webkit widgets x11extras xml \
+USE_QT= core dbus gui network script webkit widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/plasma5-polkit-kde-agent-1/Makefile
===================================================================
--- sysutils/plasma5-polkit-kde-agent-1/Makefile
+++ sysutils/plasma5-polkit-kde-agent-1/Makefile
@@ -9,10 +9,10 @@
LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@qt5
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons crash dbusaddons ecm i18n iconthemes \
notifications widgetsaddons windowsystem
-USE_QT5= core dbus gui widgets \
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/plasma5-powerdevil/Makefile
===================================================================
--- sysutils/plasma5-powerdevil/Makefile
+++ sysutils/plasma5-powerdevil/Makefile
@@ -7,7 +7,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 tool to manage the power consumption settings
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= activities auth bookmarks codecs completion configwidgets \
coreaddons crash config dbusaddons ecm emoticons globalaccel \
guiaddons i18n idletime iconthemes init itemmodels itemviews \
@@ -15,7 +15,7 @@
notifyconfig parts plasma-workspace service solid sonnet \
textwidgets unitconversion wayland widgetsaddons windowsystem \
xmlgui
-USE_QT5= core dbus gui network printsupport widgets x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb
Index: sysutils/plasma5-systemsettings/Makefile
===================================================================
--- sysutils/plasma5-systemsettings/Makefile
+++ sysutils/plasma5-systemsettings/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 system settings
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= activities activities-stats auth codecs completion config \
configwidgets coreaddons crash dbusaddons doctools ecm i18n \
iconthemes itemviews jobwidgets js kcmutils kdeclarative khtml \
kio kirigami2 package parts service sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network qml quick widgets xml \
+USE_QT= concurrent core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/plasma5-user-manager/Makefile
===================================================================
--- sysutils/plasma5-user-manager/Makefile
+++ sysutils/plasma5-user-manager/Makefile
@@ -10,13 +10,13 @@
LIB_DEPENDS= libpwquality.so:security/libpwquality
USES= cmake:outsource compiler:c++11-lib cpe gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm emoticons guiaddons i18n iconthemes \
init itemmodels itemviews jobwidgets kcmutils kdelibs4support \
kio notifications parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport widgets xml \
+USE_QT= concurrent core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= ${QT_PLUGINDIR}
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@qt4
-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
@@ -26,15 +26,16 @@
BUILD_TEST
. if ${FLAVOR} == qt4
-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_ON+= USE_QT4
CMAKE_OFF+= USE_QT5
QTVER_SUFFIX= # empty
. 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_ON+= USE_QT5
CMAKE_OFF+= USE_QT4
QTVER_SUFFIX= 5
Index: sysutils/qdirstat/Makefile
===================================================================
--- sysutils/qdirstat/Makefile
+++ sysutils/qdirstat/Makefile
@@ -13,9 +13,9 @@
USE_GITHUB= yes
GH_ACCOUNT= shundhammer
-USES= desktop-file-utils qmake shebangfix
+USES= desktop-file-utils qmake qt:5 shebangfix
USE_GL= gl
-USE_QT5= buildtools_build core gui widgets
+USE_QT= buildtools_build core gui widgets
SHEBANG_FILES= scripts/qdirstat-cache-writer
pre-configure:
Index: sysutils/qpxtool/Makefile
===================================================================
--- sysutils/qpxtool/Makefile
+++ sysutils/qpxtool/Makefile
@@ -19,8 +19,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
@@ -31,9 +31,12 @@
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_USES= qt:4
+SQLITE_USE= QT=sql-sqlite3_run
+MYSQL_USES= qt:4
+MYSQL_USE= QT=sql-mysql_run
+PGSQL_USES= qt:4
+PGSQL_USE= QT=sql-pgsql_run
post-configure:
@${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKE_AGRS}|' \
Index: sysutils/qsudo/Makefile
===================================================================
--- sysutils/qsudo/Makefile
+++ sysutils/qsudo/Makefile
@@ -12,11 +12,11 @@
RUN_DEPENDS= sudo:security/sudo
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_TAGNAME= 815e31c
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
WRKSRC_SUBDIR= src-qt5
LDFLAGS+= -Wl,--as-needed # prevents unnecessary USE_GL=gl, see bug#224488
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 corelib gui network
+USES= qmake qt:4
+USE_QT= moc_build rcc_build uic_build corelib gui network
PLIST_FILES= bin/qsynergy \
share/pixmaps/qsynergy.xpm
Index: sysutils/qt5-qtdiag/Makefile
===================================================================
--- sysutils/qt5-qtdiag/Makefile
+++ sysutils/qt5-qtdiag/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Tool for reporting diagnostic information about Qt and its environment
-USES= qmake:outsource
-USE_QT5= core gui
-QT_DIST= tools
+USES= qmake:outsource qt-dist:5,tools
+USE_QT= core gui
PLIST_FILES= ${QT_BINDIR}/qtdiag
Index: sysutils/qt5-qtpaths/Makefile
===================================================================
--- sysutils/qt5-qtpaths/Makefile
+++ sysutils/qt5-qtpaths/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Command line client to QStandardPaths
-USES= qmake:outsource
-USE_QT5= core
-QT_DIST= tools
+USES= qmake:outsource qt-dist:5,tools
+USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtpaths
Index: sysutils/qt5-qtplugininfo/Makefile
===================================================================
--- sysutils/qt5-qtplugininfo/Makefile
+++ sysutils/qt5-qtplugininfo/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt5 plugin metadata dumper
-USES= qmake:outsource
-USE_QT5= core
-QT_DIST= tools
+USES= qmake:outsource qt-dist:5,tools
+USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtplugininfo
Index: sysutils/qtpass/Makefile
===================================================================
--- sysutils/qtpass/Makefile
+++ sysutils/qtpass/Makefile
@@ -13,11 +13,11 @@
RUN_DEPENDS= pass:sysutils/password-store
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_GITHUB= yes
GH_ACCOUNT= IJhack
GH_PROJECT= QtPass
-USE_QT5= core gui network testlib widgets buildtools_build linguisttools_build
+USE_QT= core gui network testlib widgets buildtools_build linguisttools_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_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR}
-USES= cmake kde:4 python:2.7,build tar:bzip2
+USES= cmake kde:4 python:2.7,build qt:4 tar:bzip2
USE_KDE= automoc4
-USE_QT4= corelib dbus declarative qtestlib \
+USE_QT= corelib 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= qmake dos2unix qt:4 zip
DOS2UNIX_GLOB= *.cpp *.h
-USE_QT4= corelib gui moc_build rcc_build uic_build
+USE_QT= corelib gui moc_build rcc_build uic_build
PLIST_FILES= bin/${PORTNAME}
Index: sysutils/signon-kwallet-extension/Makefile
===================================================================
--- sysutils/signon-kwallet-extension/Makefile
+++ sysutils/signon-kwallet-extension/Makefile
@@ -9,9 +9,9 @@
LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5
-USES= cmake:outsource kde:5 pkgconfig tar:xz
+USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm wallet
-USE_QT5= core dbus gui \
+USE_QT= core dbus gui \
buildtools_build qmake_build
USE_LDCONFIG= ${KDE_PREFIX}/${SE_DIR}
PLIST_FILES= ${SE_DIR}/libkeyring-kwallet.so
Index: sysutils/signon-plugin-oauth2/Makefile
===================================================================
--- sysutils/signon-plugin-oauth2/Makefile
+++ sysutils/signon-plugin-oauth2/Makefile
@@ -11,8 +11,8 @@
LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5
-USES= pkgconfig python qmake
-USE_QT5= core network testlib \
+USES= pkgconfig python qmake qt:5
+USE_QT= core network testlib \
buildtools_build qmake_build
USE_LDCONFIG= ${PREFIX}/lib/signon
Index: sysutils/signon-qt5/Makefile
===================================================================
--- sysutils/signon-qt5/Makefile
+++ sysutils/signon-qt5/Makefile
@@ -12,8 +12,8 @@
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext pathfix pkgconfig python qmake tar:bz2
-USE_QT5= core dbus gui network sql testlib xml \
+USES= gettext pathfix pkgconfig python qmake qt:5 tar:bz2
+USE_QT= core dbus gui network sql testlib xml \
buildtools_build qmake_build
# gitlab variables
Index: sysutils/signon-ui/Makefile
===================================================================
--- sysutils/signon-ui/Makefile
+++ sysutils/signon-ui/Makefile
@@ -16,8 +16,8 @@
libsignon-qt5.so:sysutils/signon-qt5 \
libproxy.so:net/libproxy
-USES= pkgconfig python qmake tar:bz2
-USE_QT5= buildtools_build qmake_build webkit widgets
+USES= pkgconfig python qmake qt:5 tar:bz2
+USE_QT= buildtools_build qmake_build webkit widgets
# gitlab variables
USE_GITLAB= yes
Index: sysutils/sweeper-kde4/Makefile
===================================================================
--- sysutils/sweeper-kde4/Makefile
+++ sysutils/sweeper-kde4/Makefile
@@ -9,8 +9,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 <bsd.port.mk>
Index: sysutils/sweeper/Makefile
===================================================================
--- sysutils/sweeper/Makefile
+++ sysutils/sweeper/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Cleans temporal files for KDE
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= activities-stats auth bookmarks codecs config configwidgets \
coreaddons crash i18n kio service sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: sysutils/sysadm-client/Makefile
===================================================================
--- sysutils/sysadm-client/Makefile
+++ sysutils/sysadm-client/Makefile
@@ -13,8 +13,8 @@
LICENSE_FILE= ${WRKSRC}/../LICENSE
WRKSRC_SUBDIR= src-qt5
-USE_QT5= core buildtools_build gui network qmake websockets widgets svg concurrent
-USES= pkgconfig tar:xz qmake ssl
+USE_QT= core buildtools_build gui network qmake websockets widgets svg concurrent
+USES= pkgconfig qt:5 tar:xz qmake ssl
USE_GL+= gl
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
Index: sysutils/sysadm/Makefile
===================================================================
--- sysutils/sysadm/Makefile
+++ sysutils/sysadm/Makefile
@@ -13,8 +13,8 @@
LICENSE_FILE= ${WRKSRC}/../LICENSE
WRKSRC_SUBDIR= src
-USE_QT5= concurrent core network buildtools qmake gui websockets sql
-USES= pkgconfig tar:xz qmake ssl
+USE_QT= concurrent core network buildtools qmake gui websockets sql
+USES= pkgconfig qt:5 tar:xz qmake ssl
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
USE_GITHUB= yes
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= buildtools_build core gui network qmake_build sql sql-sqlite3 widgets
+USES= compiler:c++11-lib qmake qt:5
+USE_QT= buildtools_build core gui network qmake_build sql sql-sqlite3 widgets
USE_GL= gl
PLIST_FILES= bin/tarsnap-gui
Index: sysutils/trueos-libqt5/Makefile
===================================================================
--- sysutils/trueos-libqt5/Makefile
+++ sysutils/trueos-libqt5/Makefile
@@ -16,9 +16,9 @@
MAKE_JOBS_UNSAFE= yes
-USES= qmake shebangfix tar:xz
+USES= qmake qt:5 shebangfix tar:xz
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
buildtools x11extras widgets
USE_GL+= gl
Index: sysutils/twmn/Makefile
===================================================================
--- sysutils/twmn/Makefile
+++ sysutils/twmn/Makefile
@@ -13,11 +13,11 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= sboli
GH_TAGNAME= 5b92ac5
-USE_QT5= core dbus gui network widgets x11extras buildtools_build
+USE_QT= core dbus gui network widgets x11extras buildtools_build
LDFLAGS+= -Wl,--as-needed # see bug#224488
PORTDOCS= README.md
Index: sysutils/unetbootin/Makefile
===================================================================
--- sysutils/unetbootin/Makefile
+++ sysutils/unetbootin/Makefile
@@ -16,7 +16,8 @@
syslinux:sysutils/syslinux \
mke2fs:sysutils/e2fsprogs
-USE_QT4= linguisttools_build moc_build qmake_build uic_build \
+USES= qt:4
+USE_QT= linguisttools_build moc_build qmake_build uic_build \
corelib gui network
QMAKE_ARGS= DEFINES+=LOCALBASE=\\\\\\\"${LOCALBASE}\\\\\\\"
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= qmake qt:4
+USE_QT= corelib gui moc_build rcc_build
USE_XORG= x11 xext
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: textproc/dikt/Makefile
===================================================================
--- textproc/dikt/Makefile
+++ textproc/dikt/Makefile
@@ -13,10 +13,10 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cmake:outsource kde:5 tar:txz
+USES= cmake:outsource kde:5 qt:5 tar:txz
USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons dbusaddons guiaddons i18n \
iconthemes itemviews jobwidgets kio service solid widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network printsupport svg widgets xml \
+USE_QT= concurrent core dbus gui network printsupport svg widgets xml \
buildtools_build qmake_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= qmake qt:4
+USE_QT= corelib gui network moc_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
@@ -13,11 +13,11 @@
LIB_DEPENDS= libfcitx-config.so:chinese/fcitx \
libxkbcommon.so:x11/libxkbcommon
-USES= compiler:c++11-lib cmake:outsource gettext kde:5 pkgconfig
+USES= compiler:c++11-lib cmake:outsource gettext kde:5 pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= fcitx
USE_KDE= ecm
-USE_QT5= concurrent core dbus gui widgets buildtools_build qmake_build
+USE_QT= concurrent core dbus gui widgets buildtools_build qmake_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
Index: textproc/goldendict/Makefile
===================================================================
--- textproc/goldendict/Makefile
+++ textproc/goldendict/Makefile
@@ -17,10 +17,10 @@
libvorbis.so:audio/libvorbis
NO_WRKSUBDIR= yes
-USES= dos2unix iconv:wchar_t pkgconfig qmake tar:bzip2
+USES= dos2unix iconv:wchar_t pkgconfig qmake qt:4 tar:bzip2
DOS2UNIX_FILES= processwrapper.cc
USE_XORG= xtst
-USE_QT4= corelib gui webkit phonon \
+USE_QT= corelib gui webkit phonon \
linguist_build moc_build rcc_build script_build uic_build
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
INSTALLS_ICONS= yes
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 compiler:c++11-lib pkgconfig
+USE_QT= gui dbus moc_build qmake_build moc_build uic_build rcc_build
+USES= cmake compiler:c++11-lib 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
@@ -13,9 +13,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
@@ -10,8 +10,8 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= cmake:outsource compiler:c++11-lib gperf kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gperf 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 <bsd.port.mk>
Index: textproc/kf5-sonnet/Makefile
===================================================================
--- textproc/kf5-sonnet/Makefile
+++ textproc/kf5-sonnet/Makefile
@@ -10,9 +10,9 @@
LIB_DEPENDS= libaspell.so:textproc/aspell \
libhunspell-1.6.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 <bsd.port.mk>
Index: textproc/kf5-syntax-highlighting/Makefile
===================================================================
--- textproc/kf5-syntax-highlighting/Makefile
+++ textproc/kf5-syntax-highlighting/Makefile
@@ -7,9 +7,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 syntax highlighting engine for structured text and code
-USES= cmake:outsource compiler:c++11-lib kde:5 perl5 tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 perl5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build core gui linguisttools_build \
+USE_QT= buildtools_build core gui linguisttools_build \
network testlib qmake_build
.include <bsd.port.mk>
Index: textproc/kompare-kde4/Makefile
===================================================================
--- textproc/kompare-kde4/Makefile
+++ textproc/kompare-kde4/Makefile
@@ -10,8 +10,8 @@
LIB_DEPENDS= libkomparediff2.so:textproc/libkomparediff2-kde4
-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 <bsd.port.mk>
Index: textproc/kompare/Makefile
===================================================================
--- textproc/kompare/Makefile
+++ textproc/kompare/Makefile
@@ -9,11 +9,11 @@
LIB_DEPENDS= libkomparediff2.so:textproc/libkomparediff2
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
doctools ecm i18n iconthemes jobwidgets kio parts service \
sonnet texteditor textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: textproc/kreport/Makefile
===================================================================
--- textproc/kreport/Makefile
+++ textproc/kreport/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libKPropertyCore3.so:x11-toolkits/kproperty
-USES= cmake:outsource gettext kde:5 python:2.7 tar:xz
+USES= cmake:outsource gettext kde:5 python:2.7 qt:5 tar:xz
USE_KDE= config coreaddons ecm marble widgetsaddons
-USE_QT5= core gui network qml webkit widgets xml \
+USE_QT= core gui network qml webkit widgets xml \
buildtools_build printsupport qmake_build
CONFLICTS_INSTALL= calligra-2*
Index: textproc/libkomparediff2-kde4/Makefile
===================================================================
--- textproc/libkomparediff2-kde4/Makefile
+++ textproc/libkomparediff2-kde4/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 <bsd.port.mk>
Index: textproc/libkomparediff2/Makefile
===================================================================
--- textproc/libkomparediff2/Makefile
+++ textproc/libkomparediff2/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Library to compare files and strings
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n kio parts \
service widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
Index: textproc/py-qt4-xml/Makefile
===================================================================
--- textproc/py-qt4-xml/Makefile
+++ textproc/py-qt4-xml/Makefile
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtXml
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -11,10 +11,10 @@
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_PYTHON= flavors
-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
@@ -10,10 +10,10 @@
CONFIGURE_ARGS= --enable QtXml
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= flavors py3kplist
-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
@@ -10,10 +10,10 @@
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_PYTHON= flavors
-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 qmake qt:4 tar:bzip2
+USE_QT= corelib gui network xml uic_build moc_build rcc_build
USE_GNOME= glib20
USE_XORG= x11
DOS2UNIX_FILES= qstardict.pri
@@ -26,7 +26,8 @@
OPTIONS_DEFAULT=DBUS
OPTIONS_SUB= yes
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
DBUS_QMAKE_OFF= NO_DBUS=1
NLS_QMAKE_OFF= NO_TRANSLATIONS=1
Index: textproc/qt4-clucene/Makefile
===================================================================
--- textproc/qt4-clucene/Makefile
+++ textproc/qt4-clucene/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt bindings for the CLucene full-text search library
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: textproc/qt4-xml/Makefile
===================================================================
--- textproc/qt4-xml/Makefile
+++ textproc/qt4-xml/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SAX and DOM implementations
-USE_QT4= qmake_build moc_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: textproc/qt4-xmlpatterns-tool/Makefile
===================================================================
--- textproc/qt4-xmlpatterns-tool/Makefile
+++ textproc/qt4-xmlpatterns-tool/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt command-line utility for running XQueries
-USE_QT4= qmake_build xmlpatterns
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= xmlpatterns
HAS_CONFIGURE= yes
Index: textproc/qt4-xmlpatterns/Makefile
===================================================================
--- textproc/qt4-xmlpatterns/Makefile
+++ textproc/qt4-xmlpatterns/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema
-USE_QT4= qmake_build moc_build rcc_build corelib network
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build corelib network
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: textproc/qt5-xml/Makefile
===================================================================
--- textproc/qt5-xml/Makefile
+++ textproc/qt5-xml/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SAX and DOM implementations
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
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
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USE_QT= core network buildtools_build
+USES= qmake:norecursive qt-dist:5,xmlpatterns
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
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
@@ -20,10 +20,10 @@
GH_PROJECT= Sigil
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig python:3.4+ shebangfix
+ pkgconfig python:3.4+ 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
+USE_QT= qmake_build moc_build qt3support uic
+USES= iconv libtool qt:4
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 qt:4 tar:bz2
+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 qmake
+USE_QT= gui moc_build rcc_build uic_build
PLIST_FILES= bin/${PORTNAME}
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 qt:4 shebangfix
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-kde4/Makefile
===================================================================
--- www/choqok-kde4/Makefile
+++ www/choqok-kde4/Makefile
@@ -18,9 +18,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/choqok/Makefile
===================================================================
--- www/choqok/Makefile
+++ www/choqok/Makefile
@@ -17,14 +17,14 @@
libqoauth-qt5.so:net/qoauth-qt5 \
libtelepathy-qt5.so:net-im/telepathy-qt5
-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= attica auth bookmarks codecs completion config configwidgets \
coreaddons doctools ecm emoticons globalaccel guiaddons i18n \
itemviews jobwidgets kcmutils kdewebkit kio notifications \
notifyconfig parts service solid sonnet textwidgets wallet \
widgetsaddons xmlgui \
kded_run
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_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= qmake qt:4
+USE_QT= moc_build imageformats_run webkit
PLIST_FILES= bin/CutyCapt
Index: www/falkon/Makefile
===================================================================
--- www/falkon/Makefile
+++ www/falkon/Makefile
@@ -12,9 +12,9 @@
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource desktop-file-utils kde:5 ssl tar:xz
+USES= cmake:outsource desktop-file-utils kde:5 qt:5 ssl tar:xz
USE_KDE= wallet
-USE_QT5= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus gui location network printsupport qml quick \
sql webchannel webengine widgets x11extras \
buildtools_build qmake_build
USE_XORG= xcb
Index: www/kdewebdev-kde4/Makefile
===================================================================
--- www/kdewebdev-kde4/Makefile
+++ www/kdewebdev-kde4/Makefile
@@ -13,10 +13,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
@@ -7,11 +7,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 <bsd.port.mk>
Index: www/kf5-khtml/Makefile
===================================================================
--- www/kf5-khtml/Makefile
+++ www/kf5-khtml/Makefile
@@ -11,12 +11,12 @@
libpng.so:graphics/png
USES= cmake:outsource compiler:c++11-lib gettext gperf 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
@@ -9,8 +9,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 <bsd.port.mk>
Index: www/kf5-kjsembed/Makefile
===================================================================
--- www/kf5-kjsembed/Makefile
+++ www/kf5-kjsembed/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
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 webplugin:native tar:bzip2
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/otter-browser/Makefile
===================================================================
--- www/otter-browser/Makefile
+++ www/otter-browser/Makefile
@@ -13,8 +13,8 @@
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
-USES= cmake:outsource compiler:c++11-lib desktop-file-utils
-USE_QT5= concurrent core dbus gui multimedia network printsupport \
+USES= cmake:outsource compiler:c++11-lib desktop-file-utils qt:5
+USE_QT= concurrent core dbus gui multimedia network printsupport \
qml script sql sql-sqlite3 svg widgets xmlpatterns \
buildtools_build qmake_build
@@ -28,10 +28,10 @@
QTWEBENGINE_DESC= Build QtWebEngine backend
QTWEBKIT_DESC= Build QtWebKit backend
-QTWEBENGINE_USE= qt5=location,quick,webchannel,webengine
+QTWEBENGINE_USE= qt=location,quick,webchannel,webengine
QTWEBENGINE_CMAKE_BOOL= ENABLE_QTWEBENGINE
-QTWEBKIT_USE= qt5=webkit
+QTWEBKIT_USE= qt=webkit
QTWEBKIT_CMAKE_BOOL= ENABLE_QTWEBKIT
.include <bsd.port.mk>
Index: www/plasma5-plasma-browser-integration/Makefile
===================================================================
--- www/plasma5-plasma-browser-integration/Makefile
+++ www/plasma5-plasma-browser-integration/Makefile
@@ -8,10 +8,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 components to integrate browsers into the desktop
-USES= cmake:outsource kde:5
+USES= cmake:outsource kde:5 qt:5
USE_KDE= activities config coreaddons i18n kio notifications package \
plasma-framework runner service windowsystem
-USE_QT5= core dbus gui widgets \
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
USE_GITHUB= yes
GH_ACCOUNT= KDE
Index: www/py-qt4-webkit/Makefile
===================================================================
--- www/py-qt4-webkit/Makefile
+++ www/py-qt4-webkit/Makefile
@@ -11,10 +11,10 @@
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_PYTHON= flavors
-USE_QT4= corelib gui network webkit \
+USE_QT= corelib gui network webkit \
moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
Index: www/py-qt5-webchannel/Makefile
===================================================================
--- www/py-qt5-webchannel/Makefile
+++ www/py-qt5-webchannel/Makefile
@@ -9,10 +9,10 @@
# LICENSE set in Mk/Uses/pyqt.mk
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run gui_run network_run qml_run widgets_run
USE_PYTHON= flavors
-USE_QT5= core qmake_build gui network qml webchannel widgets
+USE_QT= core qmake_build gui network qml webchannel widgets
CONFIGURE_ARGS= --enable QtWebChannel \
--no-stubs
Index: www/py-qt5-webengine/Makefile
===================================================================
--- www/py-qt5-webengine/Makefile
+++ www/py-qt5-webengine/Makefile
@@ -9,11 +9,11 @@
# LICENSE set in Mk/Uses/pyqt.mk
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run network_run webchannel_run
USE_PYTHON= flavors
-USE_QT5= core gui location network printsupport qml quick webchannel \
+USE_QT= core gui location network printsupport qml quick webchannel \
webengine widgets qmake_build
CONFIGURE_ARGS= --enable QtWebEngine \
Index: www/py-qt5-webkit/Makefile
===================================================================
--- www/py-qt5-webkit/Makefile
+++ www/py-qt5-webkit/Makefile
@@ -13,11 +13,11 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-USE_QT5= core gui network printsupport webkit widgets \
+USE_QT= core gui network printsupport webkit widgets \
qmake_build
OPTIONS_DEFINE= API DEBUG
Index: www/qt4-webkit/Makefile
===================================================================
--- www/qt4-webkit/Makefile
+++ www/qt4-webkit/Makefile
@@ -10,11 +10,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt WebKit implementation
-USE_QT4= corelib declarative gui network \
- qmake_build moc_build rcc_build
-QT_DIST= yes
+USE_QT= corelib declarative gui network \
+ moc_build rcc_build
USE_XORG= xrender
-USES= pkgconfig
+USES= pkgconfig qmake:no_env qt-dist:4
USE_CXXSTD= gnu++98
HAS_CONFIGURE= yes
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
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USE_QT= buildtools_build core qml quick
+USES= qmake:norecursive qt-dist:5,webchannel
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
# The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted
Index: www/qt5-webengine/Makefile
===================================================================
--- www/qt5-webengine/Makefile
+++ www/qt5-webengine/Makefile
@@ -65,16 +65,15 @@
# whether webenginewidgets is available, which fails when qmake processes all
# .pro files at once.
USES= gperf jpeg python:2.7,build pkgconfig \
- qmake:norecursive,outsource shebangfix
+ qmake:norecursive,outsource qt-dist:5,webengine shebangfix
USE_GNOME= glib20 libxml2 libxslt
-USE_QT5= core designer gui location network qml quick webchannel \
+USE_QT= core designer gui location network qml quick webchannel \
widgets buildtools_build qmake_build
USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xi xproto \
xrandr xrender xscrnsaver xtst
USE_LDCONFIG= ${QT_LIBDIR}
-QT_DIST= ${PORTNAME}
QMAKE_CONFIGURE_ARGS= -no-printing-and-pdf -proprietary-codecs -system-ffmpeg
Index: www/qt5-webkit/Makefile
===================================================================
--- www/qt5-webkit/Makefile
+++ www/qt5-webkit/Makefile
@@ -20,10 +20,10 @@
libwebp.so:graphics/webp
USES= bison cmake:outsource gperf jpeg pathfix perl5 pkgconfig \
- python:2.7,build sqlite:3 tar:xz
+ python:2.7,build qt:5 sqlite:3 tar:xz
USE_GNOME= glib20 libxml2 libxslt
USE_GSTREAMER1= core
-USE_QT5= core gui location network opengl printsupport \
+USE_QT= core gui location network opengl printsupport \
qml quick sensors testlib webchannel widgets \
buildtools_build qmake_build
USE_RUBY= yes
Index: www/qt5-websockets-qml/Makefile
===================================================================
--- www/qt5-websockets-qml/Makefile
+++ www/qt5-websockets-qml/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt implementation of WebSocket protocol (QML bindings)
-USE_QT5= buildtools_build core network qml quick websockets
-QT_DIST= websockets
-USES= qmake
+USE_QT= buildtools_build core network qml quick websockets
+USES= qmake qt-dist:5,websockets
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
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
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USE_QT= buildtools_build core network
+USES= qmake:norecursive qt-dist:5,websockets
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: www/qupzilla-qt4/Makefile
===================================================================
--- www/qupzilla-qt4/Makefile
+++ www/qupzilla-qt4/Makefile
@@ -17,8 +17,8 @@
CONFLICTS_INSTALL= ${PORTNAME}-qt5*
-USES= desktop-file-utils pkgconfig qmake ssl tar:xz
-USE_QT4= corelib gui network script sql webkit xml \
+USES= desktop-file-utils pkgconfig qmake qt:4 ssl tar:xz
+USE_QT= corelib gui network script sql webkit xml \
linguisttools_build moc_build rcc_build uic_build \
imageformats_run sql-sqlite3_run
USE_XORG= x11
@@ -31,7 +31,8 @@
OPTIONS_DEFAULT=DBUS
OPTIONS_SUB= yes
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+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,8 +17,8 @@
CONFLICTS_INSTALL= ${PORTNAME}-qt4*
-USES= desktop-file-utils pkgconfig qmake ssl tar:xz
-USE_QT5= core concurrent gui network printsupport script sql webkit \
+USES= desktop-file-utils pkgconfig qmake 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
USE_XORG= x11
@@ -32,7 +32,8 @@
OPTIONS_DEFAULT=DBUS
OPTIONS_SUB= yes
-DBUS_USE= QT5=dbus
+DBUS_USES= qt:5
+DBUS_USE= QT=dbus
DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true"
GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring
Index: www/qutebrowser/Makefile
===================================================================
--- www/qutebrowser/Makefile
+++ www/qutebrowser/Makefile
@@ -21,9 +21,9 @@
${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
-USES= desktop-file-utils python:3.5+ pyqt:5
+USES= desktop-file-utils python:3.5+ pyqt:5 qt:5
USE_PYQT= core opengl printsupport sql widgets qml
-USE_QT5= sql-sqlite3
+USE_QT= sql-sqlite3
USE_PYTHON= distutils autoplist noflavors
NO_ARCH= yes
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/wt/Makefile
===================================================================
--- www/wt/Makefile
+++ www/wt/Makefile
@@ -178,7 +178,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-kde4/Makefile
===================================================================
--- x11-clocks/amor-kde4/Makefile
+++ x11-clocks/amor-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: x11-clocks/kteatime-kde4/Makefile
===================================================================
--- x11-clocks/kteatime-kde4/Makefile
+++ x11-clocks/kteatime-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: x11-clocks/kteatime/Makefile
===================================================================
--- x11-clocks/kteatime/Makefile
+++ x11-clocks/kteatime/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Handy timer for steeping tea
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash doctools ecm \
i18n iconthemes notifications notifyconfig sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11-clocks/ktimer-kde4/Makefile
===================================================================
--- x11-clocks/ktimer-kde4/Makefile
+++ x11-clocks/ktimer-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
Index: x11-clocks/ktimer/Makefile
===================================================================
--- x11-clocks/ktimer/Makefile
+++ x11-clocks/ktimer/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Countdown launcher for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons doctools ecm i18n iconthemes jobwidgets kio \
notifications service widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11-clocks/ktux-kde4/Makefile
===================================================================
--- x11-clocks/ktux-kde4/Makefile
+++ x11-clocks/ktux-kde4/Makefile
@@ -8,8 +8,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 <bsd.port.mk>
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/dolphin/Makefile
===================================================================
--- x11-fm/dolphin/Makefile
+++ x11-fm/dolphin/Makefile
@@ -14,7 +14,7 @@
${QT_PLUGINDIR}/gsthumbnail.so:graphics/kdegraphics-thumbnailers \
${QT_PLUGINDIR}/audiothumbnail.so:devel/kio-extras
-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= activities attica auth baloo baloo-widgets bookmarks codecs \
completion config configwidgets coreaddons crash dbusaddons \
doctools ecm emoticons filemetadata i18n iconthemes init \
@@ -22,7 +22,7 @@
kdelibs4support kio newstuff notifications parts service \
solid sonnet texteditor textwidgets widgetsaddons \
windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network phonon4 widgets xml \
+USE_QT= concurrent core dbus gui network phonon4 widgets xml \
buildtools_build qmake_build
SHLIB_VER= 5.0.0
Index: x11-fm/konqueror/Makefile
===================================================================
--- x11-fm/konqueror/Makefile
+++ x11-fm/konqueror/Makefile
@@ -9,13 +9,13 @@
LIB_DEPENDS= libtidy.so:www/tidy-lib
-USES= cmake:outsource desktop-file-utils gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= activities archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons i18n iconthemes \
itemviews jobwidgets js kcmutils kdelibs4support \
kdesu khtml kio notifications parts pty service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui location network printsupport qml quick script \
+USE_QT= core dbus gui location network printsupport qml quick script \
speech webchannel webengine widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
Index: x11-fm/krusader2-kde4/Makefile
===================================================================
--- x11-fm/krusader2-kde4/Makefile
+++ x11-fm/krusader2-kde4/Makefile
@@ -16,8 +16,8 @@
CONFLICTS_INSTALL= krusader2-2.*
-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 <bsd.port.mk>
Index: x11-fm/krusader2/Makefile
===================================================================
--- x11-fm/krusader2/Makefile
+++ x11-fm/krusader2/Makefile
@@ -14,13 +14,13 @@
CONFLICTS_INSTALL= krusader2-kde4
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth auth bookmarks codecs completion config \
configwidgets coreaddons doctools ecm guiaddons i18n \
iconthemes itemviews jobwidgets kio notifications parts \
service solid sonnet textwidgets wallet widgetsaddons \
windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport xml widgets \
+USE_QT= concurrent core dbus gui network printsupport xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11-fm/pcmanfm-qt/Makefile
===================================================================
--- x11-fm/pcmanfm-qt/Makefile
+++ x11-fm/pcmanfm-qt/Makefile
@@ -16,8 +16,8 @@
libexif.so:graphics/libexif
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 tar:xz
-USE_QT5= buildtools_build qmake_build core dbus gui linguisttools \
+ gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 qt:5 tar:xz
+USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
widgets x11extras
USE_KDE= oxygen-icons5
USE_LXQT= buildtools libfmqt
Index: x11-fm/pcmanfmqt-l10n/Makefile
===================================================================
--- x11-fm/pcmanfmqt-l10n/Makefile
+++ x11-fm/pcmanfmqt-l10n/Makefile
@@ -17,8 +17,8 @@
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
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 qmake qt:4
DOS2UNIX_REGEX= .*\.(h|cpp)
-USE_QT4= gui network moc_build rcc_build \
+USE_QT= gui network moc_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= qmake qt:5 tar:xz
+USE_QT= buildtools_build linguisttools_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
@@ -21,8 +21,8 @@
USE_GITHUB= yes
GH_ACCOUNT= fontmatrix
-USES= cmake
-USE_QT4= corelib xml gui svg network moc_build uic_build rcc_build qmake_build \
+USES= cmake qt:4
+USE_QT= corelib xml gui svg network moc_build uic_build rcc_build qmake_build \
linguisttools_build opengl sql webkit
INSTALLS_ICONS= yes
MANDIRS= ${PREFIX}/share/man/man1
Index: x11-themes/adwaita-common/Makefile
===================================================================
--- x11-themes/adwaita-common/Makefile
+++ x11-themes/adwaita-common/Makefile
@@ -27,10 +27,12 @@
${OPTIONS_SLAVE}_USES?= cmake:outsource compiler:c++11-lib localbase pkgconfig
${OPTIONS_SLAVE}_PLIST_FILES?= %%QT_PLUGINDIR%%/styles/adwaita.so
-QT4_USE= QT4=moc_build,rcc_build,uic_build,qmake_build,corelib,dbus,gui
+QT4_USES+= qt:4
+QT4_USE= QT=moc_build,rcc_build,uic_build,qmake_build,corelib,dbus,gui
QT4_CMAKE_BOOL= USE_QT4
-QT5_USE= QT5=buildtools_build,qmake_build,core,dbus,gui,widgets
+QT5_USES+= qt:5
+QT5_USE= QT=buildtools_build,qmake_build,core,dbus,gui,widgets
QT5_CMAKE_BOOL_OFF= USE_QT4
USE_GITHUB= yes
Index: x11-themes/gtk-qt4-engine/Makefile
===================================================================
--- x11-themes/gtk-qt4-engine/Makefile
+++ x11-themes/gtk-qt4-engine/Makefile
@@ -19,10 +19,10 @@
GH_ACCOUNT= davidsansome
GH_TAGNAME= 0dc6c26
-USES= cmake gettext kde:4 pkgconfig
+USES= cmake gettext kde:4 pkgconfig qt:4
USE_GNOME= cairo gdkpixbuf2 gtk20
USE_KDE= kdelibs automoc4
-USE_QT4= dbus corelib gui moc_build rcc_build uic_build qmake_build svg
+USE_QT= dbus corelib gui moc_build rcc_build uic_build qmake_build svg
USE_XORG= x11
WRKSRC_SUBDIR= ${PORTNAME}
Index: x11-themes/kde-base-artwork-kde4/Makefile
===================================================================
--- x11-themes/kde-base-artwork-kde4/Makefile
+++ x11-themes/kde-base-artwork-kde4/Makefile
@@ -11,9 +11,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 <bsd.port.mk>
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/kde-wallpapers-kde4/Makefile
===================================================================
--- x11-themes/kde-wallpapers-kde4/Makefile
+++ x11-themes/kde-wallpapers-kde4/Makefile
@@ -8,9 +8,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-style-bespin/Makefile
===================================================================
--- x11-themes/kde4-style-bespin/Makefile
+++ x11-themes/kde4-style-bespin/Makefile
@@ -16,9 +16,9 @@
WRKSRC= ${WRKDIR}/cloudcity
-USES= cmake:noninja kde:4
+USES= cmake:noninja kde:4 qt:4
USE_CXXSTD= gnu++98
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 <bsd.port.mk>
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 <bsd.port.mk>
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 <bsd.port.mk>
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 <bsd.port.mk>
Index: x11-themes/kde4-style-skulpture/Makefile
===================================================================
--- x11-themes/kde4-style-skulpture/Makefile
+++ x11-themes/kde4-style-skulpture/Makefile
@@ -14,8 +14,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 <bsd.port.mk>
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,noninja kde:4 tar:bzip2
+USES= cmake:outsource,noninja 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 <bsd.port.mk>
Index: x11-themes/kdeartwork-kde4/Makefile
===================================================================
--- x11-themes/kdeartwork-kde4/Makefile
+++ x11-themes/kdeartwork-kde4/Makefile
@@ -10,9 +10,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Artworks Themes
-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
@@ -10,9 +10,9 @@
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING-ICONS
-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
@@ -7,8 +7,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 <bsd.port.mk>
Index: x11-themes/kf5-kiconthemes/Makefile
===================================================================
--- x11-themes/kf5-kiconthemes/Makefile
+++ x11-themes/kf5-kiconthemes/Makefile
@@ -7,10 +7,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 <bsd.port.mk>
Index: x11-themes/kf5-oxygen-icons5/Makefile
===================================================================
--- x11-themes/kf5-oxygen-icons5/Makefile
+++ x11-themes/kf5-oxygen-icons5/Makefile
@@ -7,7 +7,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= The Oxygen icon theme for KDE
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= ecm_build # We only install icons.
# The qmake dependency is only needed so that kf5-e-c-m can query qmake for
@@ -15,7 +15,7 @@
# We explicitly prevent it from looking for qt5-core and specify qmake's path
# to avoid needlessly depending on qt5-core; we're just installing a ton of
# icon files and do not even use the paths queried from qmake.
-USE_QT5= qmake_build
+USE_QT= qmake_build
CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=TRUE \
-DQMAKE_EXECUTABLE:PATH=${QMAKE}
Index: x11-themes/lumina-themes/Makefile
===================================================================
--- x11-themes/lumina-themes/Makefile
+++ x11-themes/lumina-themes/Makefile
@@ -11,8 +11,8 @@
LICENSE= BSD2CLAUSE CC0-1.0
LICENSE_COMB= multi
-USES= qmake
-USE_QT5= qmake_build
+USES= qmake qt:5
+USE_QT= qmake_build
USE_GITHUB= yes
GH_ACCOUNT= trueos
Index: x11-themes/plasma5-breeze-gtk/Makefile
===================================================================
--- x11-themes/plasma5-breeze-gtk/Makefile
+++ x11-themes/plasma5-breeze-gtk/Makefile
@@ -10,9 +10,9 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= cmake:outsource cpe kde:5 pkgconfig tar:xz
+USES= cmake:outsource cpe kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= gdkpixbuf2
USE_KDE= ecm
-USE_QT5= core buildtools_build qmake_build
+USE_QT= core buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11-themes/plasma5-breeze-kde4/Makefile
===================================================================
--- x11-themes/plasma5-breeze-kde4/Makefile
+++ x11-themes/plasma5-breeze-kde4/Makefile
@@ -14,9 +14,9 @@
CMAKE_ON= USE_KDE4
USES= cmake:outsource compiler:c++11-lang cpe gettext \
- kde:4 pkgconfig tar:xz
+ kde:4 pkgconfig qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= corelib dbus gui svg \
+USE_QT= corelib dbus gui svg \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xcb
Index: x11-themes/plasma5-breeze/Makefile
===================================================================
--- x11-themes/plasma5-breeze/Makefile
+++ x11-themes/plasma5-breeze/Makefile
@@ -11,11 +11,11 @@
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake:outsource compiler:c++11-lib cpe \
- gettext kde:5 pkgconfig tar:xz
+ gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth breeze-icons codecs config configwidgets coreaddons \
decoration ecm frameworkintegration guiaddons i18n kcmutils \
plasma-framework service wayland widgetsaddons windowsystem
-USE_QT5= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus gui network qml quick widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb
Index: x11-themes/plasma5-kde-gtk-config/Makefile
===================================================================
--- x11-themes/plasma5-kde-gtk-config/Makefile
+++ x11-themes/plasma5-kde-gtk-config/Makefile
@@ -16,12 +16,12 @@
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
USES= cmake:outsource compiler:c++11-lib cpe gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= cairo gdkpixbuf2 gtk20 gtk30 glib20
USE_KDE= archive attica auth codecs completion config configwidgets \
coreaddons ecm i18n iconthemes jobwidgets kcmutils kio \
newstuff service widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network testlib widgets xml \
+USE_QT= concurrent core dbus gui network testlib widgets xml \
buildtools_build qmake_build
USE_XORG= xcursor
Index: x11-themes/plasma5-oxygen/Makefile
===================================================================
--- x11-themes/plasma5-oxygen/Makefile
+++ x11-themes/plasma5-oxygen/Makefile
@@ -13,12 +13,12 @@
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
USES= cmake:outsource compiler:c++11-lib cpe gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_LDCONFIG= yes
USE_KDE= auth codecs completion config configwidgets coreaddons decoration ecm \
frameworkintegration guiaddons i18n kcmutils service \
wayland widgetsaddons windowsystem
-USE_QT5= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus gui network qml quick widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb
Index: x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
===================================================================
--- x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
+++ x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
@@ -12,9 +12,9 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3
-USES= cmake:outsource cpe kde:5 tar:xz
+USES= cmake:outsource cpe kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build qmake_build
+USE_QT= buildtools_build qmake_build
# The qmake dependency is only needed so that kf5-e-c-m can query qmake for
# some installation directories.
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 qmake qt:4
+USE_QT= corelib gui svg rcc_build uic_build moc_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 qmake
+USE_QT= corelib gui moc_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 qmake
+USE_QT= corelib gui moc_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= qmake qt:4
+USE_QT= corelib gui svg rcc_build uic_build moc_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 linguisttools_build
+USES= compiler:c++11-lang qmake qt:5
+USE_QT= core gui svg widgets x11extras buildtools_build linguisttools_build
USE_XORG= x11 xext
USE_GL= gl
Index: x11-themes/qt5-style-plugins/Makefile
===================================================================
--- x11-themes/qt5-style-plugins/Makefile
+++ x11-themes/qt5-style-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qt5-style-plugins
PORTVERSION= 5.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= QT/community_releases/additional_qt_src_pkgs/
DISTNAME= qtstyleplugins-src-${PORTVERSION}
@@ -14,8 +14,8 @@
LICENSE= LGPL21
-USES= qmake
-USE_QT5= buildtools_build core gui widgets
+USES= qmake qt:5
+USE_QT= buildtools_build core gui widgets
USE_GL+= gl
WRKSRC= ${WRKDIR}/qtstyleplugins-src-${PORTVERSION}
Index: x11-themes/qt5-style-plugins/pkg-plist
===================================================================
--- x11-themes/qt5-style-plugins/pkg-plist
+++ x11-themes/qt5-style-plugins/pkg-plist
@@ -1,4 +1,7 @@
lib/cmake/Qt5Widgets/Qt5Widgets_.cmake
%%QT_PLUGINDIR%%/styles/libqcleanlooksstyle.so
+%%DEBUG%%%%QT_PLUGINDIR%%/styles/libqcleanlooksstyle.so.debug
%%QT_PLUGINDIR%%/styles/libqmotifstyle.so
+%%DEBUG%%%%QT_PLUGINDIR%%/styles/libqmotifstyle.so.debug
%%QT_PLUGINDIR%%/styles/libqplastiquestyle.so
+%%DEBUG%%%%QT_PLUGINDIR%%/styles/libqplastiquestyle.so.debug
Index: x11-themes/qtcurve/Makefile
===================================================================
--- x11-themes/qtcurve/Makefile
+++ x11-themes/qtcurve/Makefile
@@ -9,7 +9,7 @@
COMMENT?= Widget styles for Qt and GTK+ toolkits
.if !defined(QTCURVE_SLAVE)
-USES= metaport
+USES= metaport qt:4
# There is no NO_PATCH
PATCHDIR= ${MASTERDIR}/none
@@ -76,8 +76,8 @@
WITH_qt4= On # required for KDE 4
PKGNAMEPREFIX= kde4-style-
USE_KDE= kdelibs workspace automoc4
-USES+= kde:4
-USE_QT4= corelib dbus gui svg moc_build qmake_build rcc_build uic_build
+USES+= kde:4 qt:4
+USE_QT= corelib dbus gui svg moc_build qmake_build rcc_build uic_build
BUILD_WRKSRC= ${WRKSRC}/qt4
.endif
@@ -85,25 +85,27 @@
CONFLICTS_INSTALL= qt5-style-qtcurve
WITH_qt5= On # required for KF5
PKGNAMEPREFIX= kf5-style-
-USES+= kde:5
+USES+= kde:5 qt:5
USE_KDE= archive completion config configwidgets coreaddons \
ecm_build frameworkintegration guiaddons i18n iconthemes \
kdelibs4support kio widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui printsupport svg widgets x11extras \
+USE_QT= core dbus gui printsupport svg widgets x11extras \
buildtools_build qmake_build
BUILD_WRKSRC= ${WRKSRC}/qt5
.endif
.if ${QTCURVE_SLAVE} == "qt4"
PKGNAMEPREFIX= qt4-style-
-USE_QT4= corelib dbus gui svg moc_build qmake_build rcc_build uic_build
+USES+= qt:4
+USE_QT= corelib dbus gui svg moc_build qmake_build rcc_build uic_build
PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so
.endif
.if ${QTCURVE_SLAVE} == "qt5"
CONFLICTS_INSTALL= kf5-style-qtcurve
PKGNAMEPREFIX= qt5-style-
-USE_QT5= core dbus gui svg widgets x11extras \
+USES+= qt:5
+USE_QT= core 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
USE_CXXSTD= gnu++98
Index: x11-toolkits/kf5-attica/Makefile
===================================================================
--- x11-toolkits/kf5-attica/Makefile
+++ x11-toolkits/kf5-attica/Makefile
@@ -13,8 +13,8 @@
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/COPYING
-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 testlib_build widgets
+USE_QT= buildtools_build core gui network qmake_build testlib_build widgets
.include <bsd.port.mk>
Index: x11-toolkits/kf5-kcompletion/Makefile
===================================================================
--- x11-toolkits/kf5-kcompletion/Makefile
+++ x11-toolkits/kf5-kcompletion/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-kconfigwidgets/Makefile
===================================================================
--- x11-toolkits/kf5-kconfigwidgets/Makefile
+++ x11-toolkits/kf5-kconfigwidgets/Makefile
@@ -7,10 +7,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 qt:5 shebangfix 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
@@ -7,12 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-kguiaddons/Makefile
===================================================================
--- x11-toolkits/kf5-kguiaddons/Makefile
+++ x11-toolkits/kf5-kguiaddons/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-kirigami2/Makefile
===================================================================
--- x11-toolkits/kf5-kirigami2/Makefile
+++ x11-toolkits/kf5-kirigami2/Makefile
@@ -8,9 +8,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
-USE_QT5= buildtools_build core gui linguisttools network qmake_build \
+USE_QT= buildtools_build core gui linguisttools network qmake_build \
qml quick quickcontrols2 svg testlib widgets
.include <bsd.port.mk>
Index: x11-toolkits/kf5-kitemviews/Makefile
===================================================================
--- x11-toolkits/kf5-kitemviews/Makefile
+++ x11-toolkits/kf5-kitemviews/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-kjobwidgets/Makefile
===================================================================
--- x11-toolkits/kf5-kjobwidgets/Makefile
+++ x11-toolkits/kf5-kjobwidgets/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-ktextwidgets/Makefile
===================================================================
--- x11-toolkits/kf5-ktextwidgets/Makefile
+++ x11-toolkits/kf5-ktextwidgets/Makefile
@@ -7,11 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-kwidgetsaddons/Makefile
===================================================================
--- x11-toolkits/kf5-kwidgetsaddons/Makefile
+++ x11-toolkits/kf5-kwidgetsaddons/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: x11-toolkits/kf5-kxmlgui/Makefile
===================================================================
--- x11-toolkits/kf5-kxmlgui/Makefile
+++ x11-toolkits/kf5-kxmlgui/Makefile
@@ -7,11 +7,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 <bsd.port.mk>
Index: x11-toolkits/kproperty/Makefile
===================================================================
--- x11-toolkits/kproperty/Makefile
+++ x11-toolkits/kproperty/Makefile
@@ -9,9 +9,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Property editing framwork
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= ecm config coreaddons guiaddons i18n widgetsaddons
-USE_QT5= core gui widgets xml \
+USE_QT= core gui widgets xml \
buildtools_build qmake_build qml
CONFLICTS_INSTALL= calligra-2*
Index: x11-toolkits/plasma5-kdeplasma-addons/Makefile
===================================================================
--- x11-toolkits/plasma5-kdeplasma-addons/Makefile
+++ x11-toolkits/plasma5-kdeplasma-addons/Makefile
@@ -8,14 +8,14 @@
COMMENT= Plasma5 addons to improve the Plasma experience
USES= cmake:outsource compiler:c++11-lib cpe gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_KDE= activities archive attica auth bookmarks codecs completion \
config configwidgets coreaddons crash ecm emoticons guiaddons \
i18n iconthemes init itemmodels itemviews jobwidgets kcmutils \
kdelibs4support kio kross newstuff notifications package parts\
plasma-framework plasma-workspace runner service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus graphicaleffects gui location network printsupport \
+USE_QT= core dbus graphicaleffects gui location network printsupport \
qml quick script webchannel webengine widgets x11extras xml \
buildtools_build qmake_build
Index: x11-toolkits/py-qt4-gui/Makefile
===================================================================
--- x11-toolkits/py-qt4-gui/Makefile
+++ x11-toolkits/py-qt4-gui/Makefile
@@ -12,10 +12,10 @@
CONFIGURE_ARGS= --enable QtGui
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
@@ -10,10 +10,10 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-USE_QT5= core gui widgets qmake_build
+USE_QT= core gui widgets qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
Index: x11-toolkits/qml-box2d/Makefile
===================================================================
--- x11-toolkits/qml-box2d/Makefile
+++ x11-toolkits/qml-box2d/Makefile
@@ -7,11 +7,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= QML Box2D plugin
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_GITHUB= yes
GH_TAGNAME= 21e57f
USE_GL= gl
-USE_QT5= core gui network qml quick \
+USE_QT= core gui network qml quick \
buildtools_build qmake_build
USE_LDCONFIG= ${QT_QMLDIR}/Box2D.2.0/
Index: x11-toolkits/qt4-declarative/Makefile
===================================================================
--- x11-toolkits/qt4-declarative/Makefile
+++ x11-toolkits/qt4-declarative/Makefile
@@ -9,9 +9,9 @@
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= qmake:no_env qt-dist:4
+USE_QT= 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}
Index: x11-toolkits/qt4-gui/Makefile
===================================================================
--- x11-toolkits/qt4-gui/Makefile
+++ x11-toolkits/qt4-gui/Makefile
@@ -14,9 +14,8 @@
libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS= xdg-open:devel/xdg-utils
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib
-QT_DIST= yes
-USES= pkgconfig
+USE_QT= moc_build rcc_build uic_build corelib
+USES= pkgconfig qmake:no_env qt-dist:4
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: x11-toolkits/qt4pas/Makefile
===================================================================
--- x11-toolkits/qt4pas/Makefile
+++ x11-toolkits/qt4pas/Makefile
@@ -12,9 +12,9 @@
COMMENT= Qt4 binding for FreePascal
USE_LDCONFIG= yes
-USE_QT4= corelib gui network script webkit \
+USE_QT= corelib gui network script webkit \
moc_build
-USES= qmake
+USES= qmake qt:4
QT4_VER_MIN= 4.5.3
Index: x11-toolkits/qt5-canvas3d/Makefile
===================================================================
--- x11-toolkits/qt5-canvas3d/Makefile
+++ x11-toolkits/qt5-canvas3d/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt canvas3d module
-USE_QT5= core gui network qml quick buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= core gui network qml quick buildtools_build
+USES= qmake qt-dist:5,canvas3d
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Index: x11-toolkits/qt5-charts/Makefile
===================================================================
--- x11-toolkits/qt5-charts/Makefile
+++ x11-toolkits/qt5-charts/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 charts module
-USES= qmake tar:xz
-USE_QT5= core network gui widgets qml quick designer \
+USES= qmake qt-dist:5,charts tar:xz
+USE_QT= core network gui widgets qml quick designer \
buildtools_build qmake_build
-QT_DIST= ${PORTNAME}
.include <bsd.port.mk>
Index: x11-toolkits/qt5-datavis3d/Makefile
===================================================================
--- x11-toolkits/qt5-datavis3d/Makefile
+++ x11-toolkits/qt5-datavis3d/Makefile
@@ -8,10 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 3D data visualization module
-USE_QT5= core network gui widgets qml quick designer buildtools_build
-QT_DIST= ${PORTNAME}
+USE_QT= core network gui widgets qml quick designer buildtools_build
-USES= qmake
+USES= qmake qt-dist:5,datavis3d
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: x11-toolkits/qt5-gamepad/Makefile
===================================================================
--- x11-toolkits/qt5-gamepad/Makefile
+++ x11-toolkits/qt5-gamepad/Makefile
@@ -8,10 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 Gamepad Module
-USE_QT5= core gui qml quick buildtools_build
-QT_DIST= ${PORTNAME}
+USE_QT= core gui qml quick buildtools_build
-USES= qmake:norecursive
+USES= qmake:norecursive qt-dist:5,gamepad
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: x11-toolkits/qt5-gtkplatform/Makefile
===================================================================
--- x11-toolkits/qt5-gtkplatform/Makefile
+++ x11-toolkits/qt5-gtkplatform/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gtkplatform
DISTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
@@ -19,9 +20,9 @@
libudev.so:devel/libudev-devd \
libxkbcommon.so:x11/libxkbcommon
-USES= qmake:outsource pkgconfig
+USES= qmake:outsource pkgconfig qt:5
USE_GNOME= gtk30 cairo gdkpixbuf2
-USE_QT5= buildtools_build core gui widgets dbus
+USE_QT= buildtools_build core gui widgets dbus
USE_XORG= x11 xext xrender
USE_GL= gl egl
Index: x11-toolkits/qt5-gtkplatform/pkg-plist
===================================================================
--- x11-toolkits/qt5-gtkplatform/pkg-plist
+++ x11-toolkits/qt5-gtkplatform/pkg-plist
@@ -1,2 +1,3 @@
lib/cmake/Qt5Gui/Qt5Gui_QGtkIntegrationPlugin.cmake
%%QT_PLUGINDIR%%/platforms/libqgtk.so
+%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqgtk.so.debug
Index: x11-toolkits/qt5-gui/Makefile
===================================================================
--- x11-toolkits/qt5-gui/Makefile
+++ x11-toolkits/qt5-gui/Makefile
@@ -22,16 +22,19 @@
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= xdg-open:devel/xdg-utils
-USES= jpeg localbase
+USES= jpeg localbase qmake:no_env qt-dist:5,base
USE_GL= gl egl
USE_GNOME= glib20
-USE_QT5= core dbus network qmake_build buildtools_build
-QT_DIST= base
+USE_QT= core dbus network qmake_build buildtools_build
USE_XORG= ice sm x11 xi xrender
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-eglfs \
-no-evdev \
-system-harfbuzz
+# Explicitely set to c++14 as to net get c++17/c++1z, as libX11's headers
+# are using the obsolete 'register' key word.
+CONFIGURE_ARGS+= -c++std c++14
+
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
Index: x11-toolkits/qt5-quick/Makefile
===================================================================
--- x11-toolkits/qt5-quick/Makefile
+++ x11-toolkits/qt5-quick/Makefile
@@ -9,10 +9,9 @@
COMMENT= Qt declarative framework for dynamic user interfaces
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:norecursive
+USES= python:build qmake:norecursive qt-dist:5,declarative
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
CONFLICTS= qt5-declarative-render2d-*
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 \
+USE_QT= core gui qml quick widgets \
buildtools_build
-QT_DIST= quickcontrols
-USES= qmake
+USES= qmake qt-dist:5,quickcontrols
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
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 \
+USE_QT= core gui qml quick widgets \
buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USES= qmake:norecursive qt-dist:5,quickcontrols2
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: x11-toolkits/qt5-uiplugin/Makefile
===================================================================
--- x11-toolkits/qt5-uiplugin/Makefile
+++ x11-toolkits/qt5-uiplugin/Makefile
@@ -8,9 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Custom Qt widget plugin interface for Qt Designer
-USE_QT5= core gui widgets
-QT_DIST= tools
-USES= qmake
+USE_QT= core gui widgets
+USES= qmake qt-dist:5,tools
BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
Index: x11-toolkits/qt5-virtualkeyboard/Makefile
===================================================================
--- x11-toolkits/qt5-virtualkeyboard/Makefile
+++ x11-toolkits/qt5-virtualkeyboard/Makefile
@@ -8,10 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 Virtual Keyboard Module
-USE_QT5= core network gui widgets svg qml quick buildtools_build
-QT_DIST= ${PORTNAME}
+USE_QT= core network gui widgets svg qml quick buildtools_build
-USES= qmake
+USES= qmake qt-dist:5,virtualkeyboard
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: x11-toolkits/qt5-widgets/Makefile
===================================================================
--- x11-toolkits/qt5-widgets/Makefile
+++ x11-toolkits/qt5-widgets/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt C++ widgets module
-USE_QT5= core gui qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core gui qmake_build buildtools_build
USE_XORG= x11
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
@@ -26,7 +26,7 @@
OPTIONS_SUB= YES
GTK3_DESC= GTK+-based Qt theme
-GTK3_USE= GNOME=gtk30 QT5=dbus
+GTK3_USE= GNOME=gtk30 QT=dbus
GTK3_CONFIGURE_ON= -gtk
GTK3_CONFIGURE_OFF= -no-gtk
Index: x11-toolkits/qt5pas/Makefile
===================================================================
--- x11-toolkits/qt5pas/Makefile
+++ x11-toolkits/qt5pas/Makefile
@@ -9,8 +9,8 @@
COMMENT= Qt5 binding for FreePascal
USE_LDCONFIG= yes
-USES= qmake
-USE_QT5= buildtools_build core gui network printsupport x11extras
+USES= qmake qt:5
+USE_QT= buildtools_build core gui network printsupport x11extras
QT5_VER_MIN= 5.6.1
Index: x11-toolkits/qtermwidget-l10n/Makefile
===================================================================
--- x11-toolkits/qtermwidget-l10n/Makefile
+++ x11-toolkits/qtermwidget-l10n/Makefile
@@ -17,8 +17,8 @@
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \
Index: x11-toolkits/qtermwidget/Makefile
===================================================================
--- x11-toolkits/qtermwidget/Makefile
+++ x11-toolkits/qtermwidget/Makefile
@@ -12,9 +12,9 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cmake:outsource compiler:c++11-lang gettext-runtime lxqt \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_LDCONFIG= yes
-USE_QT5= buildtools_build core gui qmake_build linguisttools widgets
+USE_QT= buildtools_build core gui qmake_build linguisttools widgets
USE_LXQT= buildtools
.include <bsd.port.mk>
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 qmake qt:4 tar:bzip2
+USE_QT= designer moc_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 qmake qt:4 tar:bzip2
+USE_QT= gui svg moc_build
USE_LDCONFIG= yes
PORTSCOUT= limit:^5\.
Index: x11-toolkits/qwt6/Makefile
===================================================================
--- x11-toolkits/qwt6/Makefile
+++ x11-toolkits/qwt6/Makefile
@@ -25,9 +25,11 @@
QMAKE_ARGS+= PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
.if ${FLAVOR} == qt4
-USE_QT4= corelib designer gui opengl svg xml moc_build rcc_build script
+USES+= qt:4
+USE_QT= corelib designer gui opengl svg xml moc_build rcc_build script
.else
-USE_QT5= buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
+USES+= qt:5
+USE_QT= buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
.endif
OPTIONS_DEFINE= DOCS
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/plasma5-kdecoration/Makefile
===================================================================
--- x11-wm/plasma5-kdecoration/Makefile
+++ x11-wm/plasma5-kdecoration/Makefile
@@ -10,9 +10,9 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= cmake:outsource compiler:c++11-lib cpe kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe kde:5 qt:5 tar:xz
USE_LDCONFIG= yes
USE_KDE= ecm
-USE_QT5= core gui testlib buildtools_build qmake_build
+USE_QT= core gui testlib buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11-wm/plasma5-kwin/Makefile
===================================================================
--- x11-wm/plasma5-kwin/Makefile
+++ x11-wm/plasma5-kwin/Makefile
@@ -28,7 +28,7 @@
RUN_DEPENDS= Xwayland:x11-servers/xwayland
USES= cmake:outsource compiler:c++11-lib cpe gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_GL= egl
USE_KDE= activities activities attica auth breeze codecs \
completion config configwidgets coreaddons crash decoration \
@@ -37,7 +37,7 @@
newstuff notifications plasma-framework service sonnet \
textwidgets wayland widgetsaddons windowsystem xmlgui
USE_LDCONFIG= yes
-USE_QT5= concurrent core dbus gui multimedia network qml quick script \
+USE_QT= concurrent core dbus gui multimedia network qml quick script \
sensors testlib uiplugin uitools widgets x11extras xml \
buildtools_build qmake_build \
quickcontrols2_run virtualkeyboard_run
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_build
PORTDOCS= CHANGES README
Index: x11/antimicro/Makefile
===================================================================
--- x11/antimicro/Makefile
+++ x11/antimicro/Makefile
@@ -20,8 +20,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:outsource pkgconfig desktop-file-utils shared-mime-info
+USES= cmake:outsource pkgconfig desktop-file-utils qt:5 shared-mime-info
.include <bsd.port.mk>
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 qmake qt:5
+USE_QT= qmake_build buildtools_build core gui qml quick widgets \
graphicaleffects_run quickcontrols_run
.include <bsd.port.pre.mk>
Index: x11/dsbautostart/Makefile
===================================================================
--- x11/dsbautostart/Makefile
+++ x11/dsbautostart/Makefile
@@ -11,9 +11,9 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:tgz qmake
+USES= qt:5 tar:tgz qmake
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build widgets
+USE_QT= buildtools_build core gui linguisttools_build widgets
.include <bsd.port.mk>
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
@@ -11,10 +11,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/kde-baseapps-kde4/Makefile
===================================================================
--- x11/kde-baseapps-kde4/Makefile
+++ x11/kde-baseapps-kde4/Makefile
@@ -11,11 +11,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/kde-runtime-kde4/Makefile
===================================================================
--- x11/kde-runtime-kde4/Makefile
+++ x11/kde-runtime-kde4/Makefile
@@ -24,11 +24,11 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh
RUN_DEPENDS= cagibid:net/cagibi
-USES= cmake:outsource gettext jpeg kde:4 samba:lib shared-mime-info \
+USES= cmake:outsource gettext jpeg kde:4 qt:4 samba:lib shared-mime-info \
shebangfix tar:xz
USE_KDE= kactivities kdelibs oxygen-icons5 \
attica automoc4 pimlibs soprano 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= ice sm x11 xau xcursor xext xft xdmcp xpm
Index: x11/kde-workspace-kde4/Makefile
===================================================================
--- x11/kde-workspace-kde4/Makefile
+++ x11/kde-workspace-kde4/Makefile
@@ -42,12 +42,12 @@
${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde-base-artwork-kde4
USES= cmake:outsource,noninja compiler:c++11-lib gettext gmake jpeg kde:4 \
- pkgconfig shebangfix tar:xz
+ pkgconfig qt:4 shebangfix tar:xz
USE_GL= gl glu
USE_GNOME= glib20 libxml2
USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons5 \
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 svg webkit xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= ice sm kbproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
@@ -90,7 +90,8 @@
GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF
GSTREAMER_DESC= Multimedia via Phonon-GStreamer
-GSTREAMER_USE= QT4=phonon-gst_run
+GSTREAMER_USES= qt:4
+GSTREAMER_USE= QT=phonon-gst_run
KACTIVITY_DESC= Activity Manager daemon
KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd
Index: x11/kde5/Makefile
===================================================================
--- x11/kde5/Makefile
+++ x11/kde5/Makefile
@@ -12,9 +12,9 @@
RUN_DEPENDS= kde-baseapps>=0:x11/kde-baseapps \
kwalletmanager5:security/kwalletmanager
-USES= kde:5 metaport
+USES= kde:5 metaport qt:5
USE_KDE= plasma-desktop_run
-USE_QT5= # empty
+USE_QT= # empty
OPTIONS_DEFINE= KDEADMIN KDEEDU \
KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK \
Index: x11/kdelibs-kde4/Makefile
===================================================================
--- x11/kdelibs-kde4/Makefile
+++ x11/kdelibs-kde4/Makefile
@@ -34,11 +34,11 @@
KDE_APPLICATIONS_VERSION= 17.08.3
USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \
- shared-mime-info shebangfix tar:xz ssl
+ qt:4 shared-mime-info shebangfix tar:xz ssl
USE_GNOME= libxml2 libxslt
USE_KDE= oxygen-icons5 \
attica automoc4 ontologies soprano strigi
-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
@@ -8,10 +8,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 newstuff notifications package 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,11 +9,11 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 frameworks meta port
-USES= metaport kde:5
+USES= metaport kde:5 qt:5
# remove:
# * bluez-qt as we do have bluez
USE_KDE= ${_USE_FRAMEWORKS_ALL:Nbluez-qt}
# pull bsd.qt.mk for QT_PLUGINDIR in the kf5-dependencies
-USE_QT5= #
+USE_QT= #
.include <bsd.port.mk>
Index: x11/kf5-kactivities-stats/Makefile
===================================================================
--- x11/kf5-kactivities-stats/Makefile
+++ x11/kf5-kactivities-stats/Makefile
@@ -10,8 +10,8 @@
LIB_DEPENDS= libboost_system.so:devel/boost-libs
RUN_DEPENDS= kactivitymanagerd:x11/plasma5-kactivitymanagerd
-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= activities config ecm
-USE_QT5= buildtools_build core dbus qmake_build sql
+USE_QT= buildtools_build core dbus qmake_build sql
.include <bsd.port.mk>
Index: x11/kf5-kactivities/Makefile
===================================================================
--- x11/kf5-kactivities/Makefile
+++ x11/kf5-kactivities/Makefile
@@ -9,11 +9,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 <bsd.port.mk>
Index: x11/kf5-kded/Makefile
===================================================================
--- x11/kf5-kded/Makefile
+++ x11/kf5-kded/Makefile
@@ -7,9 +7,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 <bsd.port.mk>
Index: x11/kf5-kdelibs4support/Makefile
===================================================================
--- x11/kf5-kdelibs4support/Makefile
+++ x11/kf5-kdelibs4support/Makefile
@@ -9,7 +9,7 @@
BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix \
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 shebangfix \
tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools emoticons globalaccel guiaddons \
@@ -18,7 +18,7 @@
widgetsaddons windowsystem xmlgui \
designerplugin_build designerplugin_run \
itemmodels_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
@@ -9,10 +9,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
@@ -7,10 +7,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 <bsd.port.mk>
Index: x11/kf5-krunner/Makefile
===================================================================
--- x11/kf5-krunner/Makefile
+++ x11/kf5-krunner/Makefile
@@ -7,10 +7,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 <bsd.port.mk>
Index: x11/kf5-kwayland/Makefile
===================================================================
--- x11/kf5-kwayland/Makefile
+++ x11/kf5-kwayland/Makefile
@@ -15,9 +15,9 @@
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_GL= egl
USE_KDE= ecm
-USE_QT5= buildtools_build concurrent core gui qmake_build testlib
+USE_QT= buildtools_build concurrent core gui qmake_build testlib
.include <bsd.port.mk>
Index: x11/kf5-kwindowsystem/Makefile
===================================================================
--- x11/kf5-kwindowsystem/Makefile
+++ x11/kf5-kwindowsystem/Makefile
@@ -9,9 +9,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
@@ -7,14 +7,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 kirigami2 kio package \
notifications service wayland 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-kde4/Makefile
===================================================================
--- x11/kgamma-kde4/Makefile
+++ x11/kgamma-kde4/Makefile
@@ -8,9 +8,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 <bsd.port.mk>
Index: x11/konsole-kde4/Makefile
===================================================================
--- x11/konsole-kde4/Makefile
+++ x11/konsole-kde4/Makefile
@@ -8,9 +8,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/konsole/Makefile
===================================================================
--- x11/konsole/Makefile
+++ x11/konsole/Makefile
@@ -11,13 +11,13 @@
docbook-xml>0:textproc/docbook-xml
RUN_DEPENDS= keditbookmarks:deskutils/keditbookmarks
-USES= cmake:outsource gettext pkgconfig kde:5 tar:xz
+USES= cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
USE_KDE= auth attica bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm emoticons globalaccel guiaddons i18n \
iconthemes init itemmodels jobwidgets kdelibs4support kio \
newstuff notifications notifyconfig parts pty service sonnet \
textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport script scripttools sql \
+USE_QT= core dbus gui network printsupport script scripttools sql \
widgets xml \
buildtools_build qmake_build
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
@@ -16,8 +16,8 @@
libexif.so:graphics/libexif
USES= cmake:outsource compiler:c++11-lib gettext-runtime lxqt pkgconfig \
- shared-mime-info tar:xz
-USE_QT5= buildtools_build qmake_build core gui linguisttools widgets \
+ qt:5 shared-mime-info tar:xz
+USE_QT= buildtools_build qmake_build core gui linguisttools widgets \
x11extras
USE_GNOME= glib20
USE_XORG= xcb
Index: x11/libfmqt-l10n/Makefile
===================================================================
--- x11/libfmqt-l10n/Makefile
+++ x11/libfmqt-l10n/Makefile
@@ -17,8 +17,8 @@
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \
Index: x11/libkonq-kde4/Makefile
===================================================================
--- x11/libkonq-kde4/Makefile
+++ x11/libkonq-kde4/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libphonon.so:multimedia/phonon
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 soprano
-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_LDCONFIG= yes
USE_XORG= x11
Index: x11/lumina-core/Makefile
===================================================================
--- x11/lumina-core/Makefile
+++ x11/lumina-core/Makefile
@@ -39,11 +39,11 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
USE_XORG= x11 xdamage xcb
USE_LDCONFIG= yes
-USE_QT5= core gui widgets network svg multimedia imageformats \
+USE_QT= core gui widgets network svg multimedia imageformats \
buildtools_build x11extras concurrent
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -51,13 +51,13 @@
GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/core
-#Setup the qmake configuration options
+#Setup the qmake qt:5 configuration options
.if ${PORT_OPTIONS:MTRUEOS}
QMAKE_ARGS= DEFAULT_SETTINGS=TrueOS
.endif
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: x11/lumina-coreutils/Makefile
===================================================================
--- x11/lumina-coreutils/Makefile
+++ x11/lumina-coreutils/Makefile
@@ -24,9 +24,9 @@
MAKE_JOBS_UNSAFE=yes
-USES= qmake
+USES= qmake qt:5
USE_LDCONFIG= yes
-USE_QT5= core gui widgets network svg imageformats \
+USE_QT= core gui widgets network svg imageformats \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -35,7 +35,7 @@
WRKSRC_SUBDIR= src-qt5/core-utils
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
Index: x11/pcdm/Makefile
===================================================================
--- x11/pcdm/Makefile
+++ x11/pcdm/Makefile
@@ -19,8 +19,8 @@
CONFLICTS= pcbsd-utils-qt*
-USES= qmake
-USE_QT5= core gui network svg multimedia imageformats \
+USES= qmake qt:5
+USE_QT= core gui network svg multimedia imageformats \
buildtools_build x11extras concurrent linguisttools_build
USE_OPENRC_SUBR=pcdm
Index: x11/plasma-scriptengine-python-kde4/Makefile
===================================================================
--- x11/plasma-scriptengine-python-kde4/Makefile
+++ x11/plasma-scriptengine-python-kde4/Makefile
@@ -11,9 +11,9 @@
COMMENT= Plasma scriptengine for Python
NO_ARCH= yes
-USES= cmake:outsource kde:4 python:2.7 tar:xz
+USES= cmake:outsource kde:4 python:2.7 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/kde-workspace-kde4/distinfo
KDE_APPLICATIONS_VERSION= 15.08.0
Index: x11/plasma-scriptengine-ruby-kde4/Makefile
===================================================================
--- x11/plasma-scriptengine-ruby-kde4/Makefile
+++ x11/plasma-scriptengine-ruby-kde4/Makefile
@@ -11,9 +11,9 @@
COMMENT= Plasma scriptengine for Ruby
NO_ARCH= yes
-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/kde-workspace-kde4/distinfo
Index: x11/plasma5-kactivitymanagerd/Makefile
===================================================================
--- x11/plasma5-kactivitymanagerd/Makefile
+++ x11/plasma5-kactivitymanagerd/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= System service to manage user's activities, track the usage patterns
-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 ecm \
globalaccel i18n kio service widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network sql widgets xml \
+USE_QT= concurrent core dbus gui network sql widgets xml \
buildtools_build qmake_build
# https://bugs.kde.org/show_bug.cgi?id=305529#c10
Index: x11/plasma5-kgamma5/Makefile
===================================================================
--- x11/plasma5-kgamma5/Makefile
+++ x11/plasma5-kgamma5/Makefile
@@ -7,13 +7,13 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 monitor's gamma settings
-USES= cmake:outsource cpe gettext kde:5 tar:xz
+USES= cmake:outsource cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash doctools ecm emoticons guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio notifications parts service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xxf86vm
Index: x11/plasma5-kscreen/Makefile
===================================================================
--- x11/plasma5-kscreen/Makefile
+++ x11/plasma5-kscreen/Makefile
@@ -7,10 +7,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 screen management library
-USES= cmake:outsource cpe gettext kde:5 tar:xz
+USES= cmake:outsource cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
globalaccel i18n libkscreen widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick testlib widgets xml \
+USE_QT= core dbus gui network qml quick testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11/plasma5-kwayland-integration/Makefile
===================================================================
--- x11/plasma5-kwayland-integration/Makefile
+++ x11/plasma5-kwayland-integration/Makefile
@@ -11,9 +11,9 @@
libwayland-client.so:graphics/wayland
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
-USES= cmake:outsource compiler:c++11-lib cpe kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe kde:5 qt:5 tar:xz
USE_KDE= ecm idletime wayland windowsystem
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11/plasma5-libkscreen/Makefile
===================================================================
--- x11/plasma5-libkscreen/Makefile
+++ x11/plasma5-libkscreen/Makefile
@@ -8,9 +8,9 @@
COMMENT= Plasma5 screen management library
USES= cmake:outsource compiler:c++11-lib cpe kde:5 pathfix \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= ecm wayland
-USE_QT5= core dbus gui testlib x11extras \
+USE_QT= core dbus gui testlib x11extras \
buildtools_build qmake_build
USE_XORG= x11 xcb xrandr
Index: x11/plasma5-plasma-desktop/Makefile
===================================================================
--- x11/plasma5-plasma-desktop/Makefile
+++ x11/plasma5-plasma-desktop/Makefile
@@ -22,7 +22,7 @@
xf86-input-libinput>0:x11-drivers/xf86-input-libinput
USES= cmake:outsource compiler:c++11-lib cpe desktop-file-utils \
- gettext kde:5 pkgconfig tar:xz
+ gettext kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= glib20
USE_KDE= activities activities-stats archive attica auth baloo \
bookmarks codecs completion config configwidgets coreaddons \
@@ -36,7 +36,7 @@
widgetsaddons windowsystem xmlgui
USE_KDE+= drkonqi_run infocenter_run kmenuedit_run ksysguard_run \
polkit-kde-agent-1_run systemsettings_run
-USE_QT5= concurrent core dbus gui network phonon4 printsupport qml \
+USE_QT= concurrent core dbus gui network phonon4 printsupport qml \
quick sql svg widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xfixes xft xi xrender
Index: x11/plasma5-plasma-integration/Makefile
===================================================================
--- x11/plasma5-plasma-integration/Makefile
+++ x11/plasma5-plasma-integration/Makefile
@@ -10,12 +10,12 @@
RUN_DEPENDS= hack-font>=0:x11-fonts/hack-font
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- shebangfix tar:xz
+ qt:5 shebangfix tar:xz
USE_KDE= auth bookmarks breeze codecs completion config configwidgets \
coreaddons ecm i18n iconthemes itemviews jobwidgets kio \
notifications service solid wayland \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network qml quick quickcontrols2 widgets \
+USE_QT= concurrent core dbus gui network qml quick quickcontrols2 widgets \
x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb xcursor
Index: x11/plasma5-plasma-workspace/Makefile
===================================================================
--- x11/plasma5-plasma-workspace/Makefile
+++ x11/plasma5-plasma-workspace/Makefile
@@ -22,7 +22,7 @@
iso-codes>=0:misc/iso-codes
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= activities activitymanagerd attica auth baloo bookmarks \
codecs completion config configwidgets coreaddons crash \
dbusaddons doctools emoticons filemetadata globalaccel \
@@ -36,7 +36,7 @@
widgetsaddons windowsystem xmlgui xmlrpcclient \
breeze_run breeze-icons_run oxygen-icons5_run \
kde-cli-tools_run kded_run milou_run
-USE_QT5= concurrent core dbus graphicaleffects gui network phonon4 \
+USE_QT= concurrent core dbus graphicaleffects gui network phonon4 \
printsupport qdbus qml quick quickcontrols_run script sql \
testlib webkit widgets x11extras xml \
paths_run \
Index: x11/plasma5-plasma/Makefile
===================================================================
--- x11/plasma5-plasma/Makefile
+++ x11/plasma5-plasma/Makefile
@@ -10,13 +10,13 @@
LICENSE= LGPL20
-USES= kde:5 metaport
+USES= kde:5 metaport qt:5
# remove:
# * bluedevil as we do have bluez
# * plasma-pa don't depend on plamsa-pa by default
# * breeze-kde4 don't pull in qt4 bits
USE_KDE= ${_USE_PLASMA_ALL:Nplasma-pa:Nbreeze-kde4}
# pull bsd.qt.mk for QT_PLUGINDIR in the kf5-dependencies
-USE_QT5= #
+USE_QT= #
.include <bsd.port.mk>
Index: x11/py-qt4-opengl/Makefile
===================================================================
--- x11/py-qt4-opengl/Makefile
+++ x11/py-qt4-opengl/Makefile
@@ -12,11 +12,11 @@
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_PYTHON= flavors
-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
@@ -10,11 +10,11 @@
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_PYTHON= flavors
-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
USE_CXXSTD= gnu++98
post-patch:
Index: x11/qt4-graphicssystems-opengl/Makefile
===================================================================
--- x11/qt4-graphicssystems-opengl/Makefile
+++ x11/qt4-graphicssystems-opengl/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt OpenGL rendering engine (experimental)
-USE_QT4= qmake_build opengl
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= opengl
HAS_CONFIGURE= yes
USE_GL= glu
Index: x11/qt4-inputmethods/Makefile
===================================================================
--- x11/qt4-inputmethods/Makefile
+++ x11/qt4-inputmethods/Makefile
@@ -10,8 +10,8 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt input methods
-USE_QT4= qmake_build moc_build corelib gui
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui
HAS_CONFIGURE= yes
Index: x11/qt5-qev/Makefile
===================================================================
--- x11/qt5-qev/Makefile
+++ x11/qt5-qev/Makefile
@@ -8,15 +8,14 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt QWidget events introspection tool
-USE_QT5= core widgets
-QT_DIST= tools
-USES= qmake
+USE_QT= core widgets
+USES= qmake qt-dist:5,tools
WRKSRC_SUBDIR= src/${PORTNAME}
-# qev is not connected to qttool's build system, so we cannot just run qmake
+# qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools
# and set {BUILD,INSTALL}_WRKSRC.
-# Instead, we run qmake from src/${PORTNAME} but need to copy .qmake.conf to
+# Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to
# it for all required variables to be set (MODULE_VERSION etc).
post-patch:
${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
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
-QT_DIST= x11extras
-USES= qmake
+USE_QT= core gui
+USES= qmake qt-dist:5,x11extras
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Index: x11/qterminal-l10n/Makefile
===================================================================
--- x11/qterminal-l10n/Makefile
+++ x11/qterminal-l10n/Makefile
@@ -17,8 +17,8 @@
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \
Index: x11/qterminal/Makefile
===================================================================
--- x11/qterminal/Makefile
+++ x11/qterminal/Makefile
@@ -15,8 +15,8 @@
qterminal-l10n>0:x11/qterminal-l10n
USES= cmake:outsource compiler:c++11-lang gettext-runtime \
- localbase:ldflags lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build core gui qmake_build dbus linguisttools \
+ localbase:ldflags lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build core gui qmake_build dbus linguisttools \
widgets x11extras
USE_XORG= x11
USE_LXQT= buildtools 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/radare-cutter/Makefile
===================================================================
--- x11/radare-cutter/Makefile
+++ x11/radare-cutter/Makefile
@@ -13,12 +13,12 @@
LIB_DEPENDS= libr2.so:devel/radare2
-USES= pkgconfig qmake
+USES= pkgconfig qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= radareorg
GH_PROJECT= cutter
-USE_QT5= buildtools_build core gui svg widgets
+USE_QT= buildtools_build core gui svg widgets
WRKSRC_SUBDIR= src
Index: x11/rsibreak/Makefile
===================================================================
--- x11/rsibreak/Makefile
+++ x11/rsibreak/Makefile
@@ -12,10 +12,10 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons doctools ecm \
iconthemes i18n idletime notifications notifyconfig \
sonnet textwidgets xmlgui widgetsaddons windowsystem
-USE_QT5= core dbus gui widgets xml buildtools_build qmake_build
+USE_QT= core dbus gui widgets xml buildtools_build qmake_build
.include <bsd.port.mk>
Index: x11/sddm/Makefile
===================================================================
--- x11/sddm/Makefile
+++ x11/sddm/Makefile
@@ -8,9 +8,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= QML based login manager
-USES= cmake:outsource desktop-file-utils kde:5
+USES= cmake:outsource desktop-file-utils kde:5 qt:5
USE_KDE= ecm
-USE_QT5= concurrent core dbus gui linguisttools multimedia network \
+USE_QT= concurrent core dbus gui linguisttools multimedia network \
printsupport qml quick script sql webkit widgets \
buildtools_build qmake_build
USE_XORG= xcb
Index: x11/yakuake-kde4/Makefile
===================================================================
--- x11/yakuake-kde4/Makefile
+++ x11/yakuake-kde4/Makefile
@@ -16,10 +16,10 @@
RUN_DEPENDS= konsole:x11/konsole-kde4
-USES= cmake gettext kde:4 shebangfix tar:xz
+USES= cmake gettext kde:4 qt:4 shebangfix 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}"
Index: x11/yakuake/Makefile
===================================================================
--- x11/yakuake/Makefile
+++ x11/yakuake/Makefile
@@ -14,12 +14,12 @@
RUN_DEPENDS= konsole:x11/konsole
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth archive codecs completion config configwidgets \
coreaddons crash dbusaddons ecm globalaccel i18n iconthemes \
jobwidgets kio newstuff notifications notifyconfig parts \
service sonnet textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network widgets x11extras xml \
+USE_QT= core dbus gui network widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 5, 11:33 AM (1 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36035023
Default Alt Text
D15540.id42895.largetrue.diff (889 KB)

Event Timeline