>Number:         32127
>Category:       pkg
>Synopsis:       Update of CMake from 2.0.5 to 2.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 20 00:12:00 +0000 2005
>Originator:     Lars Nordlund
>Release:        NetBSD-current, pkgsrc-current
>Organization:
>Environment:
NetBSD glengoyne 3.99.11 NetBSD 3.99.11 (GLENGOYNE) #0: Wed Nov 16 01:56:40 CET 2005  lars@glengoyne:/home/lars/tmp/obj_i386/sys/arch/i386/compile/GLENGOYNE i386

>Description:
This diff taken from pkgsrc/devel/cmake updates cmake from 2.0.5 to 2.2.2. I have also gotten rid of the need for the patches subdirectory. I kept the DragonFly fix but I have not yet tested this on DragonFly.

>How-To-Repeat:

>Fix:
Warning: No xauth data; using fake authentication data for X11 forwarding.
Index: Makefile
===================================================================
RCS file: /home/cvs/cvsup/netbsd/pkgsrc/devel/cmake/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile    29 Oct 2005 15:57:48 -0000      1.19
+++ Makefile    20 Nov 2005 00:11:01 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.19 2005/10/29 15:57:48 reed Exp $
 
-DISTNAME=      cmake-2.0.5
-PKGREVISION=   1
+DISTNAME=      cmake-2.2.2
 CATEGORIES=    devel
-MASTER_SITES=  http://www.cmake.org/files/v2.0/
+MASTER_SITES=  http://www.cmake.org/files/v2.2/
 
 MAINTAINER=    tech-pkg@NetBSD.org
 HOMEPAGE=      http://www.cmake.org/
@@ -15,17 +14,20 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_HAS_MANDIR=  no
 CONFIGURE_ARGS+=       --mandir=/${PKGMANDIR}
+CONFIGURE_ARGS+=       --docdir=/share/doc/CMake
 BUILD_TARGET=          default_target
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     Modules/FindCurses.cmake
+SUBST_SED.paths=       -e "s|/usr/local|${PREFIX}|g" \
+                       -e "s|NAMES curses|NAMES|g"
+SUBST_MESSAGE.paths=   "Fixing hardcoded /usr/local paths and curses library."
+
+
 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"
Index: PLIST
===================================================================
RCS file: /home/cvs/cvsup/netbsd/pkgsrc/devel/cmake/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST       29 Oct 2005 15:57:48 -0000      1.6
+++ PLIST       20 Nov 2005 00:11:01 -0000
@@ -1,34 +1,49 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/29 15:57:48 reed Exp $
+@comment $NetBSD$
 bin/ccmake
 bin/cmake
 bin/ctest
 man/man1/ccmake.1
 man/man1/cmake.1
 man/man1/ctest.1
+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/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/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/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 +51,10 @@
 share/CMake/Modules/CMakeVS7BackwardCompatibility.cmake
 share/CMake/Modules/CMakeVS7FindMake.cmake
 share/CMake/Modules/CMakeVS8FindMake.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 +67,7 @@
 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
@@ -81,16 +100,28 @@
 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
@@ -108,7 +139,9 @@
 share/CMake/Modules/MacOSXBundleInfo.plist.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,24 +149,31 @@
 share/CMake/Modules/Platform/IRIX.cmake
 share/CMake/Modules/Platform/IRIX64.cmake
 share/CMake/Modules/Platform/Linux-como.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/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-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.cmake
 share/CMake/Modules/Platform/Xenix.cmake
+share/CMake/Modules/Platform/g77.cmake
 share/CMake/Modules/Platform/gcc.cmake
 share/CMake/Modules/TestBigEndian.c
 share/CMake/Modules/TestBigEndian.cmake
@@ -144,14 +184,15 @@
 share/CMake/Modules/TestForAnsiForScope.cxx
 share/CMake/Modules/TestForSTDNamespace.cmake
 share/CMake/Modules/TestForSTDNamespace.cxx
+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/readme.txt
-share/CMake/Templates/CMakeDotNetSystemConfig.cmake
 share/CMake/Templates/CMakeVisualStudio6Configurations.cmake
 share/CMake/Templates/CMakeWindowsSystemConfig.cmake
 share/CMake/Templates/DLLFooter.dsptemplate
Index: distinfo
===================================================================
RCS file: /home/cvs/cvsup/netbsd/pkgsrc/devel/cmake/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    23 Feb 2005 22:24:11 -0000      1.4
+++ distinfo    20 Nov 2005 00:11:01 -0000
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.4 2005/02/23 22:24:11 agc 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 (patch-ad) = c603f20478dcc3a7eef4e17c3dcfbab42f63e6a1
+SHA1 (cmake-2.2.2.tar.gz) = 67835730fd5721a5c15ccb407a9f40d59e86b680
+RMD160 (cmake-2.2.2.tar.gz) = 8fb4ab6ae5260702e043cac928a5dcb6b70e6d16
+Size (cmake-2.2.2.tar.gz) = 2417339 bytes