With the 2.8.10 release, users now have a new way to arrange exported targets that depend on other targets into "export sets." In addition, there are new target properties for PDB_OUTPUT_DIRECTORY and PDB_NAME implemented for Visual Studio 7 and later.

Generator expressions, which are used to introduce conditional statements at generate time rather than at CMake compile time, are now available in more contexts, notably in the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS target properties. There are also new generator expressions available in the 2.8.10 release.

The file(DOWNLOAD command can accommodate https URLs. The pre-built binaries for this are available from Kitware and link to OpenSSL. The team has also added uniform compiler "id" and version number variables available for nearly all known compilers and platforms.

7 files changed, 81 insertions, 60 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 4d83693d3aa..a5d0a27300e 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2012/10/31 11:16:46 asau Exp $
+# $NetBSD: Makefile,v 1.66 2012/11/15 19:31:54 adam Exp $
 
-DISTNAME=	cmake-${CMAKE_API}.9
+DISTNAME=	cmake-${CMAKE_API}.10
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${CMAKE_API}/
 
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 4662f5ae30b..8211038f53f 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2012/08/11 11:10:54 marino Exp $
+@comment $NetBSD: PLIST,v 1.29 2012/11/15 19:31:54 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -54,6 +54,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_MASMCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_NASMCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCXXCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineFortranCompiler.cmake
@@ -103,11 +104,9 @@ share/cmake-${CMAKE_API}/Modules/CMakeTestASM_NASMCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestCXXCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestCompilerCommon.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeTestForFreeVC.cxx
 share/cmake-${CMAKE_API}/Modules/CMakeTestFortranCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestGNU.c
 share/cmake-${CMAKE_API}/Modules/CMakeTestJavaCompiler.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeTestNMakeCLVersion.c
 share/cmake-${CMAKE_API}/Modules/CMakeTestRCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestWatcomVersion.c
 share/cmake-${CMAKE_API}/Modules/CMakeUnixFindMake.cmake
@@ -146,6 +145,7 @@ share/cmake-${CMAKE_API}/Modules/CPackZIP.cmake
 share/cmake-${CMAKE_API}/Modules/CTest.cmake
 share/cmake-${CMAKE_API}/Modules/CTestScriptMode.cmake
 share/cmake-${CMAKE_API}/Modules/CTestTargets.cmake
+share/cmake-${CMAKE_API}/Modules/CTestUseLaunchers.cmake
 share/cmake-${CMAKE_API}/Modules/CheckCCompilerFlag.cmake
 share/cmake-${CMAKE_API}/Modules/CheckCSourceCompiles.cmake
 share/cmake-${CMAKE_API}/Modules/CheckCSourceRuns.cmake
@@ -176,8 +176,10 @@ share/cmake-${CMAKE_API}/Modules/CheckTypeSizeMap.cmake.in
 share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c
 share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-Fortran.cmake
@@ -223,6 +225,12 @@ share/cmake-${CMAKE_API}/Modules/Compiler/XL-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL.cmake
+share/cmake-${CMAKE_API}/Modules/CompilerId/VS-10.vcxproj.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/VS-6.dsp.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/VS-7.vcproj.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-1.pbxproj.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-2.pbxproj.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-3.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/Dart.cmake
 share/cmake-${CMAKE_API}/Modules/DartConfiguration.tcl.in
 share/cmake-${CMAKE_API}/Modules/DeployQt4.cmake
@@ -264,6 +272,7 @@ share/cmake-${CMAKE_API}/Modules/FindFreetype.cmake
 share/cmake-${CMAKE_API}/Modules/FindGCCXML.cmake
 share/cmake-${CMAKE_API}/Modules/FindGDAL.cmake
 share/cmake-${CMAKE_API}/Modules/FindGIF.cmake
+share/cmake-${CMAKE_API}/Modules/FindGLEW.cmake
 share/cmake-${CMAKE_API}/Modules/FindGLU.cmake
 share/cmake-${CMAKE_API}/Modules/FindGLUT.cmake
 share/cmake-${CMAKE_API}/Modules/FindGTK.cmake
@@ -276,6 +285,7 @@ share/cmake-${CMAKE_API}/Modules/FindGnuplot.cmake
 share/cmake-${CMAKE_API}/Modules/FindHDF5.cmake
 share/cmake-${CMAKE_API}/Modules/FindHSPELL.cmake
 share/cmake-${CMAKE_API}/Modules/FindHTMLHelp.cmake
+share/cmake-${CMAKE_API}/Modules/FindHg.cmake
 share/cmake-${CMAKE_API}/Modules/FindITK.cmake
 share/cmake-${CMAKE_API}/Modules/FindImageMagick.cmake
 share/cmake-${CMAKE_API}/Modules/FindJNI.cmake
@@ -435,6 +445,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static-XL-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-Fortran.cmake
@@ -443,6 +454,10 @@ share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-windres.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Catamount.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Absoft-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Darwin-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake
@@ -480,6 +495,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/Haiku.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/IRIX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/IRIX64.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Absoft-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-C.cmake
@@ -530,6 +546,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero.cmake
@@ -546,16 +563,20 @@ share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-NMcl.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Windows-cl.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Windows-cl.cmake.in
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-df.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-wcl386.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-windres.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE-MSVC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE-MSVC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE-MSVC.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/WindowsPaths.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Xenix.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/cl.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/eCos.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/gas.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/kFreeBSD.cmake
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 8d5b53565ae..5422253b589 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.41 2012/10/24 22:42:16 wiz Exp $
+$NetBSD: distinfo,v 1.42 2012/11/15 19:31:54 adam Exp $
 
-SHA1 (cmake-2.8.9.tar.gz) = b96663c0757a5edfbddc410aabf7126a92131e2b
-RMD160 (cmake-2.8.9.tar.gz) = 66808a280eb8e4ae798df3283fab8bcc3f512777
-Size (cmake-2.8.9.tar.gz) = 5658837 bytes
-SHA1 (patch-Modules_FindX11.cmake) = 4851de3ab7e3fd44f87f34385a0730f47da1c820
-SHA1 (patch-Modules_Platform_SunOS.cmake) = bec194d087b2ee092cf0db11752fb30b0e86f384
+SHA1 (cmake-2.8.10.tar.gz) = 6384f2295d01f04d017e2701447378598b4c7223
+RMD160 (cmake-2.8.10.tar.gz) = 9af9e3f26f0f3d827ef566f99050fe6a2721dd25
+Size (cmake-2.8.10.tar.gz) = 5766728 bytes
+SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
+SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
 SHA1 (patch-Utilities_KWIML_ABI.h.in) = 4642d13c6bdfce92c452a4cf3876a9dd244da891
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
-SHA1 (patch-aa) = 00d3634a99727d55c77950bbc4ce6db26091dbd3
+SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
 SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
-SHA1 (patch-ac) = 80ffdef31ce31b6dafc8b84b4eb617fe19de4735
+SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508
diff --git a/devel/cmake/patches/patch-Modules_FindX11.cmake b/devel/cmake/patches/patch-Modules_FindX11.cmake
index 88a095d8f41..5adeb8990df 100644
--- a/devel/cmake/patches/patch-Modules_FindX11.cmake
+++ b/devel/cmake/patches/patch-Modules_FindX11.cmake
@@ -1,26 +1,26 @@
-$NetBSD: patch-Modules_FindX11.cmake,v 1.4 2012/09/14 13:26:20 wiz Exp $
+$NetBSD: patch-Modules_FindX11.cmake,v 1.5 2012/11/15 19:31:55 adam Exp $
 
 Patch in pkgsrc paths for finding X.
 
---- Modules/FindX11.cmake.orig	2011-10-04 16:09:24.000000000 +0000
+--- Modules/FindX11.cmake.orig	2012-10-31 15:32:05.000000000 +0000
 +++ Modules/FindX11.cmake
-@@ -61,7 +61,8 @@ IF (UNIX)
-   SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
-   SET(CMAKE_FIND_FRAMEWORK NEVER)
-   SET(X11_INC_SEARCH_PATH
+@@ -61,7 +61,8 @@ if (UNIX)
+   set(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
+   set(CMAKE_FIND_FRAMEWORK NEVER)
+   set(X11_INC_SEARCH_PATH
 -    /usr/pkg/xorg/include
 +    @LOCALBASE@/xorg/include
-+    @X11BASE@/include
++    @X11BASE@/xorg/include
      /usr/X11R6/include
      /usr/X11R7/include
      /usr/include/X11
-@@ -71,7 +72,8 @@ IF (UNIX)
+@@ -71,7 +72,8 @@ if (UNIX)
    )
  
-   SET(X11_LIB_SEARCH_PATH
+   set(X11_LIB_SEARCH_PATH
 -    /usr/pkg/xorg/lib
 +    @LOCALBASE@/xorg/lib
-+    @X11BASE@/lib
++    @X11BASE@/xorg/lib
      /usr/X11R6/lib
      /usr/X11R7/lib
      /usr/openwin/lib
diff --git a/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake b/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
index d8a997741af..82dfe17528c 100644
--- a/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
+++ b/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
@@ -1,34 +1,34 @@
-$NetBSD: patch-Modules_Platform_SunOS.cmake,v 1.2 2012/08/11 11:10:54 marino Exp $
+$NetBSD: patch-Modules_Platform_SunOS.cmake,v 1.3 2012/11/15 19:31:55 adam Exp $
 
 Don't use gcc to link c++ libraries on SunOS,
 unless we are really using a gcc lacking libstdc++.
 
 See http://public.kitware.com/pipermail/cmake/2011-July/045300.html
 
---- Modules/Platform/SunOS.cmake.orig	2012-08-09 18:15:19.000000000 +0000
+--- Modules/Platform/SunOS.cmake.orig	2012-11-14 19:47:33.000000000 +0000
 +++ Modules/Platform/SunOS.cmake
-@@ -7,12 +7,20 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
-    SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")  
- ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
+@@ -7,12 +7,20 @@ if(CMAKE_SYSTEM MATCHES "SunOS-4.*")
+    set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+ endif()
  
 +# Take the default c++ shared library creation rule from the
 +# CMakeDefaultMakeRuleVariables.cmake file unless using GCC and libstdc++.so
 +# does not exist, in which case fall back to the old implementation;
 +# using gcc to invoke the linker.
- IF(CMAKE_COMPILER_IS_GNUCXX)
-   IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
+ if(CMAKE_COMPILER_IS_GNUCXX)
+   if(CMAKE_COMPILER_IS_GNUCC)
+-    set(CMAKE_CXX_CREATE_SHARED_LIBRARY
 -        "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
--  ELSE(CMAKE_COMPILER_IS_GNUCC)
+-  else()
 -    # Take default rule from CMakeDefaultMakeRuleVariables.cmake.
-+    EXECUTE_PROCESS(
++    execute_process(
 +      COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libstdc++.so
 +      OUTPUT_VARIABLE SHARED_LIBSTDCXX_FILENAME
 +      OUTPUT_STRIP_TRAILING_WHITESPACE)
-+    IF(NOT EXISTS "${SHARED_LIBSTDCXX_FILENAME}")
-+      SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
++    if(NOT EXISTS "${SHARED_LIBSTDCXX_FILENAME}")
++      set(CMAKE_CXX_CREATE_SHARED_LIBRARY
 +          "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+    ENDIF(NOT EXISTS "${SHARED_LIBSTDCXX_FILENAME}")
-   ENDIF(CMAKE_COMPILER_IS_GNUCC)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- INCLUDE(Platform/UnixPaths)
++    endif()
+   endif()
+ endif()
+ include(Platform/UnixPaths)
diff --git a/devel/cmake/patches/patch-aa b/devel/cmake/patches/patch-aa
index 788ee4114e3..02fa260e7ea 100644
--- a/devel/cmake/patches/patch-aa
+++ b/devel/cmake/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.9 2012/09/14 13:26:20 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2012/11/15 19:31:55 adam Exp $
 
 Patch in pkgsrc paths for finding stuff.
 
---- Modules/Platform/UnixPaths.cmake.orig	2010-11-03 19:58:27.000000000 +0000
+--- Modules/Platform/UnixPaths.cmake.orig	2012-10-31 15:32:05.000000000 +0000
 +++ Modules/Platform/UnixPaths.cmake
-@@ -48,10 +48,10 @@
+@@ -48,10 +48,10 @@ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
    /usr/include/w32api
  
    # X11
@@ -14,10 +14,10 @@ Patch in pkgsrc paths for finding stuff.
    # Other
 -  /usr/pkg/include
 +  @LOCALBASE@/include
-   /opt/csw/include /opt/include  
+   /opt/csw/include /opt/include
    /usr/openwin/include
    )
-@@ -61,16 +61,16 @@
+@@ -61,16 +61,16 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
    /usr/lib/w32api
  
    # X11
@@ -27,13 +27,13 @@ Patch in pkgsrc paths for finding stuff.
    # Other
 -  /usr/pkg/lib
 +  @LOCALBASE@/lib
-   /opt/csw/lib /opt/lib 
+   /opt/csw/lib /opt/lib
    /usr/openwin/lib
    )
  
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
 +  @LOCALBASE@/bin
    )
  
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac
index 9e33b7d82a1..09660f3c6c4 100644
--- a/devel/cmake/patches/patch-ac
+++ b/devel/cmake/patches/patch-ac
@@ -1,26 +1,26 @@
-$NetBSD: patch-ac,v 1.9 2012/09/14 13:26:20 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2012/11/15 19:31:55 adam Exp $
 
 Insist on select python version for pkgsrc.
 
 --- Modules/FindPythonLibs.cmake.orig	2012-08-09 18:15:19.000000000 +0000
 +++ Modules/FindPythonLibs.cmake
 @@ -67,11 +67,18 @@ ELSE(PythonLibs_FIND_VERSION)
-     SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
- ENDIF(PythonLibs_FIND_VERSION)
+     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ endif()
  
 +# for pkgsrc: force Python version (set in pyversion.mk)
-+IF(DEFINED PYVERSSUFFIX)
-+  SET(_VERSIONS ${PYVERSSUFFIX})
-+ELSE(DEFINED PYVERSSUFFIX)
-+  SET(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
-+ENDIF(DEFINED PYVERSSUFFIX)
++if(DEFINED PYVERSSUFFIX)
++  set(_VERSIONS ${PYVERSSUFFIX})
++else()
++  set(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
++endif()
 +
  # Set up the versions we know about, in the order we will search. Always add
  # the user supplied additional versions to the front.
- SET(_Python_VERSIONS
+ set(_Python_VERSIONS
    ${Python_ADDITIONAL_VERSIONS}
 -  ${_PYTHON_FIND_OTHER_VERSIONS}
 +  ${_VERSIONS}
    )
  
- UNSET(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON_FIND_OTHER_VERSIONS)