From f94583a8a96b9b62df8f83f2b7e06ca7df03b68b Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 11 Nov 2010 08:34:01 +0000 Subject: Changes 2.8.3: * When processing DartMeasurements use the tests working directory. * ExternalProject: No svn --username if empty. * Avoid problem reading jni.h on Macs. * Fixed appending PATH to dumpbin tool from growing without bounds. * Switch to CMAKE_PATH when doing PATH comparisons on Windows. * Remove unecessary TO_CMAKE_PATH for gp_cmd_dir. * Append the gp_tool path to the system PATH using native slashes. * Fixes to GetPrerequisites for cygwin. * CPackDeb Added several optional debian binary package fields. * ENH: Added case for Python 2.7. * Fixed parallel build for generators with EXTRA. --- devel/cmake/Makefile | 15 +++++++++------ devel/cmake/PLIST | 20 +++++++++++++++++++- devel/cmake/distinfo | 14 +++++++------- devel/cmake/patches/patch-aa | 8 ++++---- devel/cmake/patches/patch-ab | 12 ++++++------ devel/cmake/patches/patch-ac | 8 ++++---- 6 files changed, 49 insertions(+), 28 deletions(-) diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 4c09a0dd6e0..f9d38352b86 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2010/10/19 08:15:01 adam Exp $ +# $NetBSD: Makefile,v 1.53 2010/11/11 08:34:01 adam Exp $ -DISTNAME= cmake-${CMAKE_API}.2 +DISTNAME= cmake-${CMAKE_API}.3 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.8/ @@ -16,13 +16,15 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ # wants wsyncup and wcursyncup USE_NCURSES= yes -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= bootstrap BUILD_TARGET= default_target CONFIGURE_HAS_MANDIR= no CONFIGURE_ARGS+= --mandir=/${PKGMANDIR} CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API} +CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --system-libs .include "../../mk/bsd.prefs.mk" @@ -40,20 +42,21 @@ UNLIMIT_RESOURCES= datasize TEST_TARGET= test SUBST_CLASSES+= cmake -SUBST_STAGE.cmake= post-patch +SUBST_STAGE.cmake= pre-configure SUBST_MESSAGE.cmake= Fixing X11 prefix. SUBST_FILES.cmake= Modules/Platform/UnixPaths.cmake SUBST_VARS.cmake= X11BASE SUBST_CLASSES+= flags -SUBST_STAGE.flags= post-patch +SUBST_STAGE.flags= pre-configure SUBST_MESSAGE.flags= Fixing compiler flags. SUBST_FILES.flags= Modules/Compiler/*.cmake SUBST_SED.flags= -e 's,-O.,,' -post-patch: +pre-configure: ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig +.include "../../archivers/libarchive/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST index 8ec3efdb60c..c76de0e6fdb 100644 --- a/devel/cmake/PLIST +++ b/devel/cmake/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2010/10/19 08:15:01 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2010/11/11 08:34:01 adam Exp $ bin/ccmake bin/cmake bin/cpack @@ -71,6 +71,7 @@ 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/CMakeParseArguments.cmake share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitLinkInfo.cmake share/cmake-${CMAKE_API}/Modules/CMakePlatformId.h.in share/cmake-${CMAKE_API}/Modules/CMakePrintSystemInformation.cmake @@ -238,6 +239,7 @@ share/cmake-${CMAKE_API}/Modules/FindKDE3.cmake share/cmake-${CMAKE_API}/Modules/FindKDE4.cmake share/cmake-${CMAKE_API}/Modules/FindLAPACK.cmake share/cmake-${CMAKE_API}/Modules/FindLATEX.cmake +share/cmake-${CMAKE_API}/Modules/FindLibArchive.cmake share/cmake-${CMAKE_API}/Modules/FindLibXml2.cmake share/cmake-${CMAKE_API}/Modules/FindLibXslt.cmake share/cmake-${CMAKE_API}/Modules/FindLua50.cmake @@ -263,6 +265,7 @@ share/cmake-${CMAKE_API}/Modules/FindPerlLibs.cmake share/cmake-${CMAKE_API}/Modules/FindPhysFS.cmake share/cmake-${CMAKE_API}/Modules/FindPike.cmake share/cmake-${CMAKE_API}/Modules/FindPkgConfig.cmake +share/cmake-${CMAKE_API}/Modules/FindPostgreSQL.cmake share/cmake-${CMAKE_API}/Modules/FindProducer.cmake share/cmake-${CMAKE_API}/Modules/FindProtobuf.cmake share/cmake-${CMAKE_API}/Modules/FindPythonInterp.cmake @@ -358,6 +361,21 @@ share/cmake-${CMAKE_API}/Modules/Platform/AIX.cmake share/cmake-${CMAKE_API}/Modules/Platform/BSDOS.cmake share/cmake-${CMAKE_API}/Modules/Platform/BeOS.cmake share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneL.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-base.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-dynamic.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static-GNU-C.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake +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-GNU-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-CXX.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-Fortran.cmake diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 68821ba3453..c73c787c82c 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2010/10/19 08:15:01 adam Exp $ +$NetBSD: distinfo,v 1.27 2010/11/11 08:34:01 adam Exp $ -SHA1 (cmake-2.8.2.tar.gz) = 272003c2fe392b211ce3b5f895ad84da2ca603cf -RMD160 (cmake-2.8.2.tar.gz) = 079b7c8cb385c59b3713a3611d7a9482f7855fe5 -Size (cmake-2.8.2.tar.gz) = 5392016 bytes -SHA1 (patch-aa) = b093f4992a7fea099d7c26a90b150ac0d057067a -SHA1 (patch-ab) = f7372942f7e28b01c26794ce1a94914b68d1b24e -SHA1 (patch-ac) = e5127b9e28375528e977898c59cb6b5044d76ebe +SHA1 (cmake-2.8.3.tar.gz) = e9bfbec47b3939be6f83ffa8006884285c687dc2 +RMD160 (cmake-2.8.3.tar.gz) = 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c +Size (cmake-2.8.3.tar.gz) = 5436543 bytes +SHA1 (patch-aa) = c16ba8be422ec243995cd5d475324d469d08c37a +SHA1 (patch-ab) = 0bd090b19c729710f8822840ec6026b156cd8e13 +SHA1 (patch-ac) = c4d6da48690bed6a2ab632dbf1a96d938ac1aa4e diff --git a/devel/cmake/patches/patch-aa b/devel/cmake/patches/patch-aa index d837a46684e..7ba48fd1d65 100644 --- a/devel/cmake/patches/patch-aa +++ b/devel/cmake/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.6 2009/11/25 19:08:18 adam Exp $ +$NetBSD: patch-aa,v 1.7 2010/11/11 08:34:02 adam Exp $ ---- Modules/Platform/UnixPaths.cmake.orig 2009-11-13 19:32:53.000000000 +0100 +--- Modules/Platform/UnixPaths.cmake.orig 2010-11-03 19:58:27.000000000 +0000 +++ Modules/Platform/UnixPaths.cmake @@ -48,7 +48,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /usr/include/w32api @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.6 2009/11/25 19:08:18 adam Exp $ + @X11BASE@/include /usr/X11R6/include /usr/include/X11 # Other - /opt/local/include /usr/pkg/include + /usr/pkg/include @@ -61,7 +61,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /usr/lib/w32api @@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.6 2009/11/25 19:08:18 adam Exp $ + @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11 # Other - /opt/local/lib /usr/pkg/lib + /usr/pkg/lib diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab index cb219c94138..2ac2e4c9a48 100644 --- a/devel/cmake/patches/patch-ab +++ b/devel/cmake/patches/patch-ab @@ -1,21 +1,21 @@ -$NetBSD: patch-ab,v 1.8 2010/02/12 13:45:54 drochner Exp $ +$NetBSD: patch-ab,v 1.9 2010/11/11 08:34:02 adam Exp $ ---- Modules/FindPythonInterp.cmake.orig 2009-11-13 18:32:52.000000000 +0000 +--- Modules/FindPythonInterp.cmake.orig 2010-11-10 20:05:11.000000000 +0000 +++ Modules/FindPythonInterp.cmake @@ -19,8 +19,15 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +# for pkgsrc: force Python version (set in pyversion.mk) +IF(DEFINED PYVERSSUFFIX) + SET(_VERSIONS python${PYVERSSUFFIX}) +ELSE(DEFINED PYVERSSUFFIX) -+ SET(_VERSIONS python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python) ++ SET(_VERSIONS python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python) +ENDIF(DEFINED PYVERSSUFFIX) + FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python +- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python + NAMES ${_VERSIONS} PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac index 475663b8476..5fdf72bb6b4 100644 --- a/devel/cmake/patches/patch-ac +++ b/devel/cmake/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.4 2010/02/12 13:45:54 drochner Exp $ +$NetBSD: patch-ac,v 1.5 2010/11/11 08:34:02 adam Exp $ ---- Modules/FindPythonLibs.cmake.orig 2009-11-13 18:32:52.000000000 +0000 +--- Modules/FindPythonLibs.cmake.orig 2010-11-10 20:06:34.000000000 +0000 +++ Modules/FindPythonLibs.cmake @@ -27,7 +27,14 @@ INCLUDE(CMakeFindFrameworks) # Search for the python framework on Apple. CMAKE_FIND_FRAMEWORKS(Python) --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) +-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) + SET(_VERSIONS ${PYVERSSUFFIX}) +ELSE(DEFINED PYVERSSUFFIX) -+ SET(_VERSIONS 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) + +FOREACH(_CURRENT_VERSION ${_VERSIONS}) -- cgit v1.2.3