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

3 files changed, 26 insertions, 25 deletions

diff --git a/devel/cmake/patches/patch-Modules_FindX11.cmake b/devel/cmake/patches/patch-Modules_FindX11.cmake
index 1fe4bb1aa8d..7fc95168172 100644
--- a/devel/cmake/patches/patch-Modules_FindX11.cmake
+++ b/devel/cmake/patches/patch-Modules_FindX11.cmake
@@ -1,8 +1,8 @@
-$NetBSD: patch-Modules_FindX11.cmake,v 1.2 2011/10/15 07:24:31 adam Exp $
+$NetBSD: patch-Modules_FindX11.cmake,v 1.3 2012/08/07 16:18:26 adam Exp $
 
 --- Modules/FindX11.cmake.orig	2011-10-04 16:09:24.000000000 +0000
 +++ Modules/FindX11.cmake
-@@ -60,7 +60,8 @@ IF (UNIX)
+@@ -61,7 +61,8 @@ IF (UNIX)
    SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
    SET(CMAKE_FIND_FRAMEWORK NEVER)
    SET(X11_INC_SEARCH_PATH
@@ -12,7 +12,7 @@ $NetBSD: patch-Modules_FindX11.cmake,v 1.2 2011/10/15 07:24:31 adam Exp $
      /usr/X11R6/include
      /usr/X11R7/include
      /usr/include/X11
-@@ -70,7 +71,8 @@ IF (UNIX)
+@@ -71,7 +72,8 @@ IF (UNIX)
    )
  
    SET(X11_LIB_SEARCH_PATH
diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab
index d9ca6b9f333..e2c9793f290 100644
--- a/devel/cmake/patches/patch-ab
+++ b/devel/cmake/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.12 2012/02/16 18:32:25 hans Exp $
+$NetBSD: patch-ab,v 1.13 2012/08/07 16:18:26 adam Exp $
 
---- Modules/FindPythonInterp.cmake.orig	2011-10-04 16:09:24.000000000 +0000
+--- Modules/FindPythonInterp.cmake.orig	2012-04-18 18:10:54.000000000 +0000
 +++ Modules/FindPythonInterp.cmake
-@@ -26,14 +26,20 @@
- # (To distribute this file outside of CMake, substitute the full
- #  License text for the above reference.)
+@@ -60,14 +60,20 @@ endif(PythonInterp_FIND_VERSION)
+ 
+ list(APPEND _Python_NAMES python)
  
 -# Search for the current active python version first
--find_program(PYTHON_EXECUTABLE NAMES python)
+-find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
 +# for pkgsrc: force Python version (set in pyversion.mk)
 +IF(DEFINED PYVERSSUFFIX)
 +  SET(_VERSIONS ${PYVERSSUFFIX})
 +ELSE(DEFINED PYVERSSUFFIX)
-+  SET(_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
++  SET(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
 +  # Search for the current active python version first
 +  find_program(PYTHON_EXECUTABLE NAMES python)
 +ENDIF(DEFINED PYVERSSUFFIX)
@@ -21,8 +21,8 @@ $NetBSD: patch-ab,v 1.12 2012/02/16 18:32:25 hans Exp $
  # the user supplied additional versions to the front.
  set(_Python_VERSIONS
    ${Python_ADDITIONAL_VERSIONS}
--  2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-+  ${_VERSIONS})
+-  ${_PYTHON_FIND_OTHER_VERSIONS}
++  ${_VERSIONS}
+   )
  
- # Search for newest python version if python executable isn't found
- if(NOT PYTHON_EXECUTABLE)
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac
index a8d9be2fa61..dbc876425d6 100644
--- a/devel/cmake/patches/patch-ac
+++ b/devel/cmake/patches/patch-ac
@@ -1,23 +1,24 @@
-$NetBSD: patch-ac,v 1.6 2011/02/22 15:05:34 adam Exp $
+$NetBSD: patch-ac,v 1.7 2012/08/07 16:18:26 adam Exp $
 
---- Modules/FindPythonLibs.cmake.orig	2011-02-15 17:47:27.000000000 +0000
+--- Modules/FindPythonLibs.cmake.orig	2012-04-18 18:10:54.000000000 +0000
 +++ Modules/FindPythonLibs.cmake
-@@ -27,11 +27,17 @@ INCLUDE(CMakeFindFrameworks)
- # Search for the python framework on Apple.
- CMAKE_FIND_FRAMEWORKS(Python)
+@@ -56,11 +56,18 @@ ELSE(PythonLibs_FIND_VERSION)
+     SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ ENDIF(PythonLibs_FIND_VERSION)
  
++# for pkgsrc: force Python version (set in pyversion.mk)
 +IF(DEFINED PYVERSSUFFIX)
 +  SET(_VERSIONS ${PYVERSSUFFIX})
 +ELSE(DEFINED PYVERSSUFFIX)
-+  SET(_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
++  SET(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
 +ENDIF(DEFINED PYVERSSUFFIX)
 +
  # 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}
--  2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-+  ${_VERSIONS})
+-  ${_PYTHON_FIND_OTHER_VERSIONS}
++  ${_VERSIONS}
+   )
  
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
-   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ UNSET(_PYTHON_FIND_OTHER_VERSIONS)