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

10 files changed, 15 insertions, 12 deletions

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>