diff options
| author | tcberner <tcberner@FreeBSD.org> | 2016-08-24 16:20:31 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2016-08-24 16:20:31 +0800 |
| commit | a5fddeafcdb2cab1016827038e317a262dad4857 (patch) | |
| tree | b9dc00f333e96550a5732b38b9c9444035e4339c | |
| parent | 3832b190ef3ea2bbefdd61450bff8af422a2e9ae (diff) | |
| download | freebsd-ports-gnome-a5fddeafcdb2cab1016827038e317a262dad4857.tar.gz freebsd-ports-gnome-a5fddeafcdb2cab1016827038e317a262dad4857.tar.zst freebsd-ports-gnome-a5fddeafcdb2cab1016827038e317a262dad4857.zip | |
Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and
Plasma5 ports
At the moment KDE ports use bsd.kde4.mk to handle their dependencies. When
working on the ports for KDE Frameworks and Plasma5 it seemed to be more
reasonable to create a new kde.mk instead of adding an bsd.kde5.mk.
The kde.mk in this review is a stripped down version of the one we are using in
the KDE Test repositories plasma5 branch [1] to only contain the parts relevant
to the current KDE4 ports in the portstree [2].
Changes to the KDE Ports needed by this:
Replace USE_KDE4 by USE_KDE [3]
Add USES=kde:4 [4]
[1] http://src.mouf.net/area51/view/branches/plasma5/KDE/Mk/Uses/kde.mk
[2] The version in the plasma5 branch also handles frameworks/plasma5 and
handles MASTER_SITES via a KDE_DIST variable similar to bsd.qt.mk for Qt
Ports -- I chose to leave this out for now, as the diff is already large
enough.
[3] I chose USE_KDE instead of USE_KDE4, USE_KDE5, USE_KDEX as the version we
want is already specified as argument to kde:<arg>
[4] For KDE Frameworks and Plasma5 ports this would be kde:5
PR: 210667
Approved by: portmgr, mat (mentor), rakuco (mentor)
Reviewed by: mat, rakuco
Differential Revision: https://reviews.freebsd.org/D6961
364 files changed, 1215 insertions, 1211 deletions
@@ -10,6 +10,20 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20160824: +AUTHOR: kde@FreeBSD.org + A new USES file has been introduced: USES=kde:4, which replaces the old + bsd.kde4.mk file in preparation for upcoming KDE Frameworks and Plasma5 + ports. + + Ports depending on KDE4 have to switch from + USE_KDE4=foo bar + to + USES=kde:4 + USE_KDE=foo bar + and make sure to switch from using KDE4_PREFIX to the new name KDE_PREFIX + in the Makefiles as well as plists. + 20160821: AUTHOR: kde@FreeBSD.org diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk new file mode 100644 index 000000000000..25563df17e69 --- /dev/null +++ b/Mk/Uses/kde.mk @@ -0,0 +1,296 @@ +# $FreeBSD$ +# +# Provides support for KDE-based ports. +# +# Feature: kde +# Usage: USES=kde or USES=kde:ARGS +# Valid ARGS: 4 +# +# 4: Depend on KDE4 components and variables. +# +# Variables that can be set by a port: +# +# USE_KDE List of KDE4 components (other ports) that this +# port depends on. +# * foo_build Add a build-time dependency (BUILD_DEPENDS) +# * foo_run Add a run-time dependency (RUN_DEPENDS) +# * foo (default) Add both dependencies on component <foo> +# +# MAINTAINER: kde@FreeBSD.org + +.if !defined(_INCLUDE_USES_KDE_MK) +_INCLUDE_USES_KDE_MK= yes + +_KDE_SUPPORTED= 4 + +. if empty(kde_ARGS) +IGNORE= kde needs a version (${_KDE_SUPPORTED}) +. endif + +# At the moment we support KDE versions 4. +. for ver in ${_KDE_SUPPORTED:O:u} +. if ${kde_ARGS:M${ver}} +. if !defined(_KDE_VERSION) +_KDE_VERSION= ${ver} +. else +IGNORE?= cannot be installed: different KDE versions specified via kde:[${_KDE_SUPPORTED:S/ //g}] #' +. endif +. endif +. endfor + +. if empty(_KDE_VERSION) +IGNORE?= kde:[${_KDE_SUPPORTED:S/ //g}] needs an argument #' +. endif + +_KDE_RELNAME= KDE${_KDE_VERSION} + +# === VERSIONS OF THE DIFFERENT COMPONENTS ===================================== +# Old KDE desktop. +KDE4_VERSION?= 4.14.3 +KDE4_KDELIBS_VERSION= 4.14.10 +KDE4_ACTIVITIES_VERSION= 4.13.3 +KDE4_WORKSPACE_VERSION= 4.11.21 +KDE4_KDEPIM_VERSION?= 4.14.10 +# Applications version for the kde4-applications. +KDE4_APPLICATIONS_BRANCH?= Attic +KDE4_APPLICATIONS_VERSION?= 15.04.3 +KDE4_BRANCH?= stable + +# Extended KDE universe applications. +CALLIGRA_VERSION?= 2.9.11 +CALLIGRA_BRANCH?= stable + +KDEVELOP_VERSION?= 4.7.3 +KDEVELOP_BRANCH?= stable + +KTP_VERSION?= 0.9.0 +KTP_BRANCH?= stable +# ============================================================================== + +# === INSTALLATION PREFIX ====================================================== +# Define installation prefix. +KDE_PREFIX= ${LOCALBASE} +# ============================================================================== + +# ==== SETUP CMAKE ENVIRONMENT ================================================= +# Help cmake to find files when testing ports with non-default PREFIX. +CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}" + +. if ${_KDE_VERSION:M*4*} +CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF +. endif + +# Set man-page installation prefix. +CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_PREFIX}/man" \ + -DMAN_INSTALL_DIR:PATH="${KDE_PREFIX}/man" +# ============================================================================== + +# === SET-UP PLIST_SUB ========================================================= +# Prefix and include directory. +PLIST_SUB+= KDE_PREFIX="${KDE_PREFIX}" +# KDE Applications version. +PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" +# For KDE4 applications provide KDE4 version numbers. +. if ${_KDE_VERSION:M*4*} +PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" \ + KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \ + KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \ + KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \ + KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} +. endif +# ============================================================================== + +# === HANDLE PYTHON ============================================================ +# TODO: Keep in sync with cmake/modules/PythonMacros.cmake +_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} +. if ${_PYTHON_SHORT_VER} > 31 +PLIST_SUB+= PYCACHE="__pycache__/" \ + PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \ + PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo +. else +PLIST_SUB+= PYCACHE="" \ + PYC_SUFFIX=pyc \ + PYO_SUFFIX=pyo +. endif +# ============================================================================== +_USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \ + kfilemetadata korundum libkcddb libkcompactdisc \ + libkdcraw libkdeedu libkdegames libkexiv2 libkipi \ + libkonq libksane marble nepomuk-core nepomuk-widgets \ + okular oxygen-icons4 perlkde perlqt pimlibs pykde4 \ + pykdeuic4 qtruby runtime smokegen smokekde smokeqt \ + workspace +# These components are not part of the Software Compilation. +_USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \ + strigi + +# ====================== kde4 components ======================================= +baloo_PORT= sysutils/baloo +baloo_PATH= ${KDE_PREFIX}/lib/libbaloocore.so + +baloo-widgets_PORT= sysutils/baloo-widgets +baloo-widgets_PATH= ${KDE_PREFIX}/lib/libbaloowidgets.so + +baseapps_PORT= x11/kde4-baseapps +baseapps_PATH= ${KDE_PREFIX}/bin/kfmclient +baseapps_TYPE= run + +kactivities_PORT= x11/kactivities +kactivities_PATH= ${KDE_PREFIX}/lib/libkactivities.so + +kate_PORT= editors/kate +kate_PATH= ${KDE_PREFIX}/lib/libkateinterfaces.so + +kdelibs_PORT= x11/kdelibs4 +kdelibs_PATH= ${KDE_PREFIX}/lib/libkdecore.so + +kfilemetadata_PORT= sysutils/kfilemetadata +kfilemetadata_PATH= ${KDE_PREFIX}/lib/libkfilemetadata.so + +korundum_PORT= devel/ruby-korundum +korundum_PATH= ${KDE_PREFIX}/lib/kde4/krubypluginfactory.so +korundum_TYPE= run + +libkcddb_PORT= audio/libkcddb +libkcddb_PATH= ${KDE_PREFIX}/lib/libkcddb.so + +libkcompactdisc_PORT= audio/libkcompactdisc +libkcompactdisc_PATH= ${KDE_PREFIX}/lib/libkcompactdisc.so + +libkdcraw_PORT= graphics/libkdcraw-kde4 +libkdcraw_PATH= ${KDE_PREFIX}/lib/libkdcraw.so + +libkdeedu_PORT= misc/libkdeedu +libkdeedu_PATH= ${KDE_PREFIX}/lib/libkeduvocdocument.so + +libkdegames_PORT= games/libkdegames +libkdegames_PATH= ${KDE_PREFIX}/lib/libkdegames.so + +libkexiv2_PORT= graphics/libkexiv2-kde4 +libkexiv2_PATH= ${KDE_PREFIX}/lib/libkexiv2.so + +libkipi_PORT= graphics/libkipi-kde4 +libkipi_PATH= ${KDE_PREFIX}/lib/libkipi.so + +libkonq_PORT= x11/libkonq +libkonq_PATH= ${KDE_PREFIX}/lib/libkonq.so + +libksane_PORT= graphics/libksane +libksane_PATH= ${KDE_PREFIX}/lib/libksane.so + +marble_PORT= astro/marble +marble_PATH= ${KDE_PREFIX}/lib/libmarblewidget.so + +nepomuk-core_PORT= sysutils/nepomuk-core +nepomuk-core_PATH= ${KDE_PREFIX}/lib/libnepomukcore.so + +nepomuk-widgets_PORT= sysutils/nepomuk-widgets +nepomuk-widgets_PATH= ${KDE_PREFIX}/lib/libnepomukwidgets.so + +okular_PORT= graphics/okular +okular_PATH= ${KDE_PREFIX}/lib/libokularcore.so + +oxygen-icons4_PORT= x11-themes/kde4-icons-oxygen +oxygen-icons4_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme +oxygen-icons4_TYPE= run + +perlkde_PORT= devel/p5-perlkde +perlkde_PATH= ${KDE_PREFIX}/lib/kde4/kperlpluginfactory.so +perlkde_TYPE= run + +perlqt_PORT= devel/p5-perlqt +perlqt_PATH= ${KDE_PREFIX}/bin/puic4 + +pimlibs_PORT= deskutils/kdepimlibs4 +pimlibs_PATH= ${KDE_PREFIX}/lib/libkpimutils.so + +pykde4_PORT= devel/py-pykde4 +pykde4_PATH= ${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so +pykde4_TYPE= run + +pykdeuic4_PORT= devel/py-pykdeuic4 +pykdeuic4_PATH= ${LOCALBASE}/bin/pykdeuic4 +pykdeuic4_TYPE= run + +qtruby_PORT= devel/ruby-qtruby +qtruby_PATH= ${KDE_PREFIX}/lib/libqtruby4shared.so + +runtime_PORT= x11/kde4-runtime +runtime_PATH= ${KDE_PREFIX}/bin/knotify4 +runtime_TYPE= run + +smokegen_PORT= devel/smokegen +smokegen_PATH= ${KDE_PREFIX}/lib/libsmokebase.so + +smokekde_PORT= devel/smokekde +smokekde_PATH= ${KDE_PREFIX}/lib/libsmokekdecore.so + +smokeqt_PORT= devel/smokeqt +smokeqt_PATH= ${KDE_PREFIX}/lib/libsmokeqtcore.so + +workspace_PORT= x11/kde4-workspace +workspace_PATH= ${KDE_PREFIX}/lib/libkworkspace.so + +# Non-Software Compilation components +akonadi_PORT= databases/akonadi +akonadi_PATH= ${KDE_PREFIX}/lib/libakonadiprotocolinternals.so + +attica_PORT= x11-toolkits/attica +attica_PATH= ${LOCALBASE}/lib/libattica.so + +automoc4_PORT= devel/automoc4 +automoc4_PATH= ${LOCALBASE}/bin/automoc4 +automoc4_TYPE= build + +ontologies_PORT= x11-toolkits/shared-desktop-ontologies +ontologies_PATH= ${LOCALBASE}/share/ontology/core/rdf.ontology + +qimageblitz_PORT= x11/qimageblitz +qimageblitz_PATH= ${LOCALBASE}/lib/libqimageblitz.so + +soprano_PORT= textproc/soprano +soprano_PATH= ${LOCALBASE}/lib/libsoprano.so + +strigi_PORT= deskutils/libstreamanalyzer +strigi_PATH= ${LOCALBASE}/lib/libstreamanalyzer.so.0 +# ====================== end of kde4 components ================================ + +# end of component list ######################################################## + +_USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL} + +# Iterate through components deprived of suffix. +. for component in ${USE_KDE:O:u:C/_.+//} + # Check that the component is valid. +. if ${_USE_KDE_ALL:M${component}} != "" + # Skip meta-components (currently none). +. if defined(${component}_PORT) && defined(${component}_PATH) +${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} + # Check if a dependency type is explicitly requested. +. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" +${component}_TYPE= # empty +. if ${USE_KDE:M${component}_build} != "" +${component}_TYPE+= build +. endif +. if ${USE_KDE:M${component}_run} != "" +${component}_TYPE+= run +. endif +. endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE: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 ${${component}_TYPE:Mbuild} != "" +BUILD_DEPENDS+= ${${component}_DEPENDS} +. endif +. if ${${component}_TYPE:Mrun} != "" +RUN_DEPENDS+= ${${component}_DEPENDS} +. endif +. endif # defined(${component}_PORT) && defined(${component}_PATH) +. else # ! ${_USE_KDE_ALL:M${component}} != "" +IGNORE= cannot be installed: unknown USE_KDE component '${component}' +. endif # ${_USE_KDE_ALL:M${component}} != "" +. endfor + +.endif diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk deleted file mode 100644 index 2abc53045351..000000000000 --- a/Mk/bsd.kde4.mk +++ /dev/null @@ -1,301 +0,0 @@ -# $FreeBSD$ - -.if !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include) - -# Please make sure all changes to this file are past through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Kde_Include_MAINTAINER= kde@FreeBSD.org -Kde_Pre_Include= bsd.kde4.mk - -# -# This file contains some variable definitions that are supposed to make your -# life easier when dealing with ports related to the KDE Software Compilation 4. -# It's automatically included when ${USE_KDE4} is defined in a port's Makefile. -# -# KDE4 related ports can use this as follows: -# -# USE_KDE4= kdelibs -# USE_QT4= corelib # Set Qt 4 components here. -# -# .include <bsd.port.mk> -# -# Additionally, '_build' and '_run' suffixes can be used to force components -# dependency type (e.g., 'marble_run'). If no suffix is set, a default -# dependency type will be used. If you want to force both types, add the -# component twice with both suffixes (e.g., 'pykde4_build pykde4_run'). -# -# Available KDE4 components are: -# -# baloo - Baloo core libraries -# baloo-widgets - Baloo widgets library -# baseapps - Basic applications for KDE Desktop -# kactivities - KDE activities library -# kate - KDE text editor framework -# kdelibs - KDE Developer Platform -# kfilemetadata - KDE library for extracting file metadata -# korundum - KDE Ruby bindings -# libkcddb - KDE CDDB library -# libkcompactdisc - KDE library for interfacing with audio CDs -# libkdcraw - KDE LibRaw library -# libkdeedu - Libraries used by KDE educational applications -# libkdegames - Libraries used by KDE games -# libkexiv2 - KDE Exiv2 library -# libkipi - KDE Image Plugin Interface -# libkonq - Konqueror core library -# libksane - KDE SANE library -# marble - KDE virtual globe -# okular - KDE universal document viewer -# nepomuk-core - Nepomuk core libraries -# nepomuk-widgets - Nepomuk widgets library -# oxygen - KDE icon theme -# perlkde - KDE Perl bindings -# perlqt - Qt 4 Perl bindings -# pimlibs - KDE-Pim libraries -# pykde4 - KDE Python bindings -# pykdeuic4 - PyKDE user interface compiler -# qtruby - Qt 4 Ruby bindings -# runtime - Components required by many KDE Applications -# smokegen - SMOKE base libraries -# smokekde - KDE SMOKE libraries -# smokeqt - Qt 4 SMOKE libraries -# workspace - KDE user environments -# akonadi - Storage server for KDE-Pim -# attica - Qt library implementing Open Collaboration Services API -# automoc4 - Automatic moc for Qt 4 packages -# ontologies - Shared ontologies for semantic searching -# qimageblitz - KDE graphical effects and filters library -# soprano - Qt 4 RDF framework -# strigi - Desktop search daemon -# -# These read-only variables can be used in a port's Makefile: -# -# KDE4_PREFIX - The place where KDE4 ports live. Currently it is -# ${LOCALBASE}/kde4, but this could change in the future. -# - -KDE4_VERSION?= 4.14.3 -KDE4_KDELIBS_VERSION= 4.14.10 -KDE4_ACTIVITES_VERSION= 4.13.3 -KDE4_WORKSPACE_VERSION= 4.11.21 -KDE4_APPLICATIONS_VERSION?= 15.04.3 -KDE4_APPLICATIONS_BRANCH?= Attic -KDE4_BRANCH?= stable -KTP_VERSION?= 0.9.0 -KTP_BRANCH?= stable -CALLIGRA_VERSION?= 2.9.11 -CALLIGRA_BRANCH?= stable -KDEVELOP_VERSION?= 4.7.3 -KDEVELOP_BRANCH?= stable - -KDE4_PREFIX?= ${LOCALBASE} - -# Help cmake to find files when testing ports with non-default PREFIX -CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE};${KDE4_PREFIX}" \ - -DKDE4_BUILD_TESTS:BOOL=OFF - -PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" \ - KDE4_VERSION="${KDE4_VERSION}" \ - KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \ - KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \ - KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \ - KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} - -# Keep in sync with cmake/modules/PythonMacros.cmake -_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} -.if ${_PYTHON_SHORT_VER} > 31 -PLIST_SUB+= PYCACHE="__pycache__/" \ - PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \ - PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo -.else -PLIST_SUB+= PYCACHE="" \ - PYC_SUFFIX=pyc \ - PYO_SUFFIX=pyo -.endif - -.endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include) - -.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include) - -Kde_Post_Include= bsd.kde4.mk - -# -# KDE4 components. -# Set ${component}_TYPE to 'build' or 'run' to specify default dependency type -# for ${component}; otherwise, it will default to 'build run'. -# - -_USE_KDE4_ALL= baloo baloo-widgets \ - baseapps kactivities kate kdelibs kfilemetadata \ - korundum libkcddb libkcompactdisc libkdcraw libkdeedu \ - libkexiv2 libkdegames libkipi libkonq libksane marble \ - nepomuk-core nepomuk-widgets \ - okular oxygen perlkde perlqt pimlibs pykde4 pykdeuic4 \ - qtruby runtime smokegen smokekde smokeqt \ - workspace -# These components are not part of the Software Compilation. -_USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \ - strigi - -baloo_PORT= sysutils/baloo -baloo_PATH= ${KDE4_PREFIX}/lib/libbaloocore.so - -baloo-widgets_PORT= sysutils/baloo-widgets -baloo-widgets_PATH= ${KDE4_PREFIX}/lib/libbaloowidgets.so - -baseapps_PORT= x11/kde4-baseapps -baseapps_PATH= ${KDE4_PREFIX}/bin/kfmclient -baseapps_TYPE= run - -kactivities_PORT= x11/kactivities -kactivities_PATH= ${KDE4_PREFIX}/lib/libkactivities.so - -kate_PORT= editors/kate -kate_PATH= ${KDE4_PREFIX}/lib/libkateinterfaces.so - -kdelibs_PORT= x11/kdelibs4 -kdelibs_PATH= ${KDE4_PREFIX}/lib/libkdecore.so - -kfilemetadata_PORT= sysutils/kfilemetadata -kfilemetadata_PATH= ${KDE4_PREFIX}/lib/libkfilemetadata.so - -korundum_PORT= devel/ruby-korundum -korundum_PATH= ${KDE4_PREFIX}/lib/kde4/krubypluginfactory.so -korundum_TYPE= run - -libkcddb_PORT= audio/libkcddb -libkcddb_PATH= ${KDE4_PREFIX}/lib/libkcddb.so - -libkcompactdisc_PORT= audio/libkcompactdisc -libkcompactdisc_PATH= ${KDE4_PREFIX}/lib/libkcompactdisc.so - -libkdcraw_PORT= graphics/libkdcraw-kde4 -libkdcraw_PATH= ${KDE4_PREFIX}/lib/libkdcraw.so - -libkdeedu_PORT= misc/libkdeedu -libkdeedu_PATH= ${KDE4_PREFIX}/lib/libkeduvocdocument.so - -libkdegames_PORT= games/libkdegames -libkdegames_PATH= ${KDE4_PREFIX}/lib/libkdegames.so - -libkexiv2_PORT= graphics/libkexiv2-kde4 -libkexiv2_PATH= ${KDE4_PREFIX}/lib/libkexiv2.so - -libkipi_PORT= graphics/libkipi-kde4 -libkipi_PATH= ${KDE4_PREFIX}/lib/libkipi.so - -libkonq_PORT= x11/libkonq -libkonq_PATH= ${KDE4_PREFIX}/lib/libkonq.so - -libksane_PORT= graphics/libksane -libksane_PATH= ${KDE4_PREFIX}/lib/libksane.so - -marble_PORT= astro/marble -marble_PATH= ${KDE4_PREFIX}/lib/libmarblewidget.so - -nepomuk-core_PORT= sysutils/nepomuk-core -nepomuk-core_PATH= ${KDE4_PREFIX}/lib/libnepomukcore.so - -nepomuk-widgets_PORT= sysutils/nepomuk-widgets -nepomuk-widgets_PATH= ${KDE4_PREFIX}/lib/libnepomukwidgets.so - -okular_PORT= graphics/okular -okular_PATH= ${KDE4_PREFIX}/lib/libokularcore.so - -oxygen_PORT= x11-themes/kde4-icons-oxygen -oxygen_PATH= ${KDE4_PREFIX}/share/icons/oxygen/index.theme -oxygen_TYPE= run - -perlkde_PORT= devel/p5-perlkde -perlkde_PATH= ${KDE4_PREFIX}/lib/kde4/kperlpluginfactory.so -perlkde_TYPE= run - -perlqt_PORT= devel/p5-perlqt -perlqt_PATH= ${KDE4_PREFIX}/bin/puic4 - -pimlibs_PORT= deskutils/kdepimlibs4 -pimlibs_PATH= ${KDE4_PREFIX}/lib/libkpimutils.so - -pykde4_PORT= devel/py-pykde4 -pykde4_PATH= ${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so -pykde4_TYPE= run - -pykdeuic4_PORT= devel/py-pykdeuic4 -pykdeuic4_PATH= ${LOCALBASE}/bin/pykdeuic4 -pykdeuic4_TYPE= run - -qtruby_PORT= devel/ruby-qtruby -qtruby_PATH= ${KDE4_PREFIX}/lib/libqtruby4shared.so - -runtime_PORT= x11/kde4-runtime -runtime_PATH= ${KDE4_PREFIX}/bin/knotify4 -runtime_TYPE= run - -smokegen_PORT= devel/smokegen -smokegen_PATH= ${KDE4_PREFIX}/lib/libsmokebase.so - -smokekde_PORT= devel/smokekde -smokekde_PATH= ${KDE4_PREFIX}/lib/libsmokekdecore.so - -smokeqt_PORT= devel/smokeqt -smokeqt_PATH= ${KDE4_PREFIX}/lib/libsmokeqtcore.so - -workspace_PORT= x11/kde4-workspace -workspace_PATH= ${KDE4_PREFIX}/lib/libkworkspace.so - -akonadi_PORT= databases/akonadi -akonadi_PATH= ${KDE4_PREFIX}/lib/libakonadiprotocolinternals.so - -attica_PORT= x11-toolkits/attica -attica_PATH= ${LOCALBASE}/lib/libattica.so - -automoc4_PORT= devel/automoc4 -automoc4_PATH= ${LOCALBASE}/bin/automoc4 -automoc4_TYPE= build - -ontologies_PORT= x11-toolkits/shared-desktop-ontologies -ontologies_PATH= ${LOCALBASE}/share/ontology/core/rdf.ontology - -qimageblitz_PORT= x11/qimageblitz -qimageblitz_PATH= ${LOCALBASE}/lib/libqimageblitz.so - -soprano_PORT= textproc/soprano -soprano_PATH= ${LOCALBASE}/lib/libsoprano.so - -strigi_PORT= deskutils/libstreamanalyzer -strigi_PATH= ${LOCALBASE}/lib/libstreamanalyzer.so.0 - -# Iterate through components deprived of suffix. -.for component in ${USE_KDE4:O:u:C/_.+//} - # Check that the component is valid. -. if ${_USE_KDE4_ALL:M${component}} != "" - # Skip meta-components -. if defined(${component}_PORT) && defined(${component}_PATH) -${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} - # Check if a dependency type is explicitly requested. -. if ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == "" -${component}_TYPE= # empty -. if ${USE_KDE4:M${component}_build} != "" -${component}_TYPE+= build -. endif -. if ${USE_KDE4:M${component}_run} != "" -${component}_TYPE+= run -. endif -. endif # ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4: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 ${${component}_TYPE:Mbuild} != "" -BUILD_DEPENDS+= ${${component}_DEPENDS} -. endif -. if ${${component}_TYPE:Mrun} != "" -RUN_DEPENDS+= ${${component}_DEPENDS} -. endif -. endif # defined(${component}_PORT) && defined(${component}_PATH) -. else # ! ${_USE_KDE4_ALL:M${component}} != "" -IGNORE= can't be installed: unknown USE_KDE4 component '${component}' -. endif # ${_USE_KDE4_ALL:M${component}} != "" -.endfor - -.endif # defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6eb8946c0934..708c54a6d08f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -389,10 +389,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_WX - If set, this port uses the WxWidgets library and related # components. See bsd.wx.mk for more details. ## -# USE_KDE4 - A list of the KDE 4 dependencies the port has (e.g., -# kdelibs, kdebase). Implies that the port needs KDE. -# Implies inclusion of bsd.kde4.mk. See bsd.kde4.mk -# for more details. # # USE_QT4 - A list of the Qt 4 dependencies the port has (e.g, # corelib, webkit). Implies that the port needs Qt. @@ -1428,10 +1424,6 @@ USES+=mysql:${USE_MYSQL} .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif -.if defined(USE_KDE4) || defined(KDE4_BUILDENV) -.include "${PORTSDIR}/Mk/bsd.kde4.mk" -.endif - .if !defined(UID) UID!= ${ID} -u .endif @@ -1949,10 +1941,6 @@ _USES_POST+= php .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(USE_KDE4) -.include "${PORTSDIR}/Mk/bsd.kde4.mk" -.endif - .if exists(${PORTSDIR}/Makefile.inc) .include "${PORTSDIR}/Makefile.inc" USE_SUBMAKE= yes diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile index 91c1eb75bf22..7cbd242ce01e 100644 --- a/accessibility/jovie/Makefile +++ b/accessibility/jovie/Makefile @@ -11,8 +11,8 @@ COMMENT= KDE text-to-speech system LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= xml qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile index e06e3757ec54..6e8b859bf56a 100644 --- a/accessibility/kaccessible/Makefile +++ b/accessibility/kaccessible/Makefile @@ -11,8 +11,8 @@ COMMENT= Accessibility services for KDE LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui xml \ qmake_build moc_build rcc_build uic_build diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile index 3390d937acd2..22f644eda6da 100644 --- a/accessibility/kdeaccessibility4/Makefile +++ b/accessibility/kdeaccessibility4/Makefile @@ -8,25 +8,24 @@ CATEGORIES= accessibility kde MAINTAINER= kde@FreeBSD.org COMMENT= Accessibility applications for KDE 4 -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} JOVIE_DESC= Install Jovie text-to-speech system -JOVIE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/jovie:accessibility/jovie +JOVIE_RUN_DEPENDS= ${KDE_PREFIX}/bin/jovie:accessibility/jovie KACCESSIBLE_DESC= Install Accessibility services for KDE -KACCESSIBLE_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible +KACCESSIBLE_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible KMAG_DESC= Install Screen magnifier -KMAG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmag:accessibility/kmag +KMAG_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmag:accessibility/kmag KMOUSETOOL_DESC= Install Automatic mouse click tool -KMOUSETOOL_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmousetool:accessibility/kmousetool +KMOUSETOOL_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmousetool:accessibility/kmousetool KMOUTH_DESC= Install Speech synthesizer frontend -KMOUTH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmouth:accessibility/kmouth +KMOUTH_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmouth:accessibility/kmouth .include <bsd.port.mk> diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile index 7cbe4212f389..0d02a6093ddf 100644 --- a/accessibility/kmag/Makefile +++ b/accessibility/kmag/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE Screen magnifier -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build # Somebody has to create port for libkdeaccessibilityclient first diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile index ca8aa92f8b93..bade9179b698 100644 --- a/accessibility/kmousetool/Makefile +++ b/accessibility/kmousetool/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Automatic mouse click tool for KDE -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build USE_XORG= xtst diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile index 1797625bbe12..63549d65ca8e 100644 --- a/accessibility/kmouth/Makefile +++ b/accessibility/kmouth/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Speech synthesizer frontend for KDE -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index ba13f99da21d..6a7e23a7b6b7 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -13,8 +13,8 @@ COMMENT= Archiving tool for KDE LIB_DEPENDS= libqjson.so:devel/qjson -USE_KDE4= automoc4 kdelibs libkonq -USES= cmake:outsource libarchive cpe tar:xz +USES= cmake:outsource kde:4 libarchive cpe tar:xz +USE_KDE= automoc4 kdelibs libkonq CPE_VENDOR= kde USE_QT4= qtestlib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index bbd19d7f0e75..aa4597a2e3ae 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -16,13 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \ xplanet:astro/xplanet RUN_DEPENDS= xplanet:astro/xplanet -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource compiler:c++11-lib tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= opengl qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= PYKDE PYKDE_DESC= Support for updating supernovae data -PYKDE_USE= KDE4=pykde4_run +PYKDE_USE= KDE=pykde4_run .include <bsd.port.mk> diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile index 2b525ef80c2c..137b76d5371d 100644 --- a/astro/libkgeomap/Makefile +++ b/astro/libkgeomap/Makefile @@ -14,8 +14,8 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs -USE_KDE4= kdelibs automoc4 marble -USES= cmake:outsource pathfix tar:xz +USES= cmake:outsource kde:4 pathfix tar:xz +USE_KDE= kdelibs automoc4 marble USE_LDCONFIG= yes USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build diff --git a/astro/marble/Makefile b/astro/marble/Makefile index c9384bb5e796..b995df8d2d39 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -11,8 +11,8 @@ COMMENT= Virtual globe and world atlas for KDE LIB_DEPENDS= libquazip.so:archivers/quazip -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource gmake shared-mime-info tar:xz +USES= cmake:outsource gmake kde:4 shared-mime-info tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus declarative designer_build gui network phonon \ qtestlib script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index c5b709e90aa8..c5e340554baa 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -20,16 +20,16 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libdbus-1.so:devel/dbus BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \ - ${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms + ${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms -USE_KDE4= kdelibs libkcddb libkcompactdisc \ +USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2 +USE_KDE= kdelibs libkcddb libkcompactdisc \ nepomuk-core runtime automoc4 strigi USE_MYSQL= embedded USE_QT4= corelib dbus designer gui network opengl \ phonon script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 -USES= cmake pkgconfig shared-mime-info shebangfix tar:bzip2 SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl USE_LDCONFIG= yes diff --git a/audio/audex/Makefile b/audio/audex/Makefile index 67d1076b9ec2..846c106ed712 100644 --- a/audio/audex/Makefile +++ b/audio/audex/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv3 LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia -USES= tar:xz cmake -USE_KDE4= automoc4 kdelibs libkcddb libkcompactdisc +USES= tar:xz cmake kde:4 +USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc USE_QT4= gui dbus network svg xml \ qmake_build moc_build rcc_build uic_build diff --git a/audio/creox/Makefile b/audio/creox/Makefile index 78cff4a32eb7..6c67f1bf1268 100644 --- a/audio/creox/Makefile +++ b/audio/creox/Makefile @@ -17,8 +17,8 @@ USE_GITHUB= yes GH_ACCOUNT= laudrup GH_PROJECT= Creox4 -USES= cmake:outsource -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= xft xpm diff --git a/audio/juk/Makefile b/audio/juk/Makefile index 12671ce80a3d..40568273eeb4 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libtag.so:audio/taglib -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile index 834e55e5ce08..17053b3d5e88 100644 --- a/audio/kaudiocreator/Makefile +++ b/audio/kaudiocreator/Makefile @@ -21,9 +21,9 @@ RUN_DEPENDS= flac:audio/flac \ RUN_DEPENDS+= lame:audio/lame .endif -USES= cmake tar:bzip2 +USES= cmake kde:4 tar:bzip2 USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 libkcddb libkcompactdisc +USE_KDE= automoc4 libkcddb libkcompactdisc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile index 9defd2e10837..83d59fe0677f 100644 --- a/audio/kid3-kde4/Makefile +++ b/audio/kid3-kde4/Makefile @@ -12,7 +12,7 @@ COMMENT?= MP3/Ogg/FLAC tag editor for KDE LICENSE= GPLv2 USE_PERL5= build -USES= cmake:outsource perl5 +USES= cmake:outsource kde:4 perl5 CMAKE_ARGS= -DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \ -DWITH_MANDIR=man \ -DFFMPEG_ROOT=${LOCALBASE} \ @@ -61,7 +61,7 @@ PLIST_SUB+= QT="" KDE="@comment " .else CONFLICTS_INSTALL+= kid3-qt4-3.* kid3-qt5-3.* -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}KDE" PLIST_SUB+= QT="@comment " KDE="" .endif diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile index 437c5761a84d..dad3c0626f3c 100644 --- a/audio/kio-audiocd/Makefile +++ b/audio/kio-audiocd/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs libkcddb libkcompactdisc \ +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkcddb libkcompactdisc \ automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile index 2ffe68c5512f..82737f530554 100644 --- a/audio/kmix/Makefile +++ b/audio/kmix/Makefile @@ -12,8 +12,8 @@ COMMENT= Sound mixer for KDE LICENSE= GPLv2 -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= gui phonon xml \ moc_build qmake_build rcc_build uic_build diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile index 5f8d42be109d..ec1692255722 100644 --- a/audio/kscd/Makefile +++ b/audio/kscd/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libmusicbrainz3.so:audio/libmusicbrainz3 -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= phonon moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= ALSA diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile index aaf56120bac5..6890fa648e14 100644 --- a/audio/kstreamripper/Makefile +++ b/audio/kstreamripper/Makefile @@ -11,8 +11,8 @@ COMMENT= Program for recording streams for KDE4 RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:audio/streamripper -USES= cmake gettext-tools tar:bzip2 -USE_KDE4= kdelibs automoc4 +USES= cmake gettext-tools kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile index de82c362d274..bd3c09b362e6 100644 --- a/audio/libkcddb/Makefile +++ b/audio/libkcddb/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE CDDB library LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5 -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qtestlib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile index 5f9b39be46a0..6d99e4a4af1a 100644 --- a/audio/libkcompactdisc/Makefile +++ b/audio/libkcompactdisc/Makefile @@ -11,8 +11,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE library for interfacing with audio CDs -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= phonon moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/audio/simon/Makefile b/audio/simon/Makefile index ef0ca644a824..7021750d0831 100644 --- a/audio/simon/Makefile +++ b/audio/simon/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libsphinxad.so:audio/sphinxbase \ libqwt6.so:x11-toolkits/qwt6 -USE_KDE4= kdelibs automoc4 pimlibs -USES= cmake:outsource gettext tar:bz2 +USES= cmake:outsource gettext kde:4 tar:bz2 +USE_KDE= kdelibs automoc4 pimlibs USE_QT4= accessible corelib dbus gui script testlib xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile index 17f88af8b11b..a0e43102009e 100644 --- a/audio/soundkonverter/Makefile +++ b/audio/soundkonverter/Makefile @@ -17,10 +17,10 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libphonon.so:multimedia/phonon GH_ACCOUNT= HessiJames -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang kde:4 USE_GITHUB= yes USE_QT4= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml -USE_KDE4= automoc4 kdelibs libkcddb +USE_KDE= automoc4 kdelibs libkcddb WRKSRC_SUBDIR= src OPTIONS_DEFAULT= VORBIS FLAC NORMALIZE VORBISGAIN CDPARANOIA diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile index 02b20f883435..2be3924d5c4d 100644 --- a/audio/tomahawk/Makefile +++ b/audio/tomahawk/Makefile @@ -34,7 +34,8 @@ GH_ACCOUNT= tomahawk-player TELEPATHY_LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 TELEPATHY_DESC= Configure Telepathy Settings -TELEPATHY_USE_KDE4= kdelibs automoc4 +TELEPATHY_USES= kde:4 +TELEPATHY_USE= KDE=kdelibs,automoc4 INSTALLS_ICONS= yes diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile index 1ec506e3ba2b..959da49b5ced 100644 --- a/chinese/qterm/Makefile +++ b/chinese/qterm/Makefile @@ -44,7 +44,8 @@ QTSCRIPT_RUN_DEPENDS= ${QT_PLUGINDIR}/script/libqtscript_core.so:devel/qtscriptg QTSCRIPT_CMAKE_ON= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE QTSCRIPT_CMAKE_OFF= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE -KDE_USE= KDE4=kdelibs,automoc4 +KDE_USES= kde:4 +KDE_USE= KDE=kdelibs,automoc4 post-patch-KDE-off: ${REINPLACE_CMD} -e "/^find_package(KDE4)/d" ${WRKSRC}/CMakeLists.txt diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index d6fbeed01a27..6efd20d92055 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -11,8 +11,8 @@ COMMENT= KDE frontend for your remote controls RUN_DEPENDS= lircd:comms/lirc -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= corelib script xmlpatterns \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/databases/akonadi-googledata/Makefile b/databases/akonadi-googledata/Makefile index 027da571ad84..0fef33934cce 100644 --- a/databases/akonadi-googledata/Makefile +++ b/databases/akonadi-googledata/Makefile @@ -12,8 +12,8 @@ COMMENT= Akonadi Resources for Google Contacts and Calendar LIB_DEPENDS= libgcal.so:deskutils/libgcal -USES= cmake gettext tar:bzip2 +USES= cmake gettext kde:4 tar:bzip2 USE_QT4= qmake_build rcc_build moc_build uic_build dbus -USE_KDE4= kdelibs pimlibs automoc4 akonadi +USE_KDE= kdelibs pimlibs automoc4 akonadi .include <bsd.port.mk> diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index dec9d469b42d..cc4190738ac8 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -16,8 +16,9 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt -USE_KDE4= automoc4 soprano -USES= cmake:outsource execinfo shared-mime-info compiler:c++11-lang tar:bzip2 +USES= cmake:outsource execinfo kde:4 shared-mime-info \ + compiler:c++11-lang tar:bzip2 +USE_KDE= automoc4 soprano USE_QT4= corelib dbus gui network qtestlib_build sql xml \ moc_build qmake_build rcc_build uic_build CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL=FALSE \ diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index 6d4275411993..8c6849560c1e 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ libqca.so:devel/qca \ libqoauth.so:net/qoauth -USES= cmake iconv shared-mime-info tar:xz +USES= cmake iconv kde:4 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ webkit USE_LDCONFIG= yes diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile index 2caa70d9a31e..a0104ac26359 100644 --- a/deskutils/basket/Makefile +++ b/deskutils/basket/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libgpgme.so:security/gpgme -USES= cmake gettext-tools tar:bzip2 +USES= cmake gettext-tools kde:4 tar:bzip2 USE_XORG= xft xpm -USE_KDE4= automoc4 pimlibs qimageblitz +USE_KDE= automoc4 pimlibs qimageblitz USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index b9ff18092e27..b2335299f0f9 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -94,7 +94,8 @@ IMPULSE_CMAKE_OFF= -Denable-impulse:BOOL=FALSE #KDE_INTEGRATION_LIB_DEPENDS= KDE_INTEGRATION_USE_QT4= corelib -KDE_INTEGRATION_USE_KDE4= kdelibs +KDE_INTEGRATION_USES= kde:4 +KDE_INTEGRATION_USE= KDE=kdelibs KDE_INTEGRATION_CMAKE_ON= -Denable-kde-integration:BOOL=TRUE KDE_INTEGRATION_CMAKE_OFF= -Denable-kde-integration:BOOL=FALSE diff --git a/deskutils/homerun/Makefile b/deskutils/homerun/Makefile index 7e3b789e605f..0521047cd406 100644 --- a/deskutils/homerun/Makefile +++ b/deskutils/homerun/Makefile @@ -9,8 +9,8 @@ MASTER_SITES= KDE/unstable/${PORTNAME}/src/ MAINTAINER= yurkis@gmail.com COMMENT= Fullscreen launcher with content organized in tabs -USES= cmake:outsource compiler:c++0x gettext tar:bzip2 -USE_KDE4= kdelibs automoc4 workspace +USES= cmake:outsource compiler:c++0x gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 workspace USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui USE_XORG= x11 USE_LDCONFIG= yes diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 9ba641f50618..3faa58068abd 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Character selector for KDE -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile index 919814382edf..cd75f3447ec8 100644 --- a/deskutils/kchmviewer-kde4/Makefile +++ b/deskutils/kchmviewer-kde4/Makefile @@ -14,14 +14,14 @@ COMMENT= KDE viewer for CHM files LIB_DEPENDS= libchm.so:misc/chmlib \ libzip.so:archivers/libzip -USES= cmake:outsource gettext-tools -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext-tools kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= webkit qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} post-patch: - ${REINPLACE_CMD} 's,/usr/bin/kate,${KDE4_PREFIX}/bin/kate,' \ + ${REINPLACE_CMD} 's,/usr/bin/kate,${KDE_PREFIX}/bin/kate,' \ ${WRKSRC}/src/config.cpp post-install: diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile index a11bb437e8c9..f9e40d0fa609 100644 --- a/deskutils/kdeconnect/Makefile +++ b/deskutils/kdeconnect/Makefile @@ -9,8 +9,8 @@ MASTER_SITES= KDE/unstable/kdeconnect/${PORTVERSION}/src/ MAINTAINER= yurkis@gmail.com COMMENT= Support for KDE to interface between your phone and your computer -USES= cmake compiler:c++0x gettext tar:xz -USE_KDE4= kdelibs automoc4 workspace runtime +USES= cmake compiler:c++0x gettext kde:4 tar:xz +USE_KDE= kdelibs automoc4 workspace runtime USE_QT4= corelib gui moc_build qmake_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile index 6b42d9207d66..7f397b61fe8a 100644 --- a/deskutils/kdepim4-runtime/Makefile +++ b/deskutils/kdepim4-runtime/Makefile @@ -19,10 +19,10 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ CONFLICTS_INSTALL= kdepim-runtime44-4.* +USES= cmake:outsource kde:4 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt:build -USE_KDE4= kdelibs pimlibs \ +USE_KDE= kdelibs pimlibs \ akonadi automoc4 -USES= cmake:outsource shared-mime-info tar:xz USE_QT4= corelib dbus declarative designer_build gui network qtestlib \ script xml xmlpatterns \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 6436f29715f8..3f8397cf00ee 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -15,15 +15,15 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libsasl2.so:security/cyrus-sasl2 \ libboost_thread.so:devel/boost-libs \ libkgapi2.so:devel/libkgapi -RUN_DEPENDS= ${KDE4_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \ +RUN_DEPENDS= ${KDE_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \ ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils CONFLICTS_INSTALL= kdepim44-4.* USE_GNOME= libxml2 libxslt:build -USE_KDE4= kdelibs pimlibs kactivities \ +USE_KDE= kdelibs pimlibs kactivities \ akonadi automoc4 soprano nepomuk-widgets baloo -USES= cmake:outsource gmake grantlee:4 iconv shebangfix tar:xz +USES= cmake:outsource gmake grantlee:4 iconv kde: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 diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile index d9dbb22dfe6a..62ed005eff3d 100644 --- a/deskutils/kdepimlibs4/Makefile +++ b/deskutils/kdepimlibs4/Makefile @@ -20,9 +20,9 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libprison.so:graphics/prison \ libqjson.so:devel/qjson -USE_KDE4= kdelibs akonadi \ +USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz +USE_KDE= kdelibs akonadi \ automoc4 ontologies soprano -USES= cmake:outsource shared-mime-info shebangfix tar:xz SHEBANG_FILES= mailtransport/kconf_update/migrate-transports.pl USE_OPENLDAP= yes USE_QT4= corelib dbus declarative designer_build gui network sql xml \ @@ -32,7 +32,7 @@ USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/cmake/modules/*.cmake - ${REINPLACE_CMD} -e 's|%%KDE4_PREFIX%%|${KDE4_PREFIX}|g' \ + ${REINPLACE_CMD} -e 's|%%KDE_PREFIX%%|${KDE_PREFIX}|g' \ ${PATCH_WRKSRC}/cmake/modules/FindQGpgme.cmake # Prevent updating MIME during build. ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ diff --git a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake index 546628a30d0d..67d17cc2334c 100644 --- a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake +++ b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake @@ -5,12 +5,12 @@ else ( WIN32 ) find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread - HINTS ${GPGME_LIBRARY_DIR}) -+ HINTS ${GPGME_LIBRARY_DIR} %%KDE4_PREFIX%%/lib) ++ HINTS ${GPGME_LIBRARY_DIR} %%KDE_PREFIX%%/lib) endif() - + find_library(QGPGME_LIBRARY qgpgme - HINTS ${GPGME_LIBRARY_DIR}) -+ HINTS ${GPGME_LIBRARY_DIR} %%KDE4_PREFIX%%/lib) - ++ HINTS ${GPGME_LIBRARY_DIR} %%KDE_PREFIX%%/lib) + if (QGPGME_LIBRARY) # get the libdirectory and then go one up diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile index 2de631a75ce3..b83b679dc0d5 100644 --- a/deskutils/kdeplasma-addons/Makefile +++ b/deskutils/kdeplasma-addons/Makefile @@ -19,9 +19,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].* -USE_KDE4= kdelibs libkexiv2 pimlibs workspace \ +USES= cmake:outsource kde:4 pkgconfig shared-mime-info tar:xz +USE_KDE= kdelibs libkexiv2 pimlibs workspace \ akonadi attica automoc4 qimageblitz soprano -USES= cmake:outsource pkgconfig shared-mime-info tar:xz USE_QT4= corelib dbus declarative gui network script sql webkit \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xrender xtst @@ -32,7 +32,7 @@ OPTIONS_DEFAULT= MARBLE OPTIONS_SUB= yes MARBLE_DESC= Support for desktop globe wallpaper -MARBLE_USE= KDE4=marble +MARBLE_USE= KDE=marble MARBLE_CMAKE_OFF= -DWITH_Marble=off IBUS_DESC= Enable IBUS backend for input dialog diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile index 98a6802ad932..6f6286ffd095 100644 --- a/deskutils/kruler/Makefile +++ b/deskutils/kruler/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 screen ruler -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= x11 diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile index 7fe363c3b9b6..e89ff1860fbf 100644 --- a/deskutils/ksshaskpass/Makefile +++ b/deskutils/ksshaskpass/Makefile @@ -12,8 +12,8 @@ MAINTAINER= swills@FreeBSD.org COMMENT= KDE 4 version of ssh-askpass with KWallet support WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= cmake -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build uic_build qmake_build rcc_build SUB_FILES= pkg-message diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile index f49b2b2b14da..d646ba41e356 100644 --- a/deskutils/plasma-applet-cwp/Makefile +++ b/deskutils/plasma-applet-cwp/Makefile @@ -13,8 +13,8 @@ COMMENT= Weather plasma applet for KDE4 LICENSE= GPLv3 -USES= cmake gettext tar:bzip2 -USE_KDE4= automoc4 kdelibs +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= gui dbus network opengl svg phonon webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/plasma-applet-daisy/Makefile b/deskutils/plasma-applet-daisy/Makefile index 2a52e1934cb4..1ef7b810fc89 100644 --- a/deskutils/plasma-applet-daisy/Makefile +++ b/deskutils/plasma-applet-daisy/Makefile @@ -13,8 +13,8 @@ COMMENT= Simple launcher plasma applet for KDE4 LICENSE= GPLv3 -USES= cmake gettext -USE_KDE4= automoc4 kdelibs workspace +USES= cmake gettext kde:4 +USE_KDE= automoc4 kdelibs workspace USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile index 150ede5687e2..dc1ac09b6afe 100644 --- a/deskutils/plasma-applet-fancytasks/Makefile +++ b/deskutils/plasma-applet-fancytasks/Makefile @@ -14,8 +14,8 @@ COMMENT= Plasmoid fancy representation of your tasks and launchers LICENSE= GPLv2 -USES= cmake tar:bzip2 -USE_KDE4= automoc4 kdelibs workspace qimageblitz +USES= cmake kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs workspace qimageblitz USE_QT4= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile index eea1cff05713..1b64b2317257 100644 --- a/deskutils/plasma-applet-panelspacer/Makefile +++ b/deskutils/plasma-applet-panelspacer/Makefile @@ -13,8 +13,8 @@ COMMENT= Panel spacer plasma applet for KDE4 LICENSE= GPLv2 -USES= cmake -USE_KDE4= automoc4 workspace +USES= cmake kde:4 +USE_KDE= automoc4 workspace USE_QT4= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile index 44fe0822f8df..28a14422c247 100644 --- a/deskutils/plasma-applet-playwolf/Makefile +++ b/deskutils/plasma-applet-playwolf/Makefile @@ -12,8 +12,8 @@ COMMENT= Amarok 2.x plasma applet for KDE4 LICENSE= GPLv2 -USES= cmake tar:bzip2 -USE_KDE4= automoc4 kdelibs +USES= cmake kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= gui dbus network opengl phonon svg webkit xml xmlpatterns \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile index 38352b908ed2..8689f1c11c36 100644 --- a/deskutils/plasma-applet-qstardict/Makefile +++ b/deskutils/plasma-applet-qstardict/Makefile @@ -12,9 +12,9 @@ COMMENT= Dictionary plasma applet for KDE RUN_DEPENDS= ${QSTARDICT_PLUGIN_PATH}/libstardict.so:textproc/qstardict -USES= cmake tar:bzip2 +USES= cmake kde:4 tar:bzip2 USE_QT4= qmake_build uic_build moc_build rcc_build -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs CMAKE_SOURCE_PATH= ${WRKSRC}/kdeplasma QSTARDICT_PLUGIN_PATH= ${LOCALBASE}/lib/qstardict/plugins diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile index 28f99f05f344..d3679335f40c 100644 --- a/deskutils/plasma-applet-serverstatuswidget/Makefile +++ b/deskutils/plasma-applet-serverstatuswidget/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE4 server monitoring plasma applet LICENSE= GPLv2 -USES= cmake gettext tar:bzip2 -USE_KDE4= automoc4 workspace +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile index 673d58a6575b..15e65fb96e0a 100644 --- a/deskutils/plasma-applet-simpleweatherforecast/Makefile +++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile @@ -14,8 +14,8 @@ COMMENT= Weather plasma applet for KDE4 RUN_DEPENDS= wget:ftp/wget -USES= cmake -USE_KDE4= automoc4 kdelibs +USES= cmake kde:4 +USE_KDE= automoc4 kdelibs USE_QT4= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile index ac611b40abe2..6c3c9e662ee5 100644 --- a/deskutils/plasma-applet-teacooker/Makefile +++ b/deskutils/plasma-applet-teacooker/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE4 tea cooker plasma applet LICENSE= GPLv3 -USES= cmake -USE_KDE4= automoc4 kdelibs +USES= cmake kde:4 +USE_KDE= automoc4 kdelibs USE_QT4= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile index 202d4eb58b5a..761d44ed0fb8 100644 --- a/deskutils/plasma-applet-yawp/Makefile +++ b/deskutils/plasma-applet-yawp/Makefile @@ -12,8 +12,8 @@ COMMENT= KDE4 weather plasma applet LICENSE= GPLv2 -USES= cmake gettext tar:bzip2 -USE_KDE4= automoc4 workspace +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile index 0c4101655731..25dbe0d80f49 100644 --- a/deskutils/semantik/Makefile +++ b/deskutils/semantik/Makefile @@ -11,16 +11,16 @@ COMMENT= KDE mind mapping tool LICENSE= GPLv3 -USE_KDE4= kdelibs +USES= kde:4 pkgconfig python:2 shebangfix tar:bzip2 waf \ + shared-mime-info +USE_KDE= kdelibs USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes USE_QT4= corelib gui linguist_build svg webkit xml \ moc_build qmake_build uic_build -USES= pkgconfig python:2 shebangfix tar:bzip2 waf \ - shared-mime-info QT_NONSTANDARD= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" \ - PATH="${KDE4_PREFIX}/bin:$$PATH" \ + PATH="${KDE_PREFIX}/bin:$$PATH" \ WAF_HOME="${WRKSRC}" CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile index 68ab772fc955..5b038fb64dc3 100644 --- a/deskutils/silence/Makefile +++ b/deskutils/silence/Makefile @@ -14,10 +14,10 @@ COMMENT= Information management tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/katepart.so:editors/kate +RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate -USES= cmake -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build linguisttools_build WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile index 2b6f7382b709..626eb659079d 100644 --- a/deskutils/strigi/Makefile +++ b/deskutils/strigi/Makefile @@ -9,8 +9,8 @@ CATEGORIES= deskutils MAINTAINER= kde@FreeBSD.org COMMENT= Strigi desktop search (meta port) -USE_KDE4= strigi_run -USES= metaport +USES= kde:4 metaport +USE_KDE= strigi_run OPTIONS_DEFINE= CLIENT DAEMON UTILITIES OPTIONS_DEFAULT= ${OPTIONS_DEFINE} diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile index 23bb74b6239f..878e987d70b5 100644 --- a/deskutils/superkaramba/Makefile +++ b/deskutils/superkaramba/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Widget framework for KDE -USE_KDE4= kdelibs automoc4 qimageblitz -USES= cmake:outsource python:2 tar:xz +USES= cmake:outsource kde:4 python:2 tar:xz +USE_KDE= kdelibs automoc4 qimageblitz USE_QT4= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index b9d48bc36a2a..b8a8406b9b1e 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= CVS Frontend for KDE -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index d22b6b989c22..787860cc8778 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -13,7 +13,7 @@ COMMENT?= Cross-platform Makefile generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt -USE_KDE4= # env +USES= kde:4 # Just pull in env for KDE_PREFIX CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ @@ -53,7 +53,7 @@ post-patch: ${WRKSRC}/Source/cmLocalGenerator.cxx \ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \ ${WRKSRC}/bootstrap - @${REINPLACE_CMD} -e 's,/opt/kde4,${KDE4_PREFIX},g' \ + @${REINPLACE_CMD} -e 's,/opt/kde4,${KDE_PREFIX},g' \ ${WRKSRC}/Modules/FindKDE4.cmake @${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \ ${WRKSRC}/Modules/FindDCMTK.cmake diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins/Makefile index 7b22ac991759..89762ccdd395 100644 --- a/devel/dolphin-plugins/Makefile +++ b/devel/dolphin-plugins/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plugins for Dolphin file manager -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs libkonq automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkonq automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile index 93c5d7ec67a1..9427e813b061 100644 --- a/devel/kapptemplate/Makefile +++ b/devel/kapptemplate/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE template generator -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource gmake tar:xz +USES= cmake:outsource gmake kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib dbus declarative diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile index 775d6b49056b..9d98d3c1a898 100644 --- a/devel/kcachegrind/Makefile +++ b/devel/kcachegrind/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Profiler frontend for KDE -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz shebangfix +USES= cmake:outsource kde:4 tar:xz shebangfix +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib dbus gui SHEBANG_FILES= converters/op2calltree converters/dprof2calltree \ diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index 709d4a26517a..761c37e0ff2a 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -11,8 +11,8 @@ COMMENT= Graphical user interface around gdb using KDE LICENSE= GPLv2 -USES= cmake -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts/Makefile index cd0228ce0261..0f839727f140 100644 --- a/devel/kde-dev-scripts/Makefile +++ b/devel/kde-dev-scripts/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE development scripts -USES= cmake:outsource shebangfix tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 shebangfix tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build SHEBANG_FILES= cxxmetric \ diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils/Makefile index c568a6490053..e305f8b58bce 100644 --- a/devel/kde-dev-utils/Makefile +++ b/devel/kde-dev-utils/Makefile @@ -10,9 +10,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE development utilities -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib designer gui qt3support xml -USES= cmake:outsource tar:xz .include <bsd.port.mk> diff --git a/devel/kdebindings4/Makefile b/devel/kdebindings4/Makefile index 9d0d8a4778ea..71dc545ccc1c 100644 --- a/devel/kdebindings4/Makefile +++ b/devel/kdebindings4/Makefile @@ -7,21 +7,20 @@ CATEGORIES= devel kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE bindings (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= PERL PYTHON RUBY OPTIONS_DEFAULT= ${OPTIONS_DEFINE} PERL_DESC= Perl bindings -PERL_USE= KDE4=perlkde_run +PERL_USE= KDE=perlkde_run PYTHON_DESC= Python bindings -PYTHON_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython -PYTHON_USE= KDE4=pykde4_run,pykdeuic4_run +PYTHON_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython +PYTHON_USE= KDE=pykde4_run,pykdeuic4_run RUBY_DESC= Ruby bindings -RUBY_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/krossruby.so:devel/ruby-krossruby -RUBY_USE= KDE4=korundum_run +RUBY_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/krossruby.so:devel/ruby-krossruby +RUBY_USE= KDE=korundum_run .include <bsd.port.mk> diff --git a/devel/kdesdk4-kioslaves/Makefile b/devel/kdesdk4-kioslaves/Makefile index 7b500787b144..2bf4c1508559 100644 --- a/devel/kdesdk4-kioslaves/Makefile +++ b/devel/kdesdk4-kioslaves/Makefile @@ -11,8 +11,8 @@ COMMENT= SDK related KIO slaves LIB_DEPENDS= libsvn_client-1.so:devel/subversion -USES= cmake:outsource perl5 shebangfix tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 perl5 shebangfix tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build SHEBANG_FILES= perldoc/pod2html.pl diff --git a/devel/kdesdk4-strigi-analyzers/Makefile b/devel/kdesdk4-strigi-analyzers/Makefile index 4ca97c0ae106..bb9cd6a4e540 100644 --- a/devel/kdesdk4-strigi-analyzers/Makefile +++ b/devel/kdesdk4-strigi-analyzers/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Strigi analyzers for SDK related file formats -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 strigi +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 strigi USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/kdesdk4-thumbnailers/Makefile b/devel/kdesdk4-thumbnailers/Makefile index d3aff2fb39e5..725b1fb5091e 100644 --- a/devel/kdesdk4-thumbnailers/Makefile +++ b/devel/kdesdk4-thumbnailers/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE thumbnail generator for gettext po files -USES= cmake:outsource gettext tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index f7b27f06188c..65ea722c52d4 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -7,8 +7,7 @@ CATEGORIES= devel kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE Software Development Kit -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= CERVISIA \ DEVUTILS \ @@ -29,51 +28,51 @@ OPTIONS_DEFINE= CERVISIA \ OPTIONS_DEFAULT= ${OPTIONS_DEFINE} CERVISIA_DESC= CVS frontend -CERVISIA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/cervisia:devel/cervisia +CERVISIA_RUN_DEPENDS= ${KDE_PREFIX}/bin/cervisia:devel/cervisia DEVUTILS_DESC= KDE development utilities -DEVUTILS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kuiviewer:devel/kde-dev-utils +DEVUTILS_RUN_DEPENDS= ${KDE_PREFIX}/bin/kuiviewer:devel/kde-dev-utils DEVSCRIPTS_DESC= KDE development scripts -DEVSCRIPTS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kdekillall:devel/kde-dev-scripts +DEVSCRIPTS_RUN_DEPENDS= ${KDE_PREFIX}/bin/kdekillall:devel/kde-dev-scripts DOLPHIN_DESC= Plugins for Dolphin file manager -DOLPHIN_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins +DOLPHIN_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins KAPPTEMPLATE_DESC= Template generator -KAPPTEMPLATE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kapptemplate:devel/kapptemplate +KAPPTEMPLATE_RUN_DEPENDS= ${KDE_PREFIX}/bin/kapptemplate:devel/kapptemplate KATE_DESC= KDE advanced text editor -KATE_USE= KDE4=kate_run +KATE_USE= KDE=kate_run KATE_PATE_DESC= Support for Python plugins in Kate -KATE_PATE_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/katepateplugin.so:editors/kate-plugin-pate +KATE_PATE_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/katepateplugin.so:editors/kate-plugin-pate KCACHEGRIND_DESC= Profiler frontend -KCACHEGRIND_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcachegrind:devel/kcachegrind +KCACHEGRIND_RUN_DEPENDS= ${KDE_PREFIX}/bin/kcachegrind:devel/kcachegrind KIOSLAVES_DESC= SDK related KIO slaves -KIOSLAVES_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kio_svn.so:devel/kdesdk4-kioslaves +KIOSLAVES_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kio_svn.so:devel/kdesdk4-kioslaves KOMPARE_DESC= Diff/Patch frontend -KOMPARE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kompare:textproc/kompare +KOMPARE_RUN_DEPENDS= ${KDE_PREFIX}/bin/kompare:textproc/kompare LOKALIZE_DESC= Computer-aided translation system -LOKALIZE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/lokalize:devel/lokalize +LOKALIZE_RUN_DEPENDS= ${KDE_PREFIX}/bin/lokalize:devel/lokalize OKTETA_DESC= Hex editor -OKTETA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/okteta:devel/okteta +OKTETA_RUN_DEPENDS= ${KDE_PREFIX}/bin/okteta:devel/okteta POXML_DESC= Tools to translate DocBook XML using gettext -POXML_RUN_DEPENDS= ${KDE4_PREFIX}/bin/po2xml:devel/poxml +POXML_RUN_DEPENDS= ${KDE_PREFIX}/bin/po2xml:devel/poxml STRIGI_DESC= Strigi analyzers for SDK file formats -STRIGI_RUN_DEPENDS= ${KDE4_PREFIX}/lib/strigi/strigila_diff.so:devel/kdesdk4-strigi-analyzers +STRIGI_RUN_DEPENDS= ${KDE_PREFIX}/lib/strigi/strigila_diff.so:devel/kdesdk4-strigi-analyzers THUMBNAILER_DESC= Thumbnail generator for gettext po files -THUMBNAILER_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/pothumbnail.so:devel/kdesdk4-thumbnailers +THUMBNAILER_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/pothumbnail.so:devel/kdesdk4-thumbnailers UMBRELLO_DESC= UML modeller -UMBRELLO_RUN_DEPENDS= ${KDE4_PREFIX}/bin/umbrello:devel/umbrello +UMBRELLO_RUN_DEPENDS= ${KDE_PREFIX}/bin/umbrello:devel/umbrello .include <bsd.port.mk> diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile index fbd66f81f181..2d12d86646e1 100644 --- a/devel/kdesvn-kde4/Makefile +++ b/devel/kdesvn-kde4/Makefile @@ -15,10 +15,11 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion CONFLICTS= qsvn-[0-9]* -USES= cmake:outsource compiler:c11 tar:xz CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \ -DMAN_INSTALL_DIR=${MANPREFIX}/man -USE_KDE4= kdelibs automoc4 + +USES= cmake:outsource compiler:c11 kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_LDCONFIG= yes USE_QT4= corelib gui xml network dbus svg sql \ qmake_build moc_build rcc_build uic_build linguist_build diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index ec712da4a781..0bf0f4ede4ff 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -13,10 +13,11 @@ COMMENT= Plugin extensible IDE for KDE LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform RUN_DEPENDS= gmake:devel/gmake -USE_KDE4= kdelibs workspace automoc4 +USES= cmake:outsource compiler:c++11-lib gmake kde:4 \ + shared-mime-info tar:bz2 +USE_KDE= kdelibs workspace automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ corelib declarative gui help script webkit xml -USES= cmake:outsource compiler:c++11-lib gmake shared-mime-info tar:bz2 OPTIONS_DEFINE= OKTETA PHP NLS OPTIONS_DEFAULT= OKTETA PHP @@ -28,7 +29,7 @@ OKTETA_CMAKE_OFF= -DWITH_LibOktetaKasten:BOOL=OFF OKTETA_CMAKE_ON= -DWITH_LibOktetaKasten:BOOL=ON PHP_DESC= PHP support for KDevelop -PHP_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:devel/kdevelop-php +PHP_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kdevphplanguagesupport.so:devel/kdevelop-php NLS_USES= gettext NLS_CMAKE_OFF= -DBUILD_po:BOOL=FALSE diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile index c642bf1effee..135822b9a8d0 100644 --- a/devel/kdevelop-pg-qt/Makefile +++ b/devel/kdevelop-pg-qt/Makefile @@ -12,8 +12,8 @@ COMMENT= Parser-generator from KDevplatform BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cmake:outsource compiler:c++11-lib tar:bzip2 -USE_KDE4= automoc4 kdelibs +USES= bison cmake:outsource compiler:c++11-lib kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build uic_build rcc_build .include <bsd.port.mk> diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile index 122b7f9e8943..40d19e523e11 100644 --- a/devel/kdevelop-php-docs/Makefile +++ b/devel/kdevelop-php-docs/Makefile @@ -11,9 +11,9 @@ COMMENT= PHP documentation for KDevelop LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource compiler:c++11-lib kde:4 tar:bz2 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake:outsource compiler:c++11-lib tar:bz2 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile index 0b152304be25..fd112a96b10f 100644 --- a/devel/kdevelop-php/Makefile +++ b/devel/kdevelop-php/Makefile @@ -10,11 +10,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= PHP support for KDevelop LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform -BUILD_DEPENDS= ${KDE4_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt +BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:bz2 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake:outsource compiler:c++11-lib gmake tar:bz2 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= PHPDOCS NLS @@ -22,7 +22,7 @@ OPTIONS_DEFAULT= PHPDOCS OPTIONS_SUB= yes PHPDOCS_DESC= Integrate with PHP.net documentation -PHPDOCS_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:devel/kdevelop-php-docs +PHPDOCS_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kdevphpdocs.so:devel/kdevelop-php-docs NLS_USES= gettext NLS_CMAKE_OFF= -DBUILD_po:BOOL=Off diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile index c080069d9d21..24f8d09cf26d 100644 --- a/devel/kdevplatform/Makefile +++ b/devel/kdevplatform/Makefile @@ -14,10 +14,11 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ libboost_thread.so:devel/boost-libs \ libqjson.so:devel/qjson -USE_KDE4= kate_run kdelibs automoc4 +USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 shebangfix \ + tar:bz2 +USE_KDE= kate_run kdelibs automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ corelib designer_build gui webkit -USES= cmake:outsource compiler:c++11-lib grantlee:4 shebangfix tar:bz2 USE_LDCONFIG= yes SHEBANG_FILES= util/kdev_format_source util/kdevplatform_shell_environment.sh diff --git a/devel/libkgapi/Makefile b/devel/libkgapi/Makefile index 27214c338cee..e22451111a7a 100644 --- a/devel/libkgapi/Makefile +++ b/devel/libkgapi/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource tar:bzip2 -USE_KDE4= automoc4 kdelibs pimlibs +USES= cmake:outsource kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes USE_QT4= corelib network webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/devel/libkolab/Makefile b/devel/libkolab/Makefile index 5f29e4864861..96009a65f0c9 100644 --- a/devel/libkolab/Makefile +++ b/devel/libkolab/Makefile @@ -19,8 +19,8 @@ CMAKE_ARGS= -DBUILD_TESTS:BOOL=OFF \ -DPHP_BINDINGS:BOOL=OFF \ -DPYTHON_BINDINGS:BOOL=OFF \ -DUSE_LIBCALENDARING:BOOL=OFF -USES= cmake:outsource -USE_KDE4= automoc4 kdelibs pimlibs +USES= cmake:outsource kde:4 +USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile index e43b0398f7ba..1edf86a3cada 100644 --- a/devel/lokalize/Makefile +++ b/devel/lokalize/Makefile @@ -11,8 +11,8 @@ COMMENT= Computer-aided translation system LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ sql diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile index eb35c35e956f..8ec7cf199db1 100644 --- a/devel/okteta/Makefile +++ b/devel/okteta/Makefile @@ -12,8 +12,8 @@ COMMENT= KDE hex editor LIB_DEPENDS= libqca.so:devel/qca -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib designer gui script scripttools xml USE_LDCONFIG= yes diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile index 7f869ce1248b..66d5e5cb058e 100644 --- a/devel/p5-perlkde/Makefile +++ b/devel/p5-perlkde/Makefile @@ -10,18 +10,18 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Perl bindings for KDE -USE_KDE4= perlqt smokekde automoc4 +USES= cmake:outsource compiler:c++11-lib kde:4 perl5 tar:xz +USE_KDE= perlqt smokekde automoc4 USE_QT4= network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource compiler:c++11-lib perl5 tar:xz # Respect PREFIX CMAKE_ARGS+= -DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_ARCH_REL} -# Fix build PREFIX != KDE4_PREFIX -CMAKE_ARGS+= -DSmoke_DIR=${KDE4_PREFIX}/lib/cmake/smoke \ - -DPerlQt_DIR=${KDE4_PREFIX}/share/perlqt/cmake \ - -DOkular_DIR=${KDE4_PREFIX}/lib/cmake/Okular +# Fix build PREFIX != KDE_PREFIX +CMAKE_ARGS+= -DSmoke_DIR=${KDE_PREFIX}/lib/cmake/smoke \ + -DPerlQt_DIR=${KDE_PREFIX}/share/perlqt/cmake \ + -DOkular_DIR=${KDE_PREFIX}/lib/cmake/Okular OPTIONS_DEFINE= ATTICA ATTICA_DESC= Bindings for libattica (may crash build) @@ -29,8 +29,8 @@ ATTICA_DESC= Bindings for libattica (may crash build) .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MATTICA} -.if exists(${KDE4_PREFIX}/lib/libsmokekdecore.so) && \ - !exists(${KDE4_PREFIX}/lib/libsmokeattica.so) +.if exists(${KDE_PREFIX}/lib/libsmokekdecore.so) && \ + !exists(${KDE_PREFIX}/lib/libsmokeattica.so) IGNORE= requires devel/smokekde built with ATTICA option .endif PLIST_SUB+= ATTICA="" diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile index c9cf69c78922..1e247ea0d205 100644 --- a/devel/p5-perlqt/Makefile +++ b/devel/p5-perlqt/Makefile @@ -13,15 +13,15 @@ COMMENT= Perl bindings for Qt LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 -USE_KDE4= smokeqt qimageblitz +USES= cmake:outsource kde:4 perl5 tar:xz +USE_KDE= smokeqt qimageblitz USE_QT4= corelib dbus gui network xml \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource perl5 tar:xz # Respect PREFIX CMAKE_ARGS+= -DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_ARCH_REL} -# Fix build PREFIX != KDE4_PREFIX -CMAKE_ARGS+= -DSmoke_DIR=${KDE4_PREFIX}/lib/cmake/smoke +# Fix build PREFIX != KDE_PREFIX +CMAKE_ARGS+= -DSmoke_DIR=${KDE_PREFIX}/lib/cmake/smoke SUB_FILES= perl-kdebindings-env.sh pkg-message SUB_LIST+= PERL5LIBDIR="${PREFIX}/${SITE_ARCH_REL}:\ diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile index e7f52027906a..b610d124182a 100644 --- a/devel/piklab/Makefile +++ b/devel/piklab/Makefile @@ -21,8 +21,8 @@ OPTIONS_DEFINE= KDE4 OPTIONS_DEFAULT= KDE4 OPTIONS_SUB= yes -KDE4_USES= shared-mime-info -KDE4_USE= KDE4=automoc4,kdelibs +KDE4_USES= kde:4 shared-mime-info +KDE4_USE= KDE=automoc4,kdelibs KDE4_CMAKE_OFF= -DQT_ONLY:BOOL=ON \ -DLOCALE_INSTALL_DIR:STRING="${PREFIX}/share/locale" diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile index 9f8318e3eeeb..65f7e7683199 100644 --- a/devel/poxml/Makefile +++ b/devel/poxml/Makefile @@ -11,8 +11,8 @@ COMMENT= Tools to translate Docbook XML using gettext BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:devel/antlr -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource gettext-tools:build,run tar:xz +USES= cmake:outsource gettext-tools:build,run kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib xml diff --git a/devel/py-krosspython/Makefile b/devel/py-krosspython/Makefile index 841d13b80e01..581d3d4eb78e 100644 --- a/devel/py-krosspython/Makefile +++ b/devel/py-krosspython/Makefile @@ -11,9 +11,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Kross Python scripting library -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 python:2 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build -USES= cmake:outsource python:2 tar:xz CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \ -DBUILD_ruby:BOOL=FALSE \ -DBUILD_java:BOOL=FALSE diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile index ccfca98bd53c..7825856082e0 100644 --- a/devel/py-pykde4/Makefile +++ b/devel/py-pykde4/Makefile @@ -13,7 +13,8 @@ COMMENT= Python bindings for KDE LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 -USE_KDE4= kdelibs nepomuk-core okular pimlibs \ +USES= cmake:outsource kde:4 python:2 pyqt: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 \ @@ -21,7 +22,6 @@ USE_PYQT= declarative designer gui network opengl phonon script sip \ USE_QT4= corelib dbus designer_build gui network xml \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource python:2 pyqt:4 tar:xz CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE \ -DENABLE_PYTHON=ON \ -DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION} diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4/Makefile index a9719585b025..bbb99d2a3cb2 100644 --- a/devel/py-pykdeuic4/Makefile +++ b/devel/py-pykdeuic4/Makefile @@ -11,10 +11,10 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Enhanced version of pyuic4 -USE_KDE4= kdelibs automoc4 pykde4 +USES= cmake:outsource python:2 kde:4 tar:xz +USE_KDE= kdelibs automoc4 pykde4 USE_QT4= moc_build qmake_build rcc_build uic_build DISTINFO_FILE= ${.CURDIR:H:H}/devel/py-pykde4/distinfo -USES= cmake:outsource python:2 tar:xz WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} diff --git a/devel/ruby-korundum/Makefile b/devel/ruby-korundum/Makefile index db34948b7842..f2939ae9f637 100644 --- a/devel/ruby-korundum/Makefile +++ b/devel/ruby-korundum/Makefile @@ -10,13 +10,13 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for KDE -USE_KDE4= kate kdelibs okular pimlibs \ +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kate kdelibs okular pimlibs \ qtruby smokegen smokekde smokeqt \ akonadi automoc4 soprano USE_QT4= corelib network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes -USES= cmake:outsource tar:xz CMAKE_ARGS+= -DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \ -DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \ diff --git a/devel/ruby-krossruby/Makefile b/devel/ruby-krossruby/Makefile index f6669969879d..eb9f1500775e 100644 --- a/devel/ruby-krossruby/Makefile +++ b/devel/ruby-krossruby/Makefile @@ -11,10 +11,10 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for Qt/KDE -USE_KDE4= kdelibs pimlibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs pimlibs automoc4 USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build USE_RUBY= yes -USES= cmake:outsource tar:xz CMAKE_ARGS+= -DBUILD_python:BOOL=FALSE \ -DBUILD_falcon:BOOL=FALSE \ -DBUILD_java:BOOL=FALSE diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile index 45ea7ee4325e..dddfe9c48043 100644 --- a/devel/ruby-qtruby/Makefile +++ b/devel/ruby-qtruby/Makefile @@ -14,11 +14,11 @@ COMMENT= Ruby bindings for Qt LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 \ libqscintilla2.so:devel/qscintilla2 -USE_KDE4= smokeqt +USES= cmake:outsource kde:4 tar:xz +USE_KDE= smokeqt USE_QT4= corelib dbus declarative gui network phonon script webkit xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes -USES= cmake:outsource tar:xz USE_LDCONFIG= yes SUB_FILES= ruby-kdebindings-env.sh pkg-message diff --git a/devel/smokegen/Makefile b/devel/smokegen/Makefile index c6860632a5f7..72948f3c4685 100644 --- a/devel/smokegen/Makefile +++ b/devel/smokegen/Makefile @@ -9,9 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= SMOKE bindings for KDE -USE_KDE4= # blank, needed to get KDE4_VERSION +USES= cmake:outsource kde:4 tar:xz USE_QT4= corelib xml qmake_build moc_build uic_build rcc_build -USES= cmake:outsource tar:xz CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke USE_LDCONFIG= yes diff --git a/devel/smokekde/Makefile b/devel/smokekde/Makefile index 62fabe2283a0..bb4ae4c0fb3f 100644 --- a/devel/smokekde/Makefile +++ b/devel/smokekde/Makefile @@ -9,11 +9,11 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= SMOKE bindings for KDE -USE_KDE4= kate kdelibs okular pimlibs \ +USES= cmake:outsource kde: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 \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= ATTICA diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile index dbc8608e885c..3529fe3c52f9 100644 --- a/devel/smokeqt/Makefile +++ b/devel/smokeqt/Makefile @@ -13,12 +13,12 @@ COMMENT= SMOKE bindings for Qt LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 -USE_KDE4= smokegen qimageblitz +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= smokegen qimageblitz USE_QT4= 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 -USES= cmake:outsource pkgconfig tar:xz USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile index 0a7e0d0b17c9..3d4bdf484061 100644 --- a/devel/umbrello/Makefile +++ b/devel/umbrello/Makefile @@ -11,9 +11,9 @@ COMMENT= UML modeller for KDE LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_GNOME= libxml2 libxslt -USES= cmake:outsource tar:xz USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile index d0624a7d76cb..758e1561f457 100644 --- a/editors/calligra-l10n/Makefile +++ b/editors/calligra-l10n/Makefile @@ -7,8 +7,7 @@ CATEGORIES= editors kde MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for Calligra -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport CALLIGRA_LANG_ALL= bs ca ca@valencia cs da de el en_GB es et fi fr \ gl hu it ja kk nb nl pl pt pt_BR ru sk \ @@ -36,7 +35,7 @@ ALL_DESC= All localizations ALL_RUN_DEPENDS=# empty .for lang in ${CALLIGRA_LANG_ALL} -${lang}_DETECT?= ${KDE4_PREFIX}/share/locale/${lang}/LC_MESSAGES/calligra.mo +${lang}_DETECT?= ${KDE_PREFIX}/share/locale/${lang}/LC_MESSAGES/calligra.mo ${lang}_PORT?= editors/calligra-l10n-${lang:S/@/_/} ${lang}_NAME?= ${lang} diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk index 54b4b197e751..5e69ec7ac7d7 100644 --- a/editors/calligra-l10n/files/bsd.l10n.mk +++ b/editors/calligra-l10n/files/bsd.l10n.mk @@ -6,8 +6,8 @@ DIST_SUBDIR= KDE/calligra/${PORTVERSION}/l10n PLIST_SUB+= LANG=${CALLIGRA_L10N} -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 USE_QT4= corelib xml moc_build qmake_build rcc_build uic_build -USES+= cmake gettext tar:xz +USES+= cmake gettext kde:4 tar:xz NO_ARCH= yes .endif diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 59483126b7db..daf8eb176539 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -37,13 +37,13 @@ RUN_DEPENDS= pstoedit:graphics/pstoedit USE_GL= glew USE_GNOME= glib20 libxml2 libxslt -USE_KDE4= kactivities kdelibs libkdcraw \ +USE_KDE= kactivities kdelibs libkdcraw \ okular pimlibs attica automoc4 soprano USE_QT4= corelib dbus designer_build gui opengl phonon \ qtestlib_build script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build USES= cmake:outsource cpe compiler:c++11-lang iconv:translit jpeg \ - perl5 pkgconfig shared-mime-info sqlite tar:xz + kde:4 perl5 pkgconfig shared-mime-info sqlite tar:xz CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \ -DPRODUCTSET:STRING="DESKTOP" USE_LDCONFIG= yes @@ -63,7 +63,7 @@ GMIC_CMAKE_ON= -DWITH_GMIC:BOOL=ON GMIC_CMAKE_OFF= -DWITH_GMIC:BOOL=OFF MARBLE_DESC= World globe widget support via Marble -MARBLE_USE= KDE4=marble +MARBLE_USE= KDE=marble MARBLE_CMAKE_OFF=-DWITH_Marble:BOOL=FALSE MYSQL_DESC= MySQL database support in Kexi diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile index 25c9f7081cd1..193dc1810522 100644 --- a/editors/kate-plugin-pate/Makefile +++ b/editors/kate-plugin-pate/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Support for Python plugins in Kate -USES= cmake:outsource python tar:xz -USE_KDE4= kdelibs automoc4 kate \ +USES= cmake:outsource kde:4 python tar:xz +USE_KDE= kdelibs automoc4 kate \ pykde4_build pykde4_run USE_QT4= gui webkit \ moc_build qmake_build rcc_build uic_build diff --git a/editors/kate/Makefile b/editors/kate/Makefile index 110c17f9e30e..ac58768ad7ad 100644 --- a/editors/kate/Makefile +++ b/editors/kate/Makefile @@ -13,8 +13,8 @@ COMMENT= Basic editor framework for the KDE system LIB_DEPENDS= libqjson.so:devel/qjson -USE_KDE4= kdelibs automoc4 kactivities -USES= cmake:outsource gettext perl5 tar:xz +USES= cmake:outsource gettext kde:4 perl5 tar:xz +USE_KDE= kdelibs automoc4 kactivities USE_PERL5= build USE_QT4= dbus gui script sql webkit xml \ moc_build qmake_build rcc_build uic_build diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile index 1d0f14269de6..7ad7ee2fc041 100644 --- a/editors/kile-kde4/Makefile +++ b/editors/kile-kde4/Makefile @@ -12,13 +12,13 @@ COMMENT= LaTeX source editor for KDE RUN_DEPENDS= identify:graphics/ImageMagick -USES= cmake gettext-tools shared-mime-info tar:bzip2 +USES= cmake gettext-tools kde:4 shared-mime-info tar:bzip2 USE_QT4= qmake_build moc_build rcc_build uic_build -USE_KDE4= kdelibs automoc4 kate_run +USE_KDE= kdelibs automoc4 kate_run USE_TEX= latex OPTIONS_DEFINE= OKULAR OKULAR_DESC= Use Okular for viewing -OKULAR_USE= KDE4=okular_run +OKULAR_USE= KDE=okular_run .include <bsd.port.mk> diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile index 4d5c60d143fb..824ab0c9c211 100644 --- a/editors/klat4/Makefile +++ b/editors/klat4/Makefile @@ -12,8 +12,8 @@ COMMENT= LaTeX source editor for KDE4 LICENSE= GPLv2+ -USES= cmake gettext-tools tar:bzip2 -USE_KDE4= automoc4 kate kdelibs +USES= cmake gettext-tools kde:4 tar:bzip2 +USE_KDE= automoc4 kate kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index b5f543a1e59b..0793f591b51b 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -172,11 +172,12 @@ JAVA_USE= JAVA=yes JAVA_VARS= JAVA_BUILD=yes KDE4_CONFIGURE_ENABLE= kde4 -KDE4_CONFIGURE_ENV= KDE4DIR="${KDE4_PREFIX}" \ +KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ QT4DIR="${QT_PREFIX}" \ QT4INC="${QT_INCDIR}" \ QT4LIB="${QT_LIBDIR}" -KDE4_USE= KDE4=kdelibs QT4=moc_build,qmake_build +KDE4_USES= kde:4 +KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 MMEDIA_USE= GSTREAMER1=yes diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile index ca11addf66c0..222512a0ca09 100644 --- a/editors/libreoffice4/Makefile +++ b/editors/libreoffice4/Makefile @@ -263,9 +263,10 @@ JAVA_CONFIGURE_OFF= --without-java JAVA_USE= JAVA=yes JAVA_VARS= JAVA_BUILD=yes -KDE4_USE= KDE4=kdelibs QT4=moc_build,qmake_build +KDE4_USES= kde:4 +KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build KDE4_CONFIGURE_ENABLE= kde4 -KDE4_CONFIGURE_ENV= KDE4DIR="${KDE4_PREFIX}" \ +KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ QT4DIR="${QT_PREFIX}" \ QT4INC="${QT_INCDIR}" \ QT4LIB="${QT_LIBDIR}" diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile index 11c3e0b8c612..0d48df3cd593 100644 --- a/editors/yzis/Makefile +++ b/editors/yzis/Makefile @@ -32,7 +32,8 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= KYZIS NYZIS DOCS OPTIONS_SUB= yes KYZIS_DESC= Build kyzis and Yzis kpart -KYZIS_USE= KDE4=kdeprefix,kdelibs,automoc4 QT4=phonon +KYZIS_USES= kde:4 +KYZIS_USE= KDE=kdeprefix,kdelibs,automoc4 QT4=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) diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile index ae6db8ebcac1..5c41d68bb368 100644 --- a/finance/kmymoney-kde4/Makefile +++ b/finance/kmymoney-kde4/Makefile @@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_graph.so:devel/boost-libs \ libalkimia.so:finance/libalkimia -USES= cmake pkgconfig shared-mime-info shebangfix tar:xz +USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:xz USE_QT4= gui dbus network phonon sql svg xml \ qmake_build moc_build rcc_build uic_build -USE_KDE4= automoc4 kdelibs pimlibs +USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes SHEBANG_FILES= kmymoney/misc/financequote.pl diff --git a/finance/libalkimia/Makefile b/finance/libalkimia/Makefile index 3c653fca719e..4d32735a5b04 100644 --- a/finance/libalkimia/Makefile +++ b/finance/libalkimia/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL21 LIB_DEPENDS= libgmp.so:math/gmp -USES= cmake:outsource pathfix tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 pathfix tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile index 5ee94a727bca..dcd736466105 100644 --- a/finance/skrooge/Makefile +++ b/finance/skrooge/Makefile @@ -13,10 +13,11 @@ LIB_DEPENDS= libofx.so:finance/libofx \ libqca.so:devel/qca \ libkactivities.so:x11/kactivities -USES= cmake:outsource gettext grantlee:4 shared-mime-info sqlite:3 tar:xz +USES= cmake:outsource gettext grantlee:4 kde:4 shared-mime-info \ + sqlite:3 tar:xz USE_QT4= qmake_build moc_build uic_build rcc_build designer_build \ corelib dbus gui script sql webkit xml sql-sqlite3_run -USE_KDE4= automoc4 kdelibs pimlibs +USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION} diff --git a/ftp/plasma-applet-ftpmonitor/Makefile b/ftp/plasma-applet-ftpmonitor/Makefile index f670e748ecb7..eea512c608f2 100644 --- a/ftp/plasma-applet-ftpmonitor/Makefile +++ b/ftp/plasma-applet-ftpmonitor/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= plasma-applet- MAINTAINER= makc@FreeBSD.org COMMENT= KDE4 Plasma applet, which monitors connections to ftp daemons -USES= cmake tar:bzip2 -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build post-patch: diff --git a/games/blinken/Makefile b/games/blinken/Makefile index beadb6049262..529149e2527d 100644 --- a/games/blinken/Makefile +++ b/games/blinken/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Memory enhancement game for KDE 4 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/games/bomber/Makefile b/games/bomber/Makefile index 6ab29e0f5249..babbe5bb4555 100644 --- a/games/bomber/Makefile +++ b/games/bomber/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/bovo/Makefile b/games/bovo/Makefile index 770223df0367..ccec6e08496b 100644 --- a/games/bovo/Makefile +++ b/games/bovo/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/granatier/Makefile b/games/granatier/Makefile index fba1c120c4e7..09b516b91aee 100644 --- a/games/granatier/Makefile +++ b/games/granatier/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile index f6e1c03bc835..6eb7c106b656 100644 --- a/games/kajongg/Makefile +++ b/games/kajongg/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource python tar:xz twisted:run sqlite -USE_KDE4= kdelibs pykde4 automoc4 +USES= cmake:outsource kde:4 python tar:xz twisted:run sqlite +USE_KDE= kdelibs pykde4 automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DINSTALL_KAJONGG:BOOL=TRUE diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile index 6e206ed8b738..9401a755ee40 100644 --- a/games/kanagram/Makefile +++ b/games/kanagram/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Letter order game for KDE 4 -USE_KDE4= kdelibs libkdeedu automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdeedu automoc4 USE_QT4= xml corelib declarative gui opengl script xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/kapman/Makefile b/games/kapman/Makefile index 7d0c663656dd..82087d646833 100644 --- a/games/kapman/Makefile +++ b/games/kapman/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/katomic/Makefile b/games/katomic/Makefile index a863e310623d..182531b12c1f 100644 --- a/games/katomic/Makefile +++ b/games/katomic/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource shebangfix tar:xz +USES= cmake:outsource kde: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 diff --git a/games/kblackbox/Makefile b/games/kblackbox/Makefile index 143ebf3958e8..9a3fa67d3653 100644 --- a/games/kblackbox/Makefile +++ b/games/kblackbox/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile index b33b60245325..14a656a03374 100644 --- a/games/kblocks/Makefile +++ b/games/kblocks/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui network \ moc_build qmake_build rcc_build uic_build diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile index 9faf753ec2cf..30fbc30fab8a 100644 --- a/games/kbounce/Makefile +++ b/games/kbounce/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kbreakout/Makefile b/games/kbreakout/Makefile index 2676695d31b8..4e78ceca01d0 100644 --- a/games/kbreakout/Makefile +++ b/games/kbreakout/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index e8284c64a802..5a8c3d463fcc 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -7,8 +7,7 @@ CATEGORIES= games kde MAINTAINER= kde@FreeBSD.org COMMENT= Games for KDE 4 (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= ALL ${KDE4_GAMES_ALL} OPTIONS_DEFAULT= ALL @@ -18,7 +17,7 @@ OPTIONS_DEFAULT= ALL .for game in ${KDE4_GAMES_ALL} # _PORT, _DETECT, and _DESC are defined in Makefile.common ${game}_PORT?= games/${game} -${game}_DETECT?= ${KDE4_PREFIX}/bin/${game} +${game}_DETECT?= ${KDE_PREFIX}/bin/${game} ${game}_DESC?= Please fix a typo in option name/desc! ${game}_RUN_DEPENDS= ${${game}_DETECT}:${${game}_PORT} ALL_RUN_DEPENDS+= ${${game}_RUN_DEPENDS} diff --git a/games/kdegames4/Makefile.common b/games/kdegames4/Makefile.common index b5839bbc5232..7c540abe9362 100644 --- a/games/kdegames4/Makefile.common +++ b/games/kdegames4/Makefile.common @@ -42,7 +42,7 @@ KDE4_GAMES_ALL= bomber \ palapeli \ picmi -ksnakeduel_DETECT= ${KDE4_PREFIX}/bin/ktron +ksnakeduel_DETECT= ${KDE_PREFIX}/bin/ktron bomber_DESC= Arcade Bombing game bovo_DESC= Five-in-a-row Board game diff --git a/games/kdiamond/Makefile b/games/kdiamond/Makefile index e650eeba46bc..95b2fcbbbdcc 100644 --- a/games/kdiamond/Makefile +++ b/games/kdiamond/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kfourinline/Makefile b/games/kfourinline/Makefile index b1e128721e16..d575aa16d2c8 100644 --- a/games/kfourinline/Makefile +++ b/games/kfourinline/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kgoldrunner/Makefile b/games/kgoldrunner/Makefile index 5abb076411b1..0ccd8fe4fe19 100644 --- a/games/kgoldrunner/Makefile +++ b/games/kgoldrunner/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/khangman/Makefile b/games/khangman/Makefile index cdd7c9d22825..def91cc87ddb 100644 --- a/games/khangman/Makefile +++ b/games/khangman/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Hangman game for KDE 4 -USE_KDE4= kdelibs libkdeedu automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdeedu automoc4 USE_QT4= corelib declarative gui opengl script xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/games/kigo/Makefile b/games/kigo/Makefile index 9e7ffe8de9ef..9b3209463f18 100644 --- a/games/kigo/Makefile +++ b/games/kigo/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/killbots/Makefile b/games/killbots/Makefile index 1b2eaf3afbf4..d379cc4a63a3 100644 --- a/games/killbots/Makefile +++ b/games/killbots/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui qtestlib xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/kiriki/Makefile b/games/kiriki/Makefile index 3013fa81ced0..a2b20a4392c8 100644 --- a/games/kiriki/Makefile +++ b/games/kiriki/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kjumpingcube/Makefile b/games/kjumpingcube/Makefile index 7223add36cd8..c92162990cdb 100644 --- a/games/kjumpingcube/Makefile +++ b/games/kjumpingcube/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/klickety/Makefile b/games/klickety/Makefile index 08e46cc6d0e0..6a6c1b58f2c5 100644 --- a/games/klickety/Makefile +++ b/games/klickety/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource shebangfix tar:xz +USES= cmake:outsource kde:4 shebangfix tar:xz +USE_KDE= kdelibs libkdegames automoc4 SHEBANG_FILES= klickety-2.0-inherit-ksame-highscore.pl USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/klines/Makefile b/games/klines/Makefile index c0ba1dfcfbb7..3e8d8a47dc95 100644 --- a/games/klines/Makefile +++ b/games/klines/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kmahjongg/Makefile b/games/kmahjongg/Makefile index 8bd0c8dce454..0d3b63d3aa5b 100644 --- a/games/kmahjongg/Makefile +++ b/games/kmahjongg/Makefile @@ -11,8 +11,8 @@ COMMENT= ${${PORTNAME}_DESC} LIB_DEPENDS= libkmahjongglib.so:games/libkmahjongg -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kmines/Makefile b/games/kmines/Makefile index 87ff1eb4589f..d28a88a01145 100644 --- a/games/kmines/Makefile +++ b/games/kmines/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/knavalbattle/Makefile b/games/knavalbattle/Makefile index 497b3019b270..2bc857c25fa9 100644 --- a/games/knavalbattle/Makefile +++ b/games/knavalbattle/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui network xml \ moc_build qmake_build rcc_build uic_build diff --git a/games/knetwalk/Makefile b/games/knetwalk/Makefile index 3236bf1e537b..527bbc76bece 100644 --- a/games/knetwalk/Makefile +++ b/games/knetwalk/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile index 5ce17cd3c487..fc9e0f60b78c 100644 --- a/games/knights-kde4/Makefile +++ b/games/knights-kde4/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:games/gnuchess LICENSE= GPLv2 -USES= cmake:outsource tar:bzip2 -USE_KDE4= kdelibs automoc4 workspace libkdegames +USES= cmake:outsource kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 workspace libkdegames USE_QT4= qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= DOCS NLS diff --git a/games/kolf/Makefile b/games/kolf/Makefile index 0bbb876ce94c..244b75abc766 100644 --- a/games/kolf/Makefile +++ b/games/kolf/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/games/kollision/Makefile b/games/kollision/Makefile index 5068e055cf48..e454c1baf58d 100644 --- a/games/kollision/Makefile +++ b/games/kollision/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/konquest/Makefile b/games/konquest/Makefile index b2d3953740a7..2819afa46bb1 100644 --- a/games/konquest/Makefile +++ b/games/konquest/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kpat/Makefile b/games/kpat/Makefile index a659c3c09a5e..ba4357c7e3c8 100644 --- a/games/kpat/Makefile +++ b/games/kpat/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build post-patch: diff --git a/games/kreversi/Makefile b/games/kreversi/Makefile index 9c0a5bc95262..56a9283a0c79 100644 --- a/games/kreversi/Makefile +++ b/games/kreversi/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kshisen/Makefile b/games/kshisen/Makefile index dc4ae094d1a0..2f7296983ea9 100644 --- a/games/kshisen/Makefile +++ b/games/kshisen/Makefile @@ -11,8 +11,8 @@ COMMENT= ${${PORTNAME}_DESC} LIB_DEPENDS= libkmahjongglib.so:games/libkmahjongg -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile index 6c11a01b9edb..33cd9dafe072 100644 --- a/games/ksirk/Makefile +++ b/games/ksirk/Makefile @@ -11,8 +11,8 @@ COMMENT= ${${PORTNAME}_DESC} LIB_DEPENDS= libqca.so:devel/qca -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui corelib gui network qt3support svg xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/games/ksnakeduel/Makefile b/games/ksnakeduel/Makefile index ef590b4a6cd1..1e7f20b93a59 100644 --- a/games/ksnakeduel/Makefile +++ b/games/ksnakeduel/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kspaceduel/Makefile b/games/kspaceduel/Makefile index d964a6a06dc8..a7994fed0f00 100644 --- a/games/kspaceduel/Makefile +++ b/games/kspaceduel/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/ksquares/Makefile b/games/ksquares/Makefile index 1d72cc6d91fa..b47ebfd4b21e 100644 --- a/games/ksquares/Makefile +++ b/games/ksquares/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile index ad7d32a0546e..66d0471f4639 100644 --- a/games/ksudoku/Makefile +++ b/games/ksudoku/Makefile @@ -9,9 +9,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} +USES= cmake:outsource kde:4 tar:xz USE_GL= glu -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui corelib gui opengl \ moc_build qmake_build rcc_build uic_build diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile index 5b84ce731aa9..c2ffa58bb87f 100644 --- a/games/ktuberling/Makefile +++ b/games/ktuberling/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <${.CURDIR}/../kdegames4/Makefile.common> diff --git a/games/kubrick/Makefile b/games/kubrick/Makefile index 8c28b5bb66a4..1fa833e0837c 100644 --- a/games/kubrick/Makefile +++ b/games/kubrick/Makefile @@ -9,9 +9,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} +USES= cmake:outsource kde:4 tar:xz USE_GL= glu -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui opengl \ moc_build qmake_build rcc_build uic_build diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile index 5f5351aca1e7..fa492e13efc2 100644 --- a/games/libkdegames/Makefile +++ b/games/libkdegames/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Libraries used by KDE 4 games -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/games/libkmahjongg/Makefile b/games/libkmahjongg/Makefile index 4c0551b72433..057cc682b5a7 100644 --- a/games/libkmahjongg/Makefile +++ b/games/libkmahjongg/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Library for the Mahjongg Solitaire for KDE 4 -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/games/lskat/Makefile b/games/lskat/Makefile index 91a2fe483e79..794cf7d333e2 100644 --- a/games/lskat/Makefile +++ b/games/lskat/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui gui svg \ moc_build qmake_build rcc_build uic_build diff --git a/games/pairs/Makefile b/games/pairs/Makefile index cc7bf8a46f50..de56a0492226 100644 --- a/games/pairs/Makefile +++ b/games/pairs/Makefile @@ -12,8 +12,8 @@ COMMENT= Memory and pairs game for KDE LICENSE= GPLv2 -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= declarative opengl phonon xmlpatterns \ moc_build qmake_build rcc_build uic_build diff --git a/games/palapeli/Makefile b/games/palapeli/Makefile index dfe0b2f36a4c..b0bbdeb27562 100644 --- a/games/palapeli/Makefile +++ b/games/palapeli/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USE_KDE4= kdelibs libkdegames automoc4 -USES= cmake:outsource shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= corelib gui gui \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/games/picmi/Makefile b/games/picmi/Makefile index e33b9220294a..a5181cba6135 100644 --- a/games/picmi/Makefile +++ b/games/picmi/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME}_DESC} -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs libkdegames automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdegames automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ svg xml diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile index 5af4d82820e4..a4c5bddecb0e 100644 --- a/graphics/digikam-kde4/Makefile +++ b/graphics/digikam-kde4/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ libboost_graph.so:devel/boost-libs USES+= pkgconfig shebangfix -USE_KDE4+= libkdcraw libkexiv2 libkipi runtime_run +USE_KDE+= libkdcraw libkexiv2 libkipi runtime_run USE_QT4+= sql-sqlite3_run USE_LDCONFIG= yes CMAKE_ARGS+= -DWITH_Sqlite2:BOOL=OFF @@ -47,7 +47,7 @@ GPHOTO2_CMAKE_ON= -DWITH_Gphoto2:BOOL=ON GPHOTO2_CMAKE_OFF= -DWITH_Gphoto2:BOOL=OFF PIMLIBS_DESC= Address book support -PIMLIBS_USE= KDE4=pimlibs baloo +PIMLIBS_USE= KDE=pimlibs baloo PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common index 9c58523a542f..5673f9b15435 100644 --- a/graphics/digikam-kde4/Makefile.common +++ b/graphics/digikam-kde4/Makefile.common @@ -118,8 +118,8 @@ LICENSE?= GPLv2 USES+= tar:bzip2 .if !defined(NO_BUILD) -USES+= cmake -USE_KDE4+= automoc4 kdelibs +USES+= cmake kde:4 +USE_KDE+= automoc4 kdelibs USE_QT4+= qmake_build moc_build rcc_build uic_build WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 28560561345a..a321684ba2dd 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ CONFLICTS= gnash-devel-[0-9]* -USES= cpe gmake jpeg libtool pkgconfig tar:bzip2 +USES= cpe gmake jpeg kde:4 libtool pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GCC= any WANT_GSTREAMER= yes @@ -106,8 +106,8 @@ CONFIGURE_ARGS+= --disable-npapi .endif .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN} -PLIST_SUB+= KPARTS4="${KDE4_PREFIX}" -CONFIGURE_ARGS+= --with-kde4_prefix=${KDE4_PREFIX} +PLIST_SUB+= KPARTS4="${KDE_PREFIX}" +CONFIGURE_ARGS+= --with-kde4_prefix=${KDE_PREFIX} .else PLIST_SUB+= KPARTS4="@comment " CONFIGURE_ARGS+= --disable-kparts4 @@ -127,8 +127,8 @@ GNASH_GUIS+= gtk GNASH_GUIS+= kde4 USE_QT4= moc_build QT_NONSTANDARD= yes -USE_KDE4= kdelibs -CONFIGURE_ENV+= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config" +USE_KDE= kdelibs +CONFIGURE_ENV+= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config" .endif .if ${GNASH_GUIS} == "" diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index 61a52103b941..ad4baf3012a6 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -13,9 +13,9 @@ COMMENT= Image viewer and browser for KDE 4 LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libpng.so:graphics/png -USE_KDE4= kactivities kdelibs baloo kfilemetadata \ +USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz +USE_KDE= kactivities kdelibs baloo kfilemetadata \ libkdcraw libkipi libkonq automoc4 soprano -USES= cmake:outsource jpeg pkgconfig tar:xz USE_QT4= corelib gui opengl qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile index 57f70cddc136..6eacc3ee43a4 100644 --- a/graphics/kamera-kde4/Makefile +++ b/graphics/kamera-kde4/Makefile @@ -11,8 +11,8 @@ COMMENT= Digital camera manager for KDE 4 LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile index aa0842ff88e8..f0280e30d9c6 100644 --- a/graphics/kcolorchooser/Makefile +++ b/graphics/kcolorchooser/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 application to select colors from the screen or from a palette -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile index 53c6586f6a45..70f029a1c9d7 100644 --- a/graphics/kcoloredit/Makefile +++ b/graphics/kcoloredit/Makefile @@ -11,9 +11,9 @@ DIST_SUBDIR= KDE/extragear MAINTAINER= kde@FreeBSD.org COMMENT= Palette files editor for KDE -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake gettext tar:bzip2 APP_VER= 2.0.0 EXTRA_VER= 4.4.0 diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile index a116209c448b..1a898fb996c4 100644 --- a/graphics/kdegraphics4-mobipocket/Makefile +++ b/graphics/kdegraphics4-mobipocket/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Mobipocket plugins for Strigi indexing and thumbnails -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 strigi +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 strigi USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile index 25a0d2504b67..8db1339db672 100644 --- a/graphics/kdegraphics4-strigi-analyzer/Makefile +++ b/graphics/kdegraphics4-strigi-analyzer/Makefile @@ -11,8 +11,8 @@ COMMENT= Strigi analyzers for various graphics file formats LIB_DEPENDS= libtiff.so:graphics/tiff -USE_KDE4= kdelibs automoc4 strigi -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 strigi USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile index 0c861853bd56..cde0bbf54615 100644 --- a/graphics/kdegraphics4-svgpart/Makefile +++ b/graphics/kdegraphics4-svgpart/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= SVG KPart -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile index 4b5ec3fcc745..1fe6ea375915 100644 --- a/graphics/kdegraphics4-thumbnailers/Makefile +++ b/graphics/kdegraphics4-thumbnailers/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Thumbnailers for various graphics file formats -USE_KDE4= kdelibs libkdcraw libkexiv2 automoc4 -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= kdelibs libkdcraw libkexiv2 automoc4 USE_QT4= gui qmake_build moc_build uic_build rcc_build .include <bsd.port.mk> diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 9a91f4027b9a..a5d029703416 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -8,8 +8,7 @@ CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= Graphics utilities for KDE 4 (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= GPHOTO \ GWENVIEW \ @@ -26,39 +25,39 @@ OPTIONS_DEFINE= GPHOTO \ OPTIONS_DEFAULT= ${OPTIONS_DEFINE} GPHOTO_DESC= Digital camera manager -GPHOTO_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kio_kamera.so:graphics/kamera-kde4 +GPHOTO_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kio_kamera.so:graphics/kamera-kde4 GWENVIEW_DESC= Image viewer and browser -GWENVIEW_RUN_DEPENDS= ${KDE4_PREFIX}/bin/gwenview:graphics/gwenview-kde4 +GWENVIEW_RUN_DEPENDS= ${KDE_PREFIX}/bin/gwenview:graphics/gwenview-kde4 KCOLORCHOOSER_DESC= Utility for colors selection -KCOLORCHOOSER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcolorchooser:graphics/kcolorchooser +KCOLORCHOOSER_RUN_DEPENDS= ${KDE_PREFIX}/bin/kcolorchooser:graphics/kcolorchooser KGAMMA_DESC= Monitor calibration tool -KGAMMA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/xf86gammacfg:x11/kgamma +KGAMMA_RUN_DEPENDS= ${KDE_PREFIX}/bin/xf86gammacfg:x11/kgamma KOLOURPAINT_DESC= Paint application -KOLOURPAINT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kolourpaint:graphics/kolourpaint +KOLOURPAINT_RUN_DEPENDS= ${KDE_PREFIX}/bin/kolourpaint:graphics/kolourpaint KRULER_DESC= Screen ruler -KRULER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kruler:deskutils/kruler +KRULER_RUN_DEPENDS= ${KDE_PREFIX}/bin/kruler:deskutils/kruler KSNAPSHOT_DESC= Screen capture program -KSNAPSHOT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ksnapshot:graphics/ksnapshot +KSNAPSHOT_RUN_DEPENDS= ${KDE_PREFIX}/bin/ksnapshot:graphics/ksnapshot MOBIPOCKET_DESC= Mobipocket plugins for Strigi indexing and thumbnailers -MOBIPOCKET_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/mobithumbnail.so:graphics/kdegraphics4-mobipocket \ +MOBIPOCKET_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/mobithumbnail.so:graphics/kdegraphics4-mobipocket \ SANE_DESC= Plugin for scanning on KDE -SANE_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/ksaneplugin.so:graphics/ksaneplugin +SANE_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/ksaneplugin.so:graphics/ksaneplugin STRIGI_DESC= Strigi analyzers for graphics file formats -STRIGI_RUN_DEPENDS= ${KDE4_PREFIX}/lib/strigi/strigiea_dvi.so:graphics/kdegraphics4-strigi-analyzer +STRIGI_RUN_DEPENDS= ${KDE_PREFIX}/lib/strigi/strigiea_dvi.so:graphics/kdegraphics4-strigi-analyzer SVG_DESC= SVG KPart -SVG_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/svgpart.so:graphics/kdegraphics4-svgpart +SVG_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/svgpart.so:graphics/kdegraphics4-svgpart THUMBNAILER_DESC= Thumbnail generator for graphics file formats -THUMBNAILER_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/gsthumbnail.so:graphics/kdegraphics4-thumbnailers +THUMBNAILER_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/gsthumbnail.so:graphics/kdegraphics4-thumbnailers .include <bsd.port.mk> diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile index 9d308978cda5..083063ef40f6 100644 --- a/graphics/kiconedit/Makefile +++ b/graphics/kiconedit/Makefile @@ -10,9 +10,9 @@ DIST_SUBDIR= KDE/extragear MAINTAINER= kde@FreeBSD.org COMMENT= KDE icon editor -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake gettext tar:bzip2 EXTRA_VER= 4.4.0 diff --git a/graphics/kipi-plugin-acquireimages/Makefile b/graphics/kipi-plugin-acquireimages/Makefile index d43605985be1..4346645aa001 100644 --- a/graphics/kipi-plugin-acquireimages/Makefile +++ b/graphics/kipi-plugin-acquireimages/Makefile @@ -7,7 +7,7 @@ CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -USE_KDE4= libksane +USE_KDE= libksane KIPI_PLUGIN= acquireimages .include "${.CURDIR}/../digikam-kde4/Makefile.common" diff --git a/graphics/kipi-plugin-calendar/Makefile b/graphics/kipi-plugin-calendar/Makefile index 4d12d6637e43..c6549c864f09 100644 --- a/graphics/kipi-plugin-calendar/Makefile +++ b/graphics/kipi-plugin-calendar/Makefile @@ -7,7 +7,7 @@ CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -USE_KDE4= pimlibs +USE_KDE= pimlibs KIPI_PLUGIN= calendar .include "${.CURDIR}/../digikam-kde4/Makefile.common" diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile index 26dff67b4c79..39081a3444af 100644 --- a/graphics/kolourpaint/Makefile +++ b/graphics/kolourpaint/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 paint program -USE_KDE4= kdelibs automoc4 qimageblitz -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 qimageblitz USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index 2e5cb81256eb..a51728884722 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -13,9 +13,10 @@ COMMENT= Image viewer and organizer for KDE LIB_DEPENDS= libexiv2.so:graphics/exiv2 -USES= cmake:outsource jpeg pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= script/open-raw.pl script/kpa-backup.sh -USE_KDE4= kdelibs libkdcraw libkipi automoc4 + +USES= cmake:outsource jpeg kde:4 pkgconfig shebangfix tar:bzip2 +USE_KDE= kdelibs libkdcraw libkipi automoc4 USE_QT4= phonon sql \ qmake_build moc_build rcc_build uic_build @@ -24,7 +25,7 @@ OPTIONS_DEFAULT= MARBLE OPTIONS_SUB= yes # NLS MARBLE_DESC= Geolocation support -MARBLE_USE= KDE4=marble +MARBLE_USE= KDE=marble MARBLE_CMAKE_OFF= -DWITH_Marble:BOOL=Off NLS_USES= gettext diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile index 8748c3c6a5a6..9249d170d398 100644 --- a/graphics/kpovmodeler/Makefile +++ b/graphics/kpovmodeler/Makefile @@ -13,10 +13,10 @@ COMMENT= KDE editor/frontend for Povray RUN_DEPENDS= povray:graphics/povray-meta +USES= cmake gettext kde:4 tar:bzip2 USE_GL= glu -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build -USES= cmake gettext tar:bzip2 APP_VER= 1.1.3 EXTRA_VER= 4.3.1 diff --git a/graphics/kqtquickcharts/Makefile b/graphics/kqtquickcharts/Makefile index b635dd0a71fc..757039e63b0f 100644 --- a/graphics/kqtquickcharts/Makefile +++ b/graphics/kqtquickcharts/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= QtQuick plugin to render interactive charts -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile index b8290959d5a0..341a968c2ec5 100644 --- a/graphics/ksaneplugin/Makefile +++ b/graphics/ksaneplugin/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 plugin for scanning through libksane -USE_KDE4= kdelibs libksane automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libksane automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile index 24e1efa51056..7c033472d58b 100644 --- a/graphics/ksnapshot/Makefile +++ b/graphics/ksnapshot/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 screen capture program -USE_KDE4= kdelibs libkipi automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkipi automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= x11 xext xfixes diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile index 8cf7a076fa83..527712f8eddb 100644 --- a/graphics/libkdcraw-kde4/Makefile +++ b/graphics/libkdcraw-kde4/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \ CMAKE_ARGS+= -DWITH_OpenMP:BOOL=False \ -DENABLE_RAWSPEED=True -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource jpeg pkgconfig tar:xz +USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile index b4b712c41175..20b39c3a5e70 100644 --- a/graphics/libkexiv2-kde4/Makefile +++ b/graphics/libkexiv2-kde4/Makefile @@ -12,8 +12,8 @@ COMMENT= Exiv2 library interface for KDE LIB_DEPENDS= libexiv2.so:graphics/exiv2 -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/libkface/Makefile b/graphics/libkface/Makefile index 3cbcde966c2d..3d7633da7841 100644 --- a/graphics/libkface/Makefile +++ b/graphics/libkface/Makefile @@ -14,8 +14,8 @@ LICENSE_COMB= multi LIB_DEPENDS= libopencv_legacy.so:graphics/opencv -USE_KDE4= kdelibs automoc4 marble -USES= cmake:outsource pathfix pkgconfig tar:xz +USES= cmake:outsource kde:4 pathfix pkgconfig tar:xz +USE_KDE= kdelibs automoc4 marble USE_LDCONFIG= yes USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile index 8ef8599a3efb..70acb29c33ce 100644 --- a/graphics/libkipi-kde4/Makefile +++ b/graphics/libkipi-kde4/Makefile @@ -11,8 +11,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE Image Plugin Interface -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/libkipiplugins/Makefile b/graphics/libkipiplugins/Makefile index cc3ca19cbe8d..79dc3d7b2ab2 100644 --- a/graphics/libkipiplugins/Makefile +++ b/graphics/libkipiplugins/Makefile @@ -10,7 +10,7 @@ COMMENT= ${${KIPI_PLUGIN}_DESC} KIPI_PLUGIN= libkipiplugins .include "${.CURDIR}/../digikam-kde4/Makefile.common" -USE_KDE4+= libkdcraw libkexiv2 libkipi +USE_KDE+= libkdcraw libkexiv2 libkipi USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile index d2748d880ae3..81f75515629c 100644 --- a/graphics/libksane/Makefile +++ b/graphics/libksane/Makefile @@ -12,8 +12,8 @@ COMMENT= SANE library interface for KDE LIB_DEPENDS= libsane.so:graphics/sane-backends -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/libkscreen/Makefile b/graphics/libkscreen/Makefile index 996b5201647e..f38e48b37223 100644 --- a/graphics/libkscreen/Makefile +++ b/graphics/libkscreen/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libqjson.so:devel/qjson \ libxcb-image.so:x11/xcb-util-image \ libxcb-render-util.so:x11/xcb-util-renderutil -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui script \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index f3152944c37c..22745dcdc29c 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -21,11 +21,11 @@ LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket -USE_KDE4= kdelibs automoc4 qimageblitz kactivities \ +USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz +USE_KDE= kdelibs automoc4 qimageblitz kactivities \ libkexiv2 USE_QT4= corelib declarative gui opengl xml \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource jpeg pkgconfig tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= DVI diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile index f22f9eded4c9..ea29270cbb96 100644 --- a/graphics/showimage/Makefile +++ b/graphics/showimage/Makefile @@ -13,8 +13,8 @@ COMMENT= Simple KDE based image viewer LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource tar:bzip2 -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile index 0525c9387edd..e37a5015c443 100644 --- a/graphics/skanlite/Makefile +++ b/graphics/skanlite/Makefile @@ -12,8 +12,8 @@ COMMENT= Simple image scanning application for KDE LIB_DEPENDS= libksane.so:graphics/libksane -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake:outsource gettext tar:xz .include <bsd.port.mk> diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile index a8b9de69f9ab..367b13a973b7 100644 --- a/irc/konversation-kde4/Makefile +++ b/irc/konversation-kde4/Makefile @@ -12,8 +12,8 @@ COMMENT= User friendly IRC client for KDE LIB_DEPENDS= libqca.so:devel/qca -USES= cmake:outsource gettext shebangfix tar:xz -USE_KDE4= pimlibs automoc4 +USES= cmake:outsource gettext kde:4 shebangfix tar:xz +USE_KDE= pimlibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build SHEBANG_FILES= data/scripts/mail \ diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 3bc3c0e75c15..8756006db18c 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -66,8 +66,8 @@ WEBKIT_CMAKE_OFF= -DWITHOUT_QTWEBKIT=yes .else #defined(PKGNAMESUFFIX) CONFLICTS_INSTALL= kvirc-qt4-4.* -USES+= shared-mime-info -USE_KDE4= kdelibs automoc4 +USES+= kde:4 shared-mime-info +USE_KDE= kdelibs automoc4 PLIST_SUB+= QT="@comment " KDE="" .endif #defined(PKGNAMESUFFIX) diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile index 0baabf7facfc..411c77400024 100644 --- a/japanese/kiten/Makefile +++ b/japanese/kiten/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Japanese reference/study tool for KDE 4 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile index 30b96edbaa39..82b778978c95 100644 --- a/lang/kturtle/Makefile +++ b/lang/kturtle/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Educational programming environment for KDE 4 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile index 8d734b573b39..a323d1764831 100644 --- a/mail/kbiff/Makefile +++ b/mail/kbiff/Makefile @@ -12,10 +12,10 @@ COMMENT= Mail notification utility for KDE with nice features LICENSE= GPLv2 -USE_KDE4= automoc4 kdelibs +USES= cmake gettext kde:4 perl5 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build -USES= cmake gettext perl5 tar:bzip2 .include <bsd.port.mk> diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile index 2087b8307628..a53b9896ccbd 100644 --- a/mail/kshowmail/Makefile +++ b/mail/kshowmail/Makefile @@ -12,10 +12,10 @@ COMMENT= POP3 mail checker for KDE LICENSE= GPLv2 -USE_KDE4= automoc4 kdelibs pimlibs +USES= cmake gettext kde:4 perl5 +USE_KDE= automoc4 kdelibs pimlibs USE_QT4= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build -USES= cmake gettext perl5 .include <bsd.port.mk> diff --git a/math/abakus/Makefile b/math/abakus/Makefile index 5339b8c1c6d1..0a0fef7a8b8f 100644 --- a/math/abakus/Makefile +++ b/math/abakus/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libmpfr.so:math/mpfr -USE_KDE4= automoc4 kdelibs +USES= bison cmake kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build -USES= bison cmake tar:bzip2 CMAKE_ARGS= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \ -DCMAKE_REQUIRED_FLAGS:STRING="${LDFLAGS}" \ -DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex diff --git a/math/analitza/Makefile b/math/analitza/Makefile index 8f5836720a23..c1093c6e077e 100644 --- a/math/analitza/Makefile +++ b/math/analitza/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Library from KDE Education project -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui opengl svg xml \ moc_build qmake_build rcc_build uic_build USE_GL= glu diff --git a/math/cantor/Makefile b/math/cantor/Makefile index 90718b6c15e2..487b5870e0ab 100644 --- a/math/cantor/Makefile +++ b/math/cantor/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libspectre.so:print/libspectre \ libqalculate.so:math/libqalculate \ libanalitza.so:math/analitza -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource pkgconfig python:2 tar:xz +USES= cmake:outsource kde:4 pkgconfig python:2 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib qtestlib_build xml xmlpatterns \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile index 3726c569660e..154ff7c93e5c 100644 --- a/math/kalgebra/Makefile +++ b/math/kalgebra/Makefile @@ -12,9 +12,10 @@ COMMENT= KDE graph calculator LIB_DEPENDS= libanalitza.so:math/analitza CMAKE_ARGS= -DBUILD_mobile:BOOL=FALSE + +USES= cmake:outsource kde:4 tar:xz USE_GL= glu -USE_KDE4= kdelibs libkdeedu automoc4 -USES= cmake:outsource tar:xz +USE_KDE= kdelibs libkdeedu automoc4 USE_QT4= corelib declarative gui opengl \ moc_build qmake_build rcc_build uic_build diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile index 7cf2bc46f5fe..0e734b345b19 100644 --- a/math/kbruch/Makefile +++ b/math/kbruch/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 application to exercise fractions -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index fd6222a7c7e9..6fd5a50ae8ef 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -12,8 +12,8 @@ COMMENT= Scientific calculator for KDE LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= xml qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/math/kig/Makefile b/math/kig/Makefile index 6eb0f871d7e3..36912f3562db 100644 --- a/math/kig/Makefile +++ b/math/kig/Makefile @@ -11,8 +11,8 @@ COMMENT= KDE 4 interactive geometry application LIB_DEPENDS= libboost_python.so:devel/boost-python-libs -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource compiler:c++11-lib tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= gui xml moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile index c477069269e7..745b5496dfc1 100644 --- a/math/kmplot/Makefile +++ b/math/kmplot/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Mathematical function plotter for KDE 4 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= xml moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 7be86dd9492e..ac80d4d9b570 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgsl.so:math/gsl -USES= cmake shared-mime-info tar:bzip2 +USES= cmake kde:4 shared-mime-info tar:bzip2 USE_XORG= xft xpm USE_GCC= yes -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build post-patch: diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile index f8d38649811f..8c7744371ffa 100644 --- a/math/rkward-kde4/Makefile +++ b/math/rkward-kde4/Makefile @@ -15,13 +15,13 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/bin/R:math/R LIB_DEPENDS= libsoprano.so:textproc/soprano RUN_DEPENDS= ${LOCALBASE}/bin/R:math/R \ - ${KDE4_PREFIX}/lib/kde4/katepart.so:editors/kate + ${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate +USES= cmake gettext fortran kde:4 php:cli shared-mime-info USE_QT4= corelib dbus gui qmake_build moc_build network phonon rcc_build \ script svg uic_build webkit xml USE_XORG= x11 -USE_KDE4= automoc4 kdelibs -USES= cmake gettext fortran php:cli shared-mime-info +USE_KDE= automoc4 kdelibs INSTALLS_ICONS= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/math/rocs/Makefile b/math/rocs/Makefile index f1d04eb8e996..b9515df4b230 100644 --- a/math/rocs/Makefile +++ b/math/rocs/Makefile @@ -12,8 +12,8 @@ COMMENT= KDE Graph theory IDE LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource grantlee:4 tar:xz +USES= cmake:outsource grantlee:4 kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= gui qtestlib script scripttools webkit xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile index 3dff6632455f..dda746e56cc6 100644 --- a/misc/artikulate/Makefile +++ b/misc/artikulate/Makefile @@ -15,8 +15,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtqui IGNORE= not usable, links to both GStreamer 0.10.x and 1.x -USE_KDE4= automoc4 kdelibs libkdeedu runtime_run -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs libkdeedu runtime_run USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile index 71d0615585b5..9ce9d1d6e49f 100644 --- a/misc/kde-thumbnailer-chm/Makefile +++ b/misc/kde-thumbnailer-chm/Makefile @@ -12,8 +12,8 @@ COMMENT= KDE thumbnail generator for CHM files LIB_DEPENDS= libchm.so:misc/chmlib -USES= cmake -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/misc/kde-thumbnailer-epub/Makefile b/misc/kde-thumbnailer-epub/Makefile index 041adeb4186c..562cf13abc8c 100644 --- a/misc/kde-thumbnailer-epub/Makefile +++ b/misc/kde-thumbnailer-epub/Makefile @@ -9,8 +9,8 @@ DISTNAME= 151210-${PORTNAME}-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= KDE thumbnail generator for ePub files -USES= cmake:outsource -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/misc/kde-thumbnailer-fb2/Makefile b/misc/kde-thumbnailer-fb2/Makefile index 899611472952..45cf9cd74378 100644 --- a/misc/kde-thumbnailer-fb2/Makefile +++ b/misc/kde-thumbnailer-fb2/Makefile @@ -9,8 +9,8 @@ DISTNAME= 160180-${PORTNAME}-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= KDE thumbnail generator for fb2 files -USES= cmake:outsource -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile index 413a00eb29ad..a30b9bc65d62 100644 --- a/misc/kde4-l10n/Makefile +++ b/misc/kde4-l10n/Makefile @@ -8,8 +8,7 @@ CATEGORIES= misc kde MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for KDE SC 4 -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport KDE4_LANG_ALL= ar bg bs ca ca@valencia cs da de el en_GB es et eu fa \ fi fr ga gl he hi hr hu ia id is it ja kk km ko lt lv mr nb \ @@ -43,7 +42,7 @@ OPTIONS_DEFAULT= ALL ALL_DESC= All localizations .for lang in ${KDE4_LANG_ALL} -${lang}_DETECT?= ${KDE4_PREFIX}/share/locale/${lang}/entry.desktop +${lang}_DETECT?= ${KDE_PREFIX}/share/locale/${lang}/entry.desktop ${lang}_PORT?= misc/kde4-l10n-${lang} ${lang}_NAME?= ${lang} diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk index 34ba5be49640..ae01971d7bec 100644 --- a/misc/kde4-l10n/files/bsd.l10n.mk +++ b/misc/kde4-l10n/files/bsd.l10n.mk @@ -4,8 +4,8 @@ DISTNAME= ${PORTNAME}-${KDE4_L10N}-${PORTVERSION} DIST_SUBDIR?= KDE/${PORTVERSION}/kde-l10n USE_QT4= uic_build moc_build qmake_build rcc_build xml -USE_KDE4= kdelibs automoc4 -USES= cmake gettext tar:xz +USE_KDE= kdelibs automoc4 +USES= cmake gettext kde:4 tar:xz # Support for spelling dictionaries diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile index e6aed3885a61..dab34195a725 100644 --- a/misc/kdeedu4/Makefile +++ b/misc/kdeedu4/Makefile @@ -8,8 +8,7 @@ CATEGORIES= misc kde MAINTAINER= kde@FreeBSD.org COMMENT= Entertaining and educational programs for KDE 4 (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOGRAPHY \ KHANGMAN KIG KITEN KLETTRES KMPLOT KSTARS KTOUCH KTURTLE \ @@ -17,69 +16,69 @@ OPTIONS_DEFINE= ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOG OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NARTIKULATE} ARTIKULATE_DESC= Pronunciation trainer -ARTIKULATE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/artikulate:misc/artikulate +ARTIKULATE_RUN_DEPENDS= ${KDE_PREFIX}/bin/artikulate:misc/artikulate BLINKEN_DESC= Memory enhancement game -BLINKEN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/blinken:games/blinken +BLINKEN_RUN_DEPENDS= ${KDE_PREFIX}/bin/blinken:games/blinken CANTOR_DESC= Frontend to mathematical software -CANTOR_RUN_DEPENDS= ${KDE4_PREFIX}/bin/cantor:math/cantor +CANTOR_RUN_DEPENDS= ${KDE_PREFIX}/bin/cantor:math/cantor KALGEBRA_DESC= Graph calculator -KALGEBRA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kalgebra:math/kalgebra +KALGEBRA_RUN_DEPENDS= ${KDE_PREFIX}/bin/kalgebra:math/kalgebra KALZIUM_DESC= Periodic table of elements -KALZIUM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kalzium:science/kalzium +KALZIUM_RUN_DEPENDS= ${KDE_PREFIX}/bin/kalzium:science/kalzium KANAGRAM_DESC= Letter order game -KANAGRAM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kanagram:games/kanagram +KANAGRAM_RUN_DEPENDS= ${KDE_PREFIX}/bin/kanagram:games/kanagram KBRUCH_DESC= Application to exercise fractions -KBRUCH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kbruch:math/kbruch +KBRUCH_RUN_DEPENDS= ${KDE_PREFIX}/bin/kbruch:math/kbruch KGEOGRAPHY_DESC= Geography trainer -KGEOGRAPHY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kgeography:misc/kgeography +KGEOGRAPHY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kgeography:misc/kgeography KHANGMAN_DESC= Hangman game -KHANGMAN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/khangman:games/khangman +KHANGMAN_RUN_DEPENDS= ${KDE_PREFIX}/bin/khangman:games/khangman KIG_DESC= Interactive geometry application -KIG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kig:math/kig +KIG_RUN_DEPENDS= ${KDE_PREFIX}/bin/kig:math/kig KITEN_DESC= Japanese reference/study tool -KITEN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kiten:japanese/kiten +KITEN_RUN_DEPENDS= ${KDE_PREFIX}/bin/kiten:japanese/kiten KLETTRES_DESC= Alphabet learning tool -KLETTRES_RUN_DEPENDS= ${KDE4_PREFIX}/bin/klettres:misc/klettres +KLETTRES_RUN_DEPENDS= ${KDE_PREFIX}/bin/klettres:misc/klettres KMPLOT_DESC= Mathematical function plotter -KMPLOT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmplot:math/kmplot +KMPLOT_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmplot:math/kmplot KSTARS_DESC= Desktop planetarium -KSTARS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kstars:astro/kstars +KSTARS_RUN_DEPENDS= ${KDE_PREFIX}/bin/kstars:astro/kstars KTOUCH_DESC= Touch typing tutor -KTOUCH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktouch:misc/ktouch +KTOUCH_RUN_DEPENDS= ${KDE_PREFIX}/bin/ktouch:misc/ktouch KTURTLE_DESC= Educational programming environment -KTURTLE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kturtle:lang/kturtle +KTURTLE_RUN_DEPENDS= ${KDE_PREFIX}/bin/kturtle:lang/kturtle KWORDQUIZ_DESC= Flash card trainer -KWORDQUIZ_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kwordquiz:misc/kwordquiz +KWORDQUIZ_RUN_DEPENDS= ${KDE_PREFIX}/bin/kwordquiz:misc/kwordquiz MARBLE_DESC= Virtual globe and world atlas -MARBLE_USE= KDE4=marble_run +MARBLE_USE= KDE=marble_run PAIRS_DESC= Memory and pairs game -PAIRS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/pairs:games/pairs +PAIRS_RUN_DEPENDS= ${KDE_PREFIX}/bin/pairs:games/pairs PARLEY_DESC= Vocabulary trainer -PARLEY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/parley:misc/parley +PARLEY_RUN_DEPENDS= ${KDE_PREFIX}/bin/parley:misc/parley ROCS_DESC= Graph teory IDE -ROCS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/rocs:math/rocs +ROCS_RUN_DEPENDS= ${KDE_PREFIX}/bin/rocs:math/rocs STEP_DESC= Interactive physics simulator -STEP_RUN_DEPENDS= ${KDE4_PREFIX}/bin/step:science/step +STEP_RUN_DEPENDS= ${KDE_PREFIX}/bin/step:science/step .include <bsd.port.mk> diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index da10957838eb..dc3e6fb87565 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -8,8 +8,7 @@ CATEGORIES= misc kde MAINTAINER= kde@FreeBSD.org COMMENT= Collection of utilities for KDE 4 -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \ KREMOTECONTROL KTIMER KWALLET PRINTMANAGER \ @@ -17,42 +16,42 @@ OPTIONS_DEFINE= ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \ OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ARK_DESC= Archiving tool Ark -ARK_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ark:archivers/ark +ARK_RUN_DEPENDS= ${KDE_PREFIX}/bin/ark:archivers/ark FILELIGHT_DESC= File system viewer Filelight -FILELIGHT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/filelight:sysutils/filelight-kde4 +FILELIGHT_RUN_DEPENDS= ${KDE_PREFIX}/bin/filelight:sysutils/filelight-kde4 KCALC_DESC= Scientific calculator KCalc -KCALC_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcalc:math/kcalc +KCALC_RUN_DEPENDS= ${KDE_PREFIX}/bin/kcalc:math/kcalc KCHARSELECT_DESC= Character selector KCharSelect -KCHARSELECT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcharselect:deskutils/kcharselect +KCHARSELECT_RUN_DEPENDS= ${KDE_PREFIX}/bin/kcharselect:deskutils/kcharselect KDF_DESC= Disk usage tool KDiskFree -KDF_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kdf:sysutils/kdf +KDF_RUN_DEPENDS= ${KDE_PREFIX}/bin/kdf:sysutils/kdf KFLOPPY_DESC= Floppy formatter KFloppy -KFLOPPY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kfloppy:sysutils/kfloppy +KFLOPPY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kfloppy:sysutils/kfloppy KGPG_DESC= Encryption tool KGpg -KGPG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kgpg:security/kgpg-kde4 +KGPG_RUN_DEPENDS= ${KDE_PREFIX}/bin/kgpg:security/kgpg-kde4 KREMOTECONTROL_DESC= KRemoteControl -KREMOTECONTROL_RUN_DEPENDS= ${KDE4_PREFIX}/bin/krcdnotifieritem:comms/kremotecontrol +KREMOTECONTROL_RUN_DEPENDS= ${KDE_PREFIX}/bin/krcdnotifieritem:comms/kremotecontrol KTIMER_DESC= Countdown launcher KTimer -KTIMER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktimer:x11-clocks/ktimer +KTIMER_RUN_DEPENDS= ${KDE_PREFIX}/bin/ktimer:x11-clocks/ktimer KWALLET_DESC= Password manager KWallet -KWALLET_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kwalletmanager:security/kwalletmanager +KWALLET_RUN_DEPENDS= ${KDE_PREFIX}/bin/kwalletmanager:security/kwalletmanager PRINTMANAGER_DESC= Print manager -PRINTMANAGER_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kcm_printer_manager.so:print/kde4-print-manager +PRINTMANAGER_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kcm_printer_manager.so:print/kde4-print-manager SUPERKARAMBA_DESC= Widget framework SuperKaramba -SUPERKARAMBA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/superkaramba:deskutils/superkaramba +SUPERKARAMBA_RUN_DEPENDS= ${KDE_PREFIX}/bin/superkaramba:deskutils/superkaramba SWEEPER_DESC= System cleaner Sweeper -SWEEPER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/sweeper:sysutils/sweeper +SWEEPER_RUN_DEPENDS= ${KDE_PREFIX}/bin/sweeper:sysutils/sweeper .include <bsd.port.mk> diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile index be995f7e187e..6e562ad25122 100644 --- a/misc/kgeography/Makefile +++ b/misc/kgeography/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 geography trainer -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= xml moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile index 9e07cad55217..51b8ef408c21 100644 --- a/misc/klettres/Makefile +++ b/misc/klettres/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Alphabet learning tool for KDE 4 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= xml moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile index dd905daf32bf..53e89f83f488 100644 --- a/misc/krecipes-kde4/Makefile +++ b/misc/krecipes-kde4/Makefile @@ -11,9 +11,9 @@ COMMENT= KDE4 recipe database LICENSE= GPLv2 -USES= cmake gettext shared-mime-info +USES= cmake gettext kde:4 shared-mime-info USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 kdelibs qimageblitz +USE_KDE= automoc4 kdelibs qimageblitz OPTIONS_MULTI= DB OPTIONS_MULTI_DB= SQLITE MYSQL PGSQL diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile index a0bc1bb2059c..39492df2fae2 100644 --- a/misc/ktouch/Makefile +++ b/misc/ktouch/Makefile @@ -11,8 +11,8 @@ COMMENT= Touch typing tutor for KDE 4 RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib declarative opengl phonon script sql xmlpatterns \ moc_build qmake_build rcc_build uic_build USE_XORG= xkbfile diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile index 4698f4c9873a..4984b8e1c31a 100644 --- a/misc/kwordquiz/Makefile +++ b/misc/kwordquiz/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Flash card trainer for KDE 4 -USE_KDE4= kdelibs libkdeedu automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkdeedu automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile index 01af2af4aedf..b809e1a7856a 100644 --- a/misc/libkdeedu/Makefile +++ b/misc/libkdeedu/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Libraries used by KDE educational applications -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/misc/parley/Makefile b/misc/parley/Makefile index b3495004ca9b..73dbf41642e3 100644 --- a/misc/parley/Makefile +++ b/misc/parley/Makefile @@ -9,9 +9,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Vocabulary trainer for KDE 4 +USES= cmake:outsource kde:4 tar:xz USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs libkdeedu attica automoc4 -USES= cmake:outsource tar:xz +USE_KDE= kdelibs libkdeedu attica automoc4 USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build USE_XORG= x11 xrender diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 84a395af83ac..cd025b537a4f 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -18,9 +18,9 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libexempi.so:textproc/exempi \ libqjson.so:devel/qjson -USE_KDE4= kdelibs libksane pimlibs \ +USES= cmake gettext kde:4 pkgconfig shared-mime-info tar:bzip2 +USE_KDE= kdelibs libksane pimlibs \ automoc4 qimageblitz libkcddb libkcompactdisc USE_QT4= qmake_build moc_build uic_build rcc_build -USES= cmake gettext pkgconfig shared-mime-info tar:bzip2 .include <bsd.port.mk> diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile index 7d61c2c4d24d..e5e0ecd6dfae 100644 --- a/multimedia/bangarang/Makefile +++ b/multimedia/bangarang/Makefile @@ -15,10 +15,10 @@ LICENSE= GPLv3 LIB_DEPENDS= libtag.so:audio/taglib PROJECTHOST= bangarangissuetracking -USES= cmake:outsource gettext +USES= cmake:outsource gettext kde:4 USE_QT4= qmake_build moc_build rcc_build uic_build \ corelib gui phonon -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME} diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile index 0e82a09add0b..201ac723f7ec 100644 --- a/multimedia/dragon/Makefile +++ b/multimedia/dragon/Makefile @@ -14,8 +14,8 @@ COMMENT= KDE multimedia player with a focus on simplicity LICENSE= GPLv2 -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= phonon moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index f7d29725d7a8..0334472d7b38 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -17,11 +17,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= bison cmake gmake pkgconfig tar:bzip2 +USES= bison cmake gmake kde:4 pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GSTREAMER= yes USE_GNOME= glib20 -USE_KDE4= automoc4 +USE_KDE= automoc4 USE_QT4= corelib gui opengl declarative \ qmake_build moc_build rcc_build uic_build qtestlib_build diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile index 640e7e747609..c95ed5dc9d9b 100644 --- a/multimedia/k9copy-kde4/Makefile +++ b/multimedia/k9copy-kde4/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libxine.so:multimedia/libxine \ libmpeg2.so:multimedia/libmpeg2 \ libavcodec0.so:multimedia/ffmpeg0 -USES= cmake gettext -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= MENCODER MPLAYER DVDAUTHOR diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index cdf7e79a9320..41f81b02cd13 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -16,8 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 -USES= cmake cpe gettext pkgconfig -USE_KDE4= automoc4 kdelibs +USES= cmake kde:4 cpe gettext pkgconfig +USE_KDE= automoc4 kdelibs USE_QT4= corelib dbus gui network phonon sql svg xml \ moc_build qmake_build rcc_build uic_build USE_XORG= xscrnsaver diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile index 04fb849f7b8d..f5b4309a0b92 100644 --- a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile +++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libswscale.so:multimedia/ffmpeg -USES= cmake:outsource pkgconfig tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/multimedia/kdemultimedia4-mplayerthumbs/Makefile b/multimedia/kdemultimedia4-mplayerthumbs/Makefile index a84d811e95af..150e59a1043e 100644 --- a/multimedia/kdemultimedia4-mplayerthumbs/Makefile +++ b/multimedia/kdemultimedia4-mplayerthumbs/Makefile @@ -15,8 +15,8 @@ LICENSE= LGPL21 RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= phonon moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 2300d4a4716e..e357b363b6ae 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -8,31 +8,30 @@ CATEGORIES= multimedia kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE Multimedia applications (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER OPTIONS_DEFAULT= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD DRAGON_DESC= Simple video player -DRAGON_RUN_DEPENDS= ${KDE4_PREFIX}/bin/dragon:multimedia/dragon +DRAGON_RUN_DEPENDS= ${KDE_PREFIX}/bin/dragon:multimedia/dragon FFMPEG_DESC= FFMPEG-based video thumbnailer -FFMPEG_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia4-ffmpegthumbs +FFMPEG_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia4-ffmpegthumbs JUK_DESC= Audio player -JUK_RUN_DEPENDS= ${KDE4_PREFIX}/bin/juk:audio/juk +JUK_RUN_DEPENDS= ${KDE_PREFIX}/bin/juk:audio/juk KIO_AUDIOCD_DESC= Audio CD IOSlave -KIO_AUDIOCD_RUN_DEPENDS= ${KDE4_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd +KIO_AUDIOCD_RUN_DEPENDS= ${KDE_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd KMIX_DESC= Audio mixer -KMIX_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmix:audio/kmix +KMIX_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmix:audio/kmix KSCD_DESC= CD Player -KSCD_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kscd:audio/kscd +KSCD_RUN_DEPENDS= ${KDE_PREFIX}/bin/kscd:audio/kscd MPLAYER_DESC= MPlayer-based video thumbnailer -MPLAYER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/mplayerthumbsconfig:multimedia/kdemultimedia4-mplayerthumbs +MPLAYER_RUN_DEPENDS= ${KDE_PREFIX}/bin/mplayerthumbsconfig:multimedia/kdemultimedia4-mplayerthumbs .include <bsd.port.mk> diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index 1b9fe3cbfadf..d21b2421cc3f 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -14,11 +14,11 @@ LIB_DEPENDS= libmlt.so:multimedia/mlt \ libqjson.so:devel/qjson RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} -USE_KDE4= automoc4 kdelibs nepomuk-core +USES= cmake kde:4 pkgconfig shared-mime-info tar:bzip2 +USE_KDE= automoc4 kdelibs nepomuk-core USE_QT4= corelib dbus gui opengl script svg xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 -USES= cmake pkgconfig shared-mime-info tar:bzip2 CMAKE_ARGS= -DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFX}" # Keep in sync with multimedia/mlt, possibly. diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile index 1ed0350be9d0..7eff567caace 100644 --- a/multimedia/kmplayer-kde4/Makefile +++ b/multimedia/kmplayer-kde4/Makefile @@ -16,10 +16,10 @@ LICENSE_COMB= multi LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake:outsource pkgconfig +USES= cmake:outsource kde:4 pkgconfig USE_GNOME= cairo gtk20 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs USE_GITHUB= yes GH_ACCOUNT= KDE diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile index c49f8ea4b443..16a60aca4726 100644 --- a/multimedia/kplayer-kde4/Makefile +++ b/multimedia/kplayer-kde4/Makefile @@ -1,4 +1,4 @@ -# Created by: Stefan Eßer <se@FreeBSD.org> +# Created by: Stefan Esser <se@FreeBSD.org> # $FreeBSD$ PORTNAME= kplayer @@ -12,9 +12,9 @@ COMMENT= Movie player based on mplayer RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake gettext tar:bzip2 +USES= cmake gettext kde:4 tar:bzip2 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 LDFLAGS+= -L${LOCALBASE}/lib -lX11 -L${LOCALBASE}/kde4/lib -lsolid post-patch: diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile index 97f7186ea22b..0977d9af8096 100644 --- a/multimedia/mlt/Makefile +++ b/multimedia/mlt/Makefile @@ -68,9 +68,10 @@ JACK_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa JACK_CONFIGURE_ENABLE= jackrack JACK_USE= GNOME=glib20 -KDE4_CONFIGURE_ENV= PATH="${KDE4_PREFIX}/bin:$$PATH" +KDE4_CONFIGURE_ENV= PATH="${KDE_PREFIX}/bin:$$PATH" KDE4_CONFIGURE_WITH= kde -KDE4_USE= kde4=kdelibs +KDE4_USES= kde:4 +KDE4_USE= KDE=kdelibs KDE4_IMPLIES= QT4 QT4_USE= QT4=corelib,gui,opengl,svg,xml diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile index b732613ff7e3..7ea43f11124b 100644 --- a/multimedia/phonon-gstreamer/Makefile +++ b/multimedia/phonon-gstreamer/Makefile @@ -15,14 +15,14 @@ COMMENT= GStreamer backend for Phonon LICENSE= LGPL21 +USES= cmake kde:4 pkgconfig tar:xz USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER1= yes -USE_KDE4= automoc4 +USE_KDE= automoc4 USE_QT4= corelib gui opengl phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 -USES= cmake pkgconfig tar:xz SUB_FILES= pkg-message diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 76d2882f4c07..7ef036377fe6 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -14,10 +14,10 @@ COMMENT= VLC backend for Phonon LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 -USE_KDE4= automoc4 +USES= cmake kde:4 pkgconfig tar:xz +USE_KDE= automoc4 USE_QT4= corelib gui phonon \ qmake_build moc_build rcc_build uic_build -USES= cmake pkgconfig tar:xz post-install: ${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile index 297c34e22f94..39fcdadd7484 100644 --- a/multimedia/phonon-xine/Makefile +++ b/multimedia/phonon-xine/Makefile @@ -15,8 +15,8 @@ COMMENT= The xine backend for Phonon LIB_DEPENDS= libxine.so:multimedia/libxine -USES= cmake pkgconfig tar:bzip2 -USE_KDE4= automoc4 +USES= cmake kde:4 pkgconfig tar:bzip2 +USE_KDE= automoc4 USE_QT4= corelib dbus gui phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= xcb diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index 45b129b03889..13861ec7e287 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -14,10 +14,10 @@ LICENSE= LGPL21 LIB_DEPENDS= libqzeitgeist.so:sysutils/qzeitgeist -USE_KDE4= automoc4 +USES= cmake kde:4 tar:xz +USE_KDE= automoc4 USE_QT4= corelib dbus gui \ qmake_build moc_build rcc_build uic_build -USES= cmake tar:xz CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \ -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \ -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile index 398675c9d980..798c65b51964 100644 --- a/multimedia/subtitlecomposer-kde4/Makefile +++ b/multimedia/subtitlecomposer-kde4/Makefile @@ -11,8 +11,8 @@ COMMENT= Subtitle editor for KDE LIB_DEPENDS= libicui18n.so:devel/icu -USES= cmake:outsource gettext shared-mime-info -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 shared-mime-info +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build phonon USE_GITHUB= yes diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile index 2db49db86a4c..c02be2671577 100644 --- a/net-im/ekiga/Makefile +++ b/net-im/ekiga/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libboost_signals.so:devel/boost-libs \ RUN_DEPENDS= gnome-icon-theme>=3.0.0:misc/gnome-icon-theme GNU_CONFIGURE= yes -USES= cpe gettext gmake libtool pathfix perl5 pkgconfig \ +USES= cpe gettext gmake kde:4 libtool pathfix perl5 pkgconfig \ tar:xz USE_XORG= xv USE_GNOME= gtk20 intlhack libxml2 @@ -51,20 +51,20 @@ LOUDMOUTH_DESC= XMPP (jabber) support PLIST_SUB+= VERSION=${PORTVERSION} .if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB} -USE_KDE4= kdelibs +USE_KDE= kdelibs USE_QT4= corelib CONFIGURE_ARGS+=--enable-kde -#CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \ -# -I${LOCALBASE}/include" KDE_LIBS="-L${KDE4_PREFIX}/lib" -CPPFLAGS+= -I${KDE4_PREFIX}/include -LDFLAGS+= -L${KDE4_PREFIX}/lib +#CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE_PREFIX}/include -I${QT_INCDIR} \ +# -I${LOCALBASE}/include" KDE_LIBS="-L${KDE_PREFIX}/lib" +CPPFLAGS+= -I${KDE_PREFIX}/include +LDFLAGS+= -L${KDE_PREFIX}/lib .else CONFIGURE_ARGS+=--disable-kde .endif .if ${PORT_OPTIONS:MKAB} CONFIGURE_ARGS+=--enable-kab -USE_KDE4+= pimlibs +USE_KDE+= pimlibs .else CONFIGURE_ARGS+=--disable-kab .endif diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile index b1ba6fbadc83..da7426ef26a9 100644 --- a/net-im/hotot/Makefile +++ b/net-im/hotot/Makefile @@ -15,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= lyricat GH_PROJECT= Hotot -USES= cmake gettext python +USES= cmake gettext kde:4 python USE_GNOME= intltool INSTALLS_ICONS= yes @@ -48,7 +48,7 @@ PLIST_SUB+= QT4="@comment " .endif .if ${PORT_OPTIONS:MKDE4} -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs .else CMAKE_ARGS+= -DWITH_KDE=off .endif diff --git a/net-im/kde-telepathy/Makefile b/net-im/kde-telepathy/Makefile index 65a4c0dcfeec..7b9d86415f09 100644 --- a/net-im/kde-telepathy/Makefile +++ b/net-im/kde-telepathy/Makefile @@ -7,17 +7,16 @@ CATEGORIES= net-im kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE integrated instant messaging framework -RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kcm_ktp_accounts.so:net-im/ktp-accounts-kcm \ - ${KDE4_PREFIX}/lib/kde4/kded_ktp_approver.so:net-im/ktp-approver \ - ${KDE4_PREFIX}/lib/kde4/libexec/ktp-auth-handler:net-im/ktp-auth-handler \ - ${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list \ - ${KDE4_PREFIX}/lib/kde4/krunner_ktp_contacts.so:net-im/ktp-contact-runner \ - ${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ - ${KDE4_PREFIX}/lib/kde4/kded_ktp_integration_module.so:net-im/ktp-kded-integration-module \ - ${KDE4_PREFIX}/lib/kde4/libexec/ktp-text-ui:net-im/ktp-text-ui - -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kcm_ktp_accounts.so:net-im/ktp-accounts-kcm \ + ${KDE_PREFIX}/lib/kde4/kded_ktp_approver.so:net-im/ktp-approver \ + ${KDE_PREFIX}/lib/kde4/libexec/ktp-auth-handler:net-im/ktp-auth-handler \ + ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list \ + ${KDE_PREFIX}/lib/kde4/krunner_ktp_contacts.so:net-im/ktp-contact-runner \ + ${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ + ${KDE_PREFIX}/lib/kde4/kded_ktp_integration_module.so:net-im/ktp-kded-integration-module \ + ${KDE_PREFIX}/lib/kde4/libexec/ktp-text-ui:net-im/ktp-text-ui + +USES= kde:4 metaport OPTIONS_DEFINE= PLASMA SEND_FILE OPTIONS_DEFAULT=PLASMA SEND_FILE @@ -28,11 +27,11 @@ SEND_FILE_DESC= Context menu plugin for sending files .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPLASMA} -RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/plasma_applet_ktp_presence.so:net-im/plasma-applet-ktp +RUN_DEPENDS+= ${KDE_PREFIX}/lib/kde4/plasma_applet_ktp_presence.so:net-im/plasma-applet-ktp .endif .if ${PORT_OPTIONS:MSEND_FILE} -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/ktp-send-file:net-im/ktp-send-file +RUN_DEPENDS+= ${KDE_PREFIX}/bin/ktp-send-file:net-im/ktp-send-file .endif .include <bsd.port.mk> diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index 08cea47af3a7..c23ed5b3cdc2 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -13,9 +13,9 @@ COMMENT= MSN Messenger client for KDE LIB_DEPENDS= libqca.so:devel/qca \ libgif.so:graphics/giflib +USES= cmake gettext kde:4 tar:bzip2 USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs libkonq automoc4 +USE_KDE= kdelibs libkonq automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile index 07c6a19fea46..5f0e5faeaad1 100644 --- a/net-im/kopete-kde4/Makefile +++ b/net-im/kopete-kde4/Makefile @@ -20,10 +20,10 @@ LIB_DEPENDS= libidn.so:dns/libidn \ libjasper.so:graphics/jasper BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -USES= cmake:outsource jpeg pkgconfig shebangfix sqlite tar:xz \ +USES= cmake:outsource jpeg kde:4 pkgconfig shebangfix sqlite tar:xz \ webplugin:native USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs pimlibs \ +USE_KDE= kdelibs pimlibs \ automoc4 qimageblitz USE_QT4= corelib gui network qt3support sql xml \ moc_build qmake_build rcc_build uic_build uic3_build diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile index 2a607f13eccb..009253d141f7 100644 --- a/net-im/ktp-accounts-kcm/Makefile +++ b/net-im/ktp-accounts-kcm/Makefile @@ -11,11 +11,11 @@ COMMENT= KDE instant messaging account management module LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list +RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 USE_LDCONFIG= yes OPTIONS_DEFINE= HAZE IRC JABBER SALUT diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile index 507622d747ef..bd8c1c8b64ac 100644 --- a/net-im/ktp-approver/Makefile +++ b/net-im/ktp-approver/Makefile @@ -10,10 +10,10 @@ COMMENT= KDE instant messaging notifier LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list +RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile index 511e1ff2a038..14877fe944d7 100644 --- a/net-im/ktp-auth-handler/Makefile +++ b/net-im/ktp-auth-handler/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libqjson.so:devel/qjson \ libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui xml webkit \ moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile index b49019f61d55..1b1a9e899af2 100644 --- a/net-im/ktp-common-internals/Makefile +++ b/net-im/ktp-common-internals/Makefile @@ -12,10 +12,10 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 RUN_DEPENDS= ${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control -USE_KDE4= kdelibs pimlibs automoc4 +USES= cmake compiler:c++11-lang gettext kde:4 tar:bzip2 +USE_KDE= kdelibs pimlibs automoc4 USE_QT4= declarative script \ moc_build qmake_build rcc_build uic_build -USES= cmake compiler:c++11-lang gettext tar:bzip2 USE_LDCONFIG= yes PLIST_SUB= KTP_VERSION=${KTP_VERSION} diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile index c1053ada1fd9..3e3bff1f3f3a 100644 --- a/net-im/ktp-contact-list/Makefile +++ b/net-im/ktp-contact-list/Makefile @@ -12,8 +12,8 @@ LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile index 724bb1d11718..b2efa6012b25 100644 --- a/net-im/ktp-contact-runner/Makefile +++ b/net-im/ktp-contact-runner/Makefile @@ -11,8 +11,8 @@ COMMENT= KRunner integration module for KDE Telepathy LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile index f90a5a026826..2e698e57743f 100644 --- a/net-im/ktp-desktop-applets/Makefile +++ b/net-im/ktp-desktop-applets/Makefile @@ -10,8 +10,8 @@ COMMENT= KDE instant messaging plasma widgets LIB_DEPENDS= libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile index 0cbf05daaf56..2f8f7ef30387 100644 --- a/net-im/ktp-filetransfer-handler/Makefile +++ b/net-im/ktp-filetransfer-handler/Makefile @@ -11,8 +11,8 @@ COMMENT= KDE instant messaging file transfer handler LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-kded-integration-module/Makefile b/net-im/ktp-kded-integration-module/Makefile index af282c378431..441424463d43 100644 --- a/net-im/ktp-kded-integration-module/Makefile +++ b/net-im/ktp-kded-integration-module/Makefile @@ -11,8 +11,8 @@ COMMENT= Module for integration of instant messaging into KDE Workspaces LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile index 421a1d772420..65254ab5b8d0 100644 --- a/net-im/ktp-send-file/Makefile +++ b/net-im/ktp-send-file/Makefile @@ -10,11 +10,11 @@ COMMENT= KDE instant messaging file transfer application LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ - ${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list +RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ + ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile index b277065e00f0..45c24146b72e 100644 --- a/net-im/ktp-text-ui/Makefile +++ b/net-im/ktp-text-ui/Makefile @@ -11,12 +11,12 @@ COMMENT= KDE chat window application LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list +RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list -USE_KDE4= automoc4 +USES= cmake compiler:c++11-lang gettext kde:4 tar:bzip2 +USE_KDE= automoc4 USE_QT4= corelib webkit xml \ moc_build qmake_build rcc_build uic_build -USES= cmake compiler:c++11-lang gettext tar:bzip2 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile index ad43eefc2e92..f0064f1404f7 100644 --- a/net-im/licq-qt-gui/Makefile +++ b/net-im/licq-qt-gui/Makefile @@ -31,7 +31,8 @@ HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ -DHUNSPELL_FOUND:BOOL=ON HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF -KDE4_USE= KDE4=kdelibs,automoc4 +KDE4_USES= kde:4 +KDE4_USE= KDE=kdelibs,automoc4 KDE4_PREVENTS= HUNSPELL KDE4_CMAKE_ON= -DWITH_KDE:BOOL=ON KDE4_CMAKE_OFF= -DWITH_KDE:BOOL=OFF diff --git a/net-im/plasma-applet-ktp/Makefile b/net-im/plasma-applet-ktp/Makefile index a9fe6b6c81a2..a9ad32d3f73b 100644 --- a/net-im/plasma-applet-ktp/Makefile +++ b/net-im/plasma-applet-ktp/Makefile @@ -13,9 +13,9 @@ COMMENT= KDE instant messaging Plasma applets LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib declarative \ moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile index eff68e898aa7..49d83df93e0b 100644 --- a/net-im/telepathy-logger-qt4/Makefile +++ b/net-im/telepathy-logger-qt4/Makefile @@ -17,11 +17,11 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libtelepathy-logger.so:net-im/telepathy-logger \ libtelepathy-qt4.so:net-im/telepathy-qt4 +USES= bison:build cmake kde:4 pkgconfig python:build tar:bzip2 USE_GNOME= glib20 libxml2 USE_GSTREAMER= qt4 -USE_KDE4= # empty +USE_KDE= # empty USE_QT4= corelib dbus moc_build qmake_build rcc_build uic_build -USES= bison:build cmake pkgconfig python:build tar:bzip2 CMAKE_ARGS= -DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR:BOOL=True USE_LDCONFIG= yes diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 122eb9c14e10..2ba28926440b 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -90,10 +90,11 @@ MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule -PLASMAMULE_USE= KDE4=kdelibs QT4=dbus,gui,moc_build +PLASMAMULE_USES= kde:4 +PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ - ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \ - KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \ + ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ + KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp @@ -129,8 +130,8 @@ post-patch: .SILENT ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} - ${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \ - -e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \ + ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ + -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist index bdef265a32c8..e65d12465c5a 100644 --- a/net-p2p/amule-devel/pkg-plist +++ b/net-p2p/amule-devel/pkg-plist @@ -1,4 +1,4 @@ -%%PLASMAMULE%%@cwd %%KDE4_PREFIX%% +%%PLASMAMULE%%@cwd %%KDE_PREFIX%% %%PLASMAMULE%%bin/plasmamule-engine-feeder %%PLASMAMULE%%lib/kde4/plasma-applet-plasmamule.so %%PLASMAMULE%%lib/kde4/plasma-engine-plasmamule.so diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index e29fdb303d2c..a43c2f81241d 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -88,10 +88,11 @@ MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule -PLASMAMULE_USE= KDE4=kdelibs QT4=dbus,gui,moc_build +PLASMAMULE_USES= kde:4 +PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ - ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \ - KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \ + ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ + KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp @@ -123,8 +124,8 @@ post-patch: .SILENT ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} - ${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \ - -e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \ + ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ + -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist index ea8ef0d9524d..23b2d4822ffe 100644 --- a/net-p2p/amule/pkg-plist +++ b/net-p2p/amule/pkg-plist @@ -1,15 +1,15 @@ -%%PLASMAMULE%%%%KDE4_PREFIX%%/bin/plasmamule-engine-feeder -%%PLASMAMULE%%%%KDE4_PREFIX%%/lib/kde4/plasma-applet-plasmamule.so -%%PLASMAMULE%%%%KDE4_PREFIX%%/lib/kde4/plasma-engine-plasmamule.so -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/applications/plasmamule-engine-feeder.desktop -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/kde4/services/ed2k.protocol -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/kde4/services/magnet.protocol -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/kde4/services/plasma-applet-plasmamule.desktop -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/kde4/services/plasma-engine-plasmamule.desktop -%%PLASMAMULE%%%%KDE4_PREFIX%%/share/mime/amule.xml -%%PLASMAMULE%%@postexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %%KDE4_PREFIX%%/share/mime >/dev/null 2>&1 || true -%%PLASMAMULE%%@postunexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %%KDE4_PREFIX%%/share/mime >/dev/null 2>&1 || true +%%PLASMAMULE%%%%KDE_PREFIX%%/bin/plasmamule-engine-feeder +%%PLASMAMULE%%%%KDE_PREFIX%%/lib/kde4/plasma-applet-plasmamule.so +%%PLASMAMULE%%%%KDE_PREFIX%%/lib/kde4/plasma-engine-plasmamule.so +%%PLASMAMULE%%%%KDE_PREFIX%%/share/applications/plasmamule-engine-feeder.desktop +%%PLASMAMULE%%%%KDE_PREFIX%%/share/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg +%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/ed2k.protocol +%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/magnet.protocol +%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/plasma-applet-plasmamule.desktop +%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/plasma-engine-plasmamule.desktop +%%PLASMAMULE%%%%KDE_PREFIX%%/share/mime/amule.xml +%%PLASMAMULE%%@postexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %%KDE_PREFIX%%/share/mime >/dev/null 2>&1 || true +%%PLASMAMULE%%@postunexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %%KDE_PREFIX%%/share/mime >/dev/null 2>&1 || true %%ALC%%bin/alc %%ALCC%%bin/alcc %%MONOLITHIC%%bin/amule diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile index 9e153c26f39f..6884658ca08a 100644 --- a/net-p2p/ktorrent/Makefile +++ b/net-p2p/ktorrent/Makefile @@ -15,10 +15,10 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libgmp.so:math/gmp \ libktorrent.so:net-p2p/libktorrent -USE_KDE4= kdelibs automoc4 pimlibs workspace +USES= cmake:outsource gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 pimlibs workspace USE_QT4= corelib gui network qt3support qtestlib webkit \ qmake_build moc_build rcc_build uic_build -USES= cmake:outsource gettext tar:bzip2 USE_LDCONFIG= yes CONFLICTS_BUILD= ktorrent-2* diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile index d047ffe95e2b..555405b1b88b 100644 --- a/net-p2p/libktorrent/Makefile +++ b/net-p2p/libktorrent/Makefile @@ -14,9 +14,9 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgmp.so:math/gmp \ libqca.so:devel/qca -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= qtestlib_build qmake_build moc_build rcc_build uic_build -USES= cmake:outsource gettext tar:bzip2 USE_LDCONFIG= yes SHLIB_VER= 5.0.1 diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile index 91eee010c017..d2182129473f 100644 --- a/net/cagibi/Makefile +++ b/net/cagibi/Makefile @@ -9,8 +9,8 @@ MASTER_SITES= KDE/stable/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= KDE SSDP/uPNP proxy -USES= cmake tar:bzip2 -USE_KDE4= automoc4 +USES= cmake kde:4 tar:bzip2 +USE_KDE= automoc4 USE_QT4= corelib network xml dbus \ qmake_build moc_build rcc_build uic_build diff --git a/net/kdenetwork4-filesharing/Makefile b/net/kdenetwork4-filesharing/Makefile index d4cae5925bb6..a57d84be74e0 100644 --- a/net/kdenetwork4-filesharing/Makefile +++ b/net/kdenetwork4-filesharing/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE Filesharing via Samba -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/net/kdenetwork4-strigi-analyzers/Makefile b/net/kdenetwork4-strigi-analyzers/Makefile index 4b8d88d0cbbe..620971ad349a 100644 --- a/net/kdenetwork4-strigi-analyzers/Makefile +++ b/net/kdenetwork4-strigi-analyzers/Makefile @@ -11,8 +11,8 @@ COMMENT= Strigi analyzers for network-related file formats LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USE_KDE4= kdelibs strigi automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs strigi automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 910abb634b63..83d07859bc6a 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -7,31 +7,30 @@ CATEGORIES= net kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE Network applications (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= FILESHARING KDNSSD KGET KOPETE KRDC KRFB STRIGI OPTIONS_DEFAULT= ${OPTIONS_DEFINE} FILESHARING_DESC= Network file sharing via Samba -FILESHARING_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/sambausershareplugin.so:net/kdenetwork4-filesharing +FILESHARING_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/sambausershareplugin.so:net/kdenetwork4-filesharing KDNSSD_DESC= Network monitor for DNS-SD services (Zeroconf) -KDNSSD_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kded_dnssdwatcher.so:net/zeroconf-ioslave +KDNSSD_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kded_dnssdwatcher.so:net/zeroconf-ioslave KGET_DESC= Download manager -KGET_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kget:net/kget +KGET_RUN_DEPENDS= ${KDE_PREFIX}/bin/kget:net/kget KOPETE_DESC= Multi-protocol instant messenger -KOPETE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kopete:net-im/kopete-kde4 +KOPETE_RUN_DEPENDS= ${KDE_PREFIX}/bin/kopete:net-im/kopete-kde4 KRDC_DESC= RDP and VNC client -KRDC_RUN_DEPENDS= ${KDE4_PREFIX}/bin/krdc:net/krdc +KRDC_RUN_DEPENDS= ${KDE_PREFIX}/bin/krdc:net/krdc KRFB_DESC= Desktop Sharing (VNC server) -KRFB_RUN_DEPENDS= ${KDE4_PREFIX}/bin/krfb:net/krfb +KRFB_RUN_DEPENDS= ${KDE_PREFIX}/bin/krfb:net/krfb STRIGI_DESC= Strigi analyzers for network-related file formats -STRIGI_RUN_DEPENDS= ${KDE4_PREFIX}/lib/strigi/strigita_torrent_analyzer.so:net/kdenetwork4-strigi-analyzers +STRIGI_RUN_DEPENDS= ${KDE_PREFIX}/lib/strigi/strigita_torrent_analyzer.so:net/kdenetwork4-strigi-analyzers .include <bsd.port.mk> diff --git a/net/kget/Makefile b/net/kget/Makefile index bcffb58327a6..5a06cabc7abd 100644 --- a/net/kget/Makefile +++ b/net/kget/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libqca.so:devel/qca \ libboost_thread.so:devel/boost-libs -USE_KDE4= kdelibs workspace libkonq \ +USES= cmake:outsource kde:4 shebangfix sqlite tar:xz +USE_KDE= kdelibs workspace libkonq \ nepomuk-core nepomuk-widgets automoc4 ontologies \ soprano -USES= cmake:outsource shebangfix sqlite tar:xz SHEBANG_FILES= conf/*.pl USE_QT4= gui sql moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile index e2f2680aee5c..74ef8b7e8c85 100644 --- a/net/kio-upnp-ms/Makefile +++ b/net/kio-upnp-ms/Makefile @@ -13,8 +13,8 @@ COMMENT= KIO slave to access UPnP MediaServers LIB_DEPENDS= libHUpnp.so:net/hupnp -USES= cmake tar:bzip2 -USE_KDE4= automoc4 kdelibs +USES= cmake kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= corelib network xml dbus gui \ qmake_build moc_build rcc_build uic_build diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile index 4e61d2d27fce..fa2478e1bd7a 100644 --- a/net/knemo-kde4/Makefile +++ b/net/knemo-kde4/Makefile @@ -9,10 +9,10 @@ DISTNAME= 12956-${PORTNAME}-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= KDE network monitor -USES= cmake gettext shebangfix tar:xz +USES= cmake gettext kde:4 shebangfix tar:xz SHEBANG_FILES= src/kconf_update/*.pl USE_QT4= qmake_build moc_build uic_build rcc_build -USE_KDE4= kdelibs workspace automoc4 +USE_KDE= kdelibs workspace automoc4 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/net/krdc/Makefile b/net/krdc/Makefile index 35947463fa44..6f7e85aa9bda 100644 --- a/net/krdc/Makefile +++ b/net/krdc/Makefile @@ -13,8 +13,8 @@ COMMENT= RDP and VNC client for KDE LIB_DEPENDS= libvncserver.so:net/libvncserver \ libtelepathy-qt4.so:net-im/telepathy-qt4 -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/net/krfb/Makefile b/net/krfb/Makefile index 54f0579d3707..8eaee33e6919 100644 --- a/net/krfb/Makefile +++ b/net/krfb/Makefile @@ -11,8 +11,8 @@ COMMENT= VNC server for KDE LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 -USES= alias cmake:outsource jpeg tar:xz -USE_KDE4= kdelibs automoc4 +USES= alias cmake:outsource jpeg kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui network \ moc_build qmake_build rcc_build uic_build diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile index ed91658cdae4..b46537fc507b 100644 --- a/net/kwooty/Makefile +++ b/net/kwooty/Makefile @@ -14,9 +14,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/unrar:archivers/unrar \ ${LOCALBASE}/bin/par2:archivers/par2cmdline \ ${LOCALBASE}/bin/7z:archivers/p7zip -USE_KDE4= kdelibs automoc4 workspace +USES= cmake gettext kde:4 +USE_KDE= kdelibs automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake gettext USE_LDCONFIG= yes post-patch: diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile index 8572b0ceb65f..cd8651563636 100644 --- a/net/libkfbapi/Makefile +++ b/net/libkfbapi/Makefile @@ -14,8 +14,8 @@ LICENSE= LGPL20 LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource gettext tar:bzip2 -USE_KDE4= automoc4 kdelibs pimlibs +USES= cmake:outsource gettext kde:4 tar:bzip2 +USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes USE_QT4= gui webkit \ qmake_build moc_build rcc_build uic_build diff --git a/net/libkvkontakte/Makefile b/net/libkvkontakte/Makefile index 6905fdcfd384..24d9cf91c927 100644 --- a/net/libkvkontakte/Makefile +++ b/net/libkvkontakte/Makefile @@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource gettext pkgconfig tar:xz +USES= cmake:outsource gettext kde:4 pkgconfig tar:xz USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs USE_LDCONFIG= yes PLIST_SUB+= SHLIB_VER="${PORTVERSION}" diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile index 2f3ff462ae3b..33d1ed888b06 100644 --- a/net/libproxy-kde/Makefile +++ b/net/libproxy-kde/Makefile @@ -16,7 +16,8 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist ALL_TARGET= config_kde -USE_KDE4= runtime +USE_KDE= runtime +USES+= kde:4 LIBPROXY_SLAVE= kde diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile index 8ae46fe00d28..b482f54998a8 100644 --- a/net/smb4k-kde4/Makefile +++ b/net/smb4k-kde4/Makefile @@ -16,9 +16,9 @@ RUN_DEPENDS= sudo:security/sudo \ SAMBA_PORT?= net/samba36 -USES= cmake gettext tar:bzip2 +USES= cmake gettext kde:4 tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde4 -USE_KDE4= kdelibs automoc4 runtime +USE_KDE= kdelibs automoc4 runtime USE_QT4= corelib gui network opengl script svg webkit \ qmake_build moc_build rcc_build uic_build phonon DOCSDIR= ${PREFIX}/share/doc/HTML/en/smb4k diff --git a/net/zeroconf-ioslave/Makefile b/net/zeroconf-ioslave/Makefile index f64d0f2c18ce..770beb791a1b 100644 --- a/net/zeroconf-ioslave/Makefile +++ b/net/zeroconf-ioslave/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE Network monitor for DNS-SD services (Zeroconf) -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile index 80a4a7b1de69..a16b559cd5ef 100644 --- a/ports-mgmt/kpackagekit/Makefile +++ b/ports-mgmt/kpackagekit/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt4 -USE_KDE4= automoc4 kdelibs +USES= cmake gettext kde:4 pkgconfig tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake gettext pkgconfig tar:bzip2 LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile index f9e8651960bd..a9e0b2a65274 100644 --- a/print/frescobaldi/Makefile +++ b/print/frescobaldi/Makefile @@ -16,9 +16,9 @@ LICENSE_COMB= dual RUN_DEPENDS= lilypond:print/lilypond \ ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 -USES= gettext python +USES= gettext kde:4 python INSTALLS_ICONS= yes -USE_KDE4= kdelibs pykde4_build pykde4_run +USE_KDE= kdelibs pykde4_build pykde4_run USE_PYTHON= distutils autoplist post-patch: diff --git a/print/kde4-print-manager/Makefile b/print/kde4-print-manager/Makefile index 400b66d55c70..9d758127fb26 100644 --- a/print/kde4-print-manager/Makefile +++ b/print/kde4-print-manager/Makefile @@ -12,8 +12,8 @@ COMMENT= Printer manager for KDE 4 LIB_DEPENDS= libcups.so:print/cups -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= designer network \ qmake_build moc_build uic_build rcc_build diff --git a/print/kover/Makefile b/print/kover/Makefile index 73e696ab80fb..941d19118427 100644 --- a/print/kover/Makefile +++ b/print/kover/Makefile @@ -16,11 +16,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcddb.so:audio/libcddb \ libcdio.so:sysutils/libcdio -USE_KDE4= automoc4 kdelibs +USES= cmake gettext kde:4 perl5 pkgconfig shared-mime-info tar:bzip2 +USE_KDE= automoc4 kdelibs USE_QT4= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build -USES= cmake gettext perl5 pkgconfig shared-mime-info tar:bzip2 post-patch: @${REINPLACE_CMD} -e \ diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile index 41fd3dab87b9..f3f0c9fe1313 100644 --- a/science/kalzium/Makefile +++ b/science/kalzium/Makefile @@ -18,8 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 \ ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= kdelibs automoc4 USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes USE_QT4= corelib declarative designer opengl script xml \ diff --git a/science/step/Makefile b/science/step/Makefile index 6e140f846763..180cd1bc4238 100644 --- a/science/step/Makefile +++ b/science/step/Makefile @@ -13,8 +13,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 LIB_DEPENDS= libqalculate.so:math/libqalculate \ libgsl.so:math/gsl -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= opengl moc_build qmake_build rcc_build uic_build pre-configure: diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 8fb1dd550ccd..06a8e9bbf8b4 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -12,8 +12,8 @@ COMMENT= Encryption tool for KDE RUN_DEPENDS= gpg2:security/gnupg -USE_KDE4= automoc4 kdelibs pimlibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs pimlibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/security/kwalletmanager/Makefile b/security/kwalletmanager/Makefile index 07774c64445d..e0e5cd42bf01 100644 --- a/security/kwalletmanager/Makefile +++ b/security/kwalletmanager/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Password manager for KDE -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource gmake tar:xz +USES= cmake:outsource gmake kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile index b90f00091118..079f4c4ec735 100644 --- a/security/py-keyrings.alt/Makefile +++ b/security/py-keyrings.alt/Makefile @@ -27,7 +27,8 @@ PYFS_DESC= Install pyfilesystem to support the pyfs backend ENCRYPTED_FILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto GNOME_KEYRING_USE= GNOME=pygobject3 -KDE_KWALLET_USE= KDE4=pykde4 +KDE_KWALLET_USES= kde:4 +KDE_KWALLET_USE= KDE=pykde4 KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs diff --git a/security/subversion-kwallet/Makefile b/security/subversion-kwallet/Makefile index 6cd0a6cce81c..f2f91204b789 100644 --- a/security/subversion-kwallet/Makefile +++ b/security/subversion-kwallet/Makefile @@ -17,11 +17,12 @@ PKGDIR= ${.CURDIR} SVN_BUILD_ADDONS= yes -USE_KDE4= kdelibs runtime +USE_KDE= kdelibs runtime +USES+= kde:4 .include "${MASTERDIR}/Makefile.common" -CONFIGURE_ARGS+= --with-kwallet=${KDE4_PREFIX} +CONFIGURE_ARGS+= --with-kwallet=${KDE_PREFIX} ALL_TARGET= kwallet-lib INSTALL_TARGET= install-kwallet-lib diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile index 28be587a24f2..288cb18a961f 100644 --- a/sysutils/baloo-widgets/Makefile +++ b/sysutils/baloo-widgets/Makefile @@ -10,9 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= The BalooWidgets library -USE_KDE4= automoc4 baloo kfilemetadata - -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 baloo kfilemetadata USE_QT4= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile index f9f5948ef593..4e8e88b2f0c1 100644 --- a/sysutils/baloo/Makefile +++ b/sysutils/baloo/Makefile @@ -15,10 +15,9 @@ CONFLICTS_INSTALL= kde-runtime-4.12.* LIB_DEPENDS= libxapian.so:databases/xapian-core \ libqjson.so:devel/qjson -USE_KDE4= akonadi automoc4 kdelibs kfilemetadata \ +USES= cmake:outsource gmake kde:4 tar:xz +USE_KDE= akonadi automoc4 kdelibs kfilemetadata \ pimlibs - -USES= cmake:outsource gmake tar:xz USE_QT4= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile index 37a489c96269..1e32f993b39d 100644 --- a/sysutils/filelight-kde4/Makefile +++ b/sysutils/filelight-kde4/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Map of concentric segmented-rings representing file system -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index d7060cedab9e..dff19b4e5c8f 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia \ RUN_DEPENDS= cdrecord:sysutils/cdrtools BUILD_DEPENDS= cdrecord:sysutils/cdrtools -USES= cmake gettext pkgconfig shared-mime-info tar:xz +USES= cmake gettext kde:4 pkgconfig shared-mime-info tar:xz CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \ -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF -USE_KDE4= automoc4 kdelibs libkcddb +USE_KDE= automoc4 kdelibs libkcddb USE_QT4= gui phonon qt3support webkit \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile index 8ace26d3b485..d56099ef6afb 100644 --- a/sysutils/kcm-polkit-kde/Makefile +++ b/sysutils/kcm-polkit-kde/Makefile @@ -12,11 +12,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Polkit-KDE configuration module LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt -RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde +RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde -USE_KDE4= kdelibs automoc4 +USES= cmake gmake kde:4 pkgconfig tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= dbus xml moc_build qmake_build rcc_build uic_build -USES= cmake gmake pkgconfig tar:bzip2 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-kcmodules-1 @@ -24,8 +24,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-kcmodules-1 PORTDATE= 20121008 post-patch: - ${REINPLACE_CMD} -e 's,/usr,${KDE4_PREFIX},' \ - -e 's,/etc,${KDE4_PREFIX}/etc,' \ + ${REINPLACE_CMD} -e 's,/usr,${KDE_PREFIX},' \ + -e 's,/etc,${KDE_PREFIX}/etc,' \ ${WRKSRC}/helper/polkitkde1helper.cpp \ ${WRKSRC}/polkitactions/ActionWidget.cpp \ ${WRKSRC}/polkitconfig/kcmpolkitconfig.cpp diff --git a/sysutils/kcron/Makefile b/sysutils/kcron/Makefile index 21be2ddf6629..31b1577ea088 100644 --- a/sysutils/kcron/Makefile +++ b/sysutils/kcron/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE task scheduler -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index 706ce1998ddd..43ee01a9e8bb 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -7,19 +7,18 @@ CATEGORIES= sysutils kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE Administration applications (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= KCRON KSYSTEMLOG KUSER OPTIONS_DEFAULT= ${OPTIONS_DEFINE} KCRON_DESC= Task scheduler -KCRON_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kcm_cron.so:sysutils/kcron +KCRON_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/kcm_cron.so:sysutils/kcron KSYSTEMLOG_DESC= System log viewer -KSYSTEMLOG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ksystemlog:sysutils/ksystemlog +KSYSTEMLOG_RUN_DEPENDS= ${KDE_PREFIX}/bin/ksystemlog:sysutils/ksystemlog KUSER_DESC= User management application -KUSER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kuser:sysutils/kuser +KUSER_RUN_DEPENDS= ${KDE_PREFIX}/bin/kuser:sysutils/kuser .include <bsd.port.mk> diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 623a3388321f..3abd5b64556c 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Shows free space of devices for KDE -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile index cf9de24f9c97..85eac0560087 100644 --- a/sysutils/kdirstat/Makefile +++ b/sysutils/kdirstat/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING WRKSRC= ${WRKDIR}/jeromerobert-k4dirstat-3a4663ee20e7 -USES= cmake cpe desktop-file-utils gettext-tools tar:bzip2 +USES= cmake cpe desktop-file-utils gettext-tools kde:4 tar:bzip2 CPE_VENDOR= kdirstat_project -USE_KDE4= automoc4 kdelibs libkonq +USE_KDE= automoc4 kdelibs libkonq USE_QT4= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes diff --git a/sysutils/kfilemetadata/Makefile b/sysutils/kfilemetadata/Makefile index 4c3629c9662e..026f95fbf04f 100644 --- a/sysutils/kfilemetadata/Makefile +++ b/sysutils/kfilemetadata/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= corelib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 0331e7bae14f..1379fc6ef8d3 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Floppy disk formatter for KDE -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile index 7d289a93d491..4d08b2b03f31 100644 --- a/sysutils/knutclient-kde4/Makefile +++ b/sysutils/knutclient-kde4/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= libqimageblitz.so:x11/qimageblitz CONFLICTS= knutclient-0.* -USES= cmake gettext -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile index bdded72607f6..47aade9f0930 100644 --- a/sysutils/krename-kde4/Makefile +++ b/sysutils/krename-kde4/Makefile @@ -13,8 +13,8 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libpodofo.so:graphics/podofo -USES= cmake:outsource gettext tar:bzip2 -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build post-patch: diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile index ccbcb5c933b3..589dd661690d 100644 --- a/sysutils/kshutdown-kde4/Makefile +++ b/sysutils/kshutdown-kde4/Makefile @@ -9,9 +9,9 @@ DISTNAME= ${PORTNAME}-source-${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Advanced shutdown utility for KDE -USES= alias cmake:outsource compiler:c++0x gettext zip +USES= alias cmake:outsource compiler:c++0x gettext kde:4 zip USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 workspace +USE_KDE= automoc4 workspace WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile index df204aacdceb..a12203a6b984 100644 --- a/sysutils/ksysguardd/Makefile +++ b/sysutils/ksysguardd/Makefile @@ -11,8 +11,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE System Guard Daemon DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= cmake tar:xz +USES= cmake kde:4 tar:xz CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \ -DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc" diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile index cd343555b966..a3e660ce2751 100644 --- a/sysutils/ksystemlog/Makefile +++ b/sysutils/ksystemlog/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE system log application -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/kuser/Makefile b/sysutils/kuser/Makefile index 829c6577aa6e..69e42f00060b 100644 --- a/sysutils/kuser/Makefile +++ b/sysutils/kuser/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE user manager -USE_KDE4= kdelibs pimlibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs pimlibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile index 0b3542a51ca8..4629b818bd4a 100644 --- a/sysutils/nepomuk-core/Makefile +++ b/sysutils/nepomuk-core/Makefile @@ -18,9 +18,9 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ libepub.so:textproc/ebook-tools \ libqmobipocket.so:graphics/kdegraphics4-mobipocket -USE_KDE4= automoc4 baloo kdelibs kfilemetadata \ +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 baloo kdelibs kfilemetadata \ ontologies soprano -USES= cmake:outsource tar:xz USE_QT4= corelib dbus gui qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null diff --git a/sysutils/nepomuk-widgets/Makefile b/sysutils/nepomuk-widgets/Makefile index 0e437d03db7e..ce06cf0b7139 100644 --- a/sysutils/nepomuk-widgets/Makefile +++ b/sysutils/nepomuk-widgets/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= The NepomukWidget libraries -USE_KDE4= kdelibs automoc4 soprano nepomuk-core -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 soprano nepomuk-core USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/sysutils/plasma-applet-apcups/Makefile b/sysutils/plasma-applet-apcups/Makefile index 30271ca30caf..46e7b62df715 100644 --- a/sysutils/plasma-applet-apcups/Makefile +++ b/sysutils/plasma-applet-apcups/Makefile @@ -13,8 +13,8 @@ COMMENT= Plasma applet to monitor the status of APC UPS PROJECTHOST= plasma-apcups -USES= cmake gettext -USE_KDE4= automoc4 kdelibs +USES= cmake gettext kde:4 +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile index 835a6db38f83..871d0502245c 100644 --- a/sysutils/policykit-qt/Makefile +++ b/sysutils/policykit-qt/Makefile @@ -14,10 +14,10 @@ COMMENT= PolicyKit manager for Qt LIB_DEPENDS= libpolkit.so:sysutils/policykit USE_LDCONFIG= yes -USE_KDE4= automoc4 +USES= cmake gettext kde:4 pkgconfig tar:bzip2 +USE_KDE= automoc4 USE_QT4= corelib dbus gui network svg xml \ qmake_build moc_build rcc_build uic_build -USES= cmake gettext pkgconfig tar:bzip2 PORTSCOUT= limit:^0 diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile index 693e01375b7d..23794cae51c5 100644 --- a/sysutils/polkit-kde/Makefile +++ b/sysutils/polkit-kde/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake tar:bzip2 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile index 6af126e46d3c..795c6ee1f9f3 100644 --- a/sysutils/polkit-qt/Makefile +++ b/sysutils/polkit-qt/Makefile @@ -19,11 +19,11 @@ CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=OFF \ -DBUILD_TEST:BOOL=OFF \ -DUSE_QT4:BOOL=ON +USES= cmake:outsource kde:4 pkgconfig tar:bzip2 USE_GNOME= glib20 -USE_KDE4= automoc4 +USE_KDE= automoc4 USE_QT4= corelib dbus gui \ qmake_build moc_build rcc_build uic_build -USES= cmake:outsource pkgconfig tar:bzip2 USE_LDCONFIG= yes post-patch: diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 0e340469d6cc..40e0cdda5ca5 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -20,10 +20,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rapper:textproc/raptor2 \ ${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib -USE_KDE4= automoc4 +USES= cmake kde:4 python:build tar:bzip2 +USE_KDE= automoc4 USE_QT4= dbus declarative qtestlib \ moc_build qmake_build rcc_build uic_build -USES= cmake python:build tar:bzip2 USE_LDCONFIG= yes # To be kept in sync with sysutils/zeitgeist. diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 8e29156c6b52..332f4d11f3dd 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Cleans temporal files for KDE -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile index d8fe3b7a51d1..b92346502f5a 100644 --- a/textproc/dikt/Makefile +++ b/textproc/dikt/Makefile @@ -9,10 +9,10 @@ MASTER_SITES= https://bitbucket.org/dikt/code/downloads/ MAINTAINER= goran.tal@gmail.com COMMENT= Dictionary for KDE4 -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 tar:txz +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui network svg xml \ qmake_build moc_build rcc_build uic_build -USES= cmake tar:txz PLIST_FILES= bin/dikt \ share/applications/kde4/dikt.desktop \ diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 6a49d7e392f8..2496aabca373 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -12,9 +12,9 @@ COMMENT= KDE4 graphical frontend for diff LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_KDE4= kdelibs libkonq automoc4 +USES= cmake:outsource kde:4 +USE_KDE= kdelibs libkonq automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake:outsource OPTIONS_DEFINE= NLS DOCS diff --git a/textproc/kompare/Makefile b/textproc/kompare/Makefile index 8ab71be426c8..cfd3d8170c9b 100644 --- a/textproc/kompare/Makefile +++ b/textproc/kompare/Makefile @@ -12,8 +12,8 @@ COMMENT= Diff/Patch Frontend LIB_DEPENDS= libkomparediff2.so:textproc/libkomparediff2 -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/textproc/libkomparediff2/Makefile b/textproc/libkomparediff2/Makefile index 0a3f8545ad25..88884a28b1a0 100644 --- a/textproc/libkomparediff2/Makefile +++ b/textproc/libkomparediff2/Makefile @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Library to compare files and strings -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile index 88162275b78c..b1a9930f57e0 100644 --- a/textproc/uim-kde4/Makefile +++ b/textproc/uim-kde4/Makefile @@ -10,14 +10,15 @@ LIB_DEPENDS= libuim.so:textproc/uim RUN_DEPENDS= uim-pref-qt4:textproc/uim-qt4 USE_GCC= any -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build qt3support uic rcc +USES+= kde:4 MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-qt4 --enable-pref --enable-default-toolkit=qt4 \ --enable-kde4-applet -CONFIGURE_ENV= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config" +CONFIGURE_ENV= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include diff --git a/www/choqok/Makefile b/www/choqok/Makefile index 9c49a6ebbf4a..8f1286d808c3 100644 --- a/www/choqok/Makefile +++ b/www/choqok/Makefile @@ -17,10 +17,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson \ libqoauth.so:net/qoauth \ libtelepathy-qt4.so:net-im/telepathy-qt4 -USE_KDE4= attica automoc4 kdelibs +USES= cmake gettext kde:4 tar:xz +USE_KDE= attica automoc4 kdelibs USE_QT4= gui imageformats_run network \ moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:xz USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index a6bdab64a6b7..717ed7677c27 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -14,9 +14,9 @@ COMMENT= Comprehensive html/website development environment LIB_DEPENDS= libtidy.so:www/tidy-lib \ libboost_thread.so:devel/boost-libs +USES= cmake:outsource kde:4 tar:xz USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs pimlibs automoc4 -USES= cmake:outsource tar:xz +USE_KDE= kdelibs pimlibs automoc4 USE_QT4= dbus porting_build \ qmake_build moc_build rcc_build uic_build uic3_build USE_LDCONFIG= yes diff --git a/www/kpartsplugin/Makefile b/www/kpartsplugin/Makefile index 15cf96de68a8..20296237e724 100644 --- a/www/kpartsplugin/Makefile +++ b/www/kpartsplugin/Makefile @@ -10,9 +10,9 @@ DISTNAME= ${PORTNAME}-${PORTDATE} MAINTAINER= avilla@FreeBSD.org COMMENT= Browser file viewer using KDE technology -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 webplugin:native tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build -USES= cmake webplugin:native tar:bzip2 CMAKE_ARGS= -DNSPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}" PORTDATE= 20120723 diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile index e8675d4238b3..d80a1bc89e62 100644 --- a/www/kwebkitpart/Makefile +++ b/www/kwebkitpart/Makefile @@ -9,10 +9,10 @@ MASTER_SITES= LOCAL/makc MAINTAINER= kde@FreeBSD.org COMMENT= Web browser component for KDE SC based on QtWebKit -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 cpe tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= designer gui webkit \ moc_build qmake_build rcc_build uic_build -USES= cmake cpe tar:xz CPE_VENDOR= urs_wolfer diff --git a/www/opera/Makefile b/www/opera/Makefile index eca0f1cad32d..3959591eedd3 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -46,7 +46,8 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups VIDEO_USE= gstreamer=vorbis,ogg,theora,vp8,good GTK2_USE= gnome=gtk20,libxml2 -KDE4_USE= kde4=kdelibs +KDE4_USES= kde:4 +KDE4_USE= KDE=kdelibs .include <bsd.port.options.mk> diff --git a/www/qupzilla-qt4/Makefile b/www/qupzilla-qt4/Makefile index 06c8f80df388..6780ba0518dd 100644 --- a/www/qupzilla-qt4/Makefile +++ b/www/qupzilla-qt4/Makefile @@ -37,7 +37,8 @@ DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true" GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true" -KWALLET_USE= KDE4=kdelibs +KWALLET_USES= kde:4 +KWALLET_USE= KDE=kdelibs KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true" post-patch: diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile index 2cdd6f539a0e..27062d679b2a 100644 --- a/www/rekonq/Makefile +++ b/www/rekonq/Makefile @@ -9,8 +9,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:C,\..*,.0,}/ MAINTAINER= makc@FreeBSD.org COMMENT= Lightweight KDE browser based on WebKit -USES= cmake:outsource gettext tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= script webkit \ moc_build qmake_build rcc_build uic_build @@ -24,7 +24,7 @@ OPERA_CMAKE_OFF= -DWITH_QCA2=off \ -DWITH_QtOAuth=off NEPOMUK_DESC= Bookmarks tagging via Nepomuk -NEPOMUK_USE= KDE4=nepomuk-core +NEPOMUK_USE= KDE=nepomuk-core NEPOMUK_CMAKE_OFF= -DWITH_NepomukCore=off post-patch: diff --git a/x11-clocks/amor/Makefile b/x11-clocks/amor/Makefile index 8573c32b8ac2..f45664970feb 100644 --- a/x11-clocks/amor/Makefile +++ b/x11-clocks/amor/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Small animation which sits on top of active window -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 93750e4eef7e..85c11f725ede 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -7,19 +7,18 @@ CATEGORIES= x11-clocks kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE miscellaneous applications (meta port) -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= AMOR KTEATIME KTUX OPTIONS_DEFAULT= ${OPTIONS_DEFINE} AMOR_DESC= Small animation which sits on top of active window -AMOR_RUN_DEPENDS= ${KDE4_PREFIX}/bin/amor:x11-clocks/amor +AMOR_RUN_DEPENDS= ${KDE_PREFIX}/bin/amor:x11-clocks/amor KTEATIME_DESC= Handy timer for steeping tea -KTEATIME_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kteatime:x11-clocks/kteatime +KTEATIME_RUN_DEPENDS= ${KDE_PREFIX}/bin/kteatime:x11-clocks/kteatime KTUX_DESC= Tux-in-a-Spaceship screen saver -KTUX_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktux:x11-clocks/ktux +KTUX_RUN_DEPENDS= ${KDE_PREFIX}/bin/ktux:x11-clocks/ktux .include <bsd.port.mk> diff --git a/x11-clocks/kteatime/Makefile b/x11-clocks/kteatime/Makefile index bd5228a46035..7487ed6c45a9 100644 --- a/x11-clocks/kteatime/Makefile +++ b/x11-clocks/kteatime/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Handy timer for steeping tea -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer/Makefile index a7f8b78f1f45..73ead3e4c0f9 100644 --- a/x11-clocks/ktimer/Makefile +++ b/x11-clocks/ktimer/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Countdown launcher for KDE -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/x11-clocks/ktux/Makefile b/x11-clocks/ktux/Makefile index 744a7484dbd5..fd3ab43bf930 100644 --- a/x11-clocks/ktux/Makefile +++ b/x11-clocks/ktux/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Tux-in-a-Spaceship screen saver -USE_KDE4= kdelibs workspace automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs workspace automoc4 USE_QT4= qt3support moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/x11-clocks/plasma-applet-adjustableclock/Makefile b/x11-clocks/plasma-applet-adjustableclock/Makefile index 15271d5377df..87f5430ae274 100644 --- a/x11-clocks/plasma-applet-adjustableclock/Makefile +++ b/x11-clocks/plasma-applet-adjustableclock/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE4 highly configurable clock plasma applet LICENSE= GPLv2 -USES= cmake gettext tar:bzip2 -USE_KDE4= automoc4 workspace +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/x11-clocks/plasma-applet-geekclock/Makefile b/x11-clocks/plasma-applet-geekclock/Makefile index be7152a1a9f7..350c4c230bc5 100644 --- a/x11-clocks/plasma-applet-geekclock/Makefile +++ b/x11-clocks/plasma-applet-geekclock/Makefile @@ -11,8 +11,8 @@ DISTNAME= geek-clock-plasmoid-${PORTVERSION}-src MAINTAINER= jhale@FreeBSD.org COMMENT= KDE4 geeky analog clock plasma applet -USES= cmake -USE_KDE4= automoc4 kdelibs workspace +USES= cmake kde:4 +USE_KDE= automoc4 kdelibs workspace USE_QT4= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index 00d315d9a647..8b08e06b5e92 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -13,8 +13,8 @@ COMMENT= Twin panel file manager for KDE, like midnight or norton commander LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource gettext tar:bzip2 -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile index 5dc9baabb169..43e5cea49320 100644 --- a/x11-themes/gtk-qt4-engine/Makefile +++ b/x11-themes/gtk-qt4-engine/Makefile @@ -12,8 +12,8 @@ COMMENT= GTK+ 2.x theme engine allowing to use Qt/KDE styles USE_GNOME= gtk20 USE_QT4= corelib gui moc_build rcc_build uic_build qmake_build -USES= cmake gettext pkgconfig tar:bzip2 -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 pkgconfig tar:bzip2 +USE_KDE= kdelibs automoc4 WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= BONOBO diff --git a/x11-themes/kde-gtk-config/Makefile b/x11-themes/kde-gtk-config/Makefile index 079b4b36b0b8..15186fd7a5bc 100644 --- a/x11-themes/kde-gtk-config/Makefile +++ b/x11-themes/kde-gtk-config/Makefile @@ -9,9 +9,9 @@ MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src MAINTAINER= kde@FreeBSD.org COMMENT= GTK2 and GTK3 Configurator for KDE -USES= cmake:outsource gettext pkgconfig tar:xz +USES= cmake:outsource gettext kde:4 pkgconfig tar:xz USE_GNOME= gtk20 gtk30 -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build post-patch: diff --git a/x11-themes/kde4-base-artwork/Makefile b/x11-themes/kde4-base-artwork/Makefile index 50c1fcf6c7d7..00fe2d304c8d 100644 --- a/x11-themes/kde4-base-artwork/Makefile +++ b/x11-themes/kde4-base-artwork/Makefile @@ -12,8 +12,8 @@ COMMENT= Base artwork for the KDE Plasma Desktop LICENSE= GPLv2 -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build NO_BUILD= yes diff --git a/x11-themes/kde4-icons-oxygen/Makefile b/x11-themes/kde4-icons-oxygen/Makefile index 6e26e5ea667d..455b0a2ef697 100644 --- a/x11-themes/kde4-icons-oxygen/Makefile +++ b/x11-themes/kde4-icons-oxygen/Makefile @@ -11,8 +11,7 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= The Oxygen icon theme for KDE -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz INSTALL_TARGET= install EXTRACT_AFTER_ARGS= --exclude '${DISTNAME}/scalable' diff --git a/x11-themes/kde4-style-bespin/Makefile b/x11-themes/kde4-style-bespin/Makefile index 68b8d91ec4f3..38e50e0057b5 100644 --- a/x11-themes/kde4-style-bespin/Makefile +++ b/x11-themes/kde4-style-bespin/Makefile @@ -15,8 +15,9 @@ COMMENT= Configurable KDE4 style LICENSE= LGPL21 WRKSRC= ${WRKDIR}/cloudcity -USE_KDE4= kdelibs automoc4 workspace + +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 workspace USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake .include <bsd.port.mk> diff --git a/x11-themes/kde4-style-nitrogen/Makefile b/x11-themes/kde4-style-nitrogen/Makefile index 880c75f6a1ce..0c8c0f8f0408 100644 --- a/x11-themes/kde4-style-nitrogen/Makefile +++ b/x11-themes/kde4-style-nitrogen/Makefile @@ -15,8 +15,9 @@ COMMENT= KDE style with animations LICENSE= GPLv2 WRKSRC= ${WRKDIR}/kde4-kstyle-nitrogen-${PORTVERSION}-Source -USE_KDE4= kdelibs automoc4 + +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake .include <bsd.port.mk> diff --git a/x11-themes/kde4-style-oxygen-transparent/Makefile b/x11-themes/kde4-style-oxygen-transparent/Makefile index e101f809a719..e395d17148fd 100644 --- a/x11-themes/kde4-style-oxygen-transparent/Makefile +++ b/x11-themes/kde4-style-oxygen-transparent/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE oxygen style with transparency LICENSE= GPLv2 -USE_KDE4= kdelibs workspace automoc4 +USES= cmake kde:4 tar:xz +USE_KDE= kdelibs workspace automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake tar:xz .include <bsd.port.mk> diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile index b85644d95527..0655ee4a5667 100644 --- a/x11-themes/kde4-style-polyester/Makefile +++ b/x11-themes/kde4-style-polyester/Makefile @@ -14,8 +14,8 @@ COMMENT= KDE style and window decoration LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -USE_KDE4= kdelibs automoc4 +USES= cmake gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/x11-themes/kde4-style-skulpture/Makefile b/x11-themes/kde4-style-skulpture/Makefile index 1098ab930026..2ec1f23003f4 100644 --- a/x11-themes/kde4-style-skulpture/Makefile +++ b/x11-themes/kde4-style-skulpture/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE style featuring 3D artwork and enhanced the visual experience LICENSE= GPLv3 -USE_KDE4= kdelibs automoc4 workspace +USES= cmake kde:4 +USE_KDE= kdelibs automoc4 workspace USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake .include <bsd.port.mk> diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde4-wallpapers/Makefile index ef54cc339db1..b1d7edca4fc0 100644 --- a/x11-themes/kde4-wallpapers/Makefile +++ b/x11-themes/kde4-wallpapers/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Set of wallpapers for the KDE Plasma workspace -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build NO_BUILD= yes diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile index 8040bf53b822..22ca8aec8da2 100644 --- a/x11-themes/kde4-windeco-crystal/Makefile +++ b/x11-themes/kde4-windeco-crystal/Makefile @@ -14,10 +14,10 @@ COMMENT= Transparent KDE window decoration LICENSE= GPLv2 -USE_KDE4= kdelibs automoc4 workspace +USES= cmake:outsource kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build \ corelib gui qt3support -USES= cmake:outsource tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile index afc245b9223c..a45bc26b9f93 100644 --- a/x11-themes/kde4-windeco-dekorator/Makefile +++ b/x11-themes/kde4-windeco-dekorator/Makefile @@ -16,9 +16,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libqimageblitz.so:x11/qimageblitz -USE_KDE4= kdelibs automoc4 workspace +USES= cmake kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 workspace USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index 5b5fffd06c10..30c0fd883fe9 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -12,8 +12,8 @@ COMMENT= KDE Artworks Themes BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 -USE_KDE4= kdelibs libkexiv2 workspace automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkexiv2 workspace automoc4 USE_QT4= corelib gui opengl \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xt diff --git a/x11-themes/qtcurve/Makefile b/x11-themes/qtcurve/Makefile index 885c08ea2a27..c56a056f177b 100644 --- a/x11-themes/qtcurve/Makefile +++ b/x11-themes/qtcurve/Makefile @@ -70,7 +70,8 @@ post-install: .if ${QTCURVE_SLAVE} == "kde4" WITH_qt4= On # required for KDE 4 PKGNAMEPREFIX= kde4-style- -USE_KDE4= kdelibs workspace automoc4 +USE_KDE= kdelibs workspace automoc4 +USES+= kde:4 USE_QT4= moc_build qmake_build rcc_build uic_build BUILD_WRKSRC= ${WRKSRC}/qt4 .endif diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile index 13e5dff5f760..998f76718cb0 100644 --- a/x11/kactivities/Makefile +++ b/x11/kactivities/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kactivities -PORTVERSION= ${KDE4_ACTIVITES_VERSION} +PORTVERSION= ${KDE4_ACTIVITIES_VERSION} PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= KDE/Attic/${PORTVERSION}/src @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Kactivities library -USE_KDE4= automoc4 kdelibs soprano nepomuk-core -USES= cmake:outsource compiler:c++11-lib tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USE_KDE= automoc4 kdelibs soprano nepomuk-core USE_QT4= declarative moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile index 0d12256ed90b..f5c7863587b7 100644 --- a/x11/kactivitymanagerd/Makefile +++ b/x11/kactivitymanagerd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kactivitymanagerd -PORTVERSION= ${KDE4_ACTIVITES_VERSION} +PORTVERSION= ${KDE4_ACTIVITIES_VERSION} CATEGORIES= x11 kde MASTER_SITES= KDE/Attic/${PORTVERSION}/src DISTNAME= kactivities-${PORTVERSION} @@ -10,9 +10,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Activity Manager daemon -USE_KDE4= automoc4 kdelibs soprano nepomuk-core \ +USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USE_KDE= automoc4 kdelibs soprano nepomuk-core \ kactivities -USES= cmake:outsource compiler:c++11-lib tar:xz USE_QT4= declarative opengl script sql \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 3f5a77ef336f..2addbb5d5b56 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -12,10 +12,10 @@ COMMENT= Basic applications for KDE LIB_DEPENDS= libtidy.so:www/tidy-lib +USES= cmake:outsource gettext kde:4 tar:xz USE_GNOME= glib20 -USE_KDE4= kdelibs baloo baloo-widgets libkonq \ +USE_KDE= kdelibs baloo baloo-widgets libkonq \ automoc4 kactivities -USES= cmake:outsource gettext tar:xz USE_QT4= corelib dbus gui script xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 xt @@ -27,16 +27,16 @@ OPTIONS_DEFINE= KONSOLE KWRITE OPTIONS_DEFAULT= ${OPTIONS_DEFINE} KONSOLE_DESC= Install Konsole terminal emulator -KONSOLE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/konsole:x11/konsole +KONSOLE_RUN_DEPENDS= ${KDE_PREFIX}/bin/konsole:x11/konsole KWRITE_DESC= Install KWrite text editor -KWRITE_USE= KDE4=kate_run +KWRITE_USE= KDE=kate_run pre-configure: # Quick hack to avoid building libkonq here ${REINPLACE_CMD} -e '/add_subdirectory (konq)/d' \ ${WRKSRC}/lib/CMakeLists.txt ${MKDIR} ${BUILD_WRKSRC}/lib && \ - ${LN} -s ${KDE4_PREFIX}/lib/libkonq.so ${BUILD_WRKSRC}/lib + ${LN} -s ${KDE_PREFIX}/lib/libkonq.so ${BUILD_WRKSRC}/lib .include <bsd.port.mk> diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index d5f0fcda7ea5..edcd6f0f93ba 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -22,10 +22,10 @@ LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \ BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh RUN_DEPENDS= cagibid:net/cagibi -USE_KDE4= kactivities kdelibs oxygen \ +USES= cmake:outsource gettext gmake jpeg kde:4 shared-mime-info \ + shebangfix tar:xz +USE_KDE= kactivities kdelibs oxygen-icons4 \ attica automoc4 pimlibs strigi nepomuk-core -USES= cmake:outsource gettext gmake jpeg shared-mime-info shebangfix \ - tar:xz USE_QT4= corelib dbus declarative designer_build gui phonon \ network qtestlib script svg webkit xml \ moc_build qmake_build rcc_build uic_build diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 084d7145dcd0..58546a12f3d9 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms BUILD_DEPENDS= xrdb:x11/xrdb -RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ +RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ xprop:x11/xprop \ xsetroot:x11/xsetroot \ @@ -33,18 +33,18 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ mkfontdir:x11-fonts/mkfontdir \ xset:x11/xset \ setxkbmap:x11/setxkbmap \ - ${KDE4_PREFIX}/bin/ksysguardd:sysutils/ksysguardd \ - ${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \ - ${KDE4_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \ + ${KDE_PREFIX}/bin/ksysguardd:sysutils/ksysguardd \ + ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \ + ${KDE_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \ ${LOCALBASE}/etc/pam.d/kde:security/pam_kde \ - ${KDE4_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork + ${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork +USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \ + pkgconfig shebangfix tar:xz USE_GL= glu USE_GNOME= glib20 -USE_KDE4= kactivities kdelibs nepomuk-core oxygen \ +USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons4 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi -USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg \ - pkgconfig shebangfix tar:xz USE_QT4= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql webkit xml \ moc_build qmake_build rcc_build uic_build @@ -85,23 +85,23 @@ GSTREAMER_DESC= Multimedia via Phonon-GStreamer GSTREAMER_USE= QT4=phonon-gst_run KACTIVITY_DESC= Activity Manager daemon -KACTIVITY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd +KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd PYTHON_DESC= Python plasmoids support -PYTHON_RUN_DEPENDS= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:x11/plasma-scriptengine-python +PYTHON_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:x11/plasma-scriptengine-python RUBY_DESC= Ruby plasmoids support -RUBY_RUN_DEPENDS= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby +RUBY_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby UPOWER_DESC= Power management via UPower UPOWER_RUN_DEPENDS= ${LOCALBASE}/libexec/upowerd:sysutils/upower VLC_DESC= Multimedia via Phonon-VLC -VLC_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc +VLC_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc WALLPAPERS_DESC= Install official KDE wallpapers -WALLPAPERS_RUN_DEPENDS= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde4-wallpapers \ - ${KDE4_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd +WALLPAPERS_RUN_DEPENDS= ${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde4-wallpapers \ + ${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd .if !exists(/usr/lib/libutempter.so) LIB_DEPENDS+= libutempter.so:sysutils/libutempter diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index a4ffb15f5c85..b8ee88f121ce 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -8,8 +8,8 @@ CATEGORIES= x11 kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE Software Compilation 4 (meta port) -USE_KDE4= baseapps_run runtime_run workspace_run -USES= metaport +USES= kde:4 metaport +USE_KDE= baseapps_run runtime_run workspace_run OPTIONS_DEFINE= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEBINDINGS KDEEDU \ KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK \ @@ -23,7 +23,7 @@ KDEADMIN_DESC= Administration utilities KDEADMIN_RUN_DEPENDS= kdeadmin>=${KDE4_VERSION}:sysutils/kdeadmin4 KDEARTWORK_DESC= Additional screensavers and wallpapers -KDEARTWORK_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kxsconfig:x11-themes/kdeartwork4 +KDEARTWORK_RUN_DEPENDS= ${KDE_PREFIX}/bin/kxsconfig:x11-themes/kdeartwork4 KDEBINDINGS_DESC= Bindings for programming languages KDEBINDINGS_RUN_DEPENDS= kdebindings>=${KDE4_VERSION}:devel/kdebindings4 @@ -44,10 +44,10 @@ KDENETWORK_DESC= Network-related programs KDENETWORK_RUN_DEPENDS= kdenetwork>=${KDE4_VERSION}:net/kdenetwork4 KDEPIM_DESC= Personal information management -KDEPIM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmail:deskutils/kdepim4 +KDEPIM_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmail:deskutils/kdepim4 KDEPLASMA_DESC= Extra plasmoids and plugins for Plasma -KDEPLASMA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/lancelot:deskutils/kdeplasma-addons +KDEPLASMA_RUN_DEPENDS= ${KDE_PREFIX}/bin/lancelot:deskutils/kdeplasma-addons KDESDK_DESC= Software development kit KDESDK_RUN_DEPENDS= kdesdk>=${KDE4_VERSION}:devel/kdesdk4 @@ -59,6 +59,6 @@ KDEUTILS_DESC= Set of generic utilities KDEUTILS_RUN_DEPENDS= kdeutils>=${KDE4_VERSION}:misc/kdeutils4 KDEWEBDEV_DESC= Web development environment -KDEWEBDEV_RUN_DEPENDS= ${KDE4_PREFIX}/bin/klinkstatus:www/kdewebdev4 +KDEWEBDEV_RUN_DEPENDS= ${KDE_PREFIX}/bin/klinkstatus:www/kdewebdev4 .include <bsd.port.mk> diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 4bed2012b5ce..e0daf79cee9f 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -30,11 +30,11 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-them docbook-xml>0:textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl +USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \ + shared-mime-info shebangfix tar:xz USE_GNOME= libxml2 libxslt -USE_KDE4= oxygen \ +USE_KDE= oxygen-icons4 \ attica automoc4 ontologies soprano strigi -USES= cmake:outsource fam gettext grantlee:4 jpeg perl5 shared-mime-info \ - shebangfix tar:xz USE_OPENSSL= yes USE_QT4= corelib dbus declarative designer_build gui \ network opengl phonon qt3support \ @@ -63,7 +63,7 @@ CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \ # -I${LOCALBASE}/include -I${LOCALBASE}/KF5 # which in turn leads to kdelibs4 headers with the same name being used instead # of the KF5 ones, possibly breaking the build. -CMAKE_ARGS+= -DINCLUDE_INSTALL_DIR:PATH="${KDE4_PREFIX}/include/kde4" +CMAKE_ARGS+= -DINCLUDE_INSTALL_DIR:PATH="${KDE_PREFIX}/include/kde4" SHEBANG_FILES= kdecore/kconfig_compiler/checkkcfg.pl \ kdeui/preparetips \ diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile index 5d569a7540cf..a9991593c02a 100644 --- a/x11/kgamma/Makefile +++ b/x11/kgamma/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 monitor calibration tool -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= x11 xxf86vm diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile index bac3f64da3b0..2b8661351b1b 100644 --- a/x11/konsole/Makefile +++ b/x11/konsole/Makefile @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE terminal emulator -USE_KDE4= automoc4 libkonq -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 libkonq USE_QT4= xml moc_build qmake_build rcc_build uic_build USE_XORG= x11 xrender CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile index 88f3f47c4bcf..0f89e7aadbfd 100644 --- a/x11/libkonq/Makefile +++ b/x11/libkonq/Makefile @@ -11,8 +11,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Core library for Konqueror -USES= cmake tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile index 9205bbce4884..769ed95d63dd 100644 --- a/x11/plasma-scriptengine-python/Makefile +++ b/x11/plasma-scriptengine-python/Makefile @@ -10,10 +10,10 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Python -USE_KDE4= kdelibs pykde4 automoc4 +USES= cmake:outsource kde:4 python:2 tar:xz +USE_KDE= kdelibs pykde4 automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo -USES= cmake:outsource python:2 tar:xz CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile index 17f55737379b..79377b7f3800 100644 --- a/x11/plasma-scriptengine-ruby/Makefile +++ b/x11/plasma-scriptengine-ruby/Makefile @@ -10,11 +10,11 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Ruby -USE_KDE4= kdelibs korundum automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs korundum automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build USE_RUBY= yes DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo -USES= cmake:outsource tar:xz CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/ruby diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile index 362c0d32baff..0d48db2ce420 100644 --- a/x11/rsibreak-kde4/Makefile +++ b/x11/rsibreak-kde4/Makefile @@ -11,9 +11,9 @@ MASTER_SITES= LOCAL/crees/${PORTNAME} \ MAINTAINER= avg@icyb.net.ua COMMENT= KDE RSI prevention tool -USES= cmake gettext tar:bzip2 +USES= cmake gettext kde:4 tar:bzip2 USE_QT4= qmake_build moc_build rcc_build uic_build -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 INSTALLS_ICONS= yes .include <bsd.port.mk> diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile index f408fcd07ebe..4da81edabafc 100644 --- a/x11/yakuake-kde4/Makefile +++ b/x11/yakuake-kde4/Makefile @@ -14,9 +14,9 @@ COMMENT= Drop-down terminal emulator for KDE LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake gettext shebangfix tar:xz +USES= cmake gettext kde:4 shebangfix tar:xz SHEBANG_FILES= data/updaters/yakuake-${PORTVERSION}-startupnotification.pl -USE_KDE4= automoc4 kdelibs +USE_KDE= automoc4 kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build PLIST_SUB= VERSION="${PORTVERSION}" |