[Midnightbsd-cvs] mports: Mk/extensions: cleanup some of the cmake logic for kde4.

[ctriv at midnightbsd.org]

Log Message:
-----------
cleanup some of the cmake logic for kde4.

Modified Files:
--------------
    mports/Mk/extensions:
        cmake.mk (r1.2 -> r1.3)
        kde4.mk (r1.2 -> r1.3)

-------------- next part --------------
Index: kde4.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/kde4.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L Mk/extensions/kde4.mk -L Mk/extensions/kde4.mk -u -r1.2 -r1.3
--- Mk/extensions/kde4.mk
+++ Mk/extensions/kde4.mk
@@ -92,6 +92,25 @@
 
 workspace_LIB_DEPENDS=		kscreensaver.5:${PORTSDIR}/x11/kdebase4-workspace
 
+
+#
+# Common build related stuff for kde4 ports. It's not intended for usage
+# in KDE4-dependent ports
+#
+.if defined(KDE4_BUILDENV)
+USE_CMAKE=	yes
+CMAKE_DEBUG=	yes
+CMAKE_VERBOSE=	yes
+
+USE_LDCONFIG=	${KDE4_PREFIX}/lib ${KDE4_PREFIX}/lib/kde4
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
+CMAKE_SOURCE_PATH=	..
+
+.endif # KDE4_BUILDENV
+
+
+
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
@@ -118,21 +137,5 @@
 . endif
 .endfor
 
-#
-# Common build related stuff for kde4 ports. It's not intended for usage
-# in KDE4-dependent ports
-#
-.if defined(KDE4_BUILDENV)
-USE_CMAKE=	yes
-CMAKE_DEBUG=	yes
-CMAKE_VERBOSE=	yes
-
-USE_LDCONFIG=	${KDE4_PREFIX}/lib ${KDE4_PREFIX}/lib/kde4
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
-CMAKE_SOURCE_PATH=	..
-
-.endif # KDE4_BUILDENV
-
 .endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
 
Index: cmake.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/cmake.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L Mk/extensions/cmake.mk -L Mk/extensions/cmake.mk -u -r1.2 -r1.3
--- Mk/extensions/cmake.mk
+++ Mk/extensions/cmake.mk
@@ -92,4 +92,17 @@
 .endif
 
 
-.endif
\ No newline at end of file
+.endif
+
+#
+# make sure DESTDIRNAME is DESTDIR (qt4 does this another way, and may ports use both cmake 
+# and qt4
+#
+.if defined(_POSTMKINCLUDED) && !defined(Cmake_Post_Include)
+
+Cmake_Post_Include= cmake.mk
+ 
+
+DESTDIRNAME= DESTDIR
+
+.endif # defined(_POSTMKINCLUDED) && !defined(Cmake_Post_Include)