summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2013-03-22 14:18:02 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2013-03-22 14:18:02 +0000
commitd65c037b00c46aa7b10d1803dee20b9bbb57e36b (patch)
treeda82a32e8ce2ded995ae7ba320231491c35220ac
parent- Get rid of no longer needed KDE4_BUILDENV (diff)
Mk/bsd.kde4.mk:
- Don't set CMAKE_BUILD_TYPE for debug builds (cmake.mk already handles it) - Don't set WITH_DEBUG for unstable branch (KDE4_BRANCH) - Remove now useless KDE4_BUILDENV KDE SC ports: - Chase KDE4_BUILDENV removal: replace 'KDE4_BUILDENV= yes' with 'USES= cmake:outsource' and add USE_LDCONFIG if needed
Notes
Notes: svn path=/head/; revision=314933
-rw-r--r--Mk/bsd.kde4.mk31
-rw-r--r--accessibility/jovie/Makefile2
-rw-r--r--accessibility/kaccessible/Makefile2
-rw-r--r--accessibility/kmag/Makefile2
-rw-r--r--accessibility/kmousetool/Makefile2
-rw-r--r--accessibility/kmouth/Makefile2
-rw-r--r--archivers/ark/Makefile3
-rw-r--r--astro/kstars/Makefile2
-rw-r--r--astro/marble/Makefile3
-rw-r--r--audio/juk/Makefile2
-rw-r--r--audio/kio-audiocd/Makefile3
-rw-r--r--audio/kmix/Makefile2
-rw-r--r--audio/kscd/Makefile2
-rw-r--r--audio/libkcddb/Makefile3
-rw-r--r--audio/libkcompactdisc/Makefile3
-rw-r--r--comms/kremotecontrol/Makefile3
-rw-r--r--deskutils/kcharselect/Makefile2
-rw-r--r--deskutils/kdepim4-runtime/Makefile3
-rw-r--r--deskutils/kdepim4/Makefile3
-rw-r--r--deskutils/kdepim44-runtime/Makefile3
-rw-r--r--deskutils/kdepim44/Makefile3
-rw-r--r--deskutils/kdepimlibs4/Makefile3
-rw-r--r--deskutils/kdeplasma-addons/Makefile3
-rw-r--r--deskutils/kruler/Makefile2
-rw-r--r--deskutils/superkaramba/Makefile3
-rw-r--r--devel/kdesdk4/Makefile3
-rw-r--r--devel/p5-perlkde/Makefile3
-rw-r--r--devel/p5-perlqt/Makefile3
-rw-r--r--devel/py-krosspython/Makefile2
-rw-r--r--devel/py-pykde4/Makefile2
-rw-r--r--devel/py-pykdeuic4/Makefile2
-rw-r--r--devel/ruby-korundum/Makefile2
-rw-r--r--devel/ruby-krossruby/Makefile2
-rw-r--r--devel/ruby-qtruby/Makefile2
-rw-r--r--devel/smokegen/Makefile2
-rw-r--r--devel/smokekde/Makefile2
-rw-r--r--devel/smokeqt/Makefile2
-rw-r--r--editors/kate/Makefile3
-rw-r--r--games/blinken/Makefile2
-rw-r--r--games/kajongg/Makefile2
-rw-r--r--games/kanagram/Makefile3
-rw-r--r--games/kdegames4/Makefile3
-rw-r--r--games/khangman/Makefile3
-rw-r--r--games/pairs/Makefile2
-rw-r--r--graphics/gwenview-kde4/Makefile3
-rw-r--r--graphics/kamera-kde4/Makefile2
-rw-r--r--graphics/kcolorchooser/Makefile2
-rw-r--r--graphics/kdegraphics4-mobipocket/Makefile2
-rw-r--r--graphics/kdegraphics4-strigi-analyzer/Makefile2
-rw-r--r--graphics/kdegraphics4-svgpart/Makefile2
-rw-r--r--graphics/kdegraphics4-thumbnailers/Makefile2
-rw-r--r--graphics/kolourpaint/Makefile3
-rw-r--r--graphics/ksaneplugin/Makefile2
-rw-r--r--graphics/ksnapshot/Makefile2
-rw-r--r--graphics/libkdcraw-kde4/Makefile3
-rw-r--r--graphics/libkexiv2-kde4/Makefile3
-rw-r--r--graphics/libkipi-kde4/Makefile3
-rw-r--r--graphics/libksane/Makefile3
-rw-r--r--graphics/okular/Makefile3
-rw-r--r--japanese/kiten/Makefile3
-rw-r--r--lang/kturtle/Makefile2
-rw-r--r--math/analitza/Makefile3
-rw-r--r--math/cantor/Makefile3
-rw-r--r--math/kalgebra/Makefile2
-rw-r--r--math/kbruch/Makefile2
-rw-r--r--math/kcalc/Makefile2
-rw-r--r--math/kig/Makefile2
-rw-r--r--math/kmplot/Makefile2
-rw-r--r--math/rocs/Makefile3
-rw-r--r--misc/kgeography/Makefile2
-rw-r--r--misc/klettres/Makefile2
-rw-r--r--misc/ktouch/Makefile2
-rw-r--r--misc/kwordquiz/Makefile2
-rw-r--r--misc/libkdeedu/Makefile3
-rw-r--r--misc/parley/Makefile2
-rw-r--r--multimedia/dragon/Makefile2
-rw-r--r--multimedia/kdemultimedia4-ffmpegthumbs/Makefile2
-rw-r--r--multimedia/kdemultimedia4-mplayerthumbs/Makefile2
-rw-r--r--net-im/kopete-kde4/Makefile4
-rw-r--r--net/kdenetwork4/Makefile3
-rw-r--r--net/krdc/Makefile3
-rw-r--r--net/krfb/Makefile3
-rw-r--r--print/kdeutils4-printer-applet/Makefile2
-rw-r--r--print/system-config-printer-kde/Makefile2
-rw-r--r--science/kalzium/Makefile3
-rw-r--r--science/step/Makefile2
-rw-r--r--security/kgpg-kde4/Makefile2
-rw-r--r--security/kwallet/Makefile2
-rw-r--r--sysutils/filelight-kde4/Makefile2
-rw-r--r--sysutils/kdeadmin4/Makefile2
-rw-r--r--sysutils/kdf/Makefile2
-rw-r--r--sysutils/kfloppy/Makefile2
-rw-r--r--sysutils/ksysguardd/Makefile2
-rw-r--r--sysutils/nepomuk-core/Makefile3
-rw-r--r--sysutils/sweeper/Makefile2
-rw-r--r--www/kdewebdev4/Makefile3
-rw-r--r--x11-clocks/kdetoys4/Makefile2
-rw-r--r--x11-clocks/ktimer/Makefile2
-rw-r--r--x11-themes/kde4-base-artwork/Makefile2
-rw-r--r--x11-themes/kde4-icons-oxygen/Makefile2
-rw-r--r--x11-themes/kde4-wallpapers/Makefile2
-rw-r--r--x11-themes/kdeartwork4/Makefile2
-rw-r--r--x11/kactivities/Makefile3
-rw-r--r--x11/kde4-baseapps/Makefile3
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kde4-workspace/Makefile3
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/kgamma/Makefile2
-rw-r--r--x11/konsole/Makefile2
-rw-r--r--x11/libkonq/Makefile2
-rw-r--r--x11/plasma-scriptengine-python/Makefile3
-rw-r--r--x11/plasma-scriptengine-ruby/Makefile3
112 files changed, 153 insertions, 147 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index f6d1a99bbbf8..8794d9b78e0a 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -102,7 +102,8 @@ NO_MTREE= yes
. endif
.endif
-PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}"
+PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" \
+ KDE4_VERSION="${KDE4_VERSION}"
# Keep in sync with cmake/modules/PythonMacros.cmake
_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//}
@@ -116,34 +117,6 @@ PLIST_SUB+= PYCACHE="" \
PYO_SUFFIX=pyo
.endif
-# The following definitions are not intended for usage in KDE4-dependent ports.
-.if defined(KDE4_BUILDENV)
-
-USE_CMAKE= yes
-CMAKE_SOURCE_PATH= ${WRKSRC}
-USE_LDCONFIG= yes
-
-. if ${KDE4_BRANCH} == "unstable"
-WITH_DEBUG= yes
-. endif
-
-. if defined(WITH_DEBUG)
-CMAKE_BUILD_TYPE= DebugFull
-. endif
-
-PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}"
-
-CONFIGURE_WRKSRC= ${CMAKE_SOURCE_PATH}/build
-BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC?= ${BUILD_WRKSRC}
-
-post-extract: kde4-create-builddir
-
-kde4-create-builddir:
- ${MKDIR} ${BUILD_WRKSRC}
-
-.endif # defined(KDE4_BUILDENV)
-
.endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index a53ca56c8f23..5ca4a0b5e8e1 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
CONFLICTS= ktts-4.[4-6].*
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
USE_KDE4= kdehier kdeprefix kdelibs automoc4
USE_QT4= xml qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index 54546b2d750f..468e7b88e146 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -16,7 +16,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index 1d43be6cf3e3..b0d1d27b7109 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index 178d35e3a4ee..44f102ceee9d 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_XORG= xtst
MAKE_JOBS_SAFE= yes
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index 51c2a0540acc..1689a2685f1c 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index b2ea18d0c3af..b2e391664859 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -17,8 +17,9 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs libkonq
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= ark.1
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 73651ce98e2a..16fe33c75725 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= xplanet:${PORTSDIR}/astro/xplanet
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= opengl qmake_build moc_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 077619f582a0..bc441595638b 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -13,12 +13,13 @@ COMMENT= Virtual globe and world atlas for KDE
CONFLICTS= kdeedu-4.4.[0-4]
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus declarative gui network \
phonon script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XZ= yes
USE_GMAKE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS= -DMOBILE:BOOL=FALSE
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 49c18d30d288..d9c15c215bef 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -19,7 +19,7 @@ CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= dbus qt3support svg \
moc_build qmake_build rcc_build uic_build
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index 71f15bf49fb1..971ba82afe59 100644
--- a/audio/kio-audiocd/Makefile
+++ b/audio/kio-audiocd/Makefile
@@ -21,8 +21,9 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
automoc4
USE_QT4= moc_build qmake_build rcc_build uic_build
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index f2b2b00cae55..b1b1c90135e8 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= dbus phonon xml \
moc_build qmake_build rcc_build uic_build
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
index cedf72c74fc4..41686379302f 100644
--- a/audio/kscd/Makefile
+++ b/audio/kscd/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
automoc4
USE_QT4= phonon moc_build qmake_build rcc_build uic_build
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index 24b39731b917..4f1566de1cae 100644
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@@ -15,8 +15,9 @@ LIB_DEPENDS= musicbrainz5:${PORTSDIR}/audio/libmusicbrainz5
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XZ= yes
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 40750752b092..88ef83e1f32e 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -13,8 +13,9 @@ COMMENT= KDE library for interfacing with audio CDs
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= dbus phonon moc_build qmake_build rcc_build uic_build
USE_XZ= yes
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index ed6b2868d560..d5be50090000 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -17,8 +17,9 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 982c4590260d..9a54050249bc 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -15,7 +15,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 3eadb83b8319..84128f633d2c 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -23,9 +23,10 @@ USE_XZ= yes
USE_GNOME= libxml2
USE_KDE4= kdehier kdelibs kdeprefix pimlibs \
akonadi automoc4 ontologies sharedmime soprano strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus designer gui network xml xmlpatterns \
qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS= -DKDEPIM_MOBILE_UI:BOOL=OFF
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 63ea5838775d..ca7415724e57 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= libxml2
USE_ICONV= yes
USE_KDE4= kdehier kdelibs kdeprefix pimlibs \
akonadi automoc4 ontologies soprano strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_OPENLDAP= yes
USE_QT4= dbus designer gui network \
qt3support script sql webkit xml \
@@ -36,6 +36,7 @@ USE_QT4= dbus designer gui network \
USE_XORG= x11 xscrnsaver
CMAKE_ARGS+= -DKDEPIM_BUILD_MOBILE:BOOL=FALSE
USE_GMAKE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= kabcclient.1
diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile
index c36bbce44231..fd4958f2c561 100644
--- a/deskutils/kdepim44-runtime/Makefile
+++ b/deskutils/kdepim44-runtime/Makefile
@@ -18,9 +18,10 @@ CONFLICTS_INSTALL= kdepim-runtime-4.[89].*
LATEST_LINK= ${PORTNAME}44
USE_KDE4= pimlibs kdeprefix kdehier sharedmime automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_BZIP2= yes
USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
post-patch:
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 50229238a2dc..584726c7648b 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -23,10 +23,11 @@ CONFLICTS_INSTALL= kdepim-4.[89].*
USE_KDE4= kdelibs pimlibs \
akonadi kdeprefix kdehier automoc4 oxygen
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_BZIP2= yes
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_OPENLDAP= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= kabcclient.1
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 1dda583b2f88..7d69ad6fed55 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -23,10 +23,11 @@ BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
USE_XZ= yes
USE_KDE4= kdelibs akonadi kdeprefix kdehier \
automoc4 ontologies sharedmime soprano
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_OPENLDAP= yes
USE_QT4= dbus designer gui network sql xml \
qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
post-patch:
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index be684b1a59e1..6f796a1379f0 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -23,10 +23,11 @@ CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].*
USE_XZ= yes
USE_KDE4= kdehier kdelibs kdeprefix libkexiv2 pimlibs workspace \
akonadi attica automoc4 qimageblitz sharedmime soprano
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus gui network opengl script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xrender xtst
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= MARBLE IBUS SCIM
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index ce313f61af73..270fa8ff87f5 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 screen ruler
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XORG= x11
USE_XZ= yes
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 26fbdb177e0b..a990dbce4223 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -15,8 +15,9 @@ CONFLICTS= kdeutils-4.[0-7].*
USE_XZ= yes
USE_PYTHON= 2.5+
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 5e9c983a9e4f..3b6546694845 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -26,12 +26,13 @@ USE_XZ= yes
USE_GNOME= libxml2 libxslt
USE_KDE4= kdehier kdelibs kdeprefix libkonq pimlibs sharedmime \
akonadi automoc4 qimageblitz_build strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_PERL5= yes
USE_QT4= dbus designer gui qt3support \
script scripttools sql svg xml \
qmake_build moc_build rcc_build uic_build uic3_build
USE_GMAKE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile
index 2ea7406c39c9..8f3e5c87d0b7 100644
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde/Makefile
@@ -17,10 +17,9 @@ USE_PERL5= yes
USE_GCC= 4.6+
USE_KDE4= kdehier kdeprefix perlqt smokekde automoc4
USE_QT4= qmake_build moc_build uic_build rcc_build
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
-USE_LDCONFIG= yes
# Respect PREFIX
CMAKE_ARGS+= -DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 5c77b0bb8e97..2e05e9042910 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -18,10 +18,9 @@ USE_XZ= yes
USE_PERL5= yes
USE_KDE4= kdehier kdeprefix smokeqt qimageblitz
USE_QT4= qmake_build moc_build uic_build rcc_build
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
-USE_LDCONFIG= yes
# Respect PREFIX
CMAKE_ARGS+= -DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
diff --git a/devel/py-krosspython/Makefile b/devel/py-krosspython/Makefile
index 3610d61c7d32..496ac5165a0e 100644
--- a/devel/py-krosspython/Makefile
+++ b/devel/py-krosspython/Makefile
@@ -16,7 +16,7 @@ USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_PYTHON= 2.5+
USE_QT4= gui qmake_build moc_build uic_build rcc_build
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \
-DBUILD_ruby:BOOL=FALSE \
-DBUILD_java:BOOL=FALSE
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index 1412519c5426..ba7132a0f054 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -31,7 +31,7 @@ USE_KDE4= kdehier kdelibs kdeprefix okular pimlibs \
USE_PYTHON= 2.5+
USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE
MAKE_JOBS_SAFE= yes
diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4/Makefile
index 22fd9fc46197..8781688b5d22 100644
--- a/devel/py-pykdeuic4/Makefile
+++ b/devel/py-pykdeuic4/Makefile
@@ -17,7 +17,7 @@ USE_PYTHON= 2.5+
USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
DISTINFO_FILE= ${PORTSDIR}/devel/py-pykde4/distinfo
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
diff --git a/devel/ruby-korundum/Makefile b/devel/ruby-korundum/Makefile
index 443a596bbbe4..937725c15f06 100644
--- a/devel/ruby-korundum/Makefile
+++ b/devel/ruby-korundum/Makefile
@@ -20,7 +20,7 @@ USE_QT4= dbus network opengl sql svg xml \
qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ruby-krossruby/Makefile b/devel/ruby-krossruby/Makefile
index 0e0c87d0b31e..b52155844bfd 100644
--- a/devel/ruby-krossruby/Makefile
+++ b/devel/ruby-krossruby/Makefile
@@ -21,7 +21,7 @@ USE_KDE4= kdehier kdelibs kdeprefix pimlibs automoc4
USE_QT4= gui qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DBUILD_python:BOOL=FALSE \
-DBUILD_falcon:BOOL=FALSE \
-DBUILD_java:BOOL=FALSE
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index fa04660e97eb..8e5b764a57e1 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -23,7 +23,7 @@ USE_QT4= dbus declarative designer gui network \
qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/devel/smokegen/Makefile b/devel/smokegen/Makefile
index 6b53fa816672..1a956bb692ea 100644
--- a/devel/smokegen/Makefile
+++ b/devel/smokegen/Makefile
@@ -15,7 +15,7 @@ CONFLICTS= kdebindings-smoke-4.[0-6].*
USE_KDE4= kdehier kdeprefix
USE_QT4= xml qmake_build moc_build uic_build rcc_build
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/devel/smokekde/Makefile b/devel/smokekde/Makefile
index ca397b38a895..66a9f44a155a 100644
--- a/devel/smokekde/Makefile
+++ b/devel/smokekde/Makefile
@@ -17,7 +17,7 @@ USE_KDE4= kate kdehier kdelibs kdeprefix okular pimlibs \
USE_QT4= dbus designer gui network opengl qt3support sql svg xml \
qmake_build moc_build uic_build rcc_build
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index b60fb50250ed..44bb53c5539c 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -21,7 +21,7 @@ USE_QT4= dbus declarative designer gui help multimedia \
script sql svg xml xmlpatterns webkit \
qmake_build moc_build uic_build rcc_build
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 7b40501cdba6..35f96d50d632 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -16,10 +16,11 @@ CONFLICTS= kdebase-4.[0-6].* kdelibs-4.[0-6].* kdesdk-4.[0-6].*
USE_XZ= yes
USE_GETTEXT= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4 sharedmime
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_PERL5_BUILD= yes
USE_QT4= dbus gui qt3support script sql xml \
moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= kate.1
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index 5d0607fa4885..eada2d734ca1 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -13,7 +13,7 @@ COMMENT= Memory enhancement game for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index 611a67bafa76..be5cefca6155 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sq
CONFLICTS= kdegames-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix pykde4 automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_PYTHON= yes
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_SQLITE= 3
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 96712228c784..9ee191fc3eb8 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -13,9 +13,10 @@ COMMENT= Letter order game for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 96646e5c78bb..8e65c65a5356 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -20,12 +20,13 @@ LATEST_LINK= ${PORTNAME}4
USE_GL= glu
USE_KDE4= kdehier kdelibs kdeprefix sharedmime automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_OPENAL= al
USE_QT4= dbus gui network opengl qt3support script svg xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
CMAKE_ARGS+= -DBUILD_kajongg:BOOL=FALSE
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= KAJONGG
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index 320111efb041..cbe5e9a6a689 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -13,9 +13,10 @@ COMMENT= Hangman game for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN6= khangman.6
diff --git a/games/pairs/Makefile b/games/pairs/Makefile
index 3bdbf24b56ef..e5f1f27b7666 100644
--- a/games/pairs/Makefile
+++ b/games/pairs/Makefile
@@ -13,7 +13,7 @@ COMMENT= Memory and pairs game for KDE
LICENSE= GPLv2
-KDE4_BUILDENV= yes
+USES= cmake:outsource
MAKE_JOBS_SAFE= yes
USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_QT4= declarative opengl phonon xmlpatterns \
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index ab683f443157..0f0371455011 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -19,9 +19,10 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkipi libkonq \
automoc4 soprano
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qmake_build moc_build uic_build rcc_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 2e1d79d242f1..568a8a0e6de1 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qt3support qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index 7c2bbdf5a971..b6336ddd203f 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 application to select colors from the screen or from a palette
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile
index 914242600cd9..da8f180e0a7c 100644
--- a/graphics/kdegraphics4-mobipocket/Makefile
+++ b/graphics/kdegraphics4-mobipocket/Makefile
@@ -13,7 +13,7 @@ COMMENT= Mobipocket plugins for Strigi indexing, Okular and thumbnails
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix okular automoc4 strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile
index 06bf2b27a432..dad1d2daa37a 100644
--- a/graphics/kdegraphics4-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4 strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile
index f3560e6c19d5..6a07bb275cdb 100644
--- a/graphics/kdegraphics4-svgpart/Makefile
+++ b/graphics/kdegraphics4-svgpart/Makefile
@@ -14,7 +14,7 @@ COMMENT= SVG KPart
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile
index 255f39710982..bd51bcd8ce84 100644
--- a/graphics/kdegraphics4-thumbnailers/Makefile
+++ b/graphics/kdegraphics4-thumbnailers/Makefile
@@ -13,7 +13,7 @@ COMMENT= Thumbnailers for various graphics file formats
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdcraw libkexiv2 automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index b21cc06630b3..7bebfc78b85c 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -13,9 +13,10 @@ COMMENT= KDE 4 paint program
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index a9ae52ccd4f9..82c53b1557a1 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 plugin for scanning through libksane
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libksane automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index 2d4b575adac3..eefe3b0cc5dc 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 screen capture program
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkipi automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qmake_build moc_build uic_build rcc_build
USE_XORG= x11 xext xfixes
USE_XZ= yes
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index e26af7a13910..561ce6ce82f3 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -19,9 +19,10 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
pre-configure:
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index f10ccff234b0..4d3430f63de7 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -18,9 +18,10 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
pre-configure:
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index 88d2ffe97c64..e308514e89a4 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -17,9 +17,10 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
pre-configure:
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index c8812fc2709f..52e443f79882 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -15,9 +15,10 @@ LIB_DEPENDS= sane.1:${PORTSDIR}/graphics/sane-backends
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
pre-configure:
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index a0ca339b7771..bfe059266c77 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -24,9 +24,10 @@ LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre \
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui xml qmake_build moc_build uic_build rcc_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= DVI
diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index 1946d60539f2..82151f91ed8d 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -13,9 +13,10 @@ COMMENT= Japanese reference/study tool for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile
index 2c840f1533e6..83bbaf383627 100644
--- a/lang/kturtle/Makefile
+++ b/lang/kturtle/Makefile
@@ -13,7 +13,7 @@ COMMENT= Educational programming environment for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index 5d7de535c386..aa42f6fd44c2 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -14,8 +14,9 @@ CONFLICTS_INSTALL= kalgebra-4.7.* kdeedu-4.[0-6].*
USE_XZ= yes
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 6d043105082f..de0448b1ca9e 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -17,10 +17,11 @@ LIB_DEPENDS= spectre.1:${PORTSDIR}/print/libspectre \
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qtestlib_build xmlpatterns \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= MAXIMA OCTAVE R
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index f05cbb68e4b3..94b34a4b5dfc 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -17,7 +17,7 @@ CONFLICTS= kdeedu-4.[0-6].*
CMAKE_ARGS= -DBUILD_mobile:BOOL=FALSE
USE_GL= glu
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui opengl script scripttools xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile
index 04c662c1e65c..ff5660cf9e61 100644
--- a/math/kbruch/Makefile
+++ b/math/kbruch/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 application to exercise fractions
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 048c93a47848..e1a732a26bb7 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -17,7 +17,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/math/kig/Makefile b/math/kig/Makefile
index 96ee3ca37511..c84dd6686ed7 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 interactive geometry application
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile
index 4a9457d58751..fd35e75487f4 100644
--- a/math/kmplot/Makefile
+++ b/math/kmplot/Makefile
@@ -13,7 +13,7 @@ COMMENT= Mathematical function plotter for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index d4d622d71e72..b8de638150b6 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -15,10 +15,11 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= script scripttools \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 2cc79249dcf5..222006dc4837 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 geography trainer
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index dc7a3b58c76c..1a0578b4a4c3 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -13,7 +13,7 @@ COMMENT= Alphabet learning tool for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 1a7119fa6fdf..72845f5d365a 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -13,7 +13,7 @@ COMMENT= Touch typing tutor for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= phonon moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index be4d897ab9fd..8a6a462551e6 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -13,7 +13,7 @@ COMMENT= Flash card trainer for KDE 4
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index f1fc5c3d106e..f529cd4216e8 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -13,9 +13,10 @@ COMMENT= Libraries used by KDE educational applications
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index 3025ac9d2cd3..fc0184a8ef27 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -14,7 +14,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_GNOME= libxml2 libxslt
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu attica automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xrender
USE_XZ= yes
diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile
index 9fd635aed18e..0b6a676f664e 100644
--- a/multimedia/dragon/Makefile
+++ b/multimedia/dragon/Makefile
@@ -18,7 +18,7 @@ LATEST_LINK= kdemultimedia-dragon
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= dbus phonon \
moc_build qmake_build rcc_build uic_build
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
index 9cc579442984..2bdbd2efbaab 100644
--- a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= swscale.1:${PORTSDIR}/multimedia/ffmpeg
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XZ= yes
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/Makefile b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
index c8fe86caa45f..40cea73adda5 100644
--- a/multimedia/kdemultimedia4-mplayerthumbs/Makefile
+++ b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
MAKE_JOBS_SAFE= yes
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= phonon moc_build qmake_build rcc_build uic_build
USE_XZ= yes
diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index b7ac8ea070e2..df078b81761e 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -35,7 +35,7 @@ DISTINFO_FILE= ${.CURDIR}/../../net/kdenetwork4/distinfo
CONFLICTS_INSTALL= kdenetwork-4.[1-8].*
-USE_CMAKE= yes
+USES= cmake:outsource
USE_GNOME= libxml2 libxslt
USE_KDE4= kdehier kdelibs kdeprefix pimlibs \
automoc4 qimageblitz
@@ -44,9 +44,9 @@ USE_QT4= moc_build qmake_build rcc_build uic_build uic3_build
USE_SQLITE= yes
USE_XORG= x11 xdamage xext xscrnsaver xtst
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CMAKE_OUTSOURCE= yes
CMAKE_SOURCE_PATH= ${WRKSRC}/${PORTNAME}
USE_WEBPLUGINS= native
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index bf9dd1699d14..3b27f0965c2d 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -23,12 +23,13 @@ LATEST_LINK= ${PORTNAME}4
USE_KDE4= kdehier kdelibs kdeprefix libkonq pimlibs workspace \
automoc4 ontologies strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_OPENSSL= yes
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_SQLITE= yes
USE_XORG= x11 xdamage xext xscrnsaver xtst
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DBUILD_kopete=off \
diff --git a/net/krdc/Makefile b/net/krdc/Makefile
index d5fb0916e662..8e45d93f4823 100644
--- a/net/krdc/Makefile
+++ b/net/krdc/Makefile
@@ -18,14 +18,13 @@ DISTINFO_FILE= ${.CURDIR}/../../net/kdenetwork4/distinfo
CONFLICTS_INSTALL= kdenetwork-4.[1-8].*
-USE_CMAKE= yes
+USES= cmake:outsource
USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XZ= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CMAKE_OUTSOURCE= yes
CMAKE_SOURCE_PATH= ${WRKSRC}/${PORTNAME}
.include <bsd.port.mk>
diff --git a/net/krfb/Makefile b/net/krfb/Makefile
index 0867774031f0..b26bdecaf3f8 100644
--- a/net/krfb/Makefile
+++ b/net/krfb/Makefile
@@ -18,13 +18,12 @@ DISTINFO_FILE= ${.CURDIR}/../../net/kdenetwork4/distinfo
CONFLICTS_INSTALL= kdenetwork-4.[1-8].*
-USE_CMAKE= yes
+USES= cmake:outsource
USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
-CMAKE_OUTSOURCE= yes
CMAKE_SOURCE_PATH= ${WRKSRC}/${PORTNAME}
.include <bsd.port.mk>
diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile
index 0a3f451ac48e..e0a4e094fcbb 100644
--- a/print/kdeutils4-printer-applet/Makefile
+++ b/print/kdeutils4-printer-applet/Makefile
@@ -18,7 +18,7 @@ USE_KDE4= kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
USE_PYTHON= 2.5+
USE_QT4= qmake_build moc_build uic_build rcc_build
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DINSTALL_PRINTER_APPLET:BOOL=ON
post-patch:
diff --git a/print/system-config-printer-kde/Makefile b/print/system-config-printer-kde/Makefile
index 9e16af90dd3d..eb10140dfa45 100644
--- a/print/system-config-printer-kde/Makefile
+++ b/print/system-config-printer-kde/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON= 2.5+
USE_QT4= qmake_build moc_build uic_build rcc_build
DISTINFO_FILE= ${PORTSDIR}/sysutils/kdeadmin4/distinfo
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DINSTALL_SYSTEM_CONFIG_PRINTER:BOOL=ON \
-DBUILD_kuser:BOOL=OFF # Avoid checking for kdepimlibs.
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index c8262e7a8db3..2cb5a9cbc8da 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -21,12 +21,13 @@ CONFLICTS= kdeedu-4.[0-6].*
# Keep USE_GCC in sync with science/avogadro.
USE_GCC= 4.4+
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
USE_QT4= dbus designer opengl script xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= kalzium.1
diff --git a/science/step/Makefile b/science/step/Makefile
index f17f2198e2fd..d370dc4dbd23 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= opengl xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 26313852c887..b45693ef2c14 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -18,7 +18,7 @@ LATEST_LINK= ${PORTNAME}4
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs pimlibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index f9dc664384c3..6e124c6d11af 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -15,7 +15,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 54c31a0cd3ba..af8a14389aae 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -16,7 +16,7 @@ LATEST_LINK= ${PORTNAME}-kde4
CONFLICTS= kdeutils-4.6.*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index da2aaf34d13c..4bfe83100f34 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -15,7 +15,7 @@ LATEST_LINK= ${PORTNAME}4
USE_XZ= yes
USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index c61c075944ae..8f469e967169 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -15,7 +15,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 7de09e39464a..e70a5c63b1a1 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -17,7 +17,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile
index 097674614c3b..6b57d2e2f9e6 100644
--- a/sysutils/ksysguardd/Makefile
+++ b/sysutils/ksysguardd/Makefile
@@ -14,7 +14,7 @@ COMMENT= KDE System Guard Daemon
DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo
USE_XZ= yes
USE_KDE4= kdeprefix kdehier
-USE_CMAKE= yes
+USES= cmake
CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \
-DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc"
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index 359fc567a7c9..bc732e587d39 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -16,8 +16,9 @@ CONFLICTS_INSTALL= kde-runtime-4.[7-8].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs \
ontologies soprano strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
SUB_FILES= nepomuk-env.sh
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 4ec68cd1dd30..cf685f62fc28 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -15,7 +15,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 0c5959f1b3e2..dea4141c9a5f 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -19,9 +19,10 @@ LATEST_LINK= ${PORTNAME}4
USE_XZ= yes
USE_GNOME= libxml2 libxslt
USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus porting_build \
qmake_build moc_build rcc_build uic_build uic3_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index ee78a4778488..fbe0041e1740 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -14,7 +14,7 @@ COMMENT= Collection of entertaining programs for KDE
LATEST_LINK= ${PORTNAME}4
USE_KDE4= kdehier kdelibs kdeprefix workspace automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus gui qt3support \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11
diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer/Makefile
index f788dd432190..18fa423e8661 100644
--- a/x11-clocks/ktimer/Makefile
+++ b/x11-clocks/ktimer/Makefile
@@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/x11-themes/kde4-base-artwork/Makefile b/x11-themes/kde4-base-artwork/Makefile
index b67ad48196ad..448730000148 100644
--- a/x11-themes/kde4-base-artwork/Makefile
+++ b/x11-themes/kde4-base-artwork/Makefile
@@ -17,7 +17,7 @@ CONFLICTS_INSTALL= kde-workspace-4.[7-8].*
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
USE_QT4= moc_build qmake_build rcc_build uic_build
-KDE4_BUILDENV= yes
+USES= cmake:outsource
NO_BUILD= yes
USE_XZ= yes
diff --git a/x11-themes/kde4-icons-oxygen/Makefile b/x11-themes/kde4-icons-oxygen/Makefile
index d1ec197b709a..1f2bf0840b0d 100644
--- a/x11-themes/kde4-icons-oxygen/Makefile
+++ b/x11-themes/kde4-icons-oxygen/Makefile
@@ -14,7 +14,7 @@ COMMENT= The Oxygen icon theme for KDE
USE_XZ= yes
USE_KDE4= kdeprefix kdehier
-USE_CMAKE= yes
+USES= cmake
INSTALL_TARGET= install
EXTRACT_AFTER_ARGS+= | ${TAR} -xf - --exclude '${DISTNAME}/scalable'
diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde4-wallpapers/Makefile
index 740be68a513c..367667aff035 100644
--- a/x11-themes/kde4-wallpapers/Makefile
+++ b/x11-themes/kde4-wallpapers/Makefile
@@ -14,7 +14,7 @@ CONFLICTS= kdebase-workspace-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= moc_build qmake_build rcc_build uic_build
NO_BUILD= yes
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index eab72d57991f..c20114d7a654 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK= ${PORTNAME}4
USE_XZ= yes
USE_KDE4= kdehier kdelibs kdeprefix libkexiv2 workspace automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= gui opengl \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xt
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 3a86e9b08c18..d52e761c8624 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -14,8 +14,9 @@ CONFLICTS_INSTALL= kdelibs-4.7.* kde-runtime-4.7.*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
post-patch:
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index be61034ea4be..90ba9a2a4608 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -19,10 +19,11 @@ USE_GETTEXT= yes
USE_GNOME= glib20
USE_KDE4= kdehier kdelibs kdeprefix libkonq \
automoc4 soprano strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus gui qt3support script \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xt
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index ccbad0cedfb4..05c37ea55bc6 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -30,12 +30,13 @@ USE_XZ= yes
USE_GETTEXT= yes
USE_KDE4= kdehier kdelibs kdeprefix oxygen \
attica automoc4 pimlibs sharedmime strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus declarative designer gui phonon qt3support \
script svg webkit xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xcursor
USE_GMAKE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= kdesu.1
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index a2215dd65137..60aaf86d1b25 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -51,7 +51,7 @@ USE_GNOME= glib20
USE_ICONV= yes
USE_KDE4= kdehier kdelibs kdeprefix oxygen pimlibs \
akonadi automoc4 ontologies qimageblitz soprano strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_PKGCONFIG= build
USE_QT4= dbus declarative gui network opengl phonon \
qt3support qtestlib script sql webkit xml \
@@ -60,6 +60,7 @@ USE_XORG= kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \
xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst
USE_XZ= yes
USE_GMAKE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
# Xmms and Googlegadgets could be enabled.
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 13b8baee086c..d4d2f52e5a30 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -48,7 +48,7 @@ USE_GETTEXT= yes
USE_GNOME= libxml2 libxslt
USE_KDE4= kdehier kdeprefix oxygen \
attica automoc4 ontologies sharedmime soprano strigi
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_OPENSSL= yes
USE_PERL5= yes
USE_QT4= dbus declarative designer gui imageformats_run \
@@ -56,6 +56,7 @@ USE_QT4= dbus declarative designer gui imageformats_run \
qtestlib script sql svg webkit xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= sm x11 xcursor xext xfixes xrender xtst
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index c9231f453d76..370964a41cf2 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -13,7 +13,7 @@ COMMENT= KDE 4 monitor calibration tool
CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= dbus qmake_build moc_build uic_build rcc_build
USE_XORG= x11 xxf86vm
USE_XZ= yes
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 9edf6c8f6919..35c981693a73 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -14,7 +14,7 @@ CONFLICTS= kdebase-4.[0-6].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4 libkonq
-KDE4_BUILDENV= yes
+USES= cmake:outsource
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xrender
CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile
index 77015fc08226..469ec46e9811 100644
--- a/x11/libkonq/Makefile
+++ b/x11/libkonq/Makefile
@@ -14,7 +14,7 @@ COMMENT= Core library for Konqueror
CONFLICTS_INSTALL= kdebase-4.[0-6].* kde-baseapps-4.7.*
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake
USE_KDE4= kdelibs kdeprefix kdehier automoc4
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index 8b65f019c6eb..0d972ff0732b 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -16,11 +16,10 @@ USE_QT4= qmake_build moc_build uic_build rcc_build
USE_PYTHON= 2.5+
DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake:outsource
MAKE_JOBS_SAFE= yes
CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python
-CMAKE_OUTSOURCE= yes
pre-configure:
${REINPLACE_CMD} -e 's,$${PYTHON_SITE_PACKAGES_DIR},${PYTHONPREFIX_SITELIBDIR},g' \
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile
index f52ff8e77cfa..cce1c5756b63 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby/Makefile
@@ -16,10 +16,9 @@ USE_QT4= qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo
USE_XZ= yes
-USE_CMAKE= yes
+USES= cmake:outsource
MAKE_JOBS_SAFE= yes
CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/ruby
-CMAKE_OUTSOURCE= yes
.include <bsd.port.mk>