- Add common code to support for cmake based ports.

- Update devel/cmake to 2.6.0 (also fix ports/123092)
- Use the new CMAKE build framework in all ports using cmake

Approved by:	portmgr (pav)

4 files changed, 24 insertions, 32 deletions

diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index 053364d09ec6..5e083ad12751 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	http://cdrkit.org/releases/ \
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Command-line CD/DVD writing suite
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-
+USE_CMAKE=	yes
+CMAKE_USE_PTHREAD=	yes
 USE_ICONV=	yes
 
 MAN1=		cdda2ogg.1 devdump.1 dirsplit.1 genisoimage.1 icedax.1 \
@@ -32,9 +32,7 @@ BROKEN=		does not compile
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt
-
-do-configure:
-	@(cd ${WRKSRC}; ${LOCALBASE}/bin/cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_C_FLAGS:STRING="${CFLAGS} -I./libparanoia -I${LOCALBASE}/include -L${LOCALBASE}/lib" -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib")
+	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake \
+	    ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/kgtk/Makefile b/sysutils/kgtk/Makefile
index d6901ec88ffe..d02f4d7ce783 100644
--- a/sysutils/kgtk/Makefile
+++ b/sysutils/kgtk/Makefile
@@ -16,8 +16,6 @@ DISTNAME=	KGtk-${PORTVERSION}
 MAINTAINER=	citycat4@ngs.ru
 COMMENT=	Daemon to use KDE dialogs in GTK applications
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-
 SUB_FILES=	pkg-message
 
 OPTIONS=	UNICODE "System locale is utf-8" off
@@ -26,11 +24,10 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_KDEBASE_VER=3
+USE_CMAKE=	yes
 
-CMAKE_PREFIX=	${LOCALBASE}
-CMAKE_BUILD_DIR=build3
-BUILD_WRKSRC=	${WRKSRC}/${CMAKE_BUILD_DIR}
-INSTALL_WRKSRC=	${WRKSRC}/${CMAKE_BUILD_DIR}
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
+CMAKE_SOURCE_PATH=	..
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
@@ -48,25 +45,22 @@ EXTRA_PATCHES+=	${PATCHDIR}/opt-patch-kgtk-wrapper \
 		${PATCHDIR}/opt-patch-gtk2__kgtk2-wrapper.cmake
 .endif
 
+post-extract:
+	${MKDIR} ${WRKSRC}
+
 post-patch:
-	@${REINPLACE_CMD} -e 's| -ldl||' ${WRKSRC}/gtk2/CMakeLists.txt \
-		${WRKSRC}/qt3/CMakeLists.txt ${WRKSRC}/qt4/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/qt3/kqt3-wrapper.cmake \
-		${WRKSRC}/gtk2/kgtk2-wrapper.cmake ${WRKSRC}/qt4/kqt4-wrapper.cmake \
-		${WRKSRC}/mangled.sh ${WRKSRC}/kdialogd-wrapper ${WRKSRC}/kgtk-wrapper
-	@${CP} ${PATCHDIR}/ru.po ${WRKSRC}/kdialogd3/po/
-pre-configure:
-	@${MKDIR} ${WRKSRC}/${CMAKE_BUILD_DIR}
+	@${REINPLACE_CMD} -e 's| -ldl||' ${WRKSRC}/../gtk2/CMakeLists.txt \
+		${WRKSRC}/../qt3/CMakeLists.txt ${WRKSRC}/../qt4/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/../qt3/kqt3-wrapper.cmake \
+		${WRKSRC}/../gtk2/kgtk2-wrapper.cmake ${WRKSRC}/../qt4/kqt4-wrapper.cmake \
+		${WRKSRC}/../mangled.sh ${WRKSRC}/../kdialogd-wrapper ${WRKSRC}/../kgtk-wrapper
+	@${CP} ${PATCHDIR}/ru.po ${WRKSRC}/../kdialogd3/po/
 
-do-configure:
-	@cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
-		${CMAKE_PREFIX}/bin/cmake .. \
-		-DCMAKE_INSTALL_DIR=${PREFIX} \
-		-DQT_INCLUDE_DIR=${QT_PREFIX}/include \
-		-DCMAKE_CXX_FLAGS=-I${LOCALBASE}/include \
-		-DCMAKE_EXE_LINKER_FLAGS=${PTHREAD_LIBS} \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
+post-configure:
+	@${REINPLACE_CMD} -e '/pofiles/ s|\.\./||' \
+	${WRKSRC}/kdialogd3/po/CMakeFiles/pofiles.dir/build.make
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
+	
 .include <bsd.port.post.mk>
diff --git a/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake b/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake
index 62686c0193d9..bc5fdb8e490e 100644
--- a/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake
+++ b/sysutils/kgtk/files/opt-patch-gtk2__kgtk2-wrapper.cmake
@@ -1,5 +1,5 @@
---- ./gtk2/kgtk2-wrapper.cmake.orig	2007-10-31 22:33:19.000000000 +0200
-+++ ./gtk2/kgtk2-wrapper.cmake	2008-05-04 22:49:28.000000000 +0300
+--- ../gtk2/kgtk2-wrapper.cmake.orig	2007-10-31 22:33:19.000000000 +0200
++++ ../gtk2/kgtk2-wrapper.cmake	2008-05-04 22:49:28.000000000 +0300
 @@ -11,6 +11,7 @@
  # Released under the GPL v2 or later
  # --
diff --git a/sysutils/kgtk/files/opt-patch-kgtk-wrapper b/sysutils/kgtk/files/opt-patch-kgtk-wrapper
index 03c668891502..5aab26e09c4e 100644
--- a/sysutils/kgtk/files/opt-patch-kgtk-wrapper
+++ b/sysutils/kgtk/files/opt-patch-kgtk-wrapper
@@ -1,5 +1,5 @@
---- ./kgtk-wrapper.orig	2007-10-31 22:33:19.000000000 +0200
-+++ ./kgtk-wrapper	2008-05-04 22:49:28.000000000 +0300
+--- ../kgtk-wrapper.orig	2007-10-31 22:33:19.000000000 +0200
++++ ../kgtk-wrapper	2008-05-04 22:49:28.000000000 +0300
 @@ -14,6 +14,7 @@
  # This script attempts to determine which KGtk library (if any) should
  # be used when launching the app