3 files changed, 53 insertions, 11 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index d93a821d1916..e3287acdc495 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	2.0.6
+PORTVERSION=	2.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A cross-platform make
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--docdir=${DOCSDIR:S|^${PREFIX}||} --datadir=${DATADIR:S|^${PREFIX}||}
+USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--datadir=${DATADIR:S|^${PREFIX}||} \
+		--docdir=${DOCSDIR:S|^${PREFIX}||}
 
 MAN1=		ccmake.1 cmake.1 ctest.1
 
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index a398296adfa1..c1f2de39e6fa 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (cmake-2.0.6.tar.gz) = 840ea86d7f1a56b469052c9cabbeac54
-SHA256 (cmake-2.0.6.tar.gz) = c37a486b788c1355d613e0362097a374c07436aca088dc41619eaf0cb6ffc220
-SIZE (cmake-2.0.6.tar.gz) = 1632052
+MD5 (cmake-2.2.3.tar.gz) = d29377b76fbab6a74107c49adc9e6457
+SHA256 (cmake-2.2.3.tar.gz) = b3d9dcced2ddce409ac2c9d54efe22761a613fee684762fc6ac75e06da8ecbc1
+SIZE (cmake-2.2.3.tar.gz) = 2427300
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 3e885a81d4a7..7cb348ab89a6 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -8,30 +8,45 @@ bin/ctest
 %%DOCSDIR%%/cmake.txt
 %%DOCSDIR%%/ctest.html
 %%DOCSDIR%%/ctest.txt
+%%DATADIR%%/Modules/CMake.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/CMakeCInformation.cmake
 %%DATADIR%%/Modules/CMakeCXXCompiler.cmake.in
-%%DATADIR%%/Modules/CMakeDefaultMakeRuleVariables.cmake
+%%DATADIR%%/Modules/CMakeCXXInformation.cmake
+%%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
 %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineSystem.cmake
 %%DATADIR%%/Modules/CMakeExportBuildSettings.cmake
 %%DATADIR%%/Modules/CMakeFindFrameworks.cmake
+%%DATADIR%%/Modules/CMakeFindXCode.cmake
+%%DATADIR%%/Modules/CMakeFortranCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeFortranInformation.cmake
+%%DATADIR%%/Modules/CMakeGenericSystem.cmake
 %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
 %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeJavaInformation.cmake
 %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
 %%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
+%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeRCInformation.cmake
 %%DATADIR%%/Modules/CMakeSystem.cmake.in
 %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
 %%DATADIR%%/Modules/CMakeTestCCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestForFreeVC.cxx
+%%DATADIR%%/Modules/CMakeTestFortranCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestGNU.c
+%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestNMakeCLVersion.c
+%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
 %%DATADIR%%/Modules/CMakeUnixFindMake.cmake
 %%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
 %%DATADIR%%/Modules/CMakeVS6FindMake.cmake
@@ -39,6 +54,10 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake
 %%DATADIR%%/Modules/CMakeVS7FindMake.cmake
 %%DATADIR%%/Modules/CMakeVS8FindMake.cmake
+%%DATADIR%%/Modules/CTest.cmake
+%%DATADIR%%/Modules/CTestTargets.cmake
+%%DATADIR%%/Modules/CheckCSourceCompiles.cmake
+%%DATADIR%%/Modules/CheckCXXSourceCompiles.cmake
 %%DATADIR%%/Modules/CheckForPthreads.c
 %%DATADIR%%/Modules/CheckFunctionExists.c
 %%DATADIR%%/Modules/CheckFunctionExists.cmake
@@ -51,7 +70,7 @@ bin/ctest
 %%DATADIR%%/Modules/CheckLibraryExists.lists.in
 %%DATADIR%%/Modules/CheckSizeOf.cmake
 %%DATADIR%%/Modules/CheckSymbolExists.cmake
-%%DATADIR%%/Modules/CheckTypeSize.c
+%%DATADIR%%/Modules/CheckTypeSize.c.in
 %%DATADIR%%/Modules/CheckTypeSize.cmake
 %%DATADIR%%/Modules/CheckVariableExists.c
 %%DATADIR%%/Modules/CheckVariableExists.cmake
@@ -84,16 +103,28 @@ bin/ctest
 %%DATADIR%%/Modules/FindMPEG.cmake
 %%DATADIR%%/Modules/FindMPEG2.cmake
 %%DATADIR%%/Modules/FindMPI.cmake
+%%DATADIR%%/Modules/FindMatlab.cmake
+%%DATADIR%%/Modules/FindMotif.cmake
+%%DATADIR%%/Modules/FindOpenAL.cmake
 %%DATADIR%%/Modules/FindOpenGL.cmake
 %%DATADIR%%/Modules/FindPHP4.cmake
 %%DATADIR%%/Modules/FindPNG.cmake
 %%DATADIR%%/Modules/FindPerl.cmake
 %%DATADIR%%/Modules/FindPerlLibs.cmake
+%%DATADIR%%/Modules/FindPhysFS.cmake
 %%DATADIR%%/Modules/FindPike.cmake
+%%DATADIR%%/Modules/FindPythonInterp.cmake
 %%DATADIR%%/Modules/FindPythonLibs.cmake
 %%DATADIR%%/Modules/FindQt.cmake
+%%DATADIR%%/Modules/FindQt3.cmake
+%%DATADIR%%/Modules/FindQt4.cmake
 %%DATADIR%%/Modules/FindRuby.cmake
 %%DATADIR%%/Modules/FindSDL.cmake
+%%DATADIR%%/Modules/FindSDL_image.cmake
+%%DATADIR%%/Modules/FindSDL_mixer.cmake
+%%DATADIR%%/Modules/FindSDL_net.cmake
+%%DATADIR%%/Modules/FindSDL_sound.cmake
+%%DATADIR%%/Modules/FindSDL_ttf.cmake
 %%DATADIR%%/Modules/FindSWIG.cmake
 %%DATADIR%%/Modules/FindSelfPackers.cmake
 %%DATADIR%%/Modules/FindTCL.cmake
@@ -111,6 +142,7 @@ bin/ctest
 %%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
 %%DATADIR%%/Modules/Platform/AIX.cmake
 %%DATADIR%%/Modules/Platform/BSDOS.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-g77.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN.cmake
 %%DATADIR%%/Modules/Platform/Darwin-xlc.cmake
 %%DATADIR%%/Modules/Platform/Darwin.cmake
@@ -119,25 +151,31 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/IRIX.cmake
 %%DATADIR%%/Modules/Platform/IRIX64.cmake
 %%DATADIR%%/Modules/Platform/Linux-como.cmake
+%%DATADIR%%/Modules/Platform/Linux-ifort.cmake
 %%DATADIR%%/Modules/Platform/Linux.cmake
 %%DATADIR%%/Modules/Platform/MP-RAS.cmake
 %%DATADIR%%/Modules/Platform/NetBSD.cmake
 %%DATADIR%%/Modules/Platform/OSF1.cmake
 %%DATADIR%%/Modules/Platform/OpenBSD.cmake
+%%DATADIR%%/Modules/Platform/QNX.cmake
 %%DATADIR%%/Modules/Platform/RISCos.cmake
 %%DATADIR%%/Modules/Platform/SCO_SV.cmake
 %%DATADIR%%/Modules/Platform/SINIX.cmake
 %%DATADIR%%/Modules/Platform/SunOS.cmake
-%%DATADIR%%/Modules/Platform/True64.cmake
+%%DATADIR%%/Modules/Platform/Tru64.cmake
 %%DATADIR%%/Modules/Platform/ULTRIX.cmake
 %%DATADIR%%/Modules/Platform/UNIX_SV.cmake
 %%DATADIR%%/Modules/Platform/UnixWare.cmake
 %%DATADIR%%/Modules/Platform/Windows-bcc32.cmake
 %%DATADIR%%/Modules/Platform/Windows-cl.cmake
+%%DATADIR%%/Modules/Platform/Windows-cl.cmake.in
+%%DATADIR%%/Modules/Platform/Windows-g77.cmake
 %%DATADIR%%/Modules/Platform/Windows-gcc.cmake
 %%DATADIR%%/Modules/Platform/Windows-icl.cmake
+%%DATADIR%%/Modules/Platform/Windows-ifort.cmake
 %%DATADIR%%/Modules/Platform/Windows.cmake
 %%DATADIR%%/Modules/Platform/Xenix.cmake
+%%DATADIR%%/Modules/Platform/g77.cmake
 %%DATADIR%%/Modules/Platform/gcc.cmake
 %%DATADIR%%/Modules/TestBigEndian.c
 %%DATADIR%%/Modules/TestBigEndian.cmake
@@ -148,14 +186,15 @@ bin/ctest
 %%DATADIR%%/Modules/TestForAnsiForScope.cxx
 %%DATADIR%%/Modules/TestForSTDNamespace.cmake
 %%DATADIR%%/Modules/TestForSTDNamespace.cxx
+%%DATADIR%%/Modules/UseQt4.cmake
 %%DATADIR%%/Modules/UseSWIG.cmake
 %%DATADIR%%/Modules/UseVTK40.cmake
 %%DATADIR%%/Modules/UseVTKBuildSettings40.cmake
 %%DATADIR%%/Modules/UseVTKConfig40.cmake
-%%DATADIR%%/Modules/UsewxWidgets.cmake
 %%DATADIR%%/Modules/Use_wxWindows.cmake
+%%DATADIR%%/Modules/UsewxWidgets.cmake
+%%DATADIR%%/Modules/VTKCompatibility.cmake
 %%DATADIR%%/Modules/readme.txt
-%%DATADIR%%/Templates/CMakeDotNetSystemConfig.cmake
 %%DATADIR%%/Templates/CMakeVisualStudio6Configurations.cmake
 %%DATADIR%%/Templates/CMakeWindowsSystemConfig.cmake
 %%DATADIR%%/Templates/DLLFooter.dsptemplate