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

9 files changed, 160 insertions, 71 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 20201b816510..68d5d97bec4a 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	2.4.8
+PORTVERSION=	2.6.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \
 		${MASTER_SITE_LOCAL}
@@ -21,7 +21,15 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--docdir=${DOCSDIR:S|^${PREFIX}||}
 CONFIGURE_ENV=	MAKE=make
 
-MAN1=		ccmake.1 cmake.1 ctest.1
+MAN1=		ccmake.1 \
+		cmake.1 \
+		cmakecommands.1 \
+		cmakecompat.1 \
+		cmakemodules.1 \
+		cmakeprops.1 \
+		cmakevars.1 \
+		cpack.1 \
+		ctest.1
 
 post-patch:
 	@${GREP} -rl '/usr/X11R6' ${WRKSRC}/Modules ${WRKSRC}/Tests | \
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index cf2222b7ca1a..ff59c379a0e6 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (cmake-2.4.8.tar.gz) = f5dd061c31765a49dc17ae8bdc986779
-SHA256 (cmake-2.4.8.tar.gz) = f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
-SIZE (cmake-2.4.8.tar.gz) = 2608800
+MD5 (cmake-2.6.0.tar.gz) = e95ae003672dfc6c8151a1ee49a0d4a6
+SHA256 (cmake-2.6.0.tar.gz) = 4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
+SIZE (cmake-2.6.0.tar.gz) = 3460096
diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake
new file mode 100644
index 000000000000..7667e25d09f2
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_FindQt4.cmake
@@ -0,0 +1,23 @@
+--- ./Modules/FindQt4.cmake.orig	2008-01-21 19:59:51.000000000 +0100
++++ ./Modules/FindQt4.cmake	2008-04-25 21:45:15.000000000 +0200
+@@ -250,7 +250,7 @@
+ 
+ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+ # check for qmake
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+@@ -790,9 +790,9 @@
+     "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
+ 
+   SET(QT_MOC_EXECUTABLE 
+-    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
++    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
+   SET(QT_UIC_EXECUTABLE 
+-    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
++    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
+ 
+   FIND_PROGRAM(QT_UIC3_EXECUTABLE
+     NAMES uic3
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 15918621c207..08655f6fa5bf 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -4,28 +4,43 @@ bin/cpack
 bin/ctest
 %%DATADIR%%/Modules/AddFileDependencies.cmake
 %%DATADIR%%/Modules/CMake.cmake
+%%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake
+%%DATADIR%%/Modules/CMakeASMCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeASMInformation.cmake
 %%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake
 %%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake
 %%DATADIR%%/Modules/CMakeBorlandFindMake.cmake
 %%DATADIR%%/Modules/CMakeBuildSettings.cmake.in
 %%DATADIR%%/Modules/CMakeCCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCCompilerABI.c
+%%DATADIR%%/Modules/CMakeCCompilerId.c.in
 %%DATADIR%%/Modules/CMakeCInformation.cmake
 %%DATADIR%%/Modules/CMakeCXXCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp
+%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in
 %%DATADIR%%/Modules/CMakeCXXInformation.cmake
 %%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
+%%DATADIR%%/Modules/CMakeCompilerABI.h
 %%DATADIR%%/Modules/CMakeConfigurableFile.in
 %%DATADIR%%/Modules/CMakeDependentOption.cmake
+%%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
 %%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineSystem.cmake
 %%DATADIR%%/Modules/CMakeExportBuildSettings.cmake
+%%DATADIR%%/Modules/CMakeFindBinUtils.cmake
 %%DATADIR%%/Modules/CMakeFindFrameworks.cmake
 %%DATADIR%%/Modules/CMakeFindWMake.cmake
 %%DATADIR%%/Modules/CMakeFindXCode.cmake
+%%DATADIR%%/Modules/CMakeForceCompiler.cmake
 %%DATADIR%%/Modules/CMakeFortranCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeFortranCompilerId.F90.in
 %%DATADIR%%/Modules/CMakeFortranInformation.cmake
 %%DATADIR%%/Modules/CMakeGenericSystem.cmake
 %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
@@ -34,11 +49,14 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
 %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
 %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
+%%DATADIR%%/Modules/CMakePlatformId.h.in
 %%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
 %%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
 %%DATADIR%%/Modules/CMakeRCInformation.cmake
 %%DATADIR%%/Modules/CMakeSystem.cmake.in
 %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
+%%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestASMCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestCCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestForFreeVC.cxx
@@ -48,8 +66,6 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeTestNMakeCLVersion.c
 %%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
 %%DATADIR%%/Modules/CMakeUnixFindMake.cmake
-%%DATADIR%%/Modules/CMakeVCManifest.cmake
-%%DATADIR%%/Modules/CMakeVCManifestExe.cmake
 %%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
 %%DATADIR%%/Modules/CMakeVS6FindMake.cmake
 %%DATADIR%%/Modules/CMakeVS71FindMake.cmake
@@ -57,10 +73,19 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeVS7FindMake.cmake
 %%DATADIR%%/Modules/CMakeVS8FindMake.cmake
 %%DATADIR%%/Modules/CMakeVS9FindMake.cmake
+%%DATADIR%%/Modules/CPack.DS_Store.in
 %%DATADIR%%/Modules/CPack.Description.plist.in
 %%DATADIR%%/Modules/CPack.Info.plist.in
+%%DATADIR%%/Modules/CPack.OSXScriptLauncher.in
+%%DATADIR%%/Modules/CPack.OSXX11.Info.plist.in
+%%DATADIR%%/Modules/CPack.RuntimeScript.in
 %%DATADIR%%/Modules/CPack.STGZ_Header.sh.in
+%%DATADIR%%/Modules/CPack.VolumeIcon.icns.in
+%%DATADIR%%/Modules/CPack.background.png.in
 %%DATADIR%%/Modules/CPack.cmake
+%%DATADIR%%/Modules/CPackDeb.cmake
+%%DATADIR%%/Modules/CPackRPM.cmake
+%%DATADIR%%/Modules/CPackZIP.cmake
 %%DATADIR%%/Modules/CTest.cmake
 %%DATADIR%%/Modules/CTestTargets.cmake
 %%DATADIR%%/Modules/CheckCCompilerFlag.cmake
@@ -70,6 +95,7 @@ bin/ctest
 %%DATADIR%%/Modules/CheckCXXSourceCompiles.cmake
 %%DATADIR%%/Modules/CheckCXXSourceRuns.cmake
 %%DATADIR%%/Modules/CheckForPthreads.c
+%%DATADIR%%/Modules/CheckFortranFunctionExists.cmake
 %%DATADIR%%/Modules/CheckFunctionExists.c
 %%DATADIR%%/Modules/CheckFunctionExists.cmake
 %%DATADIR%%/Modules/CheckIncludeFile.c.in
@@ -80,21 +106,27 @@ bin/ctest
 %%DATADIR%%/Modules/CheckLibraryExists.cmake
 %%DATADIR%%/Modules/CheckLibraryExists.lists.in
 %%DATADIR%%/Modules/CheckSizeOf.cmake
+%%DATADIR%%/Modules/CheckStructHasMember.cmake
 %%DATADIR%%/Modules/CheckSymbolExists.cmake
-%%DATADIR%%/Modules/CheckTypeSize.c.in
 %%DATADIR%%/Modules/CheckTypeSize.cmake
+%%DATADIR%%/Modules/CheckTypeSizeC.c.in
 %%DATADIR%%/Modules/CheckVariableExists.c
 %%DATADIR%%/Modules/CheckVariableExists.cmake
 %%DATADIR%%/Modules/Dart.cmake
 %%DATADIR%%/Modules/DartConfiguration.tcl.in
 %%DATADIR%%/Modules/Documentation.cmake
 %%DATADIR%%/Modules/DummyCXXFile.cxx
+%%DATADIR%%/Modules/FLTKCompatibility.cmake
+%%DATADIR%%/Modules/FeatureSummary.cmake
 %%DATADIR%%/Modules/FindASPELL.cmake
 %%DATADIR%%/Modules/FindAVIFile.cmake
+%%DATADIR%%/Modules/FindBLAS.cmake
 %%DATADIR%%/Modules/FindBZip2.cmake
 %%DATADIR%%/Modules/FindBoost.cmake
 %%DATADIR%%/Modules/FindCABLE.cmake
 %%DATADIR%%/Modules/FindCURL.cmake
+%%DATADIR%%/Modules/FindCVS.cmake
+%%DATADIR%%/Modules/FindCups.cmake
 %%DATADIR%%/Modules/FindCurses.cmake
 %%DATADIR%%/Modules/FindCygwin.cmake
 %%DATADIR%%/Modules/FindDCMTK.cmake
@@ -102,10 +134,15 @@ bin/ctest
 %%DATADIR%%/Modules/FindDoxygen.cmake
 %%DATADIR%%/Modules/FindEXPAT.cmake
 %%DATADIR%%/Modules/FindFLTK.cmake
+%%DATADIR%%/Modules/FindFLTK2.cmake
+%%DATADIR%%/Modules/FindFreetype.cmake
 %%DATADIR%%/Modules/FindGCCXML.cmake
+%%DATADIR%%/Modules/FindGDAL.cmake
+%%DATADIR%%/Modules/FindGIF.cmake
 %%DATADIR%%/Modules/FindGLU.cmake
 %%DATADIR%%/Modules/FindGLUT.cmake
 %%DATADIR%%/Modules/FindGTK.cmake
+%%DATADIR%%/Modules/FindGettext.cmake
 %%DATADIR%%/Modules/FindGnuplot.cmake
 %%DATADIR%%/Modules/FindHSPELL.cmake
 %%DATADIR%%/Modules/FindHTMLHelp.cmake
@@ -115,12 +152,14 @@ bin/ctest
 %%DATADIR%%/Modules/FindJPEG.cmake
 %%DATADIR%%/Modules/FindJasper.cmake
 %%DATADIR%%/Modules/FindJava.cmake
-%%DATADIR%%/Modules/FindKDE.cmake
 %%DATADIR%%/Modules/FindKDE3.cmake
 %%DATADIR%%/Modules/FindKDE4.cmake
+%%DATADIR%%/Modules/FindLAPACK.cmake
 %%DATADIR%%/Modules/FindLATEX.cmake
 %%DATADIR%%/Modules/FindLibXml2.cmake
 %%DATADIR%%/Modules/FindLibXslt.cmake
+%%DATADIR%%/Modules/FindLua50.cmake
+%%DATADIR%%/Modules/FindLua51.cmake
 %%DATADIR%%/Modules/FindMFC.cmake
 %%DATADIR%%/Modules/FindMPEG.cmake
 %%DATADIR%%/Modules/FindMPEG2.cmake
@@ -130,18 +169,23 @@ bin/ctest
 %%DATADIR%%/Modules/FindOpenAL.cmake
 %%DATADIR%%/Modules/FindOpenGL.cmake
 %%DATADIR%%/Modules/FindOpenSSL.cmake
+%%DATADIR%%/Modules/FindOpenThreads.cmake
 %%DATADIR%%/Modules/FindPHP4.cmake
 %%DATADIR%%/Modules/FindPNG.cmake
+%%DATADIR%%/Modules/FindPackageHandleStandardArgs.cmake
+%%DATADIR%%/Modules/FindPackageMessage.cmake
 %%DATADIR%%/Modules/FindPerl.cmake
 %%DATADIR%%/Modules/FindPerlLibs.cmake
 %%DATADIR%%/Modules/FindPhysFS.cmake
 %%DATADIR%%/Modules/FindPike.cmake
 %%DATADIR%%/Modules/FindPkgConfig.cmake
+%%DATADIR%%/Modules/FindProducer.cmake
 %%DATADIR%%/Modules/FindPythonInterp.cmake
 %%DATADIR%%/Modules/FindPythonLibs.cmake
 %%DATADIR%%/Modules/FindQt.cmake
 %%DATADIR%%/Modules/FindQt3.cmake
 %%DATADIR%%/Modules/FindQt4.cmake
+%%DATADIR%%/Modules/FindQuickTime.cmake
 %%DATADIR%%/Modules/FindRuby.cmake
 %%DATADIR%%/Modules/FindSDL.cmake
 %%DATADIR%%/Modules/FindSDL_image.cmake
@@ -154,6 +198,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindSubversion.cmake
 %%DATADIR%%/Modules/FindTCL.cmake
 %%DATADIR%%/Modules/FindTIFF.cmake
+%%DATADIR%%/Modules/FindTclStub.cmake
 %%DATADIR%%/Modules/FindTclsh.cmake
 %%DATADIR%%/Modules/FindThreads.cmake
 %%DATADIR%%/Modules/FindUnixCommands.cmake
@@ -163,26 +208,64 @@ bin/ctest
 %%DATADIR%%/Modules/FindX11.cmake
 %%DATADIR%%/Modules/FindXMLRPC.cmake
 %%DATADIR%%/Modules/FindZLIB.cmake
+%%DATADIR%%/Modules/Findosg.cmake
+%%DATADIR%%/Modules/FindosgDB.cmake
+%%DATADIR%%/Modules/FindosgFX.cmake
+%%DATADIR%%/Modules/FindosgGA.cmake
+%%DATADIR%%/Modules/FindosgIntrospection.cmake
+%%DATADIR%%/Modules/FindosgManipulator.cmake
+%%DATADIR%%/Modules/FindosgParticle.cmake
+%%DATADIR%%/Modules/FindosgProducer.cmake
+%%DATADIR%%/Modules/FindosgShadow.cmake
+%%DATADIR%%/Modules/FindosgSim.cmake
+%%DATADIR%%/Modules/FindosgTerrain.cmake
+%%DATADIR%%/Modules/FindosgText.cmake
+%%DATADIR%%/Modules/FindosgUtil.cmake
+%%DATADIR%%/Modules/FindosgViewer.cmake
 %%DATADIR%%/Modules/FindwxWidgets.cmake
 %%DATADIR%%/Modules/FindwxWindows.cmake
+%%DATADIR%%/Modules/GetPrerequisites.cmake
+%%DATADIR%%/Modules/ITKCompatibility.cmake
 %%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake
 %%DATADIR%%/Modules/KDE3Macros.cmake
-%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
 %%DATADIR%%/Modules/MacroAddFileDependencies.cmake
 %%DATADIR%%/Modules/NSIS.InstallOptions.ini.in
 %%DATADIR%%/Modules/NSIS.template.in
+%%DATADIR%%/Modules/Platform/AIX-VisualAge-Fortran.cmake
 %%DATADIR%%/Modules/Platform/AIX.cmake
 %%DATADIR%%/Modules/Platform/BSDOS.cmake
+%%DATADIR%%/Modules/Platform/BeOS.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneL.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-g77.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN.cmake
+%%DATADIR%%/Modules/Platform/Catamount.cmake
+%%DATADIR%%/Modules/Platform/Darwin-icc.cmake
+%%DATADIR%%/Modules/Platform/Darwin-icpc.cmake
 %%DATADIR%%/Modules/Platform/Darwin-xlc.cmake
 %%DATADIR%%/Modules/Platform/Darwin.cmake
 %%DATADIR%%/Modules/Platform/DragonFly.cmake
 %%DATADIR%%/Modules/Platform/FreeBSD.cmake
 %%DATADIR%%/Modules/Platform/GNU.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-ASM.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-C.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-CXX.cmake
+%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake
+%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
+%%DATADIR%%/Modules/Platform/Generic.cmake
 %%DATADIR%%/Modules/Platform/HP-UX.cmake
 %%DATADIR%%/Modules/Platform/IRIX.cmake
 %%DATADIR%%/Modules/Platform/IRIX64.cmake
+%%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-SunPro-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-SunPro-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-SunPro-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-VisualAge-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-VisualAge-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Linux-como.cmake
 %%DATADIR%%/Modules/Platform/Linux-icpc.cmake
 %%DATADIR%%/Modules/Platform/Linux-ifort.cmake
@@ -195,6 +278,7 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/RISCos.cmake
 %%DATADIR%%/Modules/Platform/SCO_SV.cmake
 %%DATADIR%%/Modules/Platform/SINIX.cmake
+%%DATADIR%%/Modules/Platform/SunOS-SunPro-Fortran.cmake
 %%DATADIR%%/Modules/Platform/SunOS.cmake
 %%DATADIR%%/Modules/Platform/Tru64.cmake
 %%DATADIR%%/Modules/Platform/ULTRIX.cmake
@@ -204,6 +288,7 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/Windows-bcc32.cmake
 %%DATADIR%%/Modules/Platform/Windows-cl.cmake
 %%DATADIR%%/Modules/Platform/Windows-cl.cmake.in
+%%DATADIR%%/Modules/Platform/Windows-df.cmake
 %%DATADIR%%/Modules/Platform/Windows-g++.cmake
 %%DATADIR%%/Modules/Platform/Windows-g77.cmake
 %%DATADIR%%/Modules/Platform/Windows-gcc.cmake
@@ -213,12 +298,19 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/Windows.cmake
 %%DATADIR%%/Modules/Platform/WindowsPaths.cmake
 %%DATADIR%%/Modules/Platform/Xenix.cmake
+%%DATADIR%%/Modules/Platform/cl.cmake
+%%DATADIR%%/Modules/Platform/eCos.cmake
 %%DATADIR%%/Modules/Platform/g77.cmake
+%%DATADIR%%/Modules/Platform/gas.cmake
 %%DATADIR%%/Modules/Platform/gcc.cmake
 %%DATADIR%%/Modules/Platform/kFreeBSD.cmake
-%%DATADIR%%/Modules/TestBigEndian.c
+%%DATADIR%%/Modules/Platform/syllable.cmake
+%%DATADIR%%/Modules/Platform/xlf.cmake
+%%DATADIR%%/Modules/SystemInformation.cmake
+%%DATADIR%%/Modules/SystemInformation.in
 %%DATADIR%%/Modules/TestBigEndian.cmake
 %%DATADIR%%/Modules/TestCXXAcceptsFlag.cmake
+%%DATADIR%%/Modules/TestEndianess.c.in
 %%DATADIR%%/Modules/TestForANSIForScope.cmake
 %%DATADIR%%/Modules/TestForANSIStreamHeaders.cmake
 %%DATADIR%%/Modules/TestForANSIStreamHeaders.cxx
@@ -237,12 +329,14 @@ bin/ctest
 %%DATADIR%%/Modules/Use_wxWindows.cmake
 %%DATADIR%%/Modules/UsewxWidgets.cmake
 %%DATADIR%%/Modules/VTKCompatibility.cmake
+%%DATADIR%%/Modules/ecos_clean.cmake
 %%DATADIR%%/Modules/kde3init_dummy.cpp.in
 %%DATADIR%%/Modules/kde3uic.cmake
 %%DATADIR%%/Modules/readme.txt
 %%DATADIR%%/Templates/CMakeLists.txt
+%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros
+%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros
 %%DATADIR%%/Templates/CMakeVisualStudio6Configurations.cmake
-%%DATADIR%%/Templates/CMakeWindowsSystemConfig.cmake
 %%DATADIR%%/Templates/CPack.GenericDescription.txt
 %%DATADIR%%/Templates/CPack.GenericLicense.txt
 %%DATADIR%%/Templates/CPack.GenericWelcome.txt
@@ -256,14 +350,26 @@ bin/ctest
 %%DATADIR%%/Templates/TestDriver.cxx.in
 %%DATADIR%%/Templates/UtilityFooter.dsptemplate
 %%DATADIR%%/Templates/UtilityHeader.dsptemplate
+%%DATADIR%%/Templates/cygwin-package.sh.in
 %%DATADIR%%/Templates/staticLibFooter.dsptemplate
 %%DATADIR%%/Templates/staticLibHeader.dsptemplate
 %%DATADIR%%/include/cmCPluginAPI.h
-%%DOCSDIR%%/Copyright.txt
 %%DOCSDIR%%/ccmake.html
 %%DOCSDIR%%/ccmake.txt
+%%DOCSDIR%%/cmake-commands.html
+%%DOCSDIR%%/cmake-commands.txt
+%%DOCSDIR%%/cmake-compatcommands.html
+%%DOCSDIR%%/cmake-compatcommands.txt
+%%DOCSDIR%%/cmake-modules.html
+%%DOCSDIR%%/cmake-modules.txt
+%%DOCSDIR%%/cmake-properties.html
+%%DOCSDIR%%/cmake-properties.txt
+%%DOCSDIR%%/cmake-variables.html
+%%DOCSDIR%%/cmake-variables.txt
 %%DOCSDIR%%/cmake.html
 %%DOCSDIR%%/cmake.txt
+%%DOCSDIR%%/cpack.html
+%%DOCSDIR%%/cpack.txt
 %%DOCSDIR%%/ctest.html
 %%DOCSDIR%%/ctest.txt
 @dirrm %%DOCSDIR%%
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 2fac46bec9d4..a5797f5ec0e8 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -6,27 +6,18 @@
 
 PORTNAME=	kdesvn
 PORTVERSION=	0.14.1
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/
 
 MAINTAINER=	yuanjue@FreeBSD.org
 COMMENT=	KDE frontend for Subversion
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-
-WRKSRC=		${WRKDIR}/${DISTNAME}-build
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
-
-CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DCMAKE_C_COMPILER:STRING='${CC}' \
-		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
-		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
-
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 		svn_client-1:${PORTSDIR}/devel/subversion \
 		neon:${PORTSDIR}/www/neon26
 
+USE_CMAKE=	yes
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
@@ -51,8 +42,4 @@ post-extract:
 	${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt
 .endif
 
-do-configure:
-	@(cd ${WRKSRC}; \
-	${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
-
 .include <bsd.port.mk>
diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
index 2fac46bec9d4..a5797f5ec0e8 100644
--- a/devel/kdesvn/Makefile
+++ b/devel/kdesvn/Makefile
@@ -6,27 +6,18 @@
 
 PORTNAME=	kdesvn
 PORTVERSION=	0.14.1
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/
 
 MAINTAINER=	yuanjue@FreeBSD.org
 COMMENT=	KDE frontend for Subversion
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-
-WRKSRC=		${WRKDIR}/${DISTNAME}-build
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
-
-CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DCMAKE_C_COMPILER:STRING='${CC}' \
-		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
-		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
-
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 		svn_client-1:${PORTSDIR}/devel/subversion \
 		neon:${PORTSDIR}/www/neon26
 
+USE_CMAKE=	yes
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
@@ -51,8 +42,4 @@ post-extract:
 	${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt
 .endif
 
-do-configure:
-	@(cd ${WRKSRC}; \
-	${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
-
 .include <bsd.port.mk>
diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile
index 5f291a4e1e29..91528b03bb3e 100644
--- a/devel/physfs-devel/Makefile
+++ b/devel/physfs-devel/Makefile
@@ -14,14 +14,7 @@ MASTER_SITES=	http://offload1.icculus.org/${PORTNAME}/downloads/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A library to provide abstract access to various archives
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-
-CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DCMAKE_C_COMPILER:STRING='${CC}' \
-		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
-		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
-
+USE_CMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 NO_LATEST_LINK=	yes
@@ -40,8 +33,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\(define SIZEOF_INT\) 4|\1 (LONG_BIT/8)|g' \
 		${WRKSRC}/platform/unix.c
 
-do-configure::
-	@(cd ${WRKSRC}; \
-	${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
-
 .include <bsd.port.mk>
diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile
index 0f08d611d8de..4da6579ca503 100644
--- a/devel/qsvn/Makefile
+++ b/devel/qsvn/Makefile
@@ -14,26 +14,15 @@ MASTER_SITES=	http://www.anrichter.net/projects/qsvn/chrome/site/
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Qt based GUI frontend for Subversion
 
-BUILD_DEPENDS=	${CMAKE}:${PORTSDIR}/devel/cmake
 LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
 
 USE_QT_VER=	4
 QT_COMPONENTS=	gui moc_build uic_build rcc_build qmake_build qt3support_build
 USE_LDCONFIG=	yes
-MAKE_ENV+=	VERBOSE=1
+USE_CMAKE=	yes
 
-DESKTOP_ENTRIES="QSvn" "SVN client" "" "qsvn" "" false
-
-CMAKE?=		${LOCALBASE}/bin/cmake
-CMAKE_ARGS=	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-DCMAKE_C_COMPILER:STRING="${CC}" \
-		-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
-		-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
-		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} src
+DESKTOP_ENTRIES="QSvn" "SVN client" "" "qsvn" "" false
 
 .include <bsd.port.mk>
diff --git a/devel/qsvn/files/patch-src__CMakeLists.txt b/devel/qsvn/files/patch-src__CMakeLists.txt
index 1350065f75bf..a5c3630e2978 100644
--- a/devel/qsvn/files/patch-src__CMakeLists.txt
+++ b/devel/qsvn/files/patch-src__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./src/CMakeLists.txt.orig	2007-11-16 21:56:31.000000000 +0300
-+++ ./src/CMakeLists.txt	2008-01-13 23:03:26.000000000 +0300
+--- ../src/CMakeLists.txt.orig	2007-11-16 21:56:31.000000000 +0300
++++ ../src/CMakeLists.txt	2008-01-13 23:03:26.000000000 +0300
 @@ -157,5 +157,5 @@
  ENDIF ( WIN32 )