Update to 2.4.6:

Changes in CMake 2.4.6

* Remove svn test in ctestctest3

* Fix for FIND_* order and framworks with PREFIX usage.

* Fix for FindDoxygen and quiet mode.

* Find JavaVM as well as jvm

* Look for ruby1.8 and ruby

* Fix for cpack .tgz.sh and dash

* Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR.

* Fix for Borland make and custom commands that do nothing


Changes in CMake 2.4.5
* Fix for seg fault when a macro runs a bad command BUG# 3815

* Fix fix for foo.dll.lib that does not brea -L/usr/lib in link names

* Fix problem with LIBRARY_OUTPUT_PATH and linking to a dll foo.dll.lib
  instead of foo.lib

* Do not depend on optimized libraries for a debug build and visa versa.

* Fix target name matching custom command output conflict.

* Fix FindQt3 so that it does not find qt4

* Fix FindKDE4 so that it only looks for kde4-config

Changes in CMake 2.4.4

* CMake Version numbers on module directory

* elseif added

* Fix docs in CheckCSourceCompiles CheckCXXSourceCompiles and diagnostic
  output.

* added Check(C/CXX)SourceRuns.cmake, CheckCXXCompilerFlag.cmake, Check

* add static and shared flags to make sure the specified versions of
  libraries are used with -static -lfoo -shared -lbar

*  Search for the compiler only once and store a full path. avoids problems
  with PATH changes in cmake re-runs.

* make sure manifest files are generated with VS 8

* added FindASPELL.cmake, FindBZip2.cmake FindHPELL.cmake, FindJasper.cmake
  FindLibXml2.cmake, FindLibXslt.cmake, FindOpenSSL.cmake

* fix for bug#3646 GLUT not Glut for framework name

* many fixes for FindKDE3.cmake

* Better FindPNG that honors REQUIRED and looks in more places.

* Support to find python 2.5

* Find Qt3 better

* Find Qt4 better and work with qmake and qmake-qt4 on the same machine.

* Much better FindRuby.cmake

* More stuff marked as advanced in FindTcl and FindSDL

* FindwxWidgets runs shell script wx-config with sh

* Support for cpack and vs8 install libraries

* Darwin shared library create and Fortran now work

* Support for isystem directories INCLUDE_DIRECTORIES (SYSTEM)

* Targets in makefiles to create pre-processed files and assembly files
  can be turned off with these variables:
   CMAKE_SKIP_PREPROCESSED_SOURCE_RULES CMAKE_SKIP_ASSEMBLY_SOURCE_RULES

* Support for QNX

* Better default search paths for unix and FIND_* stuff

* Use link /lib and not lib to create static libraries with MS

* Useqt4 works with static qt4 and other fixes

* UseSwig.cmake interface to add extra dependencies.

* Added APPEND option to ADD_CUSTOM_COMMAND, Added VERBATIM option to
  ADD_CUSTOM_COMMAND and ADD_CUSTOM_TARGET

* add EXCLUDE_FROM_ALL option  for ADD_LIBRARY and ADD_EXECUTABLE

* Fix automatic computation of binary path to work for subdirectories of out
  of source directories.  This addresses bug#3592.

* --debug-ouput to cmake that gives stack trace to message send error commands.
  The stack trace is no longer there without it.

* + can be in a variable

* Do not replace @VAR@ syntax in list files.  This addresses bug #2722

* much faster depend scanning

* do depends on system include directories

* Permission and install directory fixes

* New target property <CONFIG>_LOCATION (Debug, Release, etc)

* fix exclude from all in VS

* fix code completion problem in KDevelop

* Define MSYS when using msys generator

* fix referencece to projects outside the build tree VS 7,8

* Fix ZERO_CHECK to not always try and rebuild

* Fix Xcode universal binary rebuild problem

* add FILE_IS_NEWER to if command

* Add OPTIONAL to INSTALL command fix bug@2922

* add SORT and REVERSE to LIST command

* fix for seg fault bug #3815

* add SYBOLIC as a source file property see SET_SOURCE_FILES_PROPERTIES

* fix ctest valgrind if no coverage is done

* better message if bogus generator is specified.

* Better FindJava and FindJNI

* Fix doxygen.config for CMake

* add CPACK_MODULE_PATH

* Fix configuration for ctest dashboard targets Experimental, Nightly, etc

* Fix FindDoxygen for mac and app-bundles

* Fix CPack simple install test with NSIS

* Allow EXECUTE_PROCESS to strip trailing white space

* Fix mingw echo in makefiles

* Fix Xcode to not mess up -gdwarf-2

* Fix crash when "linking" to custom targets.

* Allow HEADER_FILE_ONLY to not compile the file in VS 7 and 8

* Fix mingw out of binary with spaces in the path.

* Fix for sudo make install (partial)

* Allow installed zlib, curl, expat, xmlrpc to be used.

* Add CMakeDependentOption.cmake module

* Allow projects to set install prefix default

* improved Find/Use wxWidgets

* add support for windows dll version numbers

* Fix message for -G when generator does not exist

* Fix html references in help

* Fix version on .exe cygwin

* allow global timeout in ctest

* Fix some odd cases with custom commands in VS 6

* Fix path suffix stuff with lib64 in FIND_* stuff.

* Fix delete in CMakeSetup to not change the current position in the list

* Fix debug stl run of ctest on Mac

* Use #2 for manifest nt command on dll and #1 on exe

* Add depends from files inside qrc files in qt

* Fix explort_library_depends to work with optimized and debug

Changes in CMake 2.4.3

* fix for 3557 - Under MSVC8 hardcoded TargetEnvironment for MIDL Compiler

* Fix for Xcode all projects to prevent -fvisibility=hidden flags. This is
needed to make RTTI work by default.

* better prototype for main in try compile of c programs avoids warnings in
logs.

* with visual studio do not use incremental linking for release builds by
default.

* fix bootstrap to use more ansi c main it test compiler

* fix import build settings to do case insensitive match on windows

* fix building in root directory c:/

* Add support for CXX only projects

* Better FindWxWidgets

* Added FindBoose.cmake

* add more fortran file extensions

* Cpack supports multiple packages at the same time

* Fix to FindKDE4 to look for kde4-config first

* Support for env var CMAKE_CONFIG_TYPE in ctest

* Fix for -DVAR=foo on the command line not saving to the cache

* ENH: Added creation of XXX_FIND_COMPONENTS list of all components requested
  withREQUIRED option.  This addresses the feature request in bug#3494.

* Object files get safe names

* progress is now reported with makefiles

* location of CMakeTmp changed to a varible

* CMAKE_COLOR_MAKEFILE cache variable available to turn off color output

* fixes for FindQt4 on mac.

* Better search paths for finding VTK

* Fix relative path problems in ADD_SUBDIRECTORY

* Fix long link commands on UNIX shells

* Fix depend file names in makefiles for generated headers

* CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS allows for if/endif without variable

* Xcode multiple custom command problem fixed.

* INSTALL_RPATH_USE_LINK_PATH when true will add the link path to the rpath

* Add target/fast rules in the sub directories

* Fix Visual stuido C and C++ targets to not add /TP and /TC

* print a context when cmake errors occur

* add rxvt-unicode, cygwin, and screen terminal support for color output

* Fix crash in CMakeSetup when status line is long

* make sure try compile files have a newline at the end

* fix for hp itanium build

7 files changed, 305 insertions, 314 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 946815f9179..7b2fa25dad5 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2006/10/08 13:01:52 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/23 11:48:18 wiz Exp $
 
-DISTNAME=	cmake-2.4.2
-PKGREVISION=	2
+DISTNAME=	cmake-2.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v2.4/
 
@@ -15,8 +14,14 @@ USE_NCURSES=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_HAS_MANDIR=	no
 CONFIGURE_ARGS+=	--mandir=/${PKGMANDIR}
+# to add /share; take care on major version bumps!
+CONFIGURE_ARGS+=	--docdir=/share/doc/cmake-2.4
+CONFIGURE_ARGS+=	--system-libs
 BUILD_TARGET=		default_target
 
+# as of 2.4.6, x11 and fortran tests fail in pkgsrc
+TEST_TARGET=		test
+
 SUBST_CLASSES+=		cmake
 SUBST_STAGE.cmake=	pre-configure
 SUBST_MESSAGE.cmake=	Fixing hard-coded prefix.
@@ -25,8 +30,13 @@ SUBST_SED.cmake=	-e "s|@prefix@|${PREFIX}|g"
 SUBST_SED.cmake+=	-e "s|@x11base@|${X11BASE}|g"
 
 post-extract:
-	${CP} ${WRKSRC}/Modules/Platform/FreeBSD.cmake \
+	cp ${WRKSRC}/Modules/Platform/FreeBSD.cmake \
 		${WRKSRC}/Modules/Platform/DragonFly.cmake
 
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+# not packaged yet, see also patch-ab
+#.include "../../textproc/xmlrpc-c/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 69b5dcb534c..f87520aeff0 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/05/21 13:53:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/02/23 11:48:18 wiz Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -6,250 +6,270 @@ 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/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
-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
-share/CMake/Modules/CheckIncludeFile.c.in
-share/CMake/Modules/CheckIncludeFile.cmake
-share/CMake/Modules/CheckIncludeFile.cxx.in
-share/CMake/Modules/CheckIncludeFileCXX.cmake
-share/CMake/Modules/CheckIncludeFiles.cmake
-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.in
-share/CMake/Modules/CheckTypeSize.cmake
-share/CMake/Modules/CheckVariableExists.c
-share/CMake/Modules/CheckVariableExists.cmake
-share/CMake/Modules/Dart.cmake
-share/CMake/Modules/DartConfiguration.tcl.in
-share/CMake/Modules/Documentation.cmake
-share/CMake/Modules/DummyCXXFile.cxx
-share/CMake/Modules/FindAVIFile.cmake
-share/CMake/Modules/FindCABLE.cmake
-share/CMake/Modules/FindCurses.cmake
-share/CMake/Modules/FindCygwin.cmake
-share/CMake/Modules/FindDCMTK.cmake
-share/CMake/Modules/FindDart.cmake
-share/CMake/Modules/FindDoxygen.cmake
-share/CMake/Modules/FindFLTK.cmake
-share/CMake/Modules/FindGCCXML.cmake
-share/CMake/Modules/FindGLU.cmake
-share/CMake/Modules/FindGLUT.cmake
-share/CMake/Modules/FindGTK.cmake
-share/CMake/Modules/FindGnuplot.cmake
-share/CMake/Modules/FindHTMLHelp.cmake
-share/CMake/Modules/FindITK.cmake
-share/CMake/Modules/FindImageMagick.cmake
-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
-share/CMake/Modules/FindTIFF.cmake
-share/CMake/Modules/FindTclsh.cmake
-share/CMake/Modules/FindThreads.cmake
-share/CMake/Modules/FindUnixCommands.cmake
-share/CMake/Modules/FindVTK.cmake
-share/CMake/Modules/FindWget.cmake
-share/CMake/Modules/FindWish.cmake
-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
-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/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/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
-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/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
-share/CMake/Templates/EXEHeader.dsptemplate
-share/CMake/Templates/EXEWinHeader.dsptemplate
-share/CMake/Templates/TestDriver.cxx.in
-share/CMake/Templates/UtilityFooter.dsptemplate
-share/CMake/Templates/UtilityHeader.dsptemplate
-share/CMake/Templates/staticLibFooter.dsptemplate
-share/CMake/Templates/staticLibHeader.dsptemplate
-share/CMake/include/cmCPluginAPI.h
-share/doc/CMake/Copyright.txt
-share/doc/CMake/ccmake.html
-share/doc/CMake/ccmake.txt
-share/doc/CMake/cmake.html
-share/doc/CMake/cmake.txt
-share/doc/CMake/ctest.html
-share/doc/CMake/ctest.txt
-@dirrm share/doc/CMake
-@dirrm share/CMake/include
-@dirrm share/CMake/Templates
-@dirrm share/CMake/Modules/Platform
-@dirrm share/CMake/Modules
-@dirrm share/CMake
+share/cmake-2.4/Modules/AddFileDependencies.cmake
+share/cmake-2.4/Modules/CMake.cmake
+share/cmake-2.4/Modules/CMakeBackwardCompatibilityC.cmake
+share/cmake-2.4/Modules/CMakeBackwardCompatibilityCXX.cmake
+share/cmake-2.4/Modules/CMakeBorlandFindMake.cmake
+share/cmake-2.4/Modules/CMakeBuildSettings.cmake.in
+share/cmake-2.4/Modules/CMakeCCompiler.cmake.in
+share/cmake-2.4/Modules/CMakeCInformation.cmake
+share/cmake-2.4/Modules/CMakeCXXCompiler.cmake.in
+share/cmake-2.4/Modules/CMakeCXXInformation.cmake
+share/cmake-2.4/Modules/CMakeCommonLanguageInclude.cmake
+share/cmake-2.4/Modules/CMakeConfigurableFile.in
+share/cmake-2.4/Modules/CMakeDependentOption.cmake
+share/cmake-2.4/Modules/CMakeDetermineCCompiler.cmake
+share/cmake-2.4/Modules/CMakeDetermineCXXCompiler.cmake
+share/cmake-2.4/Modules/CMakeDetermineFortranCompiler.cmake
+share/cmake-2.4/Modules/CMakeDetermineJavaCompiler.cmake
+share/cmake-2.4/Modules/CMakeDetermineRCCompiler.cmake
+share/cmake-2.4/Modules/CMakeDetermineSystem.cmake
+share/cmake-2.4/Modules/CMakeExportBuildSettings.cmake
+share/cmake-2.4/Modules/CMakeFindFrameworks.cmake
+share/cmake-2.4/Modules/CMakeFindWMake.cmake
+share/cmake-2.4/Modules/CMakeFindXCode.cmake
+share/cmake-2.4/Modules/CMakeFortranCompiler.cmake.in
+share/cmake-2.4/Modules/CMakeFortranInformation.cmake
+share/cmake-2.4/Modules/CMakeGenericSystem.cmake
+share/cmake-2.4/Modules/CMakeImportBuildSettings.cmake
+share/cmake-2.4/Modules/CMakeJavaCompiler.cmake.in
+share/cmake-2.4/Modules/CMakeJavaInformation.cmake
+share/cmake-2.4/Modules/CMakeMSYSFindMake.cmake
+share/cmake-2.4/Modules/CMakeMinGWFindMake.cmake
+share/cmake-2.4/Modules/CMakeNMakeFindMake.cmake
+share/cmake-2.4/Modules/CMakePrintSystemInformation.cmake
+share/cmake-2.4/Modules/CMakeRCCompiler.cmake.in
+share/cmake-2.4/Modules/CMakeRCInformation.cmake
+share/cmake-2.4/Modules/CMakeSystem.cmake.in
+share/cmake-2.4/Modules/CMakeSystemSpecificInformation.cmake
+share/cmake-2.4/Modules/CMakeTestCCompiler.cmake
+share/cmake-2.4/Modules/CMakeTestCXXCompiler.cmake
+share/cmake-2.4/Modules/CMakeTestForFreeVC.cxx
+share/cmake-2.4/Modules/CMakeTestFortranCompiler.cmake
+share/cmake-2.4/Modules/CMakeTestGNU.c
+share/cmake-2.4/Modules/CMakeTestJavaCompiler.cmake
+share/cmake-2.4/Modules/CMakeTestNMakeCLVersion.c
+share/cmake-2.4/Modules/CMakeTestRCCompiler.cmake
+share/cmake-2.4/Modules/CMakeUnixFindMake.cmake
+share/cmake-2.4/Modules/CMakeVCManifest.cmake
+share/cmake-2.4/Modules/CMakeVCManifestExe.cmake
+share/cmake-2.4/Modules/CMakeVS6BackwardCompatibility.cmake
+share/cmake-2.4/Modules/CMakeVS6FindMake.cmake
+share/cmake-2.4/Modules/CMakeVS71FindMake.cmake
+share/cmake-2.4/Modules/CMakeVS7BackwardCompatibility.cmake
+share/cmake-2.4/Modules/CMakeVS7FindMake.cmake
+share/cmake-2.4/Modules/CMakeVS8FindMake.cmake
+share/cmake-2.4/Modules/CPack.Description.plist.in
+share/cmake-2.4/Modules/CPack.Info.plist.in
+share/cmake-2.4/Modules/CPack.STGZ_Header.sh.in
+share/cmake-2.4/Modules/CPack.cmake
+share/cmake-2.4/Modules/CTest.cmake
+share/cmake-2.4/Modules/CTestTargets.cmake
+share/cmake-2.4/Modules/CheckCCompilerFlag.cmake
+share/cmake-2.4/Modules/CheckCSourceCompiles.cmake
+share/cmake-2.4/Modules/CheckCSourceRuns.cmake
+share/cmake-2.4/Modules/CheckCXXCompilerFlag.cmake
+share/cmake-2.4/Modules/CheckCXXSourceCompiles.cmake
+share/cmake-2.4/Modules/CheckCXXSourceRuns.cmake
+share/cmake-2.4/Modules/CheckForPthreads.c
+share/cmake-2.4/Modules/CheckFunctionExists.c
+share/cmake-2.4/Modules/CheckFunctionExists.cmake
+share/cmake-2.4/Modules/CheckIncludeFile.c.in
+share/cmake-2.4/Modules/CheckIncludeFile.cmake
+share/cmake-2.4/Modules/CheckIncludeFile.cxx.in
+share/cmake-2.4/Modules/CheckIncludeFileCXX.cmake
+share/cmake-2.4/Modules/CheckIncludeFiles.cmake
+share/cmake-2.4/Modules/CheckLibraryExists.cmake
+share/cmake-2.4/Modules/CheckLibraryExists.lists.in
+share/cmake-2.4/Modules/CheckSizeOf.cmake
+share/cmake-2.4/Modules/CheckSymbolExists.cmake
+share/cmake-2.4/Modules/CheckTypeSize.c.in
+share/cmake-2.4/Modules/CheckTypeSize.cmake
+share/cmake-2.4/Modules/CheckVariableExists.c
+share/cmake-2.4/Modules/CheckVariableExists.cmake
+share/cmake-2.4/Modules/Dart.cmake
+share/cmake-2.4/Modules/DartConfiguration.tcl.in
+share/cmake-2.4/Modules/Documentation.cmake
+share/cmake-2.4/Modules/DummyCXXFile.cxx
+share/cmake-2.4/Modules/FindASPELL.cmake
+share/cmake-2.4/Modules/FindAVIFile.cmake
+share/cmake-2.4/Modules/FindBZip2.cmake
+share/cmake-2.4/Modules/FindBoost.cmake
+share/cmake-2.4/Modules/FindCABLE.cmake
+share/cmake-2.4/Modules/FindCURL.cmake
+share/cmake-2.4/Modules/FindCurses.cmake
+share/cmake-2.4/Modules/FindCygwin.cmake
+share/cmake-2.4/Modules/FindDCMTK.cmake
+share/cmake-2.4/Modules/FindDart.cmake
+share/cmake-2.4/Modules/FindDoxygen.cmake
+share/cmake-2.4/Modules/FindEXPAT.cmake
+share/cmake-2.4/Modules/FindFLTK.cmake
+share/cmake-2.4/Modules/FindGCCXML.cmake
+share/cmake-2.4/Modules/FindGLU.cmake
+share/cmake-2.4/Modules/FindGLUT.cmake
+share/cmake-2.4/Modules/FindGTK.cmake
+share/cmake-2.4/Modules/FindGnuplot.cmake
+share/cmake-2.4/Modules/FindHSPELL.cmake
+share/cmake-2.4/Modules/FindHTMLHelp.cmake
+share/cmake-2.4/Modules/FindITK.cmake
+share/cmake-2.4/Modules/FindImageMagick.cmake
+share/cmake-2.4/Modules/FindJNI.cmake
+share/cmake-2.4/Modules/FindJPEG.cmake
+share/cmake-2.4/Modules/FindJasper.cmake
+share/cmake-2.4/Modules/FindJava.cmake
+share/cmake-2.4/Modules/FindKDE.cmake
+share/cmake-2.4/Modules/FindKDE3.cmake
+share/cmake-2.4/Modules/FindKDE4.cmake
+share/cmake-2.4/Modules/FindLATEX.cmake
+share/cmake-2.4/Modules/FindLibXml2.cmake
+share/cmake-2.4/Modules/FindLibXslt.cmake
+share/cmake-2.4/Modules/FindMFC.cmake
+share/cmake-2.4/Modules/FindMPEG.cmake
+share/cmake-2.4/Modules/FindMPEG2.cmake
+share/cmake-2.4/Modules/FindMPI.cmake
+share/cmake-2.4/Modules/FindMatlab.cmake
+share/cmake-2.4/Modules/FindMotif.cmake
+share/cmake-2.4/Modules/FindOpenAL.cmake
+share/cmake-2.4/Modules/FindOpenGL.cmake
+share/cmake-2.4/Modules/FindOpenSSL.cmake
+share/cmake-2.4/Modules/FindPHP4.cmake
+share/cmake-2.4/Modules/FindPNG.cmake
+share/cmake-2.4/Modules/FindPerl.cmake
+share/cmake-2.4/Modules/FindPerlLibs.cmake
+share/cmake-2.4/Modules/FindPhysFS.cmake
+share/cmake-2.4/Modules/FindPike.cmake
+share/cmake-2.4/Modules/FindPythonInterp.cmake
+share/cmake-2.4/Modules/FindPythonLibs.cmake
+share/cmake-2.4/Modules/FindQt.cmake
+share/cmake-2.4/Modules/FindQt3.cmake
+share/cmake-2.4/Modules/FindQt4.cmake
+share/cmake-2.4/Modules/FindRuby.cmake
+share/cmake-2.4/Modules/FindSDL.cmake
+share/cmake-2.4/Modules/FindSDL_image.cmake
+share/cmake-2.4/Modules/FindSDL_mixer.cmake
+share/cmake-2.4/Modules/FindSDL_net.cmake
+share/cmake-2.4/Modules/FindSDL_sound.cmake
+share/cmake-2.4/Modules/FindSDL_ttf.cmake
+share/cmake-2.4/Modules/FindSWIG.cmake
+share/cmake-2.4/Modules/FindSelfPackers.cmake
+share/cmake-2.4/Modules/FindSubversion.cmake
+share/cmake-2.4/Modules/FindTCL.cmake
+share/cmake-2.4/Modules/FindTIFF.cmake
+share/cmake-2.4/Modules/FindTclsh.cmake
+share/cmake-2.4/Modules/FindThreads.cmake
+share/cmake-2.4/Modules/FindUnixCommands.cmake
+share/cmake-2.4/Modules/FindVTK.cmake
+share/cmake-2.4/Modules/FindWget.cmake
+share/cmake-2.4/Modules/FindWish.cmake
+share/cmake-2.4/Modules/FindX11.cmake
+share/cmake-2.4/Modules/FindXMLRPC.cmake
+share/cmake-2.4/Modules/FindZLIB.cmake
+share/cmake-2.4/Modules/FindwxWidgets.cmake
+share/cmake-2.4/Modules/FindwxWindows.cmake
+share/cmake-2.4/Modules/InstallRequiredSystemLibraries.cmake
+share/cmake-2.4/Modules/KDE3Macros.cmake
+share/cmake-2.4/Modules/MacOSXBundleInfo.plist.in
+share/cmake-2.4/Modules/MacroAddFileDependencies.cmake
+share/cmake-2.4/Modules/NSIS.InstallOptions.ini.in
+share/cmake-2.4/Modules/NSIS.template.in
+share/cmake-2.4/Modules/Platform/AIX.cmake
+share/cmake-2.4/Modules/Platform/BSDOS.cmake
+share/cmake-2.4/Modules/Platform/CYGWIN-g77.cmake
+share/cmake-2.4/Modules/Platform/CYGWIN.cmake
+share/cmake-2.4/Modules/Platform/Darwin-xlc.cmake
+share/cmake-2.4/Modules/Platform/Darwin.cmake
+share/cmake-2.4/Modules/Platform/DragonFly.cmake
+share/cmake-2.4/Modules/Platform/FreeBSD.cmake
+share/cmake-2.4/Modules/Platform/HP-UX.cmake
+share/cmake-2.4/Modules/Platform/IRIX.cmake
+share/cmake-2.4/Modules/Platform/IRIX64.cmake
+share/cmake-2.4/Modules/Platform/Linux-como.cmake
+share/cmake-2.4/Modules/Platform/Linux-icpc.cmake
+share/cmake-2.4/Modules/Platform/Linux-ifort.cmake
+share/cmake-2.4/Modules/Platform/Linux.cmake
+share/cmake-2.4/Modules/Platform/MP-RAS.cmake
+share/cmake-2.4/Modules/Platform/${OPSYS}.cmake
+share/cmake-2.4/Modules/Platform/OSF1.cmake
+share/cmake-2.4/Modules/Platform/OpenBSD.cmake
+share/cmake-2.4/Modules/Platform/QNX.cmake
+share/cmake-2.4/Modules/Platform/RISCos.cmake
+share/cmake-2.4/Modules/Platform/SCO_SV.cmake
+share/cmake-2.4/Modules/Platform/SINIX.cmake
+share/cmake-2.4/Modules/Platform/SunOS.cmake
+share/cmake-2.4/Modules/Platform/Tru64.cmake
+share/cmake-2.4/Modules/Platform/ULTRIX.cmake
+share/cmake-2.4/Modules/Platform/UNIX_SV.cmake
+share/cmake-2.4/Modules/Platform/UnixPaths.cmake
+share/cmake-2.4/Modules/Platform/UnixWare.cmake
+share/cmake-2.4/Modules/Platform/Windows-bcc32.cmake
+share/cmake-2.4/Modules/Platform/Windows-cl.cmake
+share/cmake-2.4/Modules/Platform/Windows-cl.cmake.in
+share/cmake-2.4/Modules/Platform/Windows-g++.cmake
+share/cmake-2.4/Modules/Platform/Windows-g77.cmake
+share/cmake-2.4/Modules/Platform/Windows-gcc.cmake
+share/cmake-2.4/Modules/Platform/Windows-icl.cmake
+share/cmake-2.4/Modules/Platform/Windows-ifort.cmake
+share/cmake-2.4/Modules/Platform/Windows-wcl386.cmake
+share/cmake-2.4/Modules/Platform/Windows.cmake
+share/cmake-2.4/Modules/Platform/WindowsPaths.cmake
+share/cmake-2.4/Modules/Platform/Xenix.cmake
+share/cmake-2.4/Modules/Platform/g77.cmake
+share/cmake-2.4/Modules/Platform/gcc.cmake
+share/cmake-2.4/Modules/Platform/kFreeBSD.cmake
+share/cmake-2.4/Modules/TestBigEndian.c
+share/cmake-2.4/Modules/TestBigEndian.cmake
+share/cmake-2.4/Modules/TestCXXAcceptsFlag.cmake
+share/cmake-2.4/Modules/TestForANSIForScope.cmake
+share/cmake-2.4/Modules/TestForANSIStreamHeaders.cmake
+share/cmake-2.4/Modules/TestForANSIStreamHeaders.cxx
+share/cmake-2.4/Modules/TestForAnsiForScope.cxx
+share/cmake-2.4/Modules/TestForSSTREAM.cmake
+share/cmake-2.4/Modules/TestForSSTREAM.cxx
+share/cmake-2.4/Modules/TestForSTDNamespace.cmake
+share/cmake-2.4/Modules/TestForSTDNamespace.cxx
+share/cmake-2.4/Modules/UseEcos.cmake
+share/cmake-2.4/Modules/UsePkgConfig.cmake
+share/cmake-2.4/Modules/UseQt4.cmake
+share/cmake-2.4/Modules/UseSWIG.cmake
+share/cmake-2.4/Modules/UseVTK40.cmake
+share/cmake-2.4/Modules/UseVTKBuildSettings40.cmake
+share/cmake-2.4/Modules/UseVTKConfig40.cmake
+share/cmake-2.4/Modules/Use_wxWindows.cmake
+share/cmake-2.4/Modules/UsewxWidgets.cmake
+share/cmake-2.4/Modules/VTKCompatibility.cmake
+share/cmake-2.4/Modules/kde3init_dummy.cpp.in
+share/cmake-2.4/Modules/kde3uic.cmake
+share/cmake-2.4/Modules/readme.txt
+share/cmake-2.4/Templates/CMakeLists.txt
+share/cmake-2.4/Templates/CMakeVisualStudio6Configurations.cmake
+share/cmake-2.4/Templates/CMakeWindowsSystemConfig.cmake
+share/cmake-2.4/Templates/CPack.GenericDescription.txt
+share/cmake-2.4/Templates/CPack.GenericLicense.txt
+share/cmake-2.4/Templates/CPack.GenericWelcome.txt
+share/cmake-2.4/Templates/CPackConfig.cmake.in
+share/cmake-2.4/Templates/CTestScript.cmake.in
+share/cmake-2.4/Templates/DLLFooter.dsptemplate
+share/cmake-2.4/Templates/DLLHeader.dsptemplate
+share/cmake-2.4/Templates/EXEFooter.dsptemplate
+share/cmake-2.4/Templates/EXEHeader.dsptemplate
+share/cmake-2.4/Templates/EXEWinHeader.dsptemplate
+share/cmake-2.4/Templates/TestDriver.cxx.in
+share/cmake-2.4/Templates/UtilityFooter.dsptemplate
+share/cmake-2.4/Templates/UtilityHeader.dsptemplate
+share/cmake-2.4/Templates/staticLibFooter.dsptemplate
+share/cmake-2.4/Templates/staticLibHeader.dsptemplate
+share/cmake-2.4/include/cmCPluginAPI.h
+share/doc/cmake-2.4/Copyright.txt
+share/doc/cmake-2.4/ccmake.html
+share/doc/cmake-2.4/ccmake.txt
+share/doc/cmake-2.4/cmake.html
+share/doc/cmake-2.4/cmake.txt
+share/doc/cmake-2.4/ctest.html
+share/doc/cmake-2.4/ctest.txt
+@dirrm share/doc/cmake-2.4
+@dirrm share/cmake-2.4/include
+@dirrm share/cmake-2.4/Templates
+@dirrm share/cmake-2.4/Modules/Platform
+@dirrm share/cmake-2.4/Modules
+@dirrm share/cmake-2.4
diff --git a/devel/cmake/buildlink3.mk b/devel/cmake/buildlink3.mk
index 68ef3274604..4e5ca1f4d76 100644
--- a/devel/cmake/buildlink3.mk
+++ b/devel/cmake/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/08/31 13:49:35 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/02/23 11:48:18 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CMAKE_BUILDLINK3_MK:=	${CMAKE_BUILDLINK3_MK}+
@@ -12,10 +12,10 @@ BUILDLINK_PACKAGES+=	cmake
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cmake
 
 .if ${CMAKE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.cmake+=	cmake>=2.4.2
+BUILDLINK_API_DEPENDS.cmake+=	cmake>=2.4.6
 BUILDLINK_PKGSRCDIR.cmake?=	../../devel/cmake
 BUILDLINK_DEPMETHOD.cmake?=	build
-BUILDLINK_FILES.cmake+=		share/CMake/include/*
+BUILDLINK_FILES.cmake+=		share/cmake-*/include/*
 .endif	# CMAKE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index a97ff3c89a0..fa063e65fdf 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/10/11 19:26:20 rillig Exp $
+$NetBSD: distinfo,v 1.8 2007/02/23 11:48:18 wiz Exp $
 
-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 (cmake-2.4.6.tar.gz) = 5290aaf949413ee7f77275ba68e73cec1546364b
+RMD160 (cmake-2.4.6.tar.gz) = 61af13faecd10e85a0fee3252630b30b8781987a
+Size (cmake-2.4.6.tar.gz) = 2604547 bytes
 SHA1 (patch-aa) = 1652da758d103503d6cd657b7eb193a0174dab55
+SHA1 (patch-ab) = ece84d9110246c842e0b8e8a21d12830ce134e09
 SHA1 (patch-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345
-SHA1 (patch-ad) = c603f20478dcc3a7eef4e17c3dcfbab42f63e6a1
-SHA1 (patch-ae) = cc6f9ffa10456912d42f3f866a297d6928801e88
diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab
new file mode 100644
index 00000000000..a7d4eca36fa
--- /dev/null
+++ b/devel/cmake/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2007/02/23 11:48:19 wiz Exp $
+
+No pkgsrc package for xmlrpc-c yet.
+
+--- CMakeLists.txt.orig	2007-01-10 17:59:11.000000000 +0000
++++ CMakeLists.txt
+@@ -106,7 +106,7 @@ IF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
+   IF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
+     SET(CMAKE_USE_SYSTEM_CURL "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed curl" FORCE)
+     SET(CMAKE_USE_SYSTEM_EXPAT "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed expat" FORCE)
+-    SET(CMAKE_USE_SYSTEM_XMLRPC "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed xmlrpc" FORCE)
++    SET(CMAKE_USE_SYSTEM_XMLRPC OFF CACHE BOOL "Use system-installed xmlrpc" FORCE)
+     SET(CMAKE_USE_SYSTEM_ZLIB "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed zlib" FORCE)
+   ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
+ 
diff --git a/devel/cmake/patches/patch-ad b/devel/cmake/patches/patch-ad
deleted file mode 100644
index 4d0362c75a8..00000000000
--- a/devel/cmake/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/08/02 13:08:09 drochner Exp $
-
---- bootstrap.orig	2004-07-05 16:27:15.000000000 +0200
-+++ bootstrap
-@@ -74,7 +74,7 @@ cmake_source_dir=`(cd "${cmake_source_di
- cmake_binary_dir=`pwd`
- cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap.cmk"
- cmake_data_dir="/share/CMake"
--cmake_doc_dir="/doc/CMake"
-+cmake_doc_dir="/share/doc/CMake"
- cmake_man_dir="/man"
- cmake_init_file=""
- 
diff --git a/devel/cmake/patches/patch-ae b/devel/cmake/patches/patch-ae
deleted file mode 100644
index 17c15d3dd3e..00000000000
--- a/devel/cmake/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/10/11 19:26:20 rillig Exp $
-
---- Modules/CPack.STGZ_Header.sh.in.orig	2006-05-17 15:48:52.000000000 +0200
-+++ Modules/CPack.STGZ_Header.sh.in	2006-10-11 21:24:29.000000000 +0200
-@@ -58,7 +58,7 @@ for a in "$@CPACK_AT_SIGN@"; do
-   fi
- done
- 
--if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" == "xTRUEx" ]
-+if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" = "xTRUEx" ]
- then
-   interactive=FALSE
- fi
-@@ -73,7 +73,7 @@ fi
- 
- echo "The archive will be extracted to: ${toplevel}"
- 
--if [ "x${interactive}x" == "xTRUEx" ]
-+if [ "x${interactive}x" = "xTRUEx" ]
- then
-   echo ""
-   echo "If you want to stop extracting, please press <ctrl-C>."
-@@ -95,7 +95,7 @@ ____cpack__here_doc____
-     esac
-   fi
- 
--  if [ "x${cpack_include_subdir}x" == "xx" ]
-+  if [ "x${cpack_include_subdir}x" = "xx" ]
-   then
-     echo "By default the @CPACK_PACKAGE_NAME@ will be installed in:"
-     echo "  \"${toplevel}/@CPACK_PACKAGE_FILE_NAME@\""
-@@ -110,7 +110,7 @@ ____cpack__here_doc____
-   fi
- fi
- 
--if [ "x${cpack_include_subdir}x" == "xTRUEx" ]
-+if [ "x${cpack_include_subdir}x" = "xTRUEx" ]
- then
-   toplevel="${toplevel}/@CPACK_PACKAGE_FILE_NAME@"
-   mkdir -p "${toplevel}"