diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-03 02:14:57 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-03 02:14:57 +0000 |
commit | 3ceed877433caa8e59b7a0799d6c1bc659372080 (patch) | |
tree | 9154e04d4ed04c7d91bf3e65fe96ff0176c32a0e /devel/cmake | |
parent | take (diff) |
Update to 2.8.8.
It includes an upstream patch which fixes the FindPkgConfig.cmake
module. It will be part of 2.8.9.
PR: ports/167140
Approved by: portmgr (pav via exp-run)
Notes
Notes:
svn path=/head/; revision=295909
Diffstat (limited to 'devel/cmake')
-rw-r--r-- | devel/cmake/Makefile | 5 | ||||
-rw-r--r-- | devel/cmake/distinfo | 4 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 25 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindSDL.cmake | 24 | ||||
-rw-r--r-- | devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 | 56 | ||||
-rw-r--r-- | devel/cmake/pkg-plist | 18 |
6 files changed, 110 insertions, 22 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 011c88d5ac9c..c010daa18889 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cmake -PORTVERSION= 2.8.7 +PORTVERSION= 2.8.8 CATEGORIES= devel MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ @@ -16,11 +16,10 @@ COMMENT= A cross-platform Makefile generator LICENSE= BSD HAS_CONFIGURE= yes +CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" -CONFIGURE_ENV= MAKE=make - MAKE_JOBS_SAFE= yes .if defined(STRIP) && ${STRIP} != "" diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 6518157ef766..468b99b20c66 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,2 +1,2 @@ -SHA256 (cmake-2.8.7.tar.gz) = 130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f -SIZE (cmake-2.8.7.tar.gz) = 5667409 +SHA256 (cmake-2.8.8.tar.gz) = 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 +SIZE (cmake-2.8.8.tar.gz) = 5691656 diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index 4c02d1664d76..42dada1ff22f 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,6 +1,6 @@ ---- ./Modules/FindQt4.cmake.orig 2010-11-03 22:58:27.000000000 +0300 -+++ ./Modules/FindQt4.cmake 2010-11-23 18:09:33.486039056 +0300 -@@ -461,7 +461,7 @@ +--- ./Modules/FindQt4.cmake.orig 2011-12-30 17:49:56.000000000 +0100 ++++ ./Modules/FindQt4.cmake 2012-04-07 18:45:53.442654169 +0200 +@@ -473,7 +473,7 @@ # check for qmake # Debian uses qmake-qt4 # macports' Qt uses qmake-mac @@ -9,7 +9,7 @@ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" -@@ -705,13 +705,7 @@ +@@ -665,13 +665,7 @@ # ask qmake for the plugins directory IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir) @@ -24,3 +24,20 @@ ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) # ask qmake for the translations directory +@@ -684,15 +678,7 @@ + IF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) + _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) + if(qt_imports_dir) +- SET(QT_IMPORTS_DIR NOTFOUND) +- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) +- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports") +- endforeach(qt_cross_path) +- FIND_PATH(QT_IMPORTS_DIR NAMES Qt +- HINTS ${qt_cross_paths} ${qt_imports_dir} +- DOC "The location of the Qt imports" +- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH +- NO_CMAKE_SYSTEM_PATH) ++ SET(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE) + mark_as_advanced(QT_IMPORTS_DIR) + endif(qt_imports_dir) + ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) diff --git a/devel/cmake/files/patch-Modules_FindSDL.cmake b/devel/cmake/files/patch-Modules_FindSDL.cmake index 9e9881c7af03..813bd3cc998d 100644 --- a/devel/cmake/files/patch-Modules_FindSDL.cmake +++ b/devel/cmake/files/patch-Modules_FindSDL.cmake @@ -1,19 +1,19 @@ ---- Modules/FindSDL.cmake.orig 2009-11-13 21:32:52.000000000 +0300 -+++ Modules/FindSDL.cmake 2010-01-28 17:32:40.000000000 +0300 -@@ -81,6 +81,11 @@ - /opt/csw # Blastwave +--- Modules/FindSDL.cmake.orig 2012-04-18 22:24:55.000000000 -0300 ++++ Modules/FindSDL.cmake 2012-04-18 22:26:06.000000000 -0300 +@@ -82,6 +82,11 @@ /opt ) -+#On FreeBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, which is -+#located in ${LOCALBASE}/include. Append {LOCALBASE}/include to -+#the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box. + ++# On FreeBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, which is ++# located in ${LOCALBASE}/include. Append {LOCALBASE}/include to ++# the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box. +LIST(APPEND SDL_INCLUDE_DIR /usr/local/include) + - #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") - # SDL-1.1 is the name used by FreeBSD ports... -@@ -100,7 +105,7 @@ - #MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}") + # don't confuse it for the version number. + FIND_LIBRARY(SDL_LIBRARY_TEMP +@@ -97,7 +102,7 @@ + ) IF(NOT SDL_BUILDING_LIBRARY) - IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") @@ -21,7 +21,7 @@ # Non-OS X framework versions expect you to also dynamically link to # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms # seem to provide SDLmain for compatibility even though they don't -@@ -116,7 +121,7 @@ +@@ -113,7 +118,7 @@ /opt/csw /opt ) diff --git a/devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 b/devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 new file mode 100644 index 000000000000..6ddddedc7614 --- /dev/null +++ b/devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 @@ -0,0 +1,56 @@ +commit 3ea850a5023060b84dcc0e6f0098c32c28b15807 +Author: Rolf Eike Beer <eike@sf-mail.de> +Date: Fri Apr 13 08:50:49 2012 +0200 + + FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132) + + The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. + An additional hint to really get this fixed came from Rex Dieter. + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 100644 +--- Modules/FindPkgConfig.cmake ++++ Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # It sets the following variables: +-# PKG_CONFIG_FOUND ... true if pkg-config works on the system ++# PKG_CONFIG_FOUND ... if pkg-config executable was found + # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program + # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found + # (since CMake 2.8.8) +-# PKG_CONFIG_FOUND ... if pkg-config executable was found + # + # For the following variables two sets of values exist; first one is the + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + VERSION_VAR PKG_CONFIG_VERSION_STRING) + ++# This is needed because the module name is "PkgConfig" but the name of ++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically ++# handled by FPHSA. ++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") ++ + # Unsets the given variables + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") +diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +index 6604208..fc65e58 100644 +--- Tests/CMakeOnly/AllFindModules/CMakeLists.txt ++++ Tests/CMakeOnly/AllFindModules/CMakeLists.txt +@@ -71,7 +71,7 @@ endmacro(check_version_string) + # reported. + + foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL +- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB) ++ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB) + check_version_string(${VTEST} ${VTEST}_VERSION_STRING) + endforeach(VTEST) + +@@ -82,4 +82,3 @@ endforeach(VTEST) + + check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) + check_version_string(SUBVERSION Subversion_VERSION_SVN) +-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING) diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 01933db47b23..142ac54f6dd4 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -8,6 +8,7 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/AddFileDependencies.cmake %%DATADIR%%/Modules/AutomocInfo.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in +%%DATADIR%%/Modules/BasicConfigVersion-ExactVersion.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-SameMajorVersion.cmake.in %%DATADIR%%/Modules/BundleUtilities.cmake %%DATADIR%%/Modules/CMake.cmake @@ -16,6 +17,9 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/CMakeASMInformation.cmake %%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake %%DATADIR%%/Modules/CMakeASM_NASMInformation.cmake +%%DATADIR%%/Modules/CMakeAddFortranSubdirectory.cmake +%%DATADIR%%/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in +%%DATADIR%%/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in %%DATADIR%%/Modules/CMakeAddNewLanguage.txt %%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake %%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake @@ -46,6 +50,7 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineSystem.cmake %%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake +%%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake %%DATADIR%%/Modules/CMakeExportBuildSettings.cmake %%DATADIR%%/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake %%DATADIR%%/Modules/CMakeFindBinUtils.cmake @@ -69,6 +74,8 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake +%%DATADIR%%/Modules/CMakeNinjaFindMake.cmake +%%DATADIR%%/Modules/CMakePackageConfigHelpers.cmake %%DATADIR%%/Modules/CMakeParseArguments.cmake %%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake %%DATADIR%%/Modules/CMakePlatformId.h.in @@ -118,8 +125,11 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/CPack.distribution.dist.in %%DATADIR%%/Modules/CPackBundle.cmake %%DATADIR%%/Modules/CPackComponent.cmake +%%DATADIR%%/Modules/CPackCygwin.cmake +%%DATADIR%%/Modules/CPackDMG.cmake %%DATADIR%%/Modules/CPackDeb.cmake %%DATADIR%%/Modules/CPackNSIS.cmake +%%DATADIR%%/Modules/CPackPackageMaker.cmake %%DATADIR%%/Modules/CPackRPM.cmake %%DATADIR%%/Modules/CPackZIP.cmake %%DATADIR%%/Modules/CTest.cmake @@ -141,6 +151,7 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/CheckIncludeFile.cxx.in %%DATADIR%%/Modules/CheckIncludeFileCXX.cmake %%DATADIR%%/Modules/CheckIncludeFiles.cmake +%%DATADIR%%/Modules/CheckLanguage.cmake %%DATADIR%%/Modules/CheckLibraryExists.cmake %%DATADIR%%/Modules/CheckLibraryExists.lists.in %%DATADIR%%/Modules/CheckPrototypeDefinition.c.in @@ -331,7 +342,9 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/FindosgIntrospection.cmake %%DATADIR%%/Modules/FindosgManipulator.cmake %%DATADIR%%/Modules/FindosgParticle.cmake +%%DATADIR%%/Modules/FindosgPresentation.cmake %%DATADIR%%/Modules/FindosgProducer.cmake +%%DATADIR%%/Modules/FindosgQt.cmake %%DATADIR%%/Modules/FindosgShadow.cmake %%DATADIR%%/Modules/FindosgSim.cmake %%DATADIR%%/Modules/FindosgTerrain.cmake @@ -504,7 +517,9 @@ share/emacs/site-lisp/cmake-mode.el %%DATADIR%%/Modules/Platform/UnixWare.cmake %%DATADIR%%/Modules/Platform/Windows-Borland-C.cmake %%DATADIR%%/Modules/Platform/Windows-Borland-CXX.cmake -%%DATADIR%%/Modules/Platform/Windows-Borland.cmake +%%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake +%%DATADIR%%/Modules/Platform/Windows-Embarcadero-CXX.cmake +%%DATADIR%%/Modules/Platform/Windows-Embarcadero.cmake %%DATADIR%%/Modules/Platform/Windows-G95-Fortran.cmake %%DATADIR%%/Modules/Platform/Windows-GNU-C-ABI.cmake %%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake @@ -639,5 +654,6 @@ share/emacs/site-lisp/cmake-mode.el @dirrm %%DATADIR%%/Modules/FortranCInterface @dirrm %%DATADIR%%/Modules/FindCUDA @dirrm %%DATADIR%%/Modules/Compiler +@dirrm %%DATADIR%%/Modules/CMakeAddFortranSubdirectory @dirrmtry %%DATADIR%%/Modules @dirrmtry %%DATADIR%% |