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

9 files changed, 16 insertions, 9 deletions

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>