diff options
| -rw-r--r-- | devel/cmake/Makefile | 5 | ||||
| -rw-r--r-- | devel/cmake/PLIST | 22 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 12 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-Modules_FindX11.cmake | 14 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-ab | 14 |
5 files changed, 43 insertions, 24 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 503cea5d458..c156741ee1f 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2011/09/14 17:54:48 brook Exp $ +# $NetBSD: Makefile,v 1.60 2011/10/15 07:24:30 adam Exp $ -DISTNAME= cmake-${CMAKE_API}.5 -PKGREVISION= 1 +DISTNAME= cmake-${CMAKE_API}.6 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.8/ diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST index d19f27c7aff..4414587a163 100644 --- a/devel/cmake/PLIST +++ b/devel/cmake/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2011/07/31 22:04:03 adam Exp $ +@comment $NetBSD: PLIST,v 1.25 2011/10/15 07:24:30 adam Exp $ bin/ccmake bin/cmake bin/cpack @@ -13,8 +13,12 @@ man/man1/cmakeprops.1 man/man1/cmakevars.1 man/man1/cpack.1 man/man1/ctest.1 +share/aclocal/cmake.m4 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-SameMajorVersion.cmake.in share/cmake-${CMAKE_API}/Modules/BundleUtilities.cmake share/cmake-${CMAKE_API}/Modules/CMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeASM-ATTInformation.cmake @@ -53,11 +57,13 @@ 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/CMakeExportBuildSettings.cmake +share/cmake-${CMAKE_API}/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindBinUtils.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindCodeBlocks.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindEclipseCDT4.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindFrameworks.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindKDevelop3.cmake +share/cmake-${CMAKE_API}/Modules/CMakeFindPackageMode.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindWMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeFindXCode.cmake share/cmake-${CMAKE_API}/Modules/CMakeForceCompiler.cmake @@ -77,6 +83,7 @@ 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 +share/cmake-${CMAKE_API}/Modules/CMakePushCheckState.cmake share/cmake-${CMAKE_API}/Modules/CMakeRCCompiler.cmake.in share/cmake-${CMAKE_API}/Modules/CMakeRCInformation.cmake share/cmake-${CMAKE_API}/Modules/CMakeSystem.cmake.in @@ -94,8 +101,10 @@ 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 share/cmake-${CMAKE_API}/Modules/CMakeVS10FindMake.cmake +share/cmake-${CMAKE_API}/Modules/CMakeVS11FindMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeVS6BackwardCompatibility.cmake share/cmake-${CMAKE_API}/Modules/CMakeVS6FindMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeVS71FindMake.cmake @@ -132,6 +141,7 @@ share/cmake-${CMAKE_API}/Modules/CheckCSourceRuns.cmake share/cmake-${CMAKE_API}/Modules/CheckCXXCompilerFlag.cmake share/cmake-${CMAKE_API}/Modules/CheckCXXSourceCompiles.cmake share/cmake-${CMAKE_API}/Modules/CheckCXXSourceRuns.cmake +share/cmake-${CMAKE_API}/Modules/CheckCXXSymbolExists.cmake share/cmake-${CMAKE_API}/Modules/CheckForPthreads.c share/cmake-${CMAKE_API}/Modules/CheckFortranFunctionExists.cmake share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.c @@ -363,9 +373,13 @@ share/cmake-${CMAKE_API}/Modules/FortranCInterface/mymodule_.c share/cmake-${CMAKE_API}/Modules/FortranCInterface/mysub.f share/cmake-${CMAKE_API}/Modules/FortranCInterface/symbol.c.in share/cmake-${CMAKE_API}/Modules/GNUInstallDirs.cmake +share/cmake-${CMAKE_API}/Modules/GenerateExportHeader.cmake share/cmake-${CMAKE_API}/Modules/GetPrerequisites.cmake share/cmake-${CMAKE_API}/Modules/ITKCompatibility.cmake share/cmake-${CMAKE_API}/Modules/InstallRequiredSystemLibraries.cmake +share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/CMakeLists.txt +share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/detect.cmake +share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/hello.f share/cmake-${CMAKE_API}/Modules/KDE3Macros.cmake share/cmake-${CMAKE_API}/Modules/MacOSXBundleInfo.plist.in share/cmake-${CMAKE_API}/Modules/MacOSXFrameworkInfo.plist.in @@ -378,6 +392,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU.cmake share/cmake-${CMAKE_API}/Modules/Platform/AIX-VisualAge-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/AIX-VisualAge-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Platform/AIX-VisualAge-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-ASM.cmake share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-CXX.cmake @@ -541,6 +556,9 @@ share/cmake-${CMAKE_API}/Modules/TestForSSTREAM.cxx share/cmake-${CMAKE_API}/Modules/TestForSTDNamespace.cmake share/cmake-${CMAKE_API}/Modules/TestForSTDNamespace.cxx share/cmake-${CMAKE_API}/Modules/UseEcos.cmake +share/cmake-${CMAKE_API}/Modules/UseJava.cmake +share/cmake-${CMAKE_API}/Modules/UseJavaClassFilelist.cmake +share/cmake-${CMAKE_API}/Modules/UseJavaSymlinks.cmake share/cmake-${CMAKE_API}/Modules/UsePkgConfig.cmake share/cmake-${CMAKE_API}/Modules/UseQt4.cmake share/cmake-${CMAKE_API}/Modules/UseSWIG.cmake @@ -550,7 +568,9 @@ share/cmake-${CMAKE_API}/Modules/UseVTKConfig40.cmake share/cmake-${CMAKE_API}/Modules/Use_wxWindows.cmake share/cmake-${CMAKE_API}/Modules/UsewxWidgets.cmake share/cmake-${CMAKE_API}/Modules/VTKCompatibility.cmake +share/cmake-${CMAKE_API}/Modules/WriteBasicConfigVersionFile.cmake share/cmake-${CMAKE_API}/Modules/ecos_clean.cmake +share/cmake-${CMAKE_API}/Modules/exportheader.cmake.in share/cmake-${CMAKE_API}/Modules/kde3init_dummy.cpp.in share/cmake-${CMAKE_API}/Modules/kde3uic.cmake share/cmake-${CMAKE_API}/Modules/readme.txt diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 1b339a266d4..c4c186318b0 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2011/09/14 21:21:53 brook Exp $ +$NetBSD: distinfo,v 1.33 2011/10/15 07:24:30 adam Exp $ -SHA1 (cmake-2.8.5.tar.gz) = 8dd4c31cbccf1a297829a476a0ef79d1614ca368 -RMD160 (cmake-2.8.5.tar.gz) = e4767dc0ea3e53da3ab14cc6af5d42dd190eda76 -Size (cmake-2.8.5.tar.gz) = 5517977 bytes -SHA1 (patch-Modules_FindX11.cmake) = 34c6f93adad781f6f58104a53a6ce9d15213e258 +SHA1 (cmake-2.8.6.tar.gz) = 7c2cbd42d27e26580cd4923892197b84b2a90675 +RMD160 (cmake-2.8.6.tar.gz) = c3095a4776367496f895b8075fda373568f01878 +Size (cmake-2.8.6.tar.gz) = 5583905 bytes +SHA1 (patch-Modules_FindX11.cmake) = a75a6834a376a51a314989b9996a5208cc0682ab SHA1 (patch-aa) = 1af37a3f7bd8423785acff80d7b89c75018e5cab -SHA1 (patch-ab) = c3bb671d98e0d91e32e94f8d8b8203e647559543 +SHA1 (patch-ab) = ef595be6f88f74622d1ef0d850a626882bf9c80a SHA1 (patch-ac) = 1f11e98d50127fae12286708215a90f118b2d2bc diff --git a/devel/cmake/patches/patch-Modules_FindX11.cmake b/devel/cmake/patches/patch-Modules_FindX11.cmake index 50846848ac9..1fe4bb1aa8d 100644 --- a/devel/cmake/patches/patch-Modules_FindX11.cmake +++ b/devel/cmake/patches/patch-Modules_FindX11.cmake @@ -1,18 +1,18 @@ -$NetBSD: patch-Modules_FindX11.cmake,v 1.1 2011/09/14 17:54:48 brook Exp $ +$NetBSD: patch-Modules_FindX11.cmake,v 1.2 2011/10/15 07:24:31 adam Exp $ ---- Modules/FindX11.cmake.orig 2011-07-08 12:21:44.000000000 +0000 +--- Modules/FindX11.cmake.orig 2011-10-04 16:09:24.000000000 +0000 +++ Modules/FindX11.cmake -@@ -56,7 +56,8 @@ IF (UNIX) +@@ -60,7 +60,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 - /usr/X11R6/include - /usr/X11R7/include + /usr/X11R6/include + /usr/X11R7/include /usr/include/X11 -@@ -66,7 +67,8 @@ IF (UNIX) +@@ -70,7 +71,8 @@ IF (UNIX) ) SET(X11_LIB_SEARCH_PATH @@ -21,4 +21,4 @@ $NetBSD: patch-Modules_FindX11.cmake,v 1.1 2011/09/14 17:54:48 brook Exp $ + @X11BASE@/lib /usr/X11R6/lib /usr/X11R7/lib - /usr/openwin/lib + /usr/openwin/lib diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab index 374d80cdf4d..8da923e2c1f 100644 --- a/devel/cmake/patches/patch-ab +++ b/devel/cmake/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.10 2011/02/22 15:05:33 adam Exp $ +$NetBSD: patch-ab,v 1.11 2011/10/15 07:24:31 adam Exp $ ---- Modules/FindPythonInterp.cmake.orig 2011-02-15 17:47:27.000000000 +0000 +--- Modules/FindPythonInterp.cmake.orig 2011-10-04 16:09:24.000000000 +0000 +++ Modules/FindPythonInterp.cmake -@@ -20,11 +20,18 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) +@@ -29,11 +29,18 @@ + # Search for the current active python version first + find_program(PYTHON_EXECUTABLE NAMES python) +# for pkgsrc: force Python version (set in pyversion.mk) +IF(DEFINED PYVERSSUFFIX) @@ -20,5 +20,5 @@ $NetBSD: patch-ab,v 1.10 2011/02/22 15:05:33 adam Exp $ - 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) + ${_VERSIONS}) - # Run first with the Python version in the executable - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) + # Search for newest python version if python executable isn't found + if(NOT PYTHON_EXECUTABLE) |