diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-09-14 19:22:51 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-09-14 19:22:51 +0000 |
commit | e6dd931e2d83f2d95a1c99577711e28f056ba38f (patch) | |
tree | 1c3b958aee47e2b9f64839dd4dfbbaaa84e4951c /devel/cmake | |
parent | - Convert to new options framework (diff) |
Update CMake to 2.8.9.
PR: ports/170654
Notes
Notes:
svn path=/head/; revision=304291
Diffstat (limited to 'devel/cmake')
-rw-r--r-- | devel/cmake/Makefile | 3 | ||||
-rw-r--r-- | devel/cmake/distinfo | 4 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindJava.cmake | 6 | ||||
-rw-r--r-- | devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 | 56 | ||||
-rw-r--r-- | devel/cmake/pkg-plist | 13 |
5 files changed, 18 insertions, 64 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 55abf332cca9..32c179a1d4c4 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cmake -PORTVERSION= 2.8.8 -PORTREVISION?= 1 +PORTVERSION= 2.8.9 CATEGORIES= devel MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 468b99b20c66..dbb858ceb077 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,2 +1,2 @@ -SHA256 (cmake-2.8.8.tar.gz) = 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 -SIZE (cmake-2.8.8.tar.gz) = 5691656 +SHA256 (cmake-2.8.9.tar.gz) = dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 +SIZE (cmake-2.8.9.tar.gz) = 5658837 diff --git a/devel/cmake/files/patch-Modules_FindJava.cmake b/devel/cmake/files/patch-Modules_FindJava.cmake index 90148d375086..022de0e639f1 100644 --- a/devel/cmake/files/patch-Modules_FindJava.cmake +++ b/devel/cmake/files/patch-Modules_FindJava.cmake @@ -1,11 +1,11 @@ --- ./Modules/FindJava.cmake.orig 2010-04-16 16:49:52.000000000 +1100 +++ ./Modules/FindJava.cmake 2010-04-16 16:51:27.398957616 +1100 -@@ -90,7 +90,7 @@ +@@ -107,7 +107,7 @@ # 2. OpenJDK 1.6 # 3. GCJ 1.5 # 4. Kaffe 1.4.2 -- IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*") -+ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*") +- IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*") ++ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*") # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*" "\\1" Java_VERSION_STRING "${var}" ) diff --git a/devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 b/devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 deleted file mode 100644 index 6ddddedc7614..000000000000 --- a/devel/cmake/files/patch-git_3ea850a5023060b84dcc0e6f0098c32c28b15807 +++ /dev/null @@ -1,56 +0,0 @@ -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 b14d2ca9dc75..53e99190c359 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -3,7 +3,13 @@ bin/cmake bin/cpack bin/ctest share/aclocal/cmake.m4 -share/emacs/site-lisp/cmake-mode.el +%%DATADIR%%/completions/cmake +%%DATADIR%%/completions/cpack +%%DATADIR%%/completions/ctest +%%DATADIR%%/editors/emacs/cmake-mode.el +%%DATADIR%%/editors/vim/cmake-help.vim +%%DATADIR%%/editors/vim/cmake-indent.vim +%%DATADIR%%/editors/vim/cmake-syntax.vim %%DATADIR%%/include/cmCPluginAPI.h %%DOCSDIR%%/Copyright.txt %%DOCSDIR%%/ccmake.docbook @@ -36,6 +42,7 @@ share/emacs/site-lisp/cmake-mode.el %%DOCSDIR%%/ctest.docbook %%DOCSDIR%%/ctest.html %%DOCSDIR%%/ctest.txt +share/emacs/site-lisp/cmake-mode.el @dirrm %%DOCSDIR%%/cmzlib @dirrm %%DOCSDIR%%/cmsys @dirrm %%DOCSDIR%%/cmlibarchive @@ -44,4 +51,8 @@ share/emacs/site-lisp/cmake-mode.el @dirrm %%DOCSDIR%%/cmcompress @dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/include +@dirrm %%DATADIR%%/editors/vim +@dirrm %%DATADIR%%/editors/emacs +@dirrm %%DATADIR%%/editors +@dirrm %%DATADIR%%/completions @dirrmtry %%DATADIR%% |