Changes 2.8.4:

* Fix crash in GraphVizWriter when GRAPHVIZ_TARGET_IGNORE_REGEX is used
* FindPerlLibs: Add notice of copyright
* libarchive: Define major/minor/makedev only where needed
* libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL
* Fix documentation of MSVC_VERSION
* Silence the may be used uninitialized warnings: initialize stuff.
* CPack Tests the different ways of packaging components
* Avoid foreach IN LISTS syntax which is not supported by CMake 2.6
This commit is contained in:
adam 2011-02-22 15:05:33 +00:00
parent a0ab3cff90
commit 136b5f27c7
6 changed files with 52 additions and 48 deletions

View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.55 2011/01/14 11:18:02 wiz Exp $ # $NetBSD: Makefile,v 1.56 2011/02/22 15:05:33 adam Exp $
DISTNAME= cmake-${CMAKE_API}.3 DISTNAME= cmake-${CMAKE_API}.4
PKGREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v2.8/ MASTER_SITES= http://www.cmake.org/files/v2.8/
@ -10,6 +9,7 @@ CMAKE_API= 2.8
MAINTAINER= wiz@NetBSD.org MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.cmake.org/ HOMEPAGE= http://www.cmake.org/
COMMENT= Cross platform make COMMENT= Cross platform make
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir PKG_DESTDIR_SUPPORT= user-destdir

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.22 2010/11/11 08:34:01 adam Exp $ @comment $NetBSD: PLIST,v 1.23 2011/02/22 15:05:33 adam Exp $
bin/ccmake bin/ccmake
bin/cmake bin/cmake
bin/cpack bin/cpack
@ -21,6 +21,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeASM-ATTInformation.cmake
share/cmake-${CMAKE_API}/Modules/CMakeASMCompiler.cmake.in share/cmake-${CMAKE_API}/Modules/CMakeASMCompiler.cmake.in
share/cmake-${CMAKE_API}/Modules/CMakeASMInformation.cmake share/cmake-${CMAKE_API}/Modules/CMakeASMInformation.cmake
share/cmake-${CMAKE_API}/Modules/CMakeASM_MASMInformation.cmake share/cmake-${CMAKE_API}/Modules/CMakeASM_MASMInformation.cmake
share/cmake-${CMAKE_API}/Modules/CMakeASM_NASMInformation.cmake
share/cmake-${CMAKE_API}/Modules/CMakeAddNewLanguage.txt share/cmake-${CMAKE_API}/Modules/CMakeAddNewLanguage.txt
share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityC.cmake share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityC.cmake
share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityCXX.cmake share/cmake-${CMAKE_API}/Modules/CMakeBackwardCompatibilityCXX.cmake
@ -41,6 +42,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDependentOption.cmake
share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM-ATTCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM-ATTCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeDetermineASMCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeDetermineASMCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_MASMCompiler.cmake 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/CMakeDetermineCCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeDetermineCXXCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeDetermineCXXCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake
@ -82,6 +84,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInformation.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestASM-ATTCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeTestASM-ATTCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestASMCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeTestASMCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestASM_MASMCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeTestASM_MASMCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestASM_NASMCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestCCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeTestCCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestCXXCompiler.cmake share/cmake-${CMAKE_API}/Modules/CMakeTestCXXCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestCompilerCommon.cmake share/cmake-${CMAKE_API}/Modules/CMakeTestCompilerCommon.cmake
@ -147,6 +150,9 @@ share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c
share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C.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-CXX.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
share/cmake-${CMAKE_API}/Modules/Compiler/G95-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Compiler/G95-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GNU-C.cmake share/cmake-${CMAKE_API}/Modules/Compiler/GNU-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX.cmake share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX.cmake
@ -161,6 +167,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/Intel-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-C.cmake share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-CXX.cmake share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/NAG-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/PGI-C.cmake share/cmake-${CMAKE_API}/Modules/Compiler/PGI-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/PGI-CXX.cmake share/cmake-${CMAKE_API}/Modules/Compiler/PGI-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/PGI-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Compiler/PGI-Fortran.cmake
@ -169,6 +176,9 @@ share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-CXX.cmake share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/PathScale.cmake share/cmake-${CMAKE_API}/Modules/Compiler/PathScale.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SCO-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SCO-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SCO.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C.cmake share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX.cmake share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-Fortran.cmake
@ -380,12 +390,14 @@ 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-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-windres.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Catamount.cmake share/cmake-${CMAKE_API}/Modules/Platform/Catamount.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-C.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-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-NAG-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-C.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-CXX.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-C.cmake
@ -420,6 +432,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-C.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-CXX.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-NAG-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-C.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-CXX.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-Fortran.cmake
@ -464,15 +477,16 @@ share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-CXX.cmake share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU.cmake share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU.cmake
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-Intel.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-NMcl.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
share/cmake-${CMAKE_API}/Modules/Platform/Windows-cl.cmake.in 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-df.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-g++.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-icl.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-ifort.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-wcl386.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/Windows.cmake
share/cmake-${CMAKE_API}/Modules/Platform/WindowsPaths.cmake share/cmake-${CMAKE_API}/Modules/Platform/WindowsPaths.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Xenix.cmake share/cmake-${CMAKE_API}/Modules/Platform/Xenix.cmake

View file

@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.28 2011/01/14 11:18:02 wiz Exp $ $NetBSD: distinfo,v 1.29 2011/02/22 15:05:33 adam Exp $
SHA1 (cmake-2.8.3.tar.gz) = e9bfbec47b3939be6f83ffa8006884285c687dc2 SHA1 (cmake-2.8.4.tar.gz) = 6c42699bd63fdfcc7743d4906e3208d051d7f19b
RMD160 (cmake-2.8.3.tar.gz) = 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c RMD160 (cmake-2.8.4.tar.gz) = 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893
Size (cmake-2.8.3.tar.gz) = 5436543 bytes Size (cmake-2.8.4.tar.gz) = 5477628 bytes
SHA1 (patch-aa) = c16ba8be422ec243995cd5d475324d469d08c37a SHA1 (patch-aa) = c16ba8be422ec243995cd5d475324d469d08c37a
SHA1 (patch-ab) = 0bd090b19c729710f8822840ec6026b156cd8e13 SHA1 (patch-ab) = c3bb671d98e0d91e32e94f8d8b8203e647559543
SHA1 (patch-ac) = c4d6da48690bed6a2ab632dbf1a96d938ac1aa4e SHA1 (patch-ac) = 1f11e98d50127fae12286708215a90f118b2d2bc
SHA1 (patch-ad) = 18d9f0a5865b6bef04ffee2b33f945b243a2342a

View file

@ -1,21 +1,24 @@
$NetBSD: patch-ab,v 1.9 2010/11/11 08:34:02 adam Exp $ $NetBSD: patch-ab,v 1.10 2011/02/22 15:05:33 adam Exp $
--- Modules/FindPythonInterp.cmake.orig 2010-11-10 20:05:11.000000000 +0000 --- Modules/FindPythonInterp.cmake.orig 2011-02-15 17:47:27.000000000 +0000
+++ Modules/FindPythonInterp.cmake +++ Modules/FindPythonInterp.cmake
@@ -19,8 +19,15 @@ @@ -20,11 +20,18 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
+# for pkgsrc: force Python version (set in pyversion.mk) +# for pkgsrc: force Python version (set in pyversion.mk)
+IF(DEFINED PYVERSSUFFIX) +IF(DEFINED PYVERSSUFFIX)
+ SET(_VERSIONS python${PYVERSSUFFIX}) + SET(_VERSIONS ${PYVERSSUFFIX})
+ELSE(DEFINED PYVERSSUFFIX) +ELSE(DEFINED PYVERSSUFFIX)
+ SET(_VERSIONS python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python) + SET(_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+ENDIF(DEFINED PYVERSSUFFIX) +ENDIF(DEFINED PYVERSSUFFIX)
+ +
FIND_PROGRAM(PYTHON_EXECUTABLE # Set up the versions we know about, in the order we will search. Always add
- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python # the user supplied additional versions to the front.
+ NAMES ${_VERSIONS} set(_Python_VERSIONS
PATHS ${Python_ADDITIONAL_VERSIONS}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] - 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] + ${_VERSIONS})
# Run first with the Python version in the executable
foreach(_CURRENT_VERSION ${_Python_VERSIONS})

View file

@ -1,20 +1,23 @@
$NetBSD: patch-ac,v 1.5 2010/11/11 08:34:02 adam Exp $ $NetBSD: patch-ac,v 1.6 2011/02/22 15:05:34 adam Exp $
--- Modules/FindPythonLibs.cmake.orig 2010-11-10 20:06:34.000000000 +0000 --- Modules/FindPythonLibs.cmake.orig 2011-02-15 17:47:27.000000000 +0000
+++ Modules/FindPythonLibs.cmake +++ Modules/FindPythonLibs.cmake
@@ -27,7 +27,14 @@ INCLUDE(CMakeFindFrameworks) @@ -27,11 +27,17 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple. # Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python) CMAKE_FIND_FRAMEWORKS(Python)
-FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+# for pkgsrc: force Python version (set in pyversion.mk)
+IF(DEFINED PYVERSSUFFIX) +IF(DEFINED PYVERSSUFFIX)
+ SET(_VERSIONS ${PYVERSSUFFIX}) + SET(_VERSIONS ${PYVERSSUFFIX})
+ELSE(DEFINED 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 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+ENDIF(DEFINED PYVERSSUFFIX) +ENDIF(DEFINED PYVERSSUFFIX)
+ +
+FOREACH(_CURRENT_VERSION ${_VERSIONS}) # 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
${Python_ADDITIONAL_VERSIONS}
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+ ${_VERSIONS})
FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
IF(WIN32)
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY

View file

@ -1,15 +0,0 @@
$NetBSD: patch-ad,v 1.9 2011/01/14 11:18:02 wiz Exp $
Find png-1.5.
--- Modules/FindPNG.cmake.orig 2010-11-03 19:58:27.000000000 +0000
+++ Modules/FindPNG.cmake
@@ -33,7 +33,7 @@ if(ZLIB_FOUND)
/usr/local/include/libpng # OpenBSD
)
- set(PNG_NAMES ${PNG_NAMES} png libpng png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
+ set(PNG_NAMES ${PNG_NAMES} png libpng png15 libpng15 png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)