- 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)

3 files changed, 21 insertions, 30 deletions

diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index b863dcbd14ab..43f272422ee3 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	InsightToolkit
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	science biology
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	itk
@@ -14,18 +15,14 @@ MASTER_SITE_SUBDIR=	itk
 MAINTAINER=	bacon@smithers.neuro.mcw.edu
 COMMENT=	Insight Toolkit
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-
 OPTIONS=	EXAMPLES "Build examples (very time consuming)" off \
 		TESTING  "Build testing programs (very time consuming)" off
 
 USE_LDCONFIG=	${PREFIX}/lib/InsightToolkit
 NO_PACKAGE=	License does not allow redistribution of binaries
-BUILD_WRKSRC=	${WRKSRC}/Build
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-CMAKE_ARGS=	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-DBUILD_SHARED_LIBS:BOOL=ON
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
 
 SUB_FILES=	pkg-message
 
@@ -39,10 +36,6 @@ CMAKE_ARGS+=	"-DBUILD_EXAMPLES:BOOL=OFF"
 CMAKE_ARGS+=	"-DBUILD_TESTING:BOOL=OFF"
 .endif
 
-pre-build:
-	@${MKDIR} ${BUILD_WRKSRC}
-	@cd ${BUILD_WRKSRC} && cmake ${CMAKE_ARGS} ..
-
 post-install:
 	@for lib in ${PREFIX}/lib/InsightToolkit/*.so ; do \
 		${LN} -s $$lib.2.8.0 $$lib.2 ; \
diff --git a/science/InsightToolkit/pkg-plist b/science/InsightToolkit/pkg-plist
index d26f24fb9fd2..dada69482fe4 100644
--- a/science/InsightToolkit/pkg-plist
+++ b/science/InsightToolkit/pkg-plist
@@ -2521,6 +2521,7 @@ include/InsightToolkit/Utilities/vxl/vcl/vcl_utility.txx
 include/InsightToolkit/Utilities/vxl/vcl/vcl_valarray.h
 include/InsightToolkit/Utilities/vxl/vcl/vcl_vector.h
 include/InsightToolkit/Utilities/vxl/vcl/vcl_vector.txx
+include/InsightToolkit/Utilities/vxl/vcl/vcl_where_root_dir.h
 include/InsightToolkit/Utilities/vxl/vcl/win32-vc60/vcl_cmath.h
 include/InsightToolkit/Utilities/vxl/vcl/win32-vc60/vcl_complex.h
 include/InsightToolkit/Utilities/vxl/vcl/win32-vc60/vcl_cstdarg.h
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index e91faf12a1e9..7ea45ef9043d 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://www.paraview.org/files/v2.4/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ParaView is a powerful scientific data visualization application
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5 \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -25,9 +24,22 @@ LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5 \
 USE_GL=		yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DPARAVIEW_USE_SYSTEM_HDF5=1 \
+		-DBUILD_SHARED_LIBS="ON" \
+		-DVTK_USE_SYSTEM_PNG="ON" \
+		-DVTK_USE_SYSTEM_JPEG="ON" \
+		-DVTK_USE_SYSTEM_TIFF="ON" \
+		-DVTK_USE_SYSTEM_ZLIB="ON" \
+		-DVTK_USE_SYSTEM_FREETYPE="ON" \
+		-DVTK_USE_SYSTEM_EXPAT="ON" \
+		-DVTK_USE_X="ON" \
+		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-build
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
+CMAKE_SOURCE_PATH=	..
+
 PLIST_SUB+=	VERMAJORMINOR=2.4
 CMAKE2INST=	Utilities/ParaViewConfig.cmake ParaViewConfig.cmake \
 		ParaViewLibraryDepends.cmake cmake_install.cmake
@@ -35,6 +47,9 @@ MAKE_ENV=	CC="${CC}" \
 		CXX="${CXX}"
 LIB_INSTDIR=	${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
 
+post-extract:
+	${MKDIR} ${WRKSRC}
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|vtkpng|png|g' \
 		${WRKDIR}/paraview-${PORTVERSION}/GUI/Widgets/CMakeLists.txt
@@ -43,24 +58,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
 		${WRKDIR}/paraview-${PORTVERSION}/Utilities/TclTk/tk*/unix/configure
 
-do-configure:
-	${MKDIR} ${WRKSRC}
-	cd ${WRKSRC} && \
-	${LOCALBASE}/bin/cmake ../${DISTNAME} \
-		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		-DPARAVIEW_USE_SYSTEM_HDF5=1 \
-		-DBUILD_SHARED_LIBS="ON" \
-		-DVTK_USE_SYSTEM_PNG="ON" \
-		-DVTK_USE_SYSTEM_JPEG="ON" \
-		-DVTK_USE_SYSTEM_TIFF="ON" \
-		-DVTK_USE_SYSTEM_ZLIB="ON" \
-		-DVTK_USE_SYSTEM_FREETYPE="ON" \
-		-DVTK_USE_SYSTEM_EXPAT="ON" \
-		-DVTK_USE_X="ON" \
-		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1
-
 post-install:
 .for c2f in ${CMAKE2INST}
 	${SED} -e 's|${WRKSRC}|${LIB_INSTDIR}|g' \