Updated cmake to 2.4.2.

Since 2.0.5, there have been numerous small bug fixes, improvements in
speed and portability.

5 files changed, 128 insertions, 61 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 70dcf5e6679..04ef0148e4f 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:29:13 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/05/19 21:32:52 rillig Exp $
 
-DISTNAME=	cmake-2.0.5
-PKGREVISION=	2
+DISTNAME=	cmake-2.4.2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v2.0/
+MASTER_SITES=	http://www.cmake.org/files/v2.4/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cmake.org/
@@ -17,15 +16,15 @@ CONFIGURE_HAS_MANDIR=	no
 CONFIGURE_ARGS+=	--mandir=/${PKGMANDIR}
 BUILD_TARGET=		default_target
 
+SUBST_CLASSES+=		cmake
+SUBST_STAGE.cmake=	pre-configure
+SUBST_MESSAGE.cmake=	Fixing hard-coded prefix.
+SUBST_FILES.cmake=	Modules/FindCurses.cmake
+SUBST_SED.cmake=	-e "s|@prefix@|${PREFIX}|g"
+
 post-extract:
 	${CP} ${WRKSRC}/Modules/Platform/FreeBSD.cmake \
 		${WRKSRC}/Modules/Platform/DragonFly.cmake
 
-post-patch:
-	for file in ${WRKSRC}/Modules/FindCurses.cmake; do		\
-		${MV} -f $$file $$file.bak;				\
-		${SED} "s|@prefix@|${PREFIX}|g" $$file.bak > $$file;	\
-	done
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 2039d42c72e..ee38ebc8bf1 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,34 +1,55 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/29 15:57:48 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/05/19 21:32:52 rillig Exp $
 bin/ccmake
 bin/cmake
+bin/cpack
 bin/ctest
 man/man1/ccmake.1
 man/man1/cmake.1
 man/man1/ctest.1
+share/CMake/Modules/AddFileDependencies.cmake
+share/CMake/Modules/CMake.cmake
 share/CMake/Modules/CMakeBackwardCompatibilityC.cmake
 share/CMake/Modules/CMakeBackwardCompatibilityCXX.cmake
 share/CMake/Modules/CMakeBorlandFindMake.cmake
 share/CMake/Modules/CMakeBuildSettings.cmake.in
 share/CMake/Modules/CMakeCCompiler.cmake.in
+share/CMake/Modules/CMakeCInformation.cmake
 share/CMake/Modules/CMakeCXXCompiler.cmake.in
-share/CMake/Modules/CMakeDefaultMakeRuleVariables.cmake
+share/CMake/Modules/CMakeCXXInformation.cmake
+share/CMake/Modules/CMakeCommonLanguageInclude.cmake
+share/CMake/Modules/CMakeConfigurableFile.in
 share/CMake/Modules/CMakeDetermineCCompiler.cmake
 share/CMake/Modules/CMakeDetermineCXXCompiler.cmake
+share/CMake/Modules/CMakeDetermineFortranCompiler.cmake
 share/CMake/Modules/CMakeDetermineJavaCompiler.cmake
+share/CMake/Modules/CMakeDetermineRCCompiler.cmake
 share/CMake/Modules/CMakeDetermineSystem.cmake
 share/CMake/Modules/CMakeExportBuildSettings.cmake
 share/CMake/Modules/CMakeFindFrameworks.cmake
+share/CMake/Modules/CMakeFindWMake.cmake
+share/CMake/Modules/CMakeFindXCode.cmake
+share/CMake/Modules/CMakeFortranCompiler.cmake.in
+share/CMake/Modules/CMakeFortranInformation.cmake
+share/CMake/Modules/CMakeGenericSystem.cmake
 share/CMake/Modules/CMakeImportBuildSettings.cmake
 share/CMake/Modules/CMakeJavaCompiler.cmake.in
+share/CMake/Modules/CMakeJavaInformation.cmake
+share/CMake/Modules/CMakeMSYSFindMake.cmake
+share/CMake/Modules/CMakeMinGWFindMake.cmake
 share/CMake/Modules/CMakeNMakeFindMake.cmake
 share/CMake/Modules/CMakePrintSystemInformation.cmake
+share/CMake/Modules/CMakeRCCompiler.cmake.in
+share/CMake/Modules/CMakeRCInformation.cmake
 share/CMake/Modules/CMakeSystem.cmake.in
 share/CMake/Modules/CMakeSystemSpecificInformation.cmake
 share/CMake/Modules/CMakeTestCCompiler.cmake
 share/CMake/Modules/CMakeTestCXXCompiler.cmake
 share/CMake/Modules/CMakeTestForFreeVC.cxx
+share/CMake/Modules/CMakeTestFortranCompiler.cmake
 share/CMake/Modules/CMakeTestGNU.c
+share/CMake/Modules/CMakeTestJavaCompiler.cmake
 share/CMake/Modules/CMakeTestNMakeCLVersion.c
+share/CMake/Modules/CMakeTestRCCompiler.cmake
 share/CMake/Modules/CMakeUnixFindMake.cmake
 share/CMake/Modules/CMakeVS6BackwardCompatibility.cmake
 share/CMake/Modules/CMakeVS6FindMake.cmake
@@ -36,6 +57,14 @@ share/CMake/Modules/CMakeVS71FindMake.cmake
 share/CMake/Modules/CMakeVS7BackwardCompatibility.cmake
 share/CMake/Modules/CMakeVS7FindMake.cmake
 share/CMake/Modules/CMakeVS8FindMake.cmake
+share/CMake/Modules/CPack.Description.plist.in
+share/CMake/Modules/CPack.Info.plist.in
+share/CMake/Modules/CPack.STGZ_Header.sh.in
+share/CMake/Modules/CPack.cmake
+share/CMake/Modules/CTest.cmake
+share/CMake/Modules/CTestTargets.cmake
+share/CMake/Modules/CheckCSourceCompiles.cmake
+share/CMake/Modules/CheckCXXSourceCompiles.cmake
 share/CMake/Modules/CheckForPthreads.c
 share/CMake/Modules/CheckFunctionExists.c
 share/CMake/Modules/CheckFunctionExists.cmake
@@ -48,7 +77,7 @@ share/CMake/Modules/CheckLibraryExists.cmake
 share/CMake/Modules/CheckLibraryExists.lists.in
 share/CMake/Modules/CheckSizeOf.cmake
 share/CMake/Modules/CheckSymbolExists.cmake
-share/CMake/Modules/CheckTypeSize.c
+share/CMake/Modules/CheckTypeSize.c.in
 share/CMake/Modules/CheckTypeSize.cmake
 share/CMake/Modules/CheckVariableExists.c
 share/CMake/Modules/CheckVariableExists.cmake
@@ -76,21 +105,35 @@ share/CMake/Modules/FindJNI.cmake
 share/CMake/Modules/FindJPEG.cmake
 share/CMake/Modules/FindJava.cmake
 share/CMake/Modules/FindKDE.cmake
+share/CMake/Modules/FindKDE3.cmake
+share/CMake/Modules/FindKDE4.cmake
 share/CMake/Modules/FindLATEX.cmake
 share/CMake/Modules/FindMFC.cmake
 share/CMake/Modules/FindMPEG.cmake
 share/CMake/Modules/FindMPEG2.cmake
 share/CMake/Modules/FindMPI.cmake
+share/CMake/Modules/FindMatlab.cmake
+share/CMake/Modules/FindMotif.cmake
+share/CMake/Modules/FindOpenAL.cmake
 share/CMake/Modules/FindOpenGL.cmake
 share/CMake/Modules/FindPHP4.cmake
 share/CMake/Modules/FindPNG.cmake
 share/CMake/Modules/FindPerl.cmake
 share/CMake/Modules/FindPerlLibs.cmake
+share/CMake/Modules/FindPhysFS.cmake
 share/CMake/Modules/FindPike.cmake
+share/CMake/Modules/FindPythonInterp.cmake
 share/CMake/Modules/FindPythonLibs.cmake
 share/CMake/Modules/FindQt.cmake
+share/CMake/Modules/FindQt3.cmake
+share/CMake/Modules/FindQt4.cmake
 share/CMake/Modules/FindRuby.cmake
 share/CMake/Modules/FindSDL.cmake
+share/CMake/Modules/FindSDL_image.cmake
+share/CMake/Modules/FindSDL_mixer.cmake
+share/CMake/Modules/FindSDL_net.cmake
+share/CMake/Modules/FindSDL_sound.cmake
+share/CMake/Modules/FindSDL_ttf.cmake
 share/CMake/Modules/FindSWIG.cmake
 share/CMake/Modules/FindSelfPackers.cmake
 share/CMake/Modules/FindTCL.cmake
@@ -105,10 +148,16 @@ share/CMake/Modules/FindX11.cmake
 share/CMake/Modules/FindZLIB.cmake
 share/CMake/Modules/FindwxWidgets.cmake
 share/CMake/Modules/FindwxWindows.cmake
+share/CMake/Modules/InstallRequiredSystemLibraries.cmake
+share/CMake/Modules/KDE3Macros.cmake
 share/CMake/Modules/MacOSXBundleInfo.plist.in
+share/CMake/Modules/NSIS.InstallOptions.ini.in
+share/CMake/Modules/NSIS.template.in
 share/CMake/Modules/Platform/AIX.cmake
 share/CMake/Modules/Platform/BSDOS.cmake
+share/CMake/Modules/Platform/CYGWIN-g77.cmake
 share/CMake/Modules/Platform/CYGWIN.cmake
+share/CMake/Modules/Platform/Darwin-xlc.cmake
 share/CMake/Modules/Platform/Darwin.cmake
 share/CMake/Modules/Platform/DragonFly.cmake
 share/CMake/Modules/Platform/FreeBSD.cmake
@@ -116,25 +165,38 @@ share/CMake/Modules/Platform/HP-UX.cmake
 share/CMake/Modules/Platform/IRIX.cmake
 share/CMake/Modules/Platform/IRIX64.cmake
 share/CMake/Modules/Platform/Linux-como.cmake
+share/CMake/Modules/Platform/Linux-icpc.cmake
+share/CMake/Modules/Platform/Linux-ifort.cmake
 share/CMake/Modules/Platform/Linux.cmake
 share/CMake/Modules/Platform/MP-RAS.cmake
-share/CMake/Modules/Platform/NetBSD.cmake
+share/CMake/Modules/Platform/${OPSYS}.cmake
 share/CMake/Modules/Platform/OSF1.cmake
 share/CMake/Modules/Platform/OpenBSD.cmake
+share/CMake/Modules/Platform/QNX.cmake
 share/CMake/Modules/Platform/RISCos.cmake
 share/CMake/Modules/Platform/SCO_SV.cmake
 share/CMake/Modules/Platform/SINIX.cmake
 share/CMake/Modules/Platform/SunOS.cmake
-share/CMake/Modules/Platform/True64.cmake
+share/CMake/Modules/Platform/Tru64.cmake
 share/CMake/Modules/Platform/ULTRIX.cmake
 share/CMake/Modules/Platform/UNIX_SV.cmake
+share/CMake/Modules/Platform/UnixPaths.cmake
 share/CMake/Modules/Platform/UnixWare.cmake
 share/CMake/Modules/Platform/Windows-bcc32.cmake
 share/CMake/Modules/Platform/Windows-cl.cmake
+share/CMake/Modules/Platform/Windows-cl.cmake.in
+share/CMake/Modules/Platform/Windows-g++.cmake
+share/CMake/Modules/Platform/Windows-g77.cmake
 share/CMake/Modules/Platform/Windows-gcc.cmake
+share/CMake/Modules/Platform/Windows-icl.cmake
+share/CMake/Modules/Platform/Windows-ifort.cmake
+share/CMake/Modules/Platform/Windows-wcl386.cmake
 share/CMake/Modules/Platform/Windows.cmake
+share/CMake/Modules/Platform/WindowsPaths.cmake
 share/CMake/Modules/Platform/Xenix.cmake
+share/CMake/Modules/Platform/g77.cmake
 share/CMake/Modules/Platform/gcc.cmake
+share/CMake/Modules/Platform/kFreeBSD.cmake
 share/CMake/Modules/TestBigEndian.c
 share/CMake/Modules/TestBigEndian.cmake
 share/CMake/Modules/TestCXXAcceptsFlag.cmake
@@ -142,18 +204,31 @@ share/CMake/Modules/TestForANSIForScope.cmake
 share/CMake/Modules/TestForANSIStreamHeaders.cmake
 share/CMake/Modules/TestForANSIStreamHeaders.cxx
 share/CMake/Modules/TestForAnsiForScope.cxx
+share/CMake/Modules/TestForSSTREAM.cmake
+share/CMake/Modules/TestForSSTREAM.cxx
 share/CMake/Modules/TestForSTDNamespace.cmake
 share/CMake/Modules/TestForSTDNamespace.cxx
+share/CMake/Modules/UseEcos.cmake
+share/CMake/Modules/UsePkgConfig.cmake
+share/CMake/Modules/UseQt4.cmake
 share/CMake/Modules/UseSWIG.cmake
 share/CMake/Modules/UseVTK40.cmake
 share/CMake/Modules/UseVTKBuildSettings40.cmake
 share/CMake/Modules/UseVTKConfig40.cmake
 share/CMake/Modules/Use_wxWindows.cmake
 share/CMake/Modules/UsewxWidgets.cmake
+share/CMake/Modules/VTKCompatibility.cmake
+share/CMake/Modules/kde3init_dummy.cpp.in
+share/CMake/Modules/kde3uic.cmake
 share/CMake/Modules/readme.txt
-share/CMake/Templates/CMakeDotNetSystemConfig.cmake
+share/CMake/Templates/CMakeLists.txt
 share/CMake/Templates/CMakeVisualStudio6Configurations.cmake
 share/CMake/Templates/CMakeWindowsSystemConfig.cmake
+share/CMake/Templates/CPack.GenericDescription.txt
+share/CMake/Templates/CPack.GenericLicense.txt
+share/CMake/Templates/CPack.GenericWelcome.txt
+share/CMake/Templates/CPackConfig.cmake.in
+share/CMake/Templates/CTestScript.cmake.in
 share/CMake/Templates/DLLFooter.dsptemplate
 share/CMake/Templates/DLLHeader.dsptemplate
 share/CMake/Templates/EXEFooter.dsptemplate
diff --git a/devel/cmake/buildlink3.mk b/devel/cmake/buildlink3.mk
deleted file mode 100644
index faaf9d18ab6..00000000000
--- a/devel/cmake/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:07 rillig Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-CMAKE_BUILDLINK3_MK:=	${CMAKE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cmake
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncmake}
-BUILDLINK_PACKAGES+=	cmake
-
-.if !empty(CMAKE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cmake+=	cmake>=2.0.2
-BUILDLINK_ABI_DEPENDS.cmake?=	cmake>=2.0.5nb2
-BUILDLINK_PKGSRCDIR.cmake?=	../../devel/cmake
-BUILDLINK_DEPMETHOD.cmake?=	build
-.endif	# CMAKE_BUILDLINK3_MK
-
-.include "../../devel/ncurses/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 35d6def974c..8e977f4aa59 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/05/19 21:32:52 rillig Exp $
 
-SHA1 (cmake-2.0.5.tar.gz) = d687bfa7c266b3619a2c0d32a9685ba197eea67a
-RMD160 (cmake-2.0.5.tar.gz) = 17a29044f3ac53105105080e7714bcd74d38693e
-Size (cmake-2.0.5.tar.gz) = 1626284 bytes
-SHA1 (patch-ac) = 2c8ec3ac81a46a4cdfe7907b9628f4b0bea94b3e
+SHA1 (cmake-2.4.2.tar.gz) = 9fdef75873ba59cbd3ebb9400d60a26513897ee0
+RMD160 (cmake-2.4.2.tar.gz) = 436ea51033c4f20767f194165188b4d39ff4a0ab
+Size (cmake-2.4.2.tar.gz) = 2948510 bytes
+SHA1 (patch-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345
 SHA1 (patch-ad) = c603f20478dcc3a7eef4e17c3dcfbab42f63e6a1
diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac
index d370c78d045..158a847f3ba 100644
--- a/devel/cmake/patches/patch-ac
+++ b/devel/cmake/patches/patch-ac
@@ -1,28 +1,43 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/05/07 11:55:03 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2006/05/19 21:32:52 rillig Exp $
 
---- Modules/FindCurses.cmake.orig	Wed Dec 12 12:05:20 2001
+--- Modules/FindCurses.cmake.orig	2006-04-18 21:41:51.000000000 +0100
 +++ Modules/FindCurses.cmake
-@@ -3,18 +3,18 @@
- #
+@@ -3,30 +3,30 @@
  
- FIND_PATH(CURSES_INCLUDE_PATH curses.h
--/usr/local/include /usr/include
-+@prefix@/include /usr/include 
+ FIND_PATH(CURSES_INCLUDE_PATH 
+   curses.h
+-  /usr/local/include 
++  @prefix@/include
+   /usr/include
  )
  
--FIND_LIBRARY(CURSES_LIBRARY curses
--PATHS /usr/local/lib /usr/lib /lib
-+FIND_LIBRARY(CURSES_LIBRARY ncurses
-+PATHS @prefix@/lib /usr/lib /lib
+ FIND_LIBRARY(CURSES_LIBRARY 
+-  NAMES curses ncurses
+-  PATHS 
+-    /usr/local/lib 
++  NAMES ncurses
++  PATHS
++    @prefix@/lib
+     /usr/lib 
+     /lib
  )
  
- FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr
--PATHS /usr/local/lib /usr/lib /lib
-+PATHS @prefix@/lib  /usr/lib /lib
+ FIND_LIBRARY(CURSES_EXTRA_LIBRARY 
+   cur_colr
+-  PATHS 
+-    /usr/local/lib 
++  PATHS
++    @prefix@/lib
+     /usr/lib 
+     /lib
  )
  
- FIND_LIBRARY(FORM_LIBRARY form
--PATHS /usr/local/lib /usr/lib /lib
-+PATHS @prefix@/lib /usr/lib /lib
+ FIND_LIBRARY(FORM_LIBRARY 
+   form
+-  PATHS 
+-    /usr/local/lib 
++  PATHS
++    @prefix@/lib
+     /usr/lib 
+     /lib
  )
-