Page MenuHomeFreeBSD
Files F142301240

D6961.id19598.largetrue.diff
No OneTemporary
Actions

D6961.id19598.largetrue.diff
View Options

Index: Mk/Uses/kde.mk
===================================================================
--- Mk/Uses/kde.mk
+++ Mk/Uses/kde.mk
@@ -1,222 +1,211 @@
-# $FreeBSD: head/Mk/bsd.kde4.mk 420546 2016-08-21 10:20:55Z rakuco $
-
-.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.
+# $FreeBSD$
#
-# .include <bsd.port.mk>
+# Provides support for KDE-based ports.
#
-# 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').
+# Feature: kde
+# Usage: USES=kde or USES=kde:ARGS
+# Valid ARGS: 4
#
-# Available KDE4 components are:
+# 4: Depend on KDE4 components and variables.
#
-# 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
+# Variables that can be set by a port:
#
-# 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.
+# 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
-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,}
+.if !defined(_INCLUDE_USES_KDE_MK)
+_INCLUDE_USES_KDE_MK= yes
-# 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
+_KDE_SUPPORTED= 4
-.endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
+. if empty(kde_ARGS)
+IGNORE= kde needs a version (${_KDE_SUPPORTED})
+. endif
-.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
+# 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
-Kde_Post_Include= bsd.kde4.mk
+. 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
-#
-# KDE4 components.
-# Set ${component}_TYPE to 'build' or 'run' to specify default dependency type
-# for ${component}; otherwise, it will default to 'build run'.
-#
+# 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
+# ==============================================================================
-_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 \
+# === 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= ${KDE4_PREFIX}/lib/libbaloocore.so
+baloo_PATH= ${KDE_PREFIX}/lib/libbaloocore.so
baloo-widgets_PORT= sysutils/baloo-widgets
-baloo-widgets_PATH= ${KDE4_PREFIX}/lib/libbaloowidgets.so
+baloo-widgets_PATH= ${KDE_PREFIX}/lib/libbaloowidgets.so
baseapps_PORT= x11/kde4-baseapps
-baseapps_PATH= ${KDE4_PREFIX}/bin/kfmclient
+baseapps_PATH= ${KDE_PREFIX}/bin/kfmclient
baseapps_TYPE= run
kactivities_PORT= x11/kactivities
-kactivities_PATH= ${KDE4_PREFIX}/lib/libkactivities.so
+kactivities_PATH= ${KDE_PREFIX}/lib/libkactivities.so
kate_PORT= editors/kate
-kate_PATH= ${KDE4_PREFIX}/lib/libkateinterfaces.so
+kate_PATH= ${KDE_PREFIX}/lib/libkateinterfaces.so
kdelibs_PORT= x11/kdelibs4
-kdelibs_PATH= ${KDE4_PREFIX}/lib/libkdecore.so
+kdelibs_PATH= ${KDE_PREFIX}/lib/libkdecore.so
kfilemetadata_PORT= sysutils/kfilemetadata
-kfilemetadata_PATH= ${KDE4_PREFIX}/lib/libkfilemetadata.so
+kfilemetadata_PATH= ${KDE_PREFIX}/lib/libkfilemetadata.so
korundum_PORT= devel/ruby-korundum
-korundum_PATH= ${KDE4_PREFIX}/lib/kde4/krubypluginfactory.so
+korundum_PATH= ${KDE_PREFIX}/lib/kde4/krubypluginfactory.so
korundum_TYPE= run
libkcddb_PORT= audio/libkcddb
-libkcddb_PATH= ${KDE4_PREFIX}/lib/libkcddb.so
+libkcddb_PATH= ${KDE_PREFIX}/lib/libkcddb.so
libkcompactdisc_PORT= audio/libkcompactdisc
-libkcompactdisc_PATH= ${KDE4_PREFIX}/lib/libkcompactdisc.so
+libkcompactdisc_PATH= ${KDE_PREFIX}/lib/libkcompactdisc.so
libkdcraw_PORT= graphics/libkdcraw-kde4
-libkdcraw_PATH= ${KDE4_PREFIX}/lib/libkdcraw.so
+libkdcraw_PATH= ${KDE_PREFIX}/lib/libkdcraw.so
libkdeedu_PORT= misc/libkdeedu
-libkdeedu_PATH= ${KDE4_PREFIX}/lib/libkeduvocdocument.so
+libkdeedu_PATH= ${KDE_PREFIX}/lib/libkeduvocdocument.so
libkdegames_PORT= games/libkdegames
-libkdegames_PATH= ${KDE4_PREFIX}/lib/libkdegames.so
+libkdegames_PATH= ${KDE_PREFIX}/lib/libkdegames.so
libkexiv2_PORT= graphics/libkexiv2-kde4
-libkexiv2_PATH= ${KDE4_PREFIX}/lib/libkexiv2.so
+libkexiv2_PATH= ${KDE_PREFIX}/lib/libkexiv2.so
libkipi_PORT= graphics/libkipi-kde4
-libkipi_PATH= ${KDE4_PREFIX}/lib/libkipi.so
+libkipi_PATH= ${KDE_PREFIX}/lib/libkipi.so
libkonq_PORT= x11/libkonq
-libkonq_PATH= ${KDE4_PREFIX}/lib/libkonq.so
+libkonq_PATH= ${KDE_PREFIX}/lib/libkonq.so
libksane_PORT= graphics/libksane
-libksane_PATH= ${KDE4_PREFIX}/lib/libksane.so
+libksane_PATH= ${KDE_PREFIX}/lib/libksane.so
marble_PORT= astro/marble
-marble_PATH= ${KDE4_PREFIX}/lib/libmarblewidget.so
+marble_PATH= ${KDE_PREFIX}/lib/libmarblewidget.so
nepomuk-core_PORT= sysutils/nepomuk-core
-nepomuk-core_PATH= ${KDE4_PREFIX}/lib/libnepomukcore.so
+nepomuk-core_PATH= ${KDE_PREFIX}/lib/libnepomukcore.so
nepomuk-widgets_PORT= sysutils/nepomuk-widgets
-nepomuk-widgets_PATH= ${KDE4_PREFIX}/lib/libnepomukwidgets.so
+nepomuk-widgets_PATH= ${KDE_PREFIX}/lib/libnepomukwidgets.so
okular_PORT= graphics/okular
-okular_PATH= ${KDE4_PREFIX}/lib/libokularcore.so
+okular_PATH= ${KDE_PREFIX}/lib/libokularcore.so
-oxygen_PORT= x11-themes/kde4-icons-oxygen
-oxygen_PATH= ${KDE4_PREFIX}/share/icons/oxygen/index.theme
-oxygen_TYPE= run
+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= ${KDE4_PREFIX}/lib/kde4/kperlpluginfactory.so
+perlkde_PATH= ${KDE_PREFIX}/lib/kde4/kperlpluginfactory.so
perlkde_TYPE= run
perlqt_PORT= devel/p5-perlqt
-perlqt_PATH= ${KDE4_PREFIX}/bin/puic4
+perlqt_PATH= ${KDE_PREFIX}/bin/puic4
pimlibs_PORT= deskutils/kdepimlibs4
-pimlibs_PATH= ${KDE4_PREFIX}/lib/libkpimutils.so
+pimlibs_PATH= ${KDE_PREFIX}/lib/libkpimutils.so
pykde4_PORT= devel/py-pykde4
-pykde4_PATH= ${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so
+pykde4_PATH= ${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so
pykde4_TYPE= run
pykdeuic4_PORT= devel/py-pykdeuic4
@@ -224,26 +213,27 @@
pykdeuic4_TYPE= run
qtruby_PORT= devel/ruby-qtruby
-qtruby_PATH= ${KDE4_PREFIX}/lib/libqtruby4shared.so
+qtruby_PATH= ${KDE_PREFIX}/lib/libqtruby4shared.so
runtime_PORT= x11/kde4-runtime
-runtime_PATH= ${KDE4_PREFIX}/bin/knotify4
+runtime_PATH= ${KDE_PREFIX}/bin/knotify4
runtime_TYPE= run
smokegen_PORT= devel/smokegen
-smokegen_PATH= ${KDE4_PREFIX}/lib/libsmokebase.so
+smokegen_PATH= ${KDE_PREFIX}/lib/libsmokebase.so
smokekde_PORT= devel/smokekde
-smokekde_PATH= ${KDE4_PREFIX}/lib/libsmokekdecore.so
+smokekde_PATH= ${KDE_PREFIX}/lib/libsmokekdecore.so
smokeqt_PORT= devel/smokeqt
-smokeqt_PATH= ${KDE4_PREFIX}/lib/libsmokeqtcore.so
+smokeqt_PATH= ${KDE_PREFIX}/lib/libsmokeqtcore.so
workspace_PORT= x11/kde4-workspace
-workspace_PATH= ${KDE4_PREFIX}/lib/libkworkspace.so
+workspace_PATH= ${KDE_PREFIX}/lib/libkworkspace.so
+# Non-Software Compilation components
akonadi_PORT= databases/akonadi
-akonadi_PATH= ${KDE4_PREFIX}/lib/libakonadiprotocolinternals.so
+akonadi_PATH= ${KDE_PREFIX}/lib/libakonadiprotocolinternals.so
attica_PORT= x11-toolkits/attica
attica_PATH= ${LOCALBASE}/lib/libattica.so
@@ -263,39 +253,44 @@
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_KDE4:O:u:C/_.+//}
+. for component in ${USE_KDE: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)
+. 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_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == ""
+. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
${component}_TYPE= # empty
-. if ${USE_KDE4:M${component}_build} != ""
+. if ${USE_KDE:M${component}_build} != ""
${component}_TYPE+= build
-. endif
-. if ${USE_KDE4:M${component}_run} != ""
+. endif
+. if ${USE_KDE:M${component}_run} != ""
${component}_TYPE+= run
-. endif
-. endif # ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == ""
+. endif
+. endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
# If no dependency type is set, default to full dependency.
-. if !defined(${component}_TYPE)
+. if !defined(${component}_TYPE)
${component}_TYPE= build run
-. endif
+. endif
# Set real dependencies.
-. if ${${component}_TYPE:Mbuild} != ""
+. if ${${component}_TYPE:Mbuild} != ""
BUILD_DEPENDS+= ${${component}_DEPENDS}
-. endif
-. if ${${component}_TYPE:Mrun} != ""
+. 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
+. 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 # defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
+.endif
Index: Mk/bsd.kde4.mk
===================================================================
--- Mk/bsd.kde4.mk
+++ Mk/bsd.kde4.mk
@@ -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)
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -389,10 +389,6 @@
# 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 @@
.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 @@
.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
Index: accessibility/jovie/Makefile
===================================================================
--- accessibility/jovie/Makefile
+++ accessibility/jovie/Makefile
@@ -11,8 +11,8 @@
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
Index: accessibility/kaccessible/Makefile
===================================================================
--- accessibility/kaccessible/Makefile
+++ accessibility/kaccessible/Makefile
@@ -11,8 +11,8 @@
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
Index: accessibility/kdeaccessibility4/Makefile
===================================================================
--- accessibility/kdeaccessibility4/Makefile
+++ accessibility/kdeaccessibility4/Makefile
@@ -8,25 +8,24 @@
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>
Index: accessibility/kmag/Makefile
===================================================================
--- accessibility/kmag/Makefile
+++ accessibility/kmag/Makefile
@@ -9,8 +9,8 @@
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
Index: accessibility/kmousetool/Makefile
===================================================================
--- accessibility/kmousetool/Makefile
+++ accessibility/kmousetool/Makefile
@@ -9,8 +9,8 @@
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
Index: accessibility/kmouth/Makefile
===================================================================
--- accessibility/kmouth/Makefile
+++ accessibility/kmouth/Makefile
@@ -9,8 +9,8 @@
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>
Index: archivers/ark/Makefile
===================================================================
--- archivers/ark/Makefile
+++ archivers/ark/Makefile
@@ -13,8 +13,8 @@
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
Index: astro/kstars/Makefile
===================================================================
--- astro/kstars/Makefile
+++ astro/kstars/Makefile
@@ -16,13 +16,13 @@
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>
Index: astro/libkgeomap/Makefile
===================================================================
--- astro/libkgeomap/Makefile
+++ astro/libkgeomap/Makefile
@@ -14,8 +14,8 @@
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
Index: astro/marble/Makefile
===================================================================
--- astro/marble/Makefile
+++ astro/marble/Makefile
@@ -11,8 +11,8 @@
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
Index: audio/amarok-kde4/Makefile
===================================================================
--- audio/amarok-kde4/Makefile
+++ audio/amarok-kde4/Makefile
@@ -20,16 +20,16 @@
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
Index: audio/audex/Makefile
===================================================================
--- audio/audex/Makefile
+++ audio/audex/Makefile
@@ -12,8 +12,8 @@
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
Index: audio/creox/Makefile
===================================================================
--- audio/creox/Makefile
+++ audio/creox/Makefile
@@ -17,8 +17,8 @@
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
Index: audio/juk/Makefile
===================================================================
--- audio/juk/Makefile
+++ audio/juk/Makefile
@@ -14,8 +14,8 @@
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
Index: audio/kaudiocreator/Makefile
===================================================================
--- audio/kaudiocreator/Makefile
+++ audio/kaudiocreator/Makefile
@@ -21,9 +21,9 @@
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}
Index: audio/kid3-kde4/Makefile
===================================================================
--- audio/kid3-kde4/Makefile
+++ audio/kid3-kde4/Makefile
@@ -12,7 +12,7 @@
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 @@
.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
Index: audio/kio-audiocd/Makefile
===================================================================
--- audio/kio-audiocd/Makefile
+++ audio/kio-audiocd/Makefile
@@ -18,8 +18,8 @@
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
Index: audio/kmix/Makefile
===================================================================
--- audio/kmix/Makefile
+++ audio/kmix/Makefile
@@ -12,8 +12,8 @@
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
Index: audio/kscd/Makefile
===================================================================
--- audio/kscd/Makefile
+++ audio/kscd/Makefile
@@ -14,8 +14,8 @@
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
Index: audio/kstreamripper/Makefile
===================================================================
--- audio/kstreamripper/Makefile
+++ audio/kstreamripper/Makefile
@@ -11,8 +11,8 @@
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}
Index: audio/libkcddb/Makefile
===================================================================
--- audio/libkcddb/Makefile
+++ audio/libkcddb/Makefile
@@ -13,8 +13,8 @@
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
Index: audio/libkcompactdisc/Makefile
===================================================================
--- audio/libkcompactdisc/Makefile
+++ audio/libkcompactdisc/Makefile
@@ -11,8 +11,8 @@
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
Index: audio/simon/Makefile
===================================================================
--- audio/simon/Makefile
+++ audio/simon/Makefile
@@ -17,8 +17,8 @@
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
Index: audio/soundkonverter/Makefile
===================================================================
--- audio/soundkonverter/Makefile
+++ audio/soundkonverter/Makefile
@@ -17,10 +17,10 @@
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
Index: audio/tomahawk/Makefile
===================================================================
--- audio/tomahawk/Makefile
+++ audio/tomahawk/Makefile
@@ -34,7 +34,8 @@
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
Index: chinese/qterm/Makefile
===================================================================
--- chinese/qterm/Makefile
+++ chinese/qterm/Makefile
@@ -44,7 +44,8 @@
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
Index: comms/kremotecontrol/Makefile
===================================================================
--- comms/kremotecontrol/Makefile
+++ comms/kremotecontrol/Makefile
@@ -11,8 +11,8 @@
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
Index: databases/akonadi-googledata/Makefile
===================================================================
--- databases/akonadi-googledata/Makefile
+++ databases/akonadi-googledata/Makefile
@@ -12,8 +12,8 @@
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>
Index: databases/akonadi/Makefile
===================================================================
--- databases/akonadi/Makefile
+++ databases/akonadi/Makefile
@@ -16,8 +16,9 @@
# 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 \
Index: databases/kbibtex/Makefile
===================================================================
--- databases/kbibtex/Makefile
+++ databases/kbibtex/Makefile
@@ -14,9 +14,9 @@
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
Index: deskutils/basket/Makefile
===================================================================
--- deskutils/basket/Makefile
+++ deskutils/basket/Makefile
@@ -14,9 +14,9 @@
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
Index: deskutils/cairo-dock-plugins/Makefile
===================================================================
--- deskutils/cairo-dock-plugins/Makefile
+++ deskutils/cairo-dock-plugins/Makefile
@@ -94,7 +94,8 @@
#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
Index: deskutils/homerun/Makefile
===================================================================
--- deskutils/homerun/Makefile
+++ deskutils/homerun/Makefile
@@ -9,8 +9,8 @@
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
Index: deskutils/kcharselect/Makefile
===================================================================
--- deskutils/kcharselect/Makefile
+++ deskutils/kcharselect/Makefile
@@ -10,8 +10,8 @@
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>
Index: deskutils/kchmviewer-kde4/Makefile
===================================================================
--- deskutils/kchmviewer-kde4/Makefile
+++ deskutils/kchmviewer-kde4/Makefile
@@ -14,14 +14,14 @@
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:
Index: deskutils/kdeconnect/Makefile
===================================================================
--- deskutils/kdeconnect/Makefile
+++ deskutils/kdeconnect/Makefile
@@ -9,8 +9,8 @@
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
Index: deskutils/kdepim4-runtime/Makefile
===================================================================
--- deskutils/kdepim4-runtime/Makefile
+++ deskutils/kdepim4-runtime/Makefile
@@ -19,10 +19,10 @@
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
Index: deskutils/kdepim4/Makefile
===================================================================
--- deskutils/kdepim4/Makefile
+++ deskutils/kdepim4/Makefile
@@ -15,15 +15,15 @@
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
Index: deskutils/kdepimlibs4/Makefile
===================================================================
--- deskutils/kdepimlibs4/Makefile
+++ deskutils/kdepimlibs4/Makefile
@@ -20,9 +20,9 @@
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 @@
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' \
Index: deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
===================================================================
--- deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
+++ 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
Index: deskutils/kdeplasma-addons/Makefile
===================================================================
--- deskutils/kdeplasma-addons/Makefile
+++ deskutils/kdeplasma-addons/Makefile
@@ -19,9 +19,9 @@
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_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
Index: deskutils/kruler/Makefile
===================================================================
--- deskutils/kruler/Makefile
+++ deskutils/kruler/Makefile
@@ -9,8 +9,8 @@
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
Index: deskutils/ksshaskpass/Makefile
===================================================================
--- deskutils/ksshaskpass/Makefile
+++ deskutils/ksshaskpass/Makefile
@@ -12,8 +12,8 @@
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
Index: deskutils/plasma-applet-cwp/Makefile
===================================================================
--- deskutils/plasma-applet-cwp/Makefile
+++ deskutils/plasma-applet-cwp/Makefile
@@ -13,8 +13,8 @@
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
Index: deskutils/plasma-applet-daisy/Makefile
===================================================================
--- deskutils/plasma-applet-daisy/Makefile
+++ deskutils/plasma-applet-daisy/Makefile
@@ -13,8 +13,8 @@
LICENSE= GPLv3
-USES= cmake gettext
-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>
Index: deskutils/plasma-applet-fancytasks/Makefile
===================================================================
--- deskutils/plasma-applet-fancytasks/Makefile
+++ deskutils/plasma-applet-fancytasks/Makefile
@@ -14,8 +14,8 @@
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}
Index: deskutils/plasma-applet-panelspacer/Makefile
===================================================================
--- deskutils/plasma-applet-panelspacer/Makefile
+++ deskutils/plasma-applet-panelspacer/Makefile
@@ -13,8 +13,8 @@
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
Index: deskutils/plasma-applet-playwolf/Makefile
===================================================================
--- deskutils/plasma-applet-playwolf/Makefile
+++ deskutils/plasma-applet-playwolf/Makefile
@@ -12,8 +12,8 @@
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
Index: deskutils/plasma-applet-qstardict/Makefile
===================================================================
--- deskutils/plasma-applet-qstardict/Makefile
+++ deskutils/plasma-applet-qstardict/Makefile
@@ -12,9 +12,9 @@
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
Index: deskutils/plasma-applet-serverstatuswidget/Makefile
===================================================================
--- deskutils/plasma-applet-serverstatuswidget/Makefile
+++ deskutils/plasma-applet-serverstatuswidget/Makefile
@@ -13,8 +13,8 @@
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}
Index: deskutils/plasma-applet-simpleweatherforecast/Makefile
===================================================================
--- deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -14,8 +14,8 @@
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
Index: deskutils/plasma-applet-teacooker/Makefile
===================================================================
--- deskutils/plasma-applet-teacooker/Makefile
+++ deskutils/plasma-applet-teacooker/Makefile
@@ -13,8 +13,8 @@
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
Index: deskutils/plasma-applet-yawp/Makefile
===================================================================
--- deskutils/plasma-applet-yawp/Makefile
+++ deskutils/plasma-applet-yawp/Makefile
@@ -12,8 +12,8 @@
LICENSE= GPLv2
-USES= cmake gettext 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>
Index: deskutils/semantik/Makefile
===================================================================
--- deskutils/semantik/Makefile
+++ deskutils/semantik/Makefile
@@ -11,16 +11,16 @@
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
Index: deskutils/silence/Makefile
===================================================================
--- deskutils/silence/Makefile
+++ deskutils/silence/Makefile
@@ -14,10 +14,10 @@
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}
Index: deskutils/strigi/Makefile
===================================================================
--- deskutils/strigi/Makefile
+++ deskutils/strigi/Makefile
@@ -9,8 +9,8 @@
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}
Index: deskutils/superkaramba/Makefile
===================================================================
--- deskutils/superkaramba/Makefile
+++ deskutils/superkaramba/Makefile
@@ -10,8 +10,8 @@
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
Index: devel/cervisia/Makefile
===================================================================
--- devel/cervisia/Makefile
+++ devel/cervisia/Makefile
@@ -9,8 +9,8 @@
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>
Index: devel/cmake/Makefile
===================================================================
--- devel/cmake/Makefile
+++ devel/cmake/Makefile
@@ -13,7 +13,7 @@
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 @@
${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
Index: devel/dolphin-plugins/Makefile
===================================================================
--- devel/dolphin-plugins/Makefile
+++ devel/dolphin-plugins/Makefile
@@ -9,8 +9,8 @@
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>
Index: devel/kapptemplate/Makefile
===================================================================
--- devel/kapptemplate/Makefile
+++ devel/kapptemplate/Makefile
@@ -9,8 +9,8 @@
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
Index: devel/kcachegrind/Makefile
===================================================================
--- devel/kcachegrind/Makefile
+++ devel/kcachegrind/Makefile
@@ -10,8 +10,8 @@
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 \
Index: devel/kdbg/Makefile
===================================================================
--- devel/kdbg/Makefile
+++ devel/kdbg/Makefile
@@ -11,8 +11,8 @@
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
Index: devel/kde-dev-scripts/Makefile
===================================================================
--- devel/kde-dev-scripts/Makefile
+++ devel/kde-dev-scripts/Makefile
@@ -9,8 +9,8 @@
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 \
Index: devel/kde-dev-utils/Makefile
===================================================================
--- devel/kde-dev-utils/Makefile
+++ devel/kde-dev-utils/Makefile
@@ -10,9 +10,9 @@
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>
Index: devel/kdebindings4/Makefile
===================================================================
--- devel/kdebindings4/Makefile
+++ devel/kdebindings4/Makefile
@@ -7,21 +7,20 @@
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>
Index: devel/kdesdk4-kioslaves/Makefile
===================================================================
--- devel/kdesdk4-kioslaves/Makefile
+++ devel/kdesdk4-kioslaves/Makefile
@@ -11,8 +11,8 @@
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
Index: devel/kdesdk4-strigi-analyzers/Makefile
===================================================================
--- devel/kdesdk4-strigi-analyzers/Makefile
+++ devel/kdesdk4-strigi-analyzers/Makefile
@@ -9,8 +9,8 @@
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>
Index: devel/kdesdk4-thumbnailers/Makefile
===================================================================
--- devel/kdesdk4-thumbnailers/Makefile
+++ devel/kdesdk4-thumbnailers/Makefile
@@ -9,8 +9,8 @@
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>
Index: devel/kdesdk4/Makefile
===================================================================
--- devel/kdesdk4/Makefile
+++ devel/kdesdk4/Makefile
@@ -7,8 +7,7 @@
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_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>
Index: devel/kdesvn-kde4/Makefile
===================================================================
--- devel/kdesvn-kde4/Makefile
+++ devel/kdesvn-kde4/Makefile
@@ -15,10 +15,11 @@
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
Index: devel/kdevelop-kde4/Makefile
===================================================================
--- devel/kdevelop-kde4/Makefile
+++ devel/kdevelop-kde4/Makefile
@@ -13,10 +13,11 @@
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_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
Index: devel/kdevelop-pg-qt/Makefile
===================================================================
--- devel/kdevelop-pg-qt/Makefile
+++ devel/kdevelop-pg-qt/Makefile
@@ -12,8 +12,8 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex
-USES= bison cmake:outsource compiler:c++11-lib 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>
Index: devel/kdevelop-php-docs/Makefile
===================================================================
--- devel/kdevelop-php-docs/Makefile
+++ devel/kdevelop-php-docs/Makefile
@@ -11,9 +11,9 @@
LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform
-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
Index: devel/kdevelop-php/Makefile
===================================================================
--- devel/kdevelop-php/Makefile
+++ devel/kdevelop-php/Makefile
@@ -10,11 +10,11 @@
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_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
Index: devel/kdevplatform/Makefile
===================================================================
--- devel/kdevplatform/Makefile
+++ devel/kdevplatform/Makefile
@@ -14,10 +14,11 @@
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
Index: devel/libkgapi/Makefile
===================================================================
--- devel/libkgapi/Makefile
+++ devel/libkgapi/Makefile
@@ -14,8 +14,8 @@
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
Index: devel/libkolab/Makefile
===================================================================
--- devel/libkolab/Makefile
+++ devel/libkolab/Makefile
@@ -19,8 +19,8 @@
-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
Index: devel/lokalize/Makefile
===================================================================
--- devel/lokalize/Makefile
+++ devel/lokalize/Makefile
@@ -11,8 +11,8 @@
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
Index: devel/okteta/Makefile
===================================================================
--- devel/okteta/Makefile
+++ devel/okteta/Makefile
@@ -12,8 +12,8 @@
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
Index: devel/p5-perlkde/Makefile
===================================================================
--- devel/p5-perlkde/Makefile
+++ devel/p5-perlkde/Makefile
@@ -10,18 +10,18 @@
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 @@
.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=""
Index: devel/p5-perlqt/Makefile
===================================================================
--- devel/p5-perlqt/Makefile
+++ devel/p5-perlqt/Makefile
@@ -13,15 +13,15 @@
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}:\
Index: devel/piklab/Makefile
===================================================================
--- devel/piklab/Makefile
+++ devel/piklab/Makefile
@@ -21,8 +21,8 @@
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"
Index: devel/poxml/Makefile
===================================================================
--- devel/poxml/Makefile
+++ devel/poxml/Makefile
@@ -11,8 +11,8 @@
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
Index: devel/py-krosspython/Makefile
===================================================================
--- devel/py-krosspython/Makefile
+++ devel/py-krosspython/Makefile
@@ -11,9 +11,9 @@
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
Index: devel/py-pykde4/Makefile
===================================================================
--- devel/py-pykde4/Makefile
+++ devel/py-pykde4/Makefile
@@ -13,7 +13,8 @@
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_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}
Index: devel/py-pykdeuic4/Makefile
===================================================================
--- devel/py-pykdeuic4/Makefile
+++ devel/py-pykdeuic4/Makefile
@@ -11,10 +11,10 @@
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}
Index: devel/ruby-korundum/Makefile
===================================================================
--- devel/ruby-korundum/Makefile
+++ devel/ruby-korundum/Makefile
@@ -10,13 +10,13 @@
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} \
Index: devel/ruby-krossruby/Makefile
===================================================================
--- devel/ruby-krossruby/Makefile
+++ devel/ruby-krossruby/Makefile
@@ -11,10 +11,10 @@
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
Index: devel/ruby-qtruby/Makefile
===================================================================
--- devel/ruby-qtruby/Makefile
+++ devel/ruby-qtruby/Makefile
@@ -14,11 +14,11 @@
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
Index: devel/smokegen/Makefile
===================================================================
--- devel/smokegen/Makefile
+++ devel/smokegen/Makefile
@@ -9,9 +9,8 @@
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
Index: devel/smokekde/Makefile
===================================================================
--- devel/smokekde/Makefile
+++ devel/smokekde/Makefile
@@ -9,11 +9,11 @@
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
Index: devel/smokeqt/Makefile
===================================================================
--- devel/smokeqt/Makefile
+++ devel/smokeqt/Makefile
@@ -13,12 +13,12 @@
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>
Index: devel/umbrello/Makefile
===================================================================
--- devel/umbrello/Makefile
+++ devel/umbrello/Makefile
@@ -11,9 +11,9 @@
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>
Index: editors/calligra-l10n/Makefile
===================================================================
--- editors/calligra-l10n/Makefile
+++ editors/calligra-l10n/Makefile
@@ -7,8 +7,7 @@
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_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}
Index: editors/calligra-l10n/files/bsd.l10n.mk
===================================================================
--- editors/calligra-l10n/files/bsd.l10n.mk
+++ editors/calligra-l10n/files/bsd.l10n.mk
@@ -6,8 +6,8 @@
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
Index: editors/calligra/Makefile
===================================================================
--- editors/calligra/Makefile
+++ editors/calligra/Makefile
@@ -37,13 +37,13 @@
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_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
Index: editors/kate-plugin-pate/Makefile
===================================================================
--- editors/kate-plugin-pate/Makefile
+++ editors/kate-plugin-pate/Makefile
@@ -10,8 +10,8 @@
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
Index: editors/kate/Makefile
===================================================================
--- editors/kate/Makefile
+++ editors/kate/Makefile
@@ -13,8 +13,8 @@
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
Index: editors/kile-kde4/Makefile
===================================================================
--- editors/kile-kde4/Makefile
+++ editors/kile-kde4/Makefile
@@ -12,13 +12,13 @@
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>
Index: editors/klat4/Makefile
===================================================================
--- editors/klat4/Makefile
+++ editors/klat4/Makefile
@@ -12,8 +12,8 @@
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>
Index: editors/libreoffice/Makefile
===================================================================
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -172,11 +172,12 @@
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
Index: editors/libreoffice4/Makefile
===================================================================
--- editors/libreoffice4/Makefile
+++ editors/libreoffice4/Makefile
@@ -263,9 +263,10 @@
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}"
Index: editors/yzis/Makefile
===================================================================
--- editors/yzis/Makefile
+++ editors/yzis/Makefile
@@ -32,7 +32,8 @@
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)
Index: finance/kmymoney-kde4/Makefile
===================================================================
--- finance/kmymoney-kde4/Makefile
+++ finance/kmymoney-kde4/Makefile
@@ -15,10 +15,10 @@
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
Index: finance/libalkimia/Makefile
===================================================================
--- finance/libalkimia/Makefile
+++ finance/libalkimia/Makefile
@@ -13,8 +13,8 @@
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
Index: finance/skrooge/Makefile
===================================================================
--- finance/skrooge/Makefile
+++ finance/skrooge/Makefile
@@ -13,10 +13,11 @@
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}
Index: ftp/plasma-applet-ftpmonitor/Makefile
===================================================================
--- ftp/plasma-applet-ftpmonitor/Makefile
+++ ftp/plasma-applet-ftpmonitor/Makefile
@@ -10,8 +10,8 @@
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:
Index: games/blinken/Makefile
===================================================================
--- games/blinken/Makefile
+++ games/blinken/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/bomber/Makefile
===================================================================
--- games/bomber/Makefile
+++ games/bomber/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/bovo/Makefile
===================================================================
--- games/bovo/Makefile
+++ games/bovo/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/granatier/Makefile
===================================================================
--- games/granatier/Makefile
+++ games/granatier/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kajongg/Makefile
===================================================================
--- games/kajongg/Makefile
+++ games/kajongg/Makefile
@@ -10,8 +10,8 @@
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
Index: games/kanagram/Makefile
===================================================================
--- games/kanagram/Makefile
+++ games/kanagram/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kapman/Makefile
===================================================================
--- games/kapman/Makefile
+++ games/kapman/Makefile
@@ -9,8 +9,8 @@
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
Index: games/katomic/Makefile
===================================================================
--- games/katomic/Makefile
+++ games/katomic/Makefile
@@ -10,8 +10,8 @@
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
Index: games/kblackbox/Makefile
===================================================================
--- games/kblackbox/Makefile
+++ games/kblackbox/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kblocks/Makefile
===================================================================
--- games/kblocks/Makefile
+++ games/kblocks/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kbounce/Makefile
===================================================================
--- games/kbounce/Makefile
+++ games/kbounce/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kbreakout/Makefile
===================================================================
--- games/kbreakout/Makefile
+++ games/kbreakout/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kdegames4/Makefile
===================================================================
--- games/kdegames4/Makefile
+++ games/kdegames4/Makefile
@@ -7,8 +7,7 @@
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 @@
.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}
Index: games/kdegames4/Makefile.common
===================================================================
--- games/kdegames4/Makefile.common
+++ games/kdegames4/Makefile.common
@@ -42,7 +42,7 @@
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
Index: games/kdiamond/Makefile
===================================================================
--- games/kdiamond/Makefile
+++ games/kdiamond/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kfourinline/Makefile
===================================================================
--- games/kfourinline/Makefile
+++ games/kfourinline/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kgoldrunner/Makefile
===================================================================
--- games/kgoldrunner/Makefile
+++ games/kgoldrunner/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/khangman/Makefile
===================================================================
--- games/khangman/Makefile
+++ games/khangman/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kigo/Makefile
===================================================================
--- games/kigo/Makefile
+++ games/kigo/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/killbots/Makefile
===================================================================
--- games/killbots/Makefile
+++ games/killbots/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kiriki/Makefile
===================================================================
--- games/kiriki/Makefile
+++ games/kiriki/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kjumpingcube/Makefile
===================================================================
--- games/kjumpingcube/Makefile
+++ games/kjumpingcube/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/klickety/Makefile
===================================================================
--- games/klickety/Makefile
+++ games/klickety/Makefile
@@ -10,8 +10,8 @@
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
Index: games/klines/Makefile
===================================================================
--- games/klines/Makefile
+++ games/klines/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kmahjongg/Makefile
===================================================================
--- games/kmahjongg/Makefile
+++ games/kmahjongg/Makefile
@@ -11,8 +11,8 @@
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>
Index: games/kmines/Makefile
===================================================================
--- games/kmines/Makefile
+++ games/kmines/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/knavalbattle/Makefile
===================================================================
--- games/knavalbattle/Makefile
+++ games/knavalbattle/Makefile
@@ -9,8 +9,8 @@
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
Index: games/knetwalk/Makefile
===================================================================
--- games/knetwalk/Makefile
+++ games/knetwalk/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/knights-kde4/Makefile
===================================================================
--- games/knights-kde4/Makefile
+++ games/knights-kde4/Makefile
@@ -14,8 +14,8 @@
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
Index: games/kolf/Makefile
===================================================================
--- games/kolf/Makefile
+++ games/kolf/Makefile
@@ -9,8 +9,8 @@
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
Index: games/kollision/Makefile
===================================================================
--- games/kollision/Makefile
+++ games/kollision/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/konquest/Makefile
===================================================================
--- games/konquest/Makefile
+++ games/konquest/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kpat/Makefile
===================================================================
--- games/kpat/Makefile
+++ games/kpat/Makefile
@@ -9,8 +9,8 @@
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:
Index: games/kreversi/Makefile
===================================================================
--- games/kreversi/Makefile
+++ games/kreversi/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kshisen/Makefile
===================================================================
--- games/kshisen/Makefile
+++ games/kshisen/Makefile
@@ -11,8 +11,8 @@
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>
Index: games/ksirk/Makefile
===================================================================
--- games/ksirk/Makefile
+++ games/ksirk/Makefile
@@ -11,8 +11,8 @@
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
Index: games/ksnakeduel/Makefile
===================================================================
--- games/ksnakeduel/Makefile
+++ games/ksnakeduel/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kspaceduel/Makefile
===================================================================
--- games/kspaceduel/Makefile
+++ games/kspaceduel/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/ksquares/Makefile
===================================================================
--- games/ksquares/Makefile
+++ games/ksquares/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/ksudoku/Makefile
===================================================================
--- games/ksudoku/Makefile
+++ games/ksudoku/Makefile
@@ -9,9 +9,9 @@
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
Index: games/ktuberling/Makefile
===================================================================
--- games/ktuberling/Makefile
+++ games/ktuberling/Makefile
@@ -9,8 +9,8 @@
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>
Index: games/kubrick/Makefile
===================================================================
--- games/kubrick/Makefile
+++ games/kubrick/Makefile
@@ -9,9 +9,9 @@
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
Index: games/libkdegames/Makefile
===================================================================
--- games/libkdegames/Makefile
+++ games/libkdegames/Makefile
@@ -10,8 +10,8 @@
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
Index: games/libkmahjongg/Makefile
===================================================================
--- games/libkmahjongg/Makefile
+++ games/libkmahjongg/Makefile
@@ -10,8 +10,8 @@
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
Index: games/lskat/Makefile
===================================================================
--- games/lskat/Makefile
+++ games/lskat/Makefile
@@ -9,8 +9,8 @@
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
Index: games/pairs/Makefile
===================================================================
--- games/pairs/Makefile
+++ games/pairs/Makefile
@@ -12,8 +12,8 @@
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
Index: games/palapeli/Makefile
===================================================================
--- games/palapeli/Makefile
+++ games/palapeli/Makefile
@@ -10,8 +10,8 @@
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
Index: games/picmi/Makefile
===================================================================
--- games/picmi/Makefile
+++ games/picmi/Makefile
@@ -9,8 +9,8 @@
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
Index: graphics/digikam-kde4/Makefile
===================================================================
--- graphics/digikam-kde4/Makefile
+++ graphics/digikam-kde4/Makefile
@@ -24,7 +24,7 @@
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_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
Index: graphics/digikam-kde4/Makefile.common
===================================================================
--- graphics/digikam-kde4/Makefile.common
+++ graphics/digikam-kde4/Makefile.common
@@ -118,8 +118,8 @@
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}
Index: graphics/gnash/Makefile
===================================================================
--- graphics/gnash/Makefile
+++ graphics/gnash/Makefile
@@ -19,7 +19,7 @@
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 @@
.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+= 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} == ""
Index: graphics/gwenview-kde4/Makefile
===================================================================
--- graphics/gwenview-kde4/Makefile
+++ graphics/gwenview-kde4/Makefile
@@ -13,9 +13,9 @@
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
Index: graphics/kamera-kde4/Makefile
===================================================================
--- graphics/kamera-kde4/Makefile
+++ graphics/kamera-kde4/Makefile
@@ -11,8 +11,8 @@
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>
Index: graphics/kcolorchooser/Makefile
===================================================================
--- graphics/kcolorchooser/Makefile
+++ graphics/kcolorchooser/Makefile
@@ -9,8 +9,8 @@
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>
Index: graphics/kcoloredit/Makefile
===================================================================
--- graphics/kcoloredit/Makefile
+++ graphics/kcoloredit/Makefile
@@ -11,9 +11,9 @@
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
Index: graphics/kdegraphics4-mobipocket/Makefile
===================================================================
--- graphics/kdegraphics4-mobipocket/Makefile
+++ graphics/kdegraphics4-mobipocket/Makefile
@@ -10,8 +10,8 @@
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
Index: graphics/kdegraphics4-strigi-analyzer/Makefile
===================================================================
--- graphics/kdegraphics4-strigi-analyzer/Makefile
+++ graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -11,8 +11,8 @@
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>
Index: graphics/kdegraphics4-svgpart/Makefile
===================================================================
--- graphics/kdegraphics4-svgpart/Makefile
+++ graphics/kdegraphics4-svgpart/Makefile
@@ -10,8 +10,8 @@
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>
Index: graphics/kdegraphics4-thumbnailers/Makefile
===================================================================
--- graphics/kdegraphics4-thumbnailers/Makefile
+++ graphics/kdegraphics4-thumbnailers/Makefile
@@ -9,8 +9,8 @@
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>
Index: graphics/kdegraphics4/Makefile
===================================================================
--- graphics/kdegraphics4/Makefile
+++ graphics/kdegraphics4/Makefile
@@ -8,8 +8,7 @@
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_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>
Index: graphics/kiconedit/Makefile
===================================================================
--- graphics/kiconedit/Makefile
+++ graphics/kiconedit/Makefile
@@ -10,9 +10,9 @@
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
Index: graphics/kipi-plugin-acquireimages/Makefile
===================================================================
--- graphics/kipi-plugin-acquireimages/Makefile
+++ graphics/kipi-plugin-acquireimages/Makefile
@@ -7,7 +7,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-USE_KDE4= libksane
+USE_KDE= libksane
KIPI_PLUGIN= acquireimages
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
Index: graphics/kipi-plugin-calendar/Makefile
===================================================================
--- graphics/kipi-plugin-calendar/Makefile
+++ graphics/kipi-plugin-calendar/Makefile
@@ -7,7 +7,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-USE_KDE4= pimlibs
+USE_KDE= pimlibs
KIPI_PLUGIN= calendar
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
Index: graphics/kolourpaint/Makefile
===================================================================
--- graphics/kolourpaint/Makefile
+++ graphics/kolourpaint/Makefile
@@ -9,8 +9,8 @@
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
Index: graphics/kphotoalbum-kde4/Makefile
===================================================================
--- graphics/kphotoalbum-kde4/Makefile
+++ graphics/kphotoalbum-kde4/Makefile
@@ -13,9 +13,10 @@
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_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
Index: graphics/kpovmodeler/Makefile
===================================================================
--- graphics/kpovmodeler/Makefile
+++ graphics/kpovmodeler/Makefile
@@ -13,10 +13,10 @@
RUN_DEPENDS= povray:graphics/povray-meta
+USES= cmake gettext kde:4 tar:bzip2
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
Index: graphics/kqtquickcharts/Makefile
===================================================================
--- graphics/kqtquickcharts/Makefile
+++ graphics/kqtquickcharts/Makefile
@@ -9,8 +9,8 @@
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>
Index: graphics/ksaneplugin/Makefile
===================================================================
--- graphics/ksaneplugin/Makefile
+++ graphics/ksaneplugin/Makefile
@@ -9,8 +9,8 @@
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>
Index: graphics/ksnapshot/Makefile
===================================================================
--- graphics/ksnapshot/Makefile
+++ graphics/ksnapshot/Makefile
@@ -9,8 +9,8 @@
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
Index: graphics/libkdcraw-kde4/Makefile
===================================================================
--- graphics/libkdcraw-kde4/Makefile
+++ graphics/libkdcraw-kde4/Makefile
@@ -18,8 +18,8 @@
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
Index: graphics/libkexiv2-kde4/Makefile
===================================================================
--- graphics/libkexiv2-kde4/Makefile
+++ graphics/libkexiv2-kde4/Makefile
@@ -12,8 +12,8 @@
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
Index: graphics/libkface/Makefile
===================================================================
--- graphics/libkface/Makefile
+++ graphics/libkface/Makefile
@@ -14,8 +14,8 @@
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
Index: graphics/libkipi-kde4/Makefile
===================================================================
--- graphics/libkipi-kde4/Makefile
+++ graphics/libkipi-kde4/Makefile
@@ -11,8 +11,8 @@
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
Index: graphics/libkipiplugins/Makefile
===================================================================
--- graphics/libkipiplugins/Makefile
+++ graphics/libkipiplugins/Makefile
@@ -10,7 +10,7 @@
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>
Index: graphics/libksane/Makefile
===================================================================
--- graphics/libksane/Makefile
+++ graphics/libksane/Makefile
@@ -12,8 +12,8 @@
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
Index: graphics/libkscreen/Makefile
===================================================================
--- graphics/libkscreen/Makefile
+++ graphics/libkscreen/Makefile
@@ -15,8 +15,8 @@
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
Index: graphics/okular/Makefile
===================================================================
--- graphics/okular/Makefile
+++ graphics/okular/Makefile
@@ -21,11 +21,11 @@
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
Index: graphics/showimage/Makefile
===================================================================
--- graphics/showimage/Makefile
+++ graphics/showimage/Makefile
@@ -13,8 +13,8 @@
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}
Index: graphics/skanlite/Makefile
===================================================================
--- graphics/skanlite/Makefile
+++ graphics/skanlite/Makefile
@@ -12,8 +12,8 @@
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>
Index: irc/konversation-kde4/Makefile
===================================================================
--- irc/konversation-kde4/Makefile
+++ irc/konversation-kde4/Makefile
@@ -12,8 +12,8 @@
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 \
Index: irc/kvirc/Makefile
===================================================================
--- irc/kvirc/Makefile
+++ irc/kvirc/Makefile
@@ -66,8 +66,8 @@
.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)
Index: japanese/kiten/Makefile
===================================================================
--- japanese/kiten/Makefile
+++ japanese/kiten/Makefile
@@ -10,8 +10,8 @@
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
Index: lang/kturtle/Makefile
===================================================================
--- lang/kturtle/Makefile
+++ lang/kturtle/Makefile
@@ -9,8 +9,8 @@
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>
Index: mail/kbiff/Makefile
===================================================================
--- mail/kbiff/Makefile
+++ mail/kbiff/Makefile
@@ -12,10 +12,10 @@
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>
Index: mail/kshowmail/Makefile
===================================================================
--- mail/kshowmail/Makefile
+++ mail/kshowmail/Makefile
@@ -12,10 +12,10 @@
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>
Index: math/abakus/Makefile
===================================================================
--- math/abakus/Makefile
+++ math/abakus/Makefile
@@ -15,9 +15,9 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex
LIB_DEPENDS= libmpfr.so:math/mpfr
-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
Index: math/analitza/Makefile
===================================================================
--- math/analitza/Makefile
+++ math/analitza/Makefile
@@ -10,8 +10,8 @@
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
Index: math/cantor/Makefile
===================================================================
--- math/cantor/Makefile
+++ math/cantor/Makefile
@@ -14,8 +14,8 @@
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
Index: math/kalgebra/Makefile
===================================================================
--- math/kalgebra/Makefile
+++ math/kalgebra/Makefile
@@ -12,9 +12,10 @@
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
Index: math/kbruch/Makefile
===================================================================
--- math/kbruch/Makefile
+++ math/kbruch/Makefile
@@ -9,8 +9,8 @@
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>
Index: math/kcalc/Makefile
===================================================================
--- math/kcalc/Makefile
+++ math/kcalc/Makefile
@@ -12,8 +12,8 @@
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>
Index: math/kig/Makefile
===================================================================
--- math/kig/Makefile
+++ math/kig/Makefile
@@ -11,8 +11,8 @@
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>
Index: math/kmplot/Makefile
===================================================================
--- math/kmplot/Makefile
+++ math/kmplot/Makefile
@@ -9,8 +9,8 @@
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>
Index: math/labplot/Makefile
===================================================================
--- math/labplot/Makefile
+++ math/labplot/Makefile
@@ -15,10 +15,10 @@
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:
Index: math/rkward-kde4/Makefile
===================================================================
--- math/rkward-kde4/Makefile
+++ math/rkward-kde4/Makefile
@@ -15,13 +15,13 @@
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
Index: math/rocs/Makefile
===================================================================
--- math/rocs/Makefile
+++ math/rocs/Makefile
@@ -12,8 +12,8 @@
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
Index: misc/artikulate/Makefile
===================================================================
--- misc/artikulate/Makefile
+++ misc/artikulate/Makefile
@@ -15,8 +15,8 @@
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
Index: misc/kde-thumbnailer-chm/Makefile
===================================================================
--- misc/kde-thumbnailer-chm/Makefile
+++ misc/kde-thumbnailer-chm/Makefile
@@ -12,8 +12,8 @@
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}
Index: misc/kde-thumbnailer-epub/Makefile
===================================================================
--- misc/kde-thumbnailer-epub/Makefile
+++ misc/kde-thumbnailer-epub/Makefile
@@ -9,8 +9,8 @@
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}
Index: misc/kde-thumbnailer-fb2/Makefile
===================================================================
--- misc/kde-thumbnailer-fb2/Makefile
+++ misc/kde-thumbnailer-fb2/Makefile
@@ -9,8 +9,8 @@
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}
Index: misc/kde4-l10n/Makefile
===================================================================
--- misc/kde4-l10n/Makefile
+++ misc/kde4-l10n/Makefile
@@ -8,8 +8,7 @@
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 @@
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}
Index: misc/kde4-l10n/files/bsd.l10n.mk
===================================================================
--- misc/kde4-l10n/files/bsd.l10n.mk
+++ misc/kde4-l10n/files/bsd.l10n.mk
@@ -4,8 +4,8 @@
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
Index: misc/kdeedu4/Makefile
===================================================================
--- misc/kdeedu4/Makefile
+++ misc/kdeedu4/Makefile
@@ -8,8 +8,7 @@
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_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>
Index: misc/kdeutils4/Makefile
===================================================================
--- misc/kdeutils4/Makefile
+++ misc/kdeutils4/Makefile
@@ -8,8 +8,7 @@
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_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>
Index: misc/kgeography/Makefile
===================================================================
--- misc/kgeography/Makefile
+++ misc/kgeography/Makefile
@@ -9,8 +9,8 @@
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>
Index: misc/klettres/Makefile
===================================================================
--- misc/klettres/Makefile
+++ misc/klettres/Makefile
@@ -9,8 +9,8 @@
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>
Index: misc/krecipes-kde4/Makefile
===================================================================
--- misc/krecipes-kde4/Makefile
+++ misc/krecipes-kde4/Makefile
@@ -11,9 +11,9 @@
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
Index: misc/ktouch/Makefile
===================================================================
--- misc/ktouch/Makefile
+++ misc/ktouch/Makefile
@@ -11,8 +11,8 @@
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
Index: misc/kwordquiz/Makefile
===================================================================
--- misc/kwordquiz/Makefile
+++ misc/kwordquiz/Makefile
@@ -9,8 +9,8 @@
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>
Index: misc/libkdeedu/Makefile
===================================================================
--- misc/libkdeedu/Makefile
+++ misc/libkdeedu/Makefile
@@ -10,8 +10,8 @@
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
Index: misc/parley/Makefile
===================================================================
--- misc/parley/Makefile
+++ misc/parley/Makefile
@@ -9,9 +9,9 @@
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
Index: misc/tellico-kde4/Makefile
===================================================================
--- misc/tellico-kde4/Makefile
+++ misc/tellico-kde4/Makefile
@@ -18,9 +18,9 @@
libexempi.so:textproc/exempi \
libqjson.so:devel/qjson
-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>
Index: multimedia/bangarang/Makefile
===================================================================
--- multimedia/bangarang/Makefile
+++ multimedia/bangarang/Makefile
@@ -15,10 +15,10 @@
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}
Index: multimedia/dragon/Makefile
===================================================================
--- multimedia/dragon/Makefile
+++ multimedia/dragon/Makefile
@@ -14,8 +14,8 @@
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>
Index: multimedia/gstreamer-qt4/Makefile
===================================================================
--- multimedia/gstreamer-qt4/Makefile
+++ multimedia/gstreamer-qt4/Makefile
@@ -17,11 +17,11 @@
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
Index: multimedia/k9copy-kde4/Makefile
===================================================================
--- multimedia/k9copy-kde4/Makefile
+++ multimedia/k9copy-kde4/Makefile
@@ -17,8 +17,8 @@
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
Index: multimedia/kaffeine/Makefile
===================================================================
--- multimedia/kaffeine/Makefile
+++ multimedia/kaffeine/Makefile
@@ -16,8 +16,8 @@
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
Index: multimedia/kdemultimedia4-ffmpegthumbs/Makefile
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/Makefile
+++ multimedia/kdemultimedia4-ffmpegthumbs/Makefile
@@ -15,8 +15,8 @@
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>
Index: multimedia/kdemultimedia4-mplayerthumbs/Makefile
===================================================================
--- multimedia/kdemultimedia4-mplayerthumbs/Makefile
+++ multimedia/kdemultimedia4-mplayerthumbs/Makefile
@@ -15,8 +15,8 @@
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>
Index: multimedia/kdemultimedia4/Makefile
===================================================================
--- multimedia/kdemultimedia4/Makefile
+++ multimedia/kdemultimedia4/Makefile
@@ -8,31 +8,30 @@
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>
Index: multimedia/kdenlive/Makefile
===================================================================
--- multimedia/kdenlive/Makefile
+++ multimedia/kdenlive/Makefile
@@ -14,11 +14,11 @@
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.
Index: multimedia/kmplayer-kde4/Makefile
===================================================================
--- multimedia/kmplayer-kde4/Makefile
+++ multimedia/kmplayer-kde4/Makefile
@@ -16,10 +16,10 @@
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
Index: multimedia/mlt/Makefile
===================================================================
--- multimedia/mlt/Makefile
+++ multimedia/mlt/Makefile
@@ -68,9 +68,10 @@
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
Index: multimedia/phonon-gstreamer/Makefile
===================================================================
--- multimedia/phonon-gstreamer/Makefile
+++ multimedia/phonon-gstreamer/Makefile
@@ -15,14 +15,14 @@
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
Index: multimedia/phonon-vlc/Makefile
===================================================================
--- multimedia/phonon-vlc/Makefile
+++ multimedia/phonon-vlc/Makefile
@@ -14,10 +14,10 @@
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
Index: multimedia/phonon-xine/Makefile
===================================================================
--- multimedia/phonon-xine/Makefile
+++ multimedia/phonon-xine/Makefile
@@ -15,8 +15,8 @@
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
Index: multimedia/phonon/Makefile
===================================================================
--- multimedia/phonon/Makefile
+++ multimedia/phonon/Makefile
@@ -14,10 +14,10 @@
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
Index: multimedia/subtitlecomposer-kde4/Makefile
===================================================================
--- multimedia/subtitlecomposer-kde4/Makefile
+++ multimedia/subtitlecomposer-kde4/Makefile
@@ -11,8 +11,8 @@
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
Index: net-im/ekiga/Makefile
===================================================================
--- net-im/ekiga/Makefile
+++ net-im/ekiga/Makefile
@@ -20,7 +20,7 @@
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 @@
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
Index: net-im/hotot/Makefile
===================================================================
--- net-im/hotot/Makefile
+++ net-im/hotot/Makefile
@@ -15,7 +15,7 @@
GH_ACCOUNT= lyricat
GH_PROJECT= Hotot
-USES= cmake gettext python
+USES= cmake gettext kde:4 python
USE_GNOME= intltool
INSTALLS_ICONS= yes
@@ -48,7 +48,7 @@
.endif
.if ${PORT_OPTIONS:MKDE4}
-USE_KDE4= automoc4 kdelibs
+USE_KDE= automoc4 kdelibs
.else
CMAKE_ARGS+= -DWITH_KDE=off
.endif
Index: net-im/kde-telepathy/Makefile
===================================================================
--- net-im/kde-telepathy/Makefile
+++ net-im/kde-telepathy/Makefile
@@ -7,17 +7,16 @@
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
+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
-USE_KDE4= # blank, needed to get KDE4_VERSION
-USES= metaport
+USES= kde:4 metaport
OPTIONS_DEFINE= PLASMA SEND_FILE
OPTIONS_DEFAULT=PLASMA SEND_FILE
@@ -28,11 +27,11 @@
.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>
Index: net-im/kmess-kde4/Makefile
===================================================================
--- net-im/kmess-kde4/Makefile
+++ net-im/kmess-kde4/Makefile
@@ -13,9 +13,9 @@
LIB_DEPENDS= libqca.so:devel/qca \
libgif.so:graphics/giflib
+USES= cmake gettext kde:4 tar:bzip2
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>
Index: net-im/kopete-kde4/Makefile
===================================================================
--- net-im/kopete-kde4/Makefile
+++ net-im/kopete-kde4/Makefile
@@ -20,10 +20,10 @@
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
Index: net-im/ktp-accounts-kcm/Makefile
===================================================================
--- net-im/ktp-accounts-kcm/Makefile
+++ net-im/ktp-accounts-kcm/Makefile
@@ -11,11 +11,11 @@
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
Index: net-im/ktp-approver/Makefile
===================================================================
--- net-im/ktp-approver/Makefile
+++ net-im/ktp-approver/Makefile
@@ -10,10 +10,10 @@
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>
Index: net-im/ktp-auth-handler/Makefile
===================================================================
--- net-im/ktp-auth-handler/Makefile
+++ net-im/ktp-auth-handler/Makefile
@@ -13,9 +13,9 @@
libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/ktp-common-internals/Makefile
===================================================================
--- net-im/ktp-common-internals/Makefile
+++ net-im/ktp-common-internals/Makefile
@@ -12,10 +12,10 @@
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}
Index: net-im/ktp-contact-list/Makefile
===================================================================
--- net-im/ktp-contact-list/Makefile
+++ net-im/ktp-contact-list/Makefile
@@ -12,8 +12,8 @@
libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/ktp-contact-runner/Makefile
===================================================================
--- net-im/ktp-contact-runner/Makefile
+++ net-im/ktp-contact-runner/Makefile
@@ -11,8 +11,8 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/ktp-desktop-applets/Makefile
===================================================================
--- net-im/ktp-desktop-applets/Makefile
+++ net-im/ktp-desktop-applets/Makefile
@@ -10,8 +10,8 @@
LIB_DEPENDS= libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/ktp-filetransfer-handler/Makefile
===================================================================
--- net-im/ktp-filetransfer-handler/Makefile
+++ net-im/ktp-filetransfer-handler/Makefile
@@ -11,8 +11,8 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/ktp-kded-integration-module/Makefile
===================================================================
--- net-im/ktp-kded-integration-module/Makefile
+++ net-im/ktp-kded-integration-module/Makefile
@@ -11,8 +11,8 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/ktp-send-file/Makefile
===================================================================
--- net-im/ktp-send-file/Makefile
+++ net-im/ktp-send-file/Makefile
@@ -10,11 +10,11 @@
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>
Index: net-im/ktp-text-ui/Makefile
===================================================================
--- net-im/ktp-text-ui/Makefile
+++ net-im/ktp-text-ui/Makefile
@@ -11,12 +11,12 @@
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>
Index: net-im/licq-qt-gui/Makefile
===================================================================
--- net-im/licq-qt-gui/Makefile
+++ net-im/licq-qt-gui/Makefile
@@ -31,7 +31,8 @@
-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
Index: net-im/plasma-applet-ktp/Makefile
===================================================================
--- net-im/plasma-applet-ktp/Makefile
+++ net-im/plasma-applet-ktp/Makefile
@@ -13,9 +13,9 @@
LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-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>
Index: net-im/telepathy-logger-qt4/Makefile
===================================================================
--- net-im/telepathy-logger-qt4/Makefile
+++ net-im/telepathy-logger-qt4/Makefile
@@ -17,11 +17,11 @@
libtelepathy-logger.so:net-im/telepathy-logger \
libtelepathy-qt4.so:net-im/telepathy-qt4
+USES= bison:build cmake kde:4 pkgconfig python:build tar:bzip2
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
Index: net-p2p/amule-devel/Makefile
===================================================================
--- net-p2p/amule-devel/Makefile
+++ net-p2p/amule-devel/Makefile
@@ -90,10 +90,11 @@
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 @@
${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
Index: net-p2p/amule-devel/pkg-plist
===================================================================
--- net-p2p/amule-devel/pkg-plist
+++ 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
Index: net-p2p/amule/Makefile
===================================================================
--- net-p2p/amule/Makefile
+++ net-p2p/amule/Makefile
@@ -88,10 +88,11 @@
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 @@
${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
Index: net-p2p/amule/pkg-plist
===================================================================
--- net-p2p/amule/pkg-plist
+++ 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
Index: net-p2p/ktorrent/Makefile
===================================================================
--- net-p2p/ktorrent/Makefile
+++ net-p2p/ktorrent/Makefile
@@ -15,10 +15,10 @@
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*
Index: net-p2p/libktorrent/Makefile
===================================================================
--- net-p2p/libktorrent/Makefile
+++ net-p2p/libktorrent/Makefile
@@ -14,9 +14,9 @@
libgmp.so:math/gmp \
libqca.so:devel/qca
-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
Index: net/cagibi/Makefile
===================================================================
--- net/cagibi/Makefile
+++ net/cagibi/Makefile
@@ -9,8 +9,8 @@
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
Index: net/kdenetwork4-filesharing/Makefile
===================================================================
--- net/kdenetwork4-filesharing/Makefile
+++ net/kdenetwork4-filesharing/Makefile
@@ -9,8 +9,8 @@
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>
Index: net/kdenetwork4-strigi-analyzers/Makefile
===================================================================
--- net/kdenetwork4-strigi-analyzers/Makefile
+++ net/kdenetwork4-strigi-analyzers/Makefile
@@ -11,8 +11,8 @@
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>
Index: net/kdenetwork4/Makefile
===================================================================
--- net/kdenetwork4/Makefile
+++ net/kdenetwork4/Makefile
@@ -7,31 +7,30 @@
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>
Index: net/kget/Makefile
===================================================================
--- net/kget/Makefile
+++ net/kget/Makefile
@@ -16,10 +16,10 @@
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
Index: net/kio-upnp-ms/Makefile
===================================================================
--- net/kio-upnp-ms/Makefile
+++ net/kio-upnp-ms/Makefile
@@ -13,8 +13,8 @@
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
Index: net/knemo-kde4/Makefile
===================================================================
--- net/knemo-kde4/Makefile
+++ net/knemo-kde4/Makefile
@@ -9,10 +9,10 @@
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}
Index: net/krdc/Makefile
===================================================================
--- net/krdc/Makefile
+++ net/krdc/Makefile
@@ -13,8 +13,8 @@
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
Index: net/krfb/Makefile
===================================================================
--- net/krfb/Makefile
+++ net/krfb/Makefile
@@ -11,8 +11,8 @@
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
Index: net/kwooty/Makefile
===================================================================
--- net/kwooty/Makefile
+++ net/kwooty/Makefile
@@ -14,9 +14,9 @@
${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:
Index: net/libkfbapi/Makefile
===================================================================
--- net/libkfbapi/Makefile
+++ net/libkfbapi/Makefile
@@ -14,8 +14,8 @@
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
Index: net/libkvkontakte/Makefile
===================================================================
--- net/libkvkontakte/Makefile
+++ net/libkvkontakte/Makefile
@@ -14,9 +14,9 @@
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}"
Index: net/libproxy-kde/Makefile
===================================================================
--- net/libproxy-kde/Makefile
+++ net/libproxy-kde/Makefile
@@ -16,7 +16,8 @@
PLIST= ${.CURDIR}/pkg-plist
ALL_TARGET= config_kde
-USE_KDE4= runtime
+USE_KDE= runtime
+USES+= kde:4
LIBPROXY_SLAVE= kde
Index: net/smb4k-kde4/Makefile
===================================================================
--- net/smb4k-kde4/Makefile
+++ net/smb4k-kde4/Makefile
@@ -16,9 +16,9 @@
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
Index: net/zeroconf-ioslave/Makefile
===================================================================
--- net/zeroconf-ioslave/Makefile
+++ net/zeroconf-ioslave/Makefile
@@ -9,8 +9,8 @@
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>
Index: ports-mgmt/kpackagekit/Makefile
===================================================================
--- ports-mgmt/kpackagekit/Makefile
+++ ports-mgmt/kpackagekit/Makefile
@@ -15,9 +15,9 @@
LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt4
-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
Index: print/frescobaldi/Makefile
===================================================================
--- print/frescobaldi/Makefile
+++ print/frescobaldi/Makefile
@@ -16,9 +16,9 @@
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:
Index: print/kde4-print-manager/Makefile
===================================================================
--- print/kde4-print-manager/Makefile
+++ print/kde4-print-manager/Makefile
@@ -12,8 +12,8 @@
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
Index: print/kover/Makefile
===================================================================
--- print/kover/Makefile
+++ print/kover/Makefile
@@ -16,11 +16,11 @@
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 \
Index: science/kalzium/Makefile
===================================================================
--- science/kalzium/Makefile
+++ science/kalzium/Makefile
@@ -18,8 +18,8 @@
${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 \
Index: science/step/Makefile
===================================================================
--- science/step/Makefile
+++ science/step/Makefile
@@ -13,8 +13,8 @@
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:
Index: security/kgpg-kde4/Makefile
===================================================================
--- security/kgpg-kde4/Makefile
+++ security/kgpg-kde4/Makefile
@@ -12,8 +12,8 @@
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>
Index: security/kwalletmanager/Makefile
===================================================================
--- security/kwalletmanager/Makefile
+++ security/kwalletmanager/Makefile
@@ -10,8 +10,8 @@
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>
Index: security/py-keyrings.alt/Makefile
===================================================================
--- security/py-keyrings.alt/Makefile
+++ security/py-keyrings.alt/Makefile
@@ -27,7 +27,8 @@
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
Index: security/subversion-kwallet/Makefile
===================================================================
--- security/subversion-kwallet/Makefile
+++ security/subversion-kwallet/Makefile
@@ -17,11 +17,12 @@
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
Index: sysutils/baloo-widgets/Makefile
===================================================================
--- sysutils/baloo-widgets/Makefile
+++ sysutils/baloo-widgets/Makefile
@@ -10,9 +10,8 @@
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
Index: sysutils/baloo/Makefile
===================================================================
--- sysutils/baloo/Makefile
+++ sysutils/baloo/Makefile
@@ -15,10 +15,9 @@
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
Index: sysutils/filelight-kde4/Makefile
===================================================================
--- sysutils/filelight-kde4/Makefile
+++ sysutils/filelight-kde4/Makefile
@@ -10,8 +10,8 @@
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>
Index: sysutils/k3b-kde4/Makefile
===================================================================
--- sysutils/k3b-kde4/Makefile
+++ sysutils/k3b-kde4/Makefile
@@ -16,10 +16,10 @@
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
Index: sysutils/kcm-polkit-kde/Makefile
===================================================================
--- sysutils/kcm-polkit-kde/Makefile
+++ sysutils/kcm-polkit-kde/Makefile
@@ -12,11 +12,11 @@
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 @@
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
Index: sysutils/kcron/Makefile
===================================================================
--- sysutils/kcron/Makefile
+++ sysutils/kcron/Makefile
@@ -9,8 +9,8 @@
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>
Index: sysutils/kdeadmin4/Makefile
===================================================================
--- sysutils/kdeadmin4/Makefile
+++ sysutils/kdeadmin4/Makefile
@@ -7,19 +7,18 @@
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>
Index: sysutils/kdf/Makefile
===================================================================
--- sysutils/kdf/Makefile
+++ sysutils/kdf/Makefile
@@ -10,8 +10,8 @@
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>
Index: sysutils/kdirstat/Makefile
===================================================================
--- sysutils/kdirstat/Makefile
+++ sysutils/kdirstat/Makefile
@@ -15,9 +15,9 @@
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
Index: sysutils/kfilemetadata/Makefile
===================================================================
--- sysutils/kfilemetadata/Makefile
+++ sysutils/kfilemetadata/Makefile
@@ -17,8 +17,8 @@
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
Index: sysutils/kfloppy/Makefile
===================================================================
--- sysutils/kfloppy/Makefile
+++ sysutils/kfloppy/Makefile
@@ -10,8 +10,8 @@
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>
Index: sysutils/knutclient-kde4/Makefile
===================================================================
--- sysutils/knutclient-kde4/Makefile
+++ sysutils/knutclient-kde4/Makefile
@@ -19,8 +19,8 @@
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>
Index: sysutils/krename-kde4/Makefile
===================================================================
--- sysutils/krename-kde4/Makefile
+++ sysutils/krename-kde4/Makefile
@@ -13,8 +13,8 @@
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:
Index: sysutils/kshutdown-kde4/Makefile
===================================================================
--- sysutils/kshutdown-kde4/Makefile
+++ sysutils/kshutdown-kde4/Makefile
@@ -9,9 +9,9 @@
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}
Index: sysutils/ksysguardd/Makefile
===================================================================
--- sysutils/ksysguardd/Makefile
+++ sysutils/ksysguardd/Makefile
@@ -11,8 +11,7 @@
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"
Index: sysutils/ksystemlog/Makefile
===================================================================
--- sysutils/ksystemlog/Makefile
+++ sysutils/ksystemlog/Makefile
@@ -9,8 +9,8 @@
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>
Index: sysutils/kuser/Makefile
===================================================================
--- sysutils/kuser/Makefile
+++ sysutils/kuser/Makefile
@@ -9,8 +9,8 @@
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>
Index: sysutils/nepomuk-core/Makefile
===================================================================
--- sysutils/nepomuk-core/Makefile
+++ sysutils/nepomuk-core/Makefile
@@ -18,9 +18,9 @@
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
Index: sysutils/nepomuk-widgets/Makefile
===================================================================
--- sysutils/nepomuk-widgets/Makefile
+++ sysutils/nepomuk-widgets/Makefile
@@ -10,8 +10,8 @@
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
Index: sysutils/plasma-applet-apcups/Makefile
===================================================================
--- sysutils/plasma-applet-apcups/Makefile
+++ sysutils/plasma-applet-apcups/Makefile
@@ -13,8 +13,8 @@
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>
Index: sysutils/policykit-qt/Makefile
===================================================================
--- sysutils/policykit-qt/Makefile
+++ sysutils/policykit-qt/Makefile
@@ -14,10 +14,10 @@
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
Index: sysutils/polkit-kde/Makefile
===================================================================
--- sysutils/polkit-kde/Makefile
+++ sysutils/polkit-kde/Makefile
@@ -15,9 +15,9 @@
LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt
-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
Index: sysutils/polkit-qt/Makefile
===================================================================
--- sysutils/polkit-qt/Makefile
+++ sysutils/polkit-qt/Makefile
@@ -19,11 +19,11 @@
-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:
Index: sysutils/qzeitgeist/Makefile
===================================================================
--- sysutils/qzeitgeist/Makefile
+++ sysutils/qzeitgeist/Makefile
@@ -20,10 +20,10 @@
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.
Index: sysutils/sweeper/Makefile
===================================================================
--- sysutils/sweeper/Makefile
+++ sysutils/sweeper/Makefile
@@ -10,8 +10,8 @@
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>
Index: textproc/dikt/Makefile
===================================================================
--- textproc/dikt/Makefile
+++ textproc/dikt/Makefile
@@ -9,10 +9,10 @@
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 \
Index: textproc/kdiff3/Makefile
===================================================================
--- textproc/kdiff3/Makefile
+++ textproc/kdiff3/Makefile
@@ -12,9 +12,9 @@
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
Index: textproc/kompare/Makefile
===================================================================
--- textproc/kompare/Makefile
+++ textproc/kompare/Makefile
@@ -12,8 +12,8 @@
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>
Index: textproc/libkomparediff2/Makefile
===================================================================
--- textproc/libkomparediff2/Makefile
+++ textproc/libkomparediff2/Makefile
@@ -10,8 +10,8 @@
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
Index: textproc/uim-kde4/Makefile
===================================================================
--- textproc/uim-kde4/Makefile
+++ textproc/uim-kde4/Makefile
@@ -10,14 +10,15 @@
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
Index: www/choqok/Makefile
===================================================================
--- www/choqok/Makefile
+++ www/choqok/Makefile
@@ -17,10 +17,10 @@
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>
Index: www/kdewebdev4/Makefile
===================================================================
--- www/kdewebdev4/Makefile
+++ www/kdewebdev4/Makefile
@@ -14,9 +14,9 @@
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
Index: www/kpartsplugin/Makefile
===================================================================
--- www/kpartsplugin/Makefile
+++ www/kpartsplugin/Makefile
@@ -10,9 +10,9 @@
MAINTAINER= avilla@FreeBSD.org
COMMENT= Browser file viewer using KDE technology
-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
Index: www/kwebkitpart/Makefile
===================================================================
--- www/kwebkitpart/Makefile
+++ www/kwebkitpart/Makefile
@@ -9,10 +9,10 @@
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
Index: www/opera/Makefile
===================================================================
--- www/opera/Makefile
+++ www/opera/Makefile
@@ -46,7 +46,8 @@
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>
Index: www/qupzilla-qt4/Makefile
===================================================================
--- www/qupzilla-qt4/Makefile
+++ www/qupzilla-qt4/Makefile
@@ -37,7 +37,8 @@
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:
Index: www/rekonq/Makefile
===================================================================
--- www/rekonq/Makefile
+++ www/rekonq/Makefile
@@ -9,8 +9,8 @@
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 @@
-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:
Index: x11-clocks/amor/Makefile
===================================================================
--- x11-clocks/amor/Makefile
+++ x11-clocks/amor/Makefile
@@ -9,8 +9,8 @@
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>
Index: x11-clocks/kdetoys4/Makefile
===================================================================
--- x11-clocks/kdetoys4/Makefile
+++ x11-clocks/kdetoys4/Makefile
@@ -7,19 +7,18 @@
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>
Index: x11-clocks/kteatime/Makefile
===================================================================
--- x11-clocks/kteatime/Makefile
+++ x11-clocks/kteatime/Makefile
@@ -9,8 +9,8 @@
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>
Index: x11-clocks/ktimer/Makefile
===================================================================
--- x11-clocks/ktimer/Makefile
+++ x11-clocks/ktimer/Makefile
@@ -9,8 +9,8 @@
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>
Index: x11-clocks/ktux/Makefile
===================================================================
--- x11-clocks/ktux/Makefile
+++ x11-clocks/ktux/Makefile
@@ -9,8 +9,8 @@
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>
Index: x11-clocks/plasma-applet-adjustableclock/Makefile
===================================================================
--- x11-clocks/plasma-applet-adjustableclock/Makefile
+++ x11-clocks/plasma-applet-adjustableclock/Makefile
@@ -13,8 +13,8 @@
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}
Index: x11-clocks/plasma-applet-geekclock/Makefile
===================================================================
--- x11-clocks/plasma-applet-geekclock/Makefile
+++ x11-clocks/plasma-applet-geekclock/Makefile
@@ -11,8 +11,8 @@
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
Index: x11-fm/krusader2/Makefile
===================================================================
--- x11-fm/krusader2/Makefile
+++ x11-fm/krusader2/Makefile
@@ -13,8 +13,8 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext 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>
Index: x11-themes/gtk-qt4-engine/Makefile
===================================================================
--- x11-themes/gtk-qt4-engine/Makefile
+++ x11-themes/gtk-qt4-engine/Makefile
@@ -12,8 +12,8 @@
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
Index: x11-themes/kde-gtk-config/Makefile
===================================================================
--- x11-themes/kde-gtk-config/Makefile
+++ x11-themes/kde-gtk-config/Makefile
@@ -9,9 +9,9 @@
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:
Index: x11-themes/kde4-base-artwork/Makefile
===================================================================
--- x11-themes/kde4-base-artwork/Makefile
+++ x11-themes/kde4-base-artwork/Makefile
@@ -12,8 +12,8 @@
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
Index: x11-themes/kde4-icons-oxygen/Makefile
===================================================================
--- x11-themes/kde4-icons-oxygen/Makefile
+++ x11-themes/kde4-icons-oxygen/Makefile
@@ -11,8 +11,7 @@
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'
Index: x11-themes/kde4-style-bespin/Makefile
===================================================================
--- x11-themes/kde4-style-bespin/Makefile
+++ x11-themes/kde4-style-bespin/Makefile
@@ -15,8 +15,9 @@
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>
Index: x11-themes/kde4-style-nitrogen/Makefile
===================================================================
--- x11-themes/kde4-style-nitrogen/Makefile
+++ x11-themes/kde4-style-nitrogen/Makefile
@@ -15,8 +15,9 @@
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>
Index: x11-themes/kde4-style-oxygen-transparent/Makefile
===================================================================
--- x11-themes/kde4-style-oxygen-transparent/Makefile
+++ x11-themes/kde4-style-oxygen-transparent/Makefile
@@ -13,8 +13,8 @@
LICENSE= GPLv2
-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>
Index: x11-themes/kde4-style-polyester/Makefile
===================================================================
--- x11-themes/kde4-style-polyester/Makefile
+++ x11-themes/kde4-style-polyester/Makefile
@@ -14,8 +14,8 @@
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-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>
Index: x11-themes/kde4-style-skulpture/Makefile
===================================================================
--- x11-themes/kde4-style-skulpture/Makefile
+++ x11-themes/kde4-style-skulpture/Makefile
@@ -13,8 +13,8 @@
LICENSE= GPLv3
-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>
Index: x11-themes/kde4-wallpapers/Makefile
===================================================================
--- x11-themes/kde4-wallpapers/Makefile
+++ x11-themes/kde4-wallpapers/Makefile
@@ -9,8 +9,8 @@
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
Index: x11-themes/kde4-windeco-crystal/Makefile
===================================================================
--- x11-themes/kde4-windeco-crystal/Makefile
+++ x11-themes/kde4-windeco-crystal/Makefile
@@ -14,10 +14,10 @@
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>
Index: x11-themes/kde4-windeco-dekorator/Makefile
===================================================================
--- x11-themes/kde4-windeco-dekorator/Makefile
+++ x11-themes/kde4-windeco-dekorator/Makefile
@@ -16,9 +16,9 @@
LIB_DEPENDS= libqimageblitz.so:x11/qimageblitz
-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>
Index: x11-themes/kdeartwork4/Makefile
===================================================================
--- x11-themes/kdeartwork4/Makefile
+++ x11-themes/kdeartwork4/Makefile
@@ -12,8 +12,8 @@
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
Index: x11-themes/qtcurve/Makefile
===================================================================
--- x11-themes/qtcurve/Makefile
+++ x11-themes/qtcurve/Makefile
@@ -70,7 +70,8 @@
.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
Index: x11/kactivities/Makefile
===================================================================
--- x11/kactivities/Makefile
+++ 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 @@
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
Index: x11/kactivitymanagerd/Makefile
===================================================================
--- x11/kactivitymanagerd/Makefile
+++ 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 @@
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
Index: x11/kde4-baseapps/Makefile
===================================================================
--- x11/kde4-baseapps/Makefile
+++ x11/kde4-baseapps/Makefile
@@ -12,10 +12,10 @@
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_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>
Index: x11/kde4-runtime/Makefile
===================================================================
--- x11/kde4-runtime/Makefile
+++ x11/kde4-runtime/Makefile
@@ -22,10 +22,10 @@
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
Index: x11/kde4-workspace/Makefile
===================================================================
--- x11/kde4-workspace/Makefile
+++ x11/kde4-workspace/Makefile
@@ -24,7 +24,7 @@
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 @@
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_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
Index: x11/kde4/Makefile
===================================================================
--- x11/kde4/Makefile
+++ x11/kde4/Makefile
@@ -8,8 +8,8 @@
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_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_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_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>
Index: x11/kdelibs4/Makefile
===================================================================
--- x11/kdelibs4/Makefile
+++ x11/kdelibs4/Makefile
@@ -30,11 +30,11 @@
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 @@
# -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 \
Index: x11/kgamma/Makefile
===================================================================
--- x11/kgamma/Makefile
+++ x11/kgamma/Makefile
@@ -9,8 +9,8 @@
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
Index: x11/konsole/Makefile
===================================================================
--- x11/konsole/Makefile
+++ x11/konsole/Makefile
@@ -9,8 +9,8 @@
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"
Index: x11/libkonq/Makefile
===================================================================
--- x11/libkonq/Makefile
+++ x11/libkonq/Makefile
@@ -11,8 +11,8 @@
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
Index: x11/plasma-scriptengine-python/Makefile
===================================================================
--- x11/plasma-scriptengine-python/Makefile
+++ x11/plasma-scriptengine-python/Makefile
@@ -10,10 +10,10 @@
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
Index: x11/plasma-scriptengine-ruby/Makefile
===================================================================
--- x11/plasma-scriptengine-ruby/Makefile
+++ x11/plasma-scriptengine-ruby/Makefile
@@ -10,11 +10,11 @@
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
Index: x11/rsibreak-kde4/Makefile
===================================================================
--- x11/rsibreak-kde4/Makefile
+++ x11/rsibreak-kde4/Makefile
@@ -11,9 +11,9 @@
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>
Index: x11/yakuake-kde4/Makefile
===================================================================
--- x11/yakuake-kde4/Makefile
+++ x11/yakuake-kde4/Makefile
@@ -14,9 +14,9 @@
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}"

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 8:30 AM (20 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27737573
Default Alt Text
D6961.id19598.largetrue.diff (239 KB)

Event Timeline