Tue Aug 7 16:18:27 2012 UTC ()
Changes 2.8.8:
* CheckIncludeFiles: Shorten check description message
* CPackNSIS: Rewrite variable documentation to make it more readable.
* OS X: Use correct extra path when searching for applicaton bundles
* OS X: Mark find_program results as advanced
* Fix some doc typo and add an undocumented var.
* OS X: Use OSX_DEVELOPER_ROOT for app search path
* FindBoost: add support for 1.49 and 1.50


(adam)
diff -r1.62 -r1.63 pkgsrc/devel/cmake/Makefile
diff -r1.26 -r1.27 pkgsrc/devel/cmake/PLIST
diff -r1.37 -r1.38 pkgsrc/devel/cmake/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/cmake/patches/patch-Modules_FindX11.cmake
diff -r1.12 -r1.13 pkgsrc/devel/cmake/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/devel/cmake/patches/patch-ac
cvs diff -r1.62 -r1.63 pkgsrc/devel/cmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cmake/Makefile 2012/01/08 09:47:42 1.62
+++ pkgsrc/devel/cmake/Makefile 2012/08/07 16:18:26 1.63
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.62 2012/01/08 09:47:42 adam Exp $ 1# $NetBSD: Makefile,v 1.63 2012/08/07 16:18:26 adam Exp $
2 2
3DISTNAME= cmake-${CMAKE_API}.7 3DISTNAME= cmake-${CMAKE_API}.8
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= http://www.cmake.org/files/v2.8/ 5MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
6 6
7CMAKE_API= 2.8 7CMAKE_API= 2.8
8 8
9MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://www.cmake.org/ 10HOMEPAGE= http://www.cmake.org/
11COMMENT= Cross platform make 11COMMENT= Cross platform make
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18# wants wsyncup and wcursyncup 18# wants wsyncup and wcursyncup
@@ -55,15 +55,14 @@ SUBST_MESSAGE.flags= Fixing compiler fla @@ -55,15 +55,14 @@ SUBST_MESSAGE.flags= Fixing compiler fla
55SUBST_FILES.flags= Modules/Compiler/*.cmake 55SUBST_FILES.flags= Modules/Compiler/*.cmake
56SUBST_SED.flags= -e 's,-O.,,' 56SUBST_SED.flags= -e 's,-O.,,'
57 57
58pre-configure: 58pre-configure:
59 ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig 59 ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig
60 60
61BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4 61BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4
62.include "../../archivers/libarchive/buildlink3.mk" 62.include "../../archivers/libarchive/buildlink3.mk"
63.include "../../devel/ncurses/buildlink3.mk" 63.include "../../devel/ncurses/buildlink3.mk"
64.include "../../devel/zlib/buildlink3.mk" 64.include "../../devel/zlib/buildlink3.mk"
65.include "../../textproc/expat/buildlink3.mk" 65.include "../../textproc/expat/buildlink3.mk"
66.include "../../textproc/xmlrpc-c/buildlink3.mk" 66.include "../../textproc/xmlrpc-c/buildlink3.mk"
67.include "../../www/curl/buildlink3.mk" 67.include "../../www/curl/buildlink3.mk"
68 
69.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/devel/cmake/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/cmake/PLIST 2012/01/08 09:47:42 1.26
+++ pkgsrc/devel/cmake/PLIST 2012/08/07 16:18:26 1.27
@@ -1,41 +1,45 @@ @@ -1,41 +1,45 @@
1@comment $NetBSD: PLIST,v 1.26 2012/01/08 09:47:42 adam Exp $ 1@comment $NetBSD: PLIST,v 1.27 2012/08/07 16:18:26 adam Exp $
2bin/ccmake 2bin/ccmake
3bin/cmake 3bin/cmake
4bin/cpack 4bin/cpack
5bin/ctest 5bin/ctest
6man/man1/ccmake.1 6man/man1/ccmake.1
7man/man1/cmake.1 7man/man1/cmake.1
8man/man1/cmakecommands.1 8man/man1/cmakecommands.1
9man/man1/cmakecompat.1 9man/man1/cmakecompat.1
10man/man1/cmakemodules.1 10man/man1/cmakemodules.1
11man/man1/cmakepolicies.1 11man/man1/cmakepolicies.1
12man/man1/cmakeprops.1 12man/man1/cmakeprops.1
13man/man1/cmakevars.1 13man/man1/cmakevars.1
14man/man1/cpack.1 14man/man1/cpack.1
15man/man1/ctest.1 15man/man1/ctest.1
16share/aclocal/cmake.m4 16share/aclocal/cmake.m4
17share/cmake-${CMAKE_API}/Modules/.NoDartCoverage 17share/cmake-${CMAKE_API}/Modules/.NoDartCoverage
18share/cmake-${CMAKE_API}/Modules/AddFileDependencies.cmake 18share/cmake-${CMAKE_API}/Modules/AddFileDependencies.cmake
19share/cmake-${CMAKE_API}/Modules/AutomocInfo.cmake.in 19share/cmake-${CMAKE_API}/Modules/AutomocInfo.cmake.in
20share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in 20share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
 21share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-ExactVersion.cmake.in
21share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-SameMajorVersion.cmake.in 22share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
22share/cmake-${CMAKE_API}/Modules/BundleUtilities.cmake 23share/cmake-${CMAKE_API}/Modules/BundleUtilities.cmake
23share/cmake-${CMAKE_API}/Modules/CMake.cmake 24share/cmake-${CMAKE_API}/Modules/CMake.cmake
24share/cmake-${CMAKE_API}/Modules/CMakeASM-ATTInformation.cmake 25share/cmake-${CMAKE_API}/Modules/CMakeASM-ATTInformation.cmake
25share/cmake-${CMAKE_API}/Modules/CMakeASMCompiler.cmake.in 26share/cmake-${CMAKE_API}/Modules/CMakeASMCompiler.cmake.in
26share/cmake-${CMAKE_API}/Modules/CMakeASMInformation.cmake 27share/cmake-${CMAKE_API}/Modules/CMakeASMInformation.cmake
27share/cmake-${CMAKE_API}/Modules/CMakeASM_MASMInformation.cmake 28share/cmake-${CMAKE_API}/Modules/CMakeASM_MASMInformation.cmake
28share/cmake-${CMAKE_API}/Modules/CMakeASM_NASMInformation.cmake 29share/cmake-${CMAKE_API}/Modules/CMakeASM_NASMInformation.cmake
 30share/cmake-${CMAKE_API}/Modules/CMakeAddFortranSubdirectory.cmake
 31share/cmake-${CMAKE_API}/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
 32share/cmake-${CMAKE_API}/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
29share/cmake-${CMAKE_API}/Modules/CMakeAddNewLanguage.txt 33share/cmake-${CMAKE_API}/Modules/CMakeAddNewLanguage.txt
30share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityC.cmake 34share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityC.cmake
31share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityCXX.cmake 35share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityCXX.cmake
32share/cmake-${CMAKE_API}/Modules/CMakeBorlandFindMake.cmake 36share/cmake-${CMAKE_API}/Modules/CMakeBorlandFindMake.cmake
33share/cmake-${CMAKE_API}/Modules/CMakeBuildSettings.cmake.in 37share/cmake-${CMAKE_API}/Modules/CMakeBuildSettings.cmake.in
34share/cmake-${CMAKE_API}/Modules/CMakeCCompiler.cmake.in 38share/cmake-${CMAKE_API}/Modules/CMakeCCompiler.cmake.in
35share/cmake-${CMAKE_API}/Modules/CMakeCCompilerABI.c 39share/cmake-${CMAKE_API}/Modules/CMakeCCompilerABI.c
36share/cmake-${CMAKE_API}/Modules/CMakeCCompilerId.c.in 40share/cmake-${CMAKE_API}/Modules/CMakeCCompilerId.c.in
37share/cmake-${CMAKE_API}/Modules/CMakeCInformation.cmake 41share/cmake-${CMAKE_API}/Modules/CMakeCInformation.cmake
38share/cmake-${CMAKE_API}/Modules/CMakeCXXCompiler.cmake.in 42share/cmake-${CMAKE_API}/Modules/CMakeCXXCompiler.cmake.in
39share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerABI.cpp 43share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerABI.cpp
40share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerId.cpp.in 44share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerId.cpp.in
41share/cmake-${CMAKE_API}/Modules/CMakeCXXInformation.cmake 45share/cmake-${CMAKE_API}/Modules/CMakeCXXInformation.cmake
@@ -46,49 +50,52 @@ share/cmake-${CMAKE_API}/Modules/CMakeDe @@ -46,49 +50,52 @@ share/cmake-${CMAKE_API}/Modules/CMakeDe
46share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM-ATTCompiler.cmake 50share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM-ATTCompiler.cmake
47share/cmake-${CMAKE_API}/Modules/CMakeDetermineASMCompiler.cmake 51share/cmake-${CMAKE_API}/Modules/CMakeDetermineASMCompiler.cmake
48share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_MASMCompiler.cmake 52share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_MASMCompiler.cmake
49share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_NASMCompiler.cmake 53share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_NASMCompiler.cmake
50share/cmake-${CMAKE_API}/Modules/CMakeDetermineCCompiler.cmake 54share/cmake-${CMAKE_API}/Modules/CMakeDetermineCCompiler.cmake
51share/cmake-${CMAKE_API}/Modules/CMakeDetermineCXXCompiler.cmake 55share/cmake-${CMAKE_API}/Modules/CMakeDetermineCXXCompiler.cmake
52share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake 56share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake
53share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake 57share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake
54share/cmake-${CMAKE_API}/Modules/CMakeDetermineFortranCompiler.cmake 58share/cmake-${CMAKE_API}/Modules/CMakeDetermineFortranCompiler.cmake
55share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake 59share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake
56share/cmake-${CMAKE_API}/Modules/CMakeDetermineRCCompiler.cmake 60share/cmake-${CMAKE_API}/Modules/CMakeDetermineRCCompiler.cmake
57share/cmake-${CMAKE_API}/Modules/CMakeDetermineSystem.cmake 61share/cmake-${CMAKE_API}/Modules/CMakeDetermineSystem.cmake
58share/cmake-${CMAKE_API}/Modules/CMakeDetermineVSServicePack.cmake 62share/cmake-${CMAKE_API}/Modules/CMakeDetermineVSServicePack.cmake
 63share/cmake-${CMAKE_API}/Modules/CMakeExpandImportedTargets.cmake
59share/cmake-${CMAKE_API}/Modules/CMakeExportBuildSettings.cmake 64share/cmake-${CMAKE_API}/Modules/CMakeExportBuildSettings.cmake
60share/cmake-${CMAKE_API}/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake 65share/cmake-${CMAKE_API}/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
61share/cmake-${CMAKE_API}/Modules/CMakeFindBinUtils.cmake 66share/cmake-${CMAKE_API}/Modules/CMakeFindBinUtils.cmake
62share/cmake-${CMAKE_API}/Modules/CMakeFindCodeBlocks.cmake 67share/cmake-${CMAKE_API}/Modules/CMakeFindCodeBlocks.cmake
63share/cmake-${CMAKE_API}/Modules/CMakeFindEclipseCDT4.cmake 68share/cmake-${CMAKE_API}/Modules/CMakeFindEclipseCDT4.cmake
64share/cmake-${CMAKE_API}/Modules/CMakeFindFrameworks.cmake 69share/cmake-${CMAKE_API}/Modules/CMakeFindFrameworks.cmake
65share/cmake-${CMAKE_API}/Modules/CMakeFindKDevelop3.cmake 70share/cmake-${CMAKE_API}/Modules/CMakeFindKDevelop3.cmake
66share/cmake-${CMAKE_API}/Modules/CMakeFindPackageMode.cmake 71share/cmake-${CMAKE_API}/Modules/CMakeFindPackageMode.cmake
67share/cmake-${CMAKE_API}/Modules/CMakeFindWMake.cmake 72share/cmake-${CMAKE_API}/Modules/CMakeFindWMake.cmake
68share/cmake-${CMAKE_API}/Modules/CMakeFindXCode.cmake 73share/cmake-${CMAKE_API}/Modules/CMakeFindXCode.cmake
69share/cmake-${CMAKE_API}/Modules/CMakeForceCompiler.cmake 74share/cmake-${CMAKE_API}/Modules/CMakeForceCompiler.cmake
70share/cmake-${CMAKE_API}/Modules/CMakeFortranCompiler.cmake.in 75share/cmake-${CMAKE_API}/Modules/CMakeFortranCompiler.cmake.in
71share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerABI.F 76share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerABI.F
72share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerId.F.in 77share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerId.F.in
73share/cmake-${CMAKE_API}/Modules/CMakeFortranInformation.cmake 78share/cmake-${CMAKE_API}/Modules/CMakeFortranInformation.cmake
74share/cmake-${CMAKE_API}/Modules/CMakeGenericSystem.cmake 79share/cmake-${CMAKE_API}/Modules/CMakeGenericSystem.cmake
75share/cmake-${CMAKE_API}/Modules/CMakeImportBuildSettings.cmake 80share/cmake-${CMAKE_API}/Modules/CMakeImportBuildSettings.cmake
76share/cmake-${CMAKE_API}/Modules/CMakeJOMFindMake.cmake 81share/cmake-${CMAKE_API}/Modules/CMakeJOMFindMake.cmake
77share/cmake-${CMAKE_API}/Modules/CMakeJavaCompiler.cmake.in 82share/cmake-${CMAKE_API}/Modules/CMakeJavaCompiler.cmake.in
78share/cmake-${CMAKE_API}/Modules/CMakeJavaInformation.cmake 83share/cmake-${CMAKE_API}/Modules/CMakeJavaInformation.cmake
79share/cmake-${CMAKE_API}/Modules/CMakeMSYSFindMake.cmake 84share/cmake-${CMAKE_API}/Modules/CMakeMSYSFindMake.cmake
80share/cmake-${CMAKE_API}/Modules/CMakeMinGWFindMake.cmake 85share/cmake-${CMAKE_API}/Modules/CMakeMinGWFindMake.cmake
81share/cmake-${CMAKE_API}/Modules/CMakeNMakeFindMake.cmake 86share/cmake-${CMAKE_API}/Modules/CMakeNMakeFindMake.cmake
 87share/cmake-${CMAKE_API}/Modules/CMakeNinjaFindMake.cmake
 88share/cmake-${CMAKE_API}/Modules/CMakePackageConfigHelpers.cmake
82share/cmake-${CMAKE_API}/Modules/CMakeParseArguments.cmake 89share/cmake-${CMAKE_API}/Modules/CMakeParseArguments.cmake
83share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitLinkInfo.cmake 90share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitLinkInfo.cmake
84share/cmake-${CMAKE_API}/Modules/CMakePlatformId.h.in 91share/cmake-${CMAKE_API}/Modules/CMakePlatformId.h.in
85share/cmake-${CMAKE_API}/Modules/CMakePrintSystemInformation.cmake 92share/cmake-${CMAKE_API}/Modules/CMakePrintSystemInformation.cmake
86share/cmake-${CMAKE_API}/Modules/CMakePushCheckState.cmake 93share/cmake-${CMAKE_API}/Modules/CMakePushCheckState.cmake
87share/cmake-${CMAKE_API}/Modules/CMakeRCCompiler.cmake.in 94share/cmake-${CMAKE_API}/Modules/CMakeRCCompiler.cmake.in
88share/cmake-${CMAKE_API}/Modules/CMakeRCInformation.cmake 95share/cmake-${CMAKE_API}/Modules/CMakeRCInformation.cmake
89share/cmake-${CMAKE_API}/Modules/CMakeSystem.cmake.in 96share/cmake-${CMAKE_API}/Modules/CMakeSystem.cmake.in
90share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInformation.cmake 97share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInformation.cmake
91share/cmake-${CMAKE_API}/Modules/CMakeTestASM-ATTCompiler.cmake 98share/cmake-${CMAKE_API}/Modules/CMakeTestASM-ATTCompiler.cmake
92share/cmake-${CMAKE_API}/Modules/CMakeTestASMCompiler.cmake 99share/cmake-${CMAKE_API}/Modules/CMakeTestASMCompiler.cmake
93share/cmake-${CMAKE_API}/Modules/CMakeTestASM_MASMCompiler.cmake 100share/cmake-${CMAKE_API}/Modules/CMakeTestASM_MASMCompiler.cmake
94share/cmake-${CMAKE_API}/Modules/CMakeTestASM_NASMCompiler.cmake 101share/cmake-${CMAKE_API}/Modules/CMakeTestASM_NASMCompiler.cmake
@@ -118,49 +125,53 @@ share/cmake-${CMAKE_API}/Modules/CPack.D @@ -118,49 +125,53 @@ share/cmake-${CMAKE_API}/Modules/CPack.D
118share/cmake-${CMAKE_API}/Modules/CPack.Info.plist.in 125share/cmake-${CMAKE_API}/Modules/CPack.Info.plist.in
119share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.in 126share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.in
120share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.rsrc.in 127share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.rsrc.in
121share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.Info.plist.in 128share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.Info.plist.in
122share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.main.scpt.in 129share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.main.scpt.in
123share/cmake-${CMAKE_API}/Modules/CPack.RuntimeScript.in 130share/cmake-${CMAKE_API}/Modules/CPack.RuntimeScript.in
124share/cmake-${CMAKE_API}/Modules/CPack.STGZ_Header.sh.in 131share/cmake-${CMAKE_API}/Modules/CPack.STGZ_Header.sh.in
125share/cmake-${CMAKE_API}/Modules/CPack.VolumeIcon.icns.in 132share/cmake-${CMAKE_API}/Modules/CPack.VolumeIcon.icns.in
126share/cmake-${CMAKE_API}/Modules/CPack.background.png.in 133share/cmake-${CMAKE_API}/Modules/CPack.background.png.in
127share/cmake-${CMAKE_API}/Modules/CPack.cmake 134share/cmake-${CMAKE_API}/Modules/CPack.cmake
128share/cmake-${CMAKE_API}/Modules/CPack.distribution.dist.in 135share/cmake-${CMAKE_API}/Modules/CPack.distribution.dist.in
129share/cmake-${CMAKE_API}/Modules/CPackBundle.cmake 136share/cmake-${CMAKE_API}/Modules/CPackBundle.cmake
130share/cmake-${CMAKE_API}/Modules/CPackComponent.cmake 137share/cmake-${CMAKE_API}/Modules/CPackComponent.cmake
 138share/cmake-${CMAKE_API}/Modules/CPackCygwin.cmake
 139share/cmake-${CMAKE_API}/Modules/CPackDMG.cmake
131share/cmake-${CMAKE_API}/Modules/CPackDeb.cmake 140share/cmake-${CMAKE_API}/Modules/CPackDeb.cmake
132share/cmake-${CMAKE_API}/Modules/CPackNSIS.cmake 141share/cmake-${CMAKE_API}/Modules/CPackNSIS.cmake
 142share/cmake-${CMAKE_API}/Modules/CPackPackageMaker.cmake
133share/cmake-${CMAKE_API}/Modules/CPackRPM.cmake 143share/cmake-${CMAKE_API}/Modules/CPackRPM.cmake
134share/cmake-${CMAKE_API}/Modules/CPackZIP.cmake 144share/cmake-${CMAKE_API}/Modules/CPackZIP.cmake
135share/cmake-${CMAKE_API}/Modules/CTest.cmake 145share/cmake-${CMAKE_API}/Modules/CTest.cmake
136share/cmake-${CMAKE_API}/Modules/CTestScriptMode.cmake 146share/cmake-${CMAKE_API}/Modules/CTestScriptMode.cmake
137share/cmake-${CMAKE_API}/Modules/CTestTargets.cmake 147share/cmake-${CMAKE_API}/Modules/CTestTargets.cmake
138share/cmake-${CMAKE_API}/Modules/CheckCCompilerFlag.cmake 148share/cmake-${CMAKE_API}/Modules/CheckCCompilerFlag.cmake
139share/cmake-${CMAKE_API}/Modules/CheckCSourceCompiles.cmake 149share/cmake-${CMAKE_API}/Modules/CheckCSourceCompiles.cmake
140share/cmake-${CMAKE_API}/Modules/CheckCSourceRuns.cmake 150share/cmake-${CMAKE_API}/Modules/CheckCSourceRuns.cmake
141share/cmake-${CMAKE_API}/Modules/CheckCXXCompilerFlag.cmake 151share/cmake-${CMAKE_API}/Modules/CheckCXXCompilerFlag.cmake
142share/cmake-${CMAKE_API}/Modules/CheckCXXSourceCompiles.cmake 152share/cmake-${CMAKE_API}/Modules/CheckCXXSourceCompiles.cmake
143share/cmake-${CMAKE_API}/Modules/CheckCXXSourceRuns.cmake 153share/cmake-${CMAKE_API}/Modules/CheckCXXSourceRuns.cmake
144share/cmake-${CMAKE_API}/Modules/CheckCXXSymbolExists.cmake 154share/cmake-${CMAKE_API}/Modules/CheckCXXSymbolExists.cmake
145share/cmake-${CMAKE_API}/Modules/CheckForPthreads.c 155share/cmake-${CMAKE_API}/Modules/CheckForPthreads.c
146share/cmake-${CMAKE_API}/Modules/CheckFortranFunctionExists.cmake 156share/cmake-${CMAKE_API}/Modules/CheckFortranFunctionExists.cmake
147share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.c 157share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.c
148share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.cmake 158share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.cmake
149share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.c.in 159share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.c.in
150share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cmake 160share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cmake
151share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cxx.in 161share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cxx.in
152share/cmake-${CMAKE_API}/Modules/CheckIncludeFileCXX.cmake 162share/cmake-${CMAKE_API}/Modules/CheckIncludeFileCXX.cmake
153share/cmake-${CMAKE_API}/Modules/CheckIncludeFiles.cmake 163share/cmake-${CMAKE_API}/Modules/CheckIncludeFiles.cmake
 164share/cmake-${CMAKE_API}/Modules/CheckLanguage.cmake
154share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.cmake 165share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.cmake
155share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.lists.in 166share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.lists.in
156share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.c.in 167share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.c.in
157share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.cmake 168share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.cmake
158share/cmake-${CMAKE_API}/Modules/CheckSizeOf.cmake 169share/cmake-${CMAKE_API}/Modules/CheckSizeOf.cmake
159share/cmake-${CMAKE_API}/Modules/CheckStructHasMember.cmake 170share/cmake-${CMAKE_API}/Modules/CheckStructHasMember.cmake
160share/cmake-${CMAKE_API}/Modules/CheckSymbolExists.cmake 171share/cmake-${CMAKE_API}/Modules/CheckSymbolExists.cmake
161share/cmake-${CMAKE_API}/Modules/CheckTypeSize.c.in 172share/cmake-${CMAKE_API}/Modules/CheckTypeSize.c.in
162share/cmake-${CMAKE_API}/Modules/CheckTypeSize.cmake 173share/cmake-${CMAKE_API}/Modules/CheckTypeSize.cmake
163share/cmake-${CMAKE_API}/Modules/CheckTypeSizeMap.cmake.in 174share/cmake-${CMAKE_API}/Modules/CheckTypeSizeMap.cmake.in
164share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c 175share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c
165share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake 176share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake
166share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake 177share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake
@@ -331,27 +342,29 @@ share/cmake-${CMAKE_API}/Modules/FindVTK @@ -331,27 +342,29 @@ share/cmake-${CMAKE_API}/Modules/FindVTK
331share/cmake-${CMAKE_API}/Modules/FindWget.cmake 342share/cmake-${CMAKE_API}/Modules/FindWget.cmake
332share/cmake-${CMAKE_API}/Modules/FindWish.cmake 343share/cmake-${CMAKE_API}/Modules/FindWish.cmake
333share/cmake-${CMAKE_API}/Modules/FindX11.cmake 344share/cmake-${CMAKE_API}/Modules/FindX11.cmake
334share/cmake-${CMAKE_API}/Modules/FindXMLRPC.cmake 345share/cmake-${CMAKE_API}/Modules/FindXMLRPC.cmake
335share/cmake-${CMAKE_API}/Modules/FindZLIB.cmake 346share/cmake-${CMAKE_API}/Modules/FindZLIB.cmake
336share/cmake-${CMAKE_API}/Modules/Findosg.cmake 347share/cmake-${CMAKE_API}/Modules/Findosg.cmake
337share/cmake-${CMAKE_API}/Modules/FindosgAnimation.cmake 348share/cmake-${CMAKE_API}/Modules/FindosgAnimation.cmake
338share/cmake-${CMAKE_API}/Modules/FindosgDB.cmake 349share/cmake-${CMAKE_API}/Modules/FindosgDB.cmake
339share/cmake-${CMAKE_API}/Modules/FindosgFX.cmake 350share/cmake-${CMAKE_API}/Modules/FindosgFX.cmake
340share/cmake-${CMAKE_API}/Modules/FindosgGA.cmake 351share/cmake-${CMAKE_API}/Modules/FindosgGA.cmake
341share/cmake-${CMAKE_API}/Modules/FindosgIntrospection.cmake 352share/cmake-${CMAKE_API}/Modules/FindosgIntrospection.cmake
342share/cmake-${CMAKE_API}/Modules/FindosgManipulator.cmake 353share/cmake-${CMAKE_API}/Modules/FindosgManipulator.cmake
343share/cmake-${CMAKE_API}/Modules/FindosgParticle.cmake 354share/cmake-${CMAKE_API}/Modules/FindosgParticle.cmake
 355share/cmake-${CMAKE_API}/Modules/FindosgPresentation.cmake
344share/cmake-${CMAKE_API}/Modules/FindosgProducer.cmake 356share/cmake-${CMAKE_API}/Modules/FindosgProducer.cmake
 357share/cmake-${CMAKE_API}/Modules/FindosgQt.cmake
345share/cmake-${CMAKE_API}/Modules/FindosgShadow.cmake 358share/cmake-${CMAKE_API}/Modules/FindosgShadow.cmake
346share/cmake-${CMAKE_API}/Modules/FindosgSim.cmake 359share/cmake-${CMAKE_API}/Modules/FindosgSim.cmake
347share/cmake-${CMAKE_API}/Modules/FindosgTerrain.cmake 360share/cmake-${CMAKE_API}/Modules/FindosgTerrain.cmake
348share/cmake-${CMAKE_API}/Modules/FindosgText.cmake 361share/cmake-${CMAKE_API}/Modules/FindosgText.cmake
349share/cmake-${CMAKE_API}/Modules/FindosgUtil.cmake 362share/cmake-${CMAKE_API}/Modules/FindosgUtil.cmake
350share/cmake-${CMAKE_API}/Modules/FindosgViewer.cmake 363share/cmake-${CMAKE_API}/Modules/FindosgViewer.cmake
351share/cmake-${CMAKE_API}/Modules/FindosgVolume.cmake 364share/cmake-${CMAKE_API}/Modules/FindosgVolume.cmake
352share/cmake-${CMAKE_API}/Modules/FindosgWidget.cmake 365share/cmake-${CMAKE_API}/Modules/FindosgWidget.cmake
353share/cmake-${CMAKE_API}/Modules/Findosg_functions.cmake 366share/cmake-${CMAKE_API}/Modules/Findosg_functions.cmake
354share/cmake-${CMAKE_API}/Modules/FindwxWidgets.cmake 367share/cmake-${CMAKE_API}/Modules/FindwxWidgets.cmake
355share/cmake-${CMAKE_API}/Modules/FindwxWindows.cmake 368share/cmake-${CMAKE_API}/Modules/FindwxWindows.cmake
356share/cmake-${CMAKE_API}/Modules/FortranCInterface.cmake 369share/cmake-${CMAKE_API}/Modules/FortranCInterface.cmake
357share/cmake-${CMAKE_API}/Modules/FortranCInterface/CMakeLists.txt 370share/cmake-${CMAKE_API}/Modules/FortranCInterface/CMakeLists.txt
@@ -504,27 +517,29 @@ share/cmake-${CMAKE_API}/Modules/Platfor @@ -504,27 +517,29 @@ share/cmake-${CMAKE_API}/Modules/Platfor
504share/cmake-${CMAKE_API}/Modules/Platform/SINIX.cmake 517share/cmake-${CMAKE_API}/Modules/Platform/SINIX.cmake
505share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-C.cmake 518share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-C.cmake
506share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-CXX.cmake 519share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-CXX.cmake
507share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-Fortran.cmake 520share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-Fortran.cmake
508share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU.cmake 521share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU.cmake
509share/cmake-${CMAKE_API}/Modules/Platform/SunOS.cmake 522share/cmake-${CMAKE_API}/Modules/Platform/SunOS.cmake
510share/cmake-${CMAKE_API}/Modules/Platform/Tru64.cmake 523share/cmake-${CMAKE_API}/Modules/Platform/Tru64.cmake
511share/cmake-${CMAKE_API}/Modules/Platform/ULTRIX.cmake 524share/cmake-${CMAKE_API}/Modules/Platform/ULTRIX.cmake
512share/cmake-${CMAKE_API}/Modules/Platform/UNIX_SV.cmake 525share/cmake-${CMAKE_API}/Modules/Platform/UNIX_SV.cmake
513share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake 526share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake
514share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake 527share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake
515share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake 528share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake
516share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake 529share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake
517share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland.cmake 530share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-C.cmake
 531share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-CXX.cmake
 532share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero.cmake
518share/cmake-${CMAKE_API}/Modules/Platform/Windows-G95-Fortran.cmake 533share/cmake-${CMAKE_API}/Modules/Platform/Windows-G95-Fortran.cmake
519share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C-ABI.cmake 534share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C-ABI.cmake
520share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C.cmake 535share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C.cmake
521share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-CXX-ABI.cmake 536share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-CXX-ABI.cmake
522share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-CXX.cmake 537share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-CXX.cmake
523share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-Fortran-ABI.cmake 538share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
524share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-Fortran.cmake 539share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-Fortran.cmake
525share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU.cmake 540share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU.cmake
526share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-ASM.cmake 541share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-ASM.cmake
527share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-C.cmake 542share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-C.cmake
528share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-CXX.cmake 543share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-CXX.cmake
529share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-Fortran.cmake 544share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-Fortran.cmake
530share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel.cmake 545share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel.cmake
cvs diff -r1.37 -r1.38 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2012/05/28 18:06:48 1.37
+++ pkgsrc/devel/cmake/distinfo 2012/08/07 16:18:26 1.38
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.37 2012/05/28 18:06:48 abs Exp $ 1$NetBSD: distinfo,v 1.38 2012/08/07 16:18:26 adam Exp $
2 2
3SHA1 (cmake-2.8.7.tar.gz) = d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 3SHA1 (cmake-2.8.8.tar.gz) = a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1
4RMD160 (cmake-2.8.7.tar.gz) = 13b188e75152feef4e5692807e3a9e7c34b26fe3 4RMD160 (cmake-2.8.8.tar.gz) = db60999fd4d1b3e2e28368d45035a058ed7e7639
5Size (cmake-2.8.7.tar.gz) = 5667409 bytes 5Size (cmake-2.8.8.tar.gz) = 5691656 bytes
6SHA1 (patch-Modules_FindX11.cmake) = a75a6834a376a51a314989b9996a5208cc0682ab 6SHA1 (patch-Modules_FindX11.cmake) = c87f91643f3d9df7b1bbae298fc694dfcf26af75
7SHA1 (patch-Modules_Platform_SunOS.cmake) = a873f937568744208fec90f80ebb67ca3150b49a 7SHA1 (patch-Modules_Platform_SunOS.cmake) = a873f937568744208fec90f80ebb67ca3150b49a
8SHA1 (patch-Utilities_KWIML_ABI.h.in) = 3e71a1a38f156a0711e273628d95a938072566c5 8SHA1 (patch-Utilities_KWIML_ABI.h.in) = 3e71a1a38f156a0711e273628d95a938072566c5
9SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c 9SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
10SHA1 (patch-aa) = 1af37a3f7bd8423785acff80d7b89c75018e5cab 10SHA1 (patch-aa) = 1af37a3f7bd8423785acff80d7b89c75018e5cab
11SHA1 (patch-ab) = 85b3bf0d51d5235f57195c82fb3888d08b3d4099 11SHA1 (patch-ab) = 1e10b88b9929a49f6c0b6aec13e21d169a1f9480
12SHA1 (patch-ac) = 1f11e98d50127fae12286708215a90f118b2d2bc 12SHA1 (patch-ac) = a35634d41dc633707fd56ddb3ef587a41e04afbf
cvs diff -r1.2 -r1.3 pkgsrc/devel/cmake/patches/patch-Modules_FindX11.cmake (expand / switch to unified diff)

--- pkgsrc/devel/cmake/patches/patch-Modules_FindX11.cmake 2011/10/15 07:24:31 1.2
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindX11.cmake 2012/08/07 16:18:26 1.3
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-Modules_FindX11.cmake,v 1.2 2011/10/15 07:24:31 adam Exp $ 1$NetBSD: patch-Modules_FindX11.cmake,v 1.3 2012/08/07 16:18:26 adam Exp $
2 2
3--- Modules/FindX11.cmake.orig 2011-10-04 16:09:24.000000000 +0000 3--- Modules/FindX11.cmake.orig 2011-10-04 16:09:24.000000000 +0000
4+++ Modules/FindX11.cmake 4+++ Modules/FindX11.cmake
5@@ -60,7 +60,8 @@ IF (UNIX) 5@@ -61,7 +61,8 @@ IF (UNIX)
6 SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK}) 6 SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
7 SET(CMAKE_FIND_FRAMEWORK NEVER) 7 SET(CMAKE_FIND_FRAMEWORK NEVER)
8 SET(X11_INC_SEARCH_PATH 8 SET(X11_INC_SEARCH_PATH
9- /usr/pkg/xorg/include 9- /usr/pkg/xorg/include
10+ @LOCALBASE@/xorg/include 10+ @LOCALBASE@/xorg/include
11+ @X11BASE@/include 11+ @X11BASE@/include
12 /usr/X11R6/include 12 /usr/X11R6/include
13 /usr/X11R7/include 13 /usr/X11R7/include
14 /usr/include/X11 14 /usr/include/X11
15@@ -70,7 +71,8 @@ IF (UNIX) 15@@ -71,7 +72,8 @@ IF (UNIX)
16 ) 16 )
17  17
18 SET(X11_LIB_SEARCH_PATH 18 SET(X11_LIB_SEARCH_PATH
19- /usr/pkg/xorg/lib 19- /usr/pkg/xorg/lib
20+ @LOCALBASE@/xorg/lib 20+ @LOCALBASE@/xorg/lib
21+ @X11BASE@/lib 21+ @X11BASE@/lib
22 /usr/X11R6/lib 22 /usr/X11R6/lib
23 /usr/X11R7/lib 23 /usr/X11R7/lib
24 /usr/openwin/lib 24 /usr/openwin/lib
cvs diff -r1.12 -r1.13 pkgsrc/devel/cmake/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/cmake/patches/Attic/patch-ab 2012/02/16 18:32:25 1.12
+++ pkgsrc/devel/cmake/patches/Attic/patch-ab 2012/08/07 16:18:26 1.13
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ab,v 1.12 2012/02/16 18:32:25 hans Exp $ 1$NetBSD: patch-ab,v 1.13 2012/08/07 16:18:26 adam Exp $
2 2
3--- Modules/FindPythonInterp.cmake.orig 2011-10-04 16:09:24.000000000 +0000 3--- Modules/FindPythonInterp.cmake.orig 2012-04-18 18:10:54.000000000 +0000
4+++ Modules/FindPythonInterp.cmake 4+++ Modules/FindPythonInterp.cmake
5@@ -26,14 +26,20 @@ 5@@ -60,14 +60,20 @@ endif(PythonInterp_FIND_VERSION)
6 # (To distribute this file outside of CMake, substitute the full 6
7 # License text for the above reference.) 7 list(APPEND _Python_NAMES python)
8  8
9-# Search for the current active python version first 9-# Search for the current active python version first
10-find_program(PYTHON_EXECUTABLE NAMES python) 10-find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
11+# for pkgsrc: force Python version (set in pyversion.mk) 11+# for pkgsrc: force Python version (set in pyversion.mk)
12+IF(DEFINED PYVERSSUFFIX) 12+IF(DEFINED PYVERSSUFFIX)
13+ SET(_VERSIONS ${PYVERSSUFFIX}) 13+ SET(_VERSIONS ${PYVERSSUFFIX})
14+ELSE(DEFINED PYVERSSUFFIX) 14+ELSE(DEFINED PYVERSSUFFIX)
15+ SET(_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) 15+ SET(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
16+ # Search for the current active python version first 16+ # Search for the current active python version first
17+ find_program(PYTHON_EXECUTABLE NAMES python) 17+ find_program(PYTHON_EXECUTABLE NAMES python)
18+ENDIF(DEFINED PYVERSSUFFIX) 18+ENDIF(DEFINED PYVERSSUFFIX)
19  19
20 # Set up the versions we know about, in the order we will search. Always add 20 # Set up the versions we know about, in the order we will search. Always add
21 # the user supplied additional versions to the front. 21 # the user supplied additional versions to the front.
22 set(_Python_VERSIONS 22 set(_Python_VERSIONS
23 ${Python_ADDITIONAL_VERSIONS} 23 ${Python_ADDITIONAL_VERSIONS}
24- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) 24- ${_PYTHON_FIND_OTHER_VERSIONS}
25+ ${_VERSIONS}) 25+ ${_VERSIONS}
 26 )
26  27
27 # Search for newest python version if python executable isn't found 28 unset(_PYTHON_FIND_OTHER_VERSIONS)
28 if(NOT PYTHON_EXECUTABLE) 
cvs diff -r1.6 -r1.7 pkgsrc/devel/cmake/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/cmake/patches/Attic/patch-ac 2011/02/22 15:05:34 1.6
+++ pkgsrc/devel/cmake/patches/Attic/patch-ac 2012/08/07 16:18:26 1.7
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: patch-ac,v 1.6 2011/02/22 15:05:34 adam Exp $ 1$NetBSD: patch-ac,v 1.7 2012/08/07 16:18:26 adam Exp $
2 2
3--- Modules/FindPythonLibs.cmake.orig 2011-02-15 17:47:27.000000000 +0000 3--- Modules/FindPythonLibs.cmake.orig 2012-04-18 18:10:54.000000000 +0000
4+++ Modules/FindPythonLibs.cmake 4+++ Modules/FindPythonLibs.cmake
5@@ -27,11 +27,17 @@ INCLUDE(CMakeFindFrameworks) 5@@ -56,11 +56,18 @@ ELSE(PythonLibs_FIND_VERSION)
6 # Search for the python framework on Apple. 6 SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
7 CMAKE_FIND_FRAMEWORKS(Python) 7 ENDIF(PythonLibs_FIND_VERSION)
8  8
 9+# for pkgsrc: force Python version (set in pyversion.mk)
9+IF(DEFINED PYVERSSUFFIX) 10+IF(DEFINED PYVERSSUFFIX)
10+ SET(_VERSIONS ${PYVERSSUFFIX}) 11+ SET(_VERSIONS ${PYVERSSUFFIX})
11+ELSE(DEFINED PYVERSSUFFIX) 12+ELSE(DEFINED PYVERSSUFFIX)
12+ SET(_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) 13+ SET(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
13+ENDIF(DEFINED PYVERSSUFFIX) 14+ENDIF(DEFINED PYVERSSUFFIX)
14+ 15+
15 # Set up the versions we know about, in the order we will search. Always add 16 # Set up the versions we know about, in the order we will search. Always add
16 # the user supplied additional versions to the front. 17 # the user supplied additional versions to the front.
17 set(_Python_VERSIONS 18 SET(_Python_VERSIONS
18 ${Python_ADDITIONAL_VERSIONS} 19 ${Python_ADDITIONAL_VERSIONS}
19- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) 20- ${_PYTHON_FIND_OTHER_VERSIONS}
20+ ${_VERSIONS}) 21+ ${_VERSIONS}
 22 )
21  23
22 FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) 24 UNSET(_PYTHON_FIND_OTHER_VERSIONS)
23 STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})