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

6 files changed, 53 insertions, 38 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index d528dc2aa3f..a2737c54011 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2012/01/08 09:47:42 adam Exp $
+# $NetBSD: Makefile,v 1.63 2012/08/07 16:18:26 adam Exp $
 
-DISTNAME=	cmake-${CMAKE_API}.7
+DISTNAME=	cmake-${CMAKE_API}.8
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v2.8/
+MASTER_SITES=	http://www.cmake.org/files/v${CMAKE_API}/
 
 CMAKE_API=	2.8
 
@@ -65,5 +65,4 @@ BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=2.8.4
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/xmlrpc-c/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 8bc66939fa4..8b8d95ea21b 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2012/01/08 09:47:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2012/08/07 16:18:26 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -18,6 +18,7 @@ share/cmake-${CMAKE_API}/Modules/.NoDartCoverage
 share/cmake-${CMAKE_API}/Modules/AddFileDependencies.cmake
 share/cmake-${CMAKE_API}/Modules/AutomocInfo.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-ExactVersion.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
 share/cmake-${CMAKE_API}/Modules/BundleUtilities.cmake
 share/cmake-${CMAKE_API}/Modules/CMake.cmake
@@ -26,6 +27,9 @@ share/cmake-${CMAKE_API}/Modules/CMakeASMCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeASMInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeASM_MASMInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeASM_NASMInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeAddFortranSubdirectory.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
+share/cmake-${CMAKE_API}/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeAddNewLanguage.txt
 share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityC.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityCXX.cmake
@@ -56,6 +60,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineRCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineSystem.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineVSServicePack.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeExpandImportedTargets.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeExportBuildSettings.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindBinUtils.cmake
@@ -79,6 +84,8 @@ share/cmake-${CMAKE_API}/Modules/CMakeJavaInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeMSYSFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeMinGWFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeNMakeFindMake.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeNinjaFindMake.cmake
+share/cmake-${CMAKE_API}/Modules/CMakePackageConfigHelpers.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeParseArguments.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitLinkInfo.cmake
 share/cmake-${CMAKE_API}/Modules/CMakePlatformId.h.in
@@ -128,8 +135,11 @@ share/cmake-${CMAKE_API}/Modules/CPack.cmake
 share/cmake-${CMAKE_API}/Modules/CPack.distribution.dist.in
 share/cmake-${CMAKE_API}/Modules/CPackBundle.cmake
 share/cmake-${CMAKE_API}/Modules/CPackComponent.cmake
+share/cmake-${CMAKE_API}/Modules/CPackCygwin.cmake
+share/cmake-${CMAKE_API}/Modules/CPackDMG.cmake
 share/cmake-${CMAKE_API}/Modules/CPackDeb.cmake
 share/cmake-${CMAKE_API}/Modules/CPackNSIS.cmake
+share/cmake-${CMAKE_API}/Modules/CPackPackageMaker.cmake
 share/cmake-${CMAKE_API}/Modules/CPackRPM.cmake
 share/cmake-${CMAKE_API}/Modules/CPackZIP.cmake
 share/cmake-${CMAKE_API}/Modules/CTest.cmake
@@ -151,6 +161,7 @@ share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cmake
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cxx.in
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFileCXX.cmake
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFiles.cmake
+share/cmake-${CMAKE_API}/Modules/CheckLanguage.cmake
 share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.cmake
 share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.lists.in
 share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.c.in
@@ -341,7 +352,9 @@ share/cmake-${CMAKE_API}/Modules/FindosgGA.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgIntrospection.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgManipulator.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgParticle.cmake
+share/cmake-${CMAKE_API}/Modules/FindosgPresentation.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgProducer.cmake
+share/cmake-${CMAKE_API}/Modules/FindosgQt.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgShadow.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgSim.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgTerrain.cmake
@@ -514,7 +527,9 @@ 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-Borland.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
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-G95-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C-ABI.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C.cmake
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 64755574699..698ba56acaf 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.37 2012/05/28 18:06:48 abs Exp $
+$NetBSD: distinfo,v 1.38 2012/08/07 16:18:26 adam Exp $
 
-SHA1 (cmake-2.8.7.tar.gz) = d206182b454f4d1ddeb0f11d7d1be8a66e5c2464
-RMD160 (cmake-2.8.7.tar.gz) = 13b188e75152feef4e5692807e3a9e7c34b26fe3
-Size (cmake-2.8.7.tar.gz) = 5667409 bytes
-SHA1 (patch-Modules_FindX11.cmake) = a75a6834a376a51a314989b9996a5208cc0682ab
+SHA1 (cmake-2.8.8.tar.gz) = a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1
+RMD160 (cmake-2.8.8.tar.gz) = db60999fd4d1b3e2e28368d45035a058ed7e7639
+Size (cmake-2.8.8.tar.gz) = 5691656 bytes
+SHA1 (patch-Modules_FindX11.cmake) = c87f91643f3d9df7b1bbae298fc694dfcf26af75
 SHA1 (patch-Modules_Platform_SunOS.cmake) = a873f937568744208fec90f80ebb67ca3150b49a
 SHA1 (patch-Utilities_KWIML_ABI.h.in) = 3e71a1a38f156a0711e273628d95a938072566c5
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
 SHA1 (patch-aa) = 1af37a3f7bd8423785acff80d7b89c75018e5cab
-SHA1 (patch-ab) = 85b3bf0d51d5235f57195c82fb3888d08b3d4099
-SHA1 (patch-ac) = 1f11e98d50127fae12286708215a90f118b2d2bc
+SHA1 (patch-ab) = 1e10b88b9929a49f6c0b6aec13e21d169a1f9480
+SHA1 (patch-ac) = a35634d41dc633707fd56ddb3ef587a41e04afbf
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)