Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=796b98b3ad6dc0fe2c66e0af346d1d148486c706
commit 796b98b3ad6dc0fe2c66e0af346d1d148486c706 Author: Daniel Exner <[email protected]> Date: Fri Aug 10 20:12:42 2012 +0200 cmake-2.8.9-1-x86_64 * version bump * Bugfixes upstream diff --git a/source/devel-extra/cmake/FrugalBuild b/source/devel-extra/cmake/FrugalBuild index fe7a918..b128f5d 100644 --- a/source/devel-extra/cmake/FrugalBuild +++ b/source/devel-extra/cmake/FrugalBuild @@ -3,20 +3,18 @@ # Contributor: Priyank Gosalia <[email protected]> pkgname=cmake -pkgver=2.8.8 -pkgrel=2 +pkgver=2.8.9 +pkgrel=1 pkgdesc="Cross platform make" url="http://www.cmake.org/"; depends=('glibc' 'ncurses') groups=('devel-extra') archs=('i686' 'x86_64' 'arm') up2date="lynx -dump http://cmake.org/HTML/Download.html | grep -m1 Latest | sed 's/.* \(.*\).*/\1/g' | sed 's/(\|)//g'" -source=(http://www.cmake.org/files/v2.8/$pkgname-$pkgver.tar.gz cmake-pkgconfig.patch) -sha1sums=('a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1' \ - '49ea74dfae74f625160b3d02ac6f2ef5b7249c8d') +source=(http://www.cmake.org/files/v2.8/$pkgname-$pkgver.tar.gz) +sha1sums=('b96663c0757a5edfbddc410aabf7126a92131e2b') build() { - Fpatchall Fsed '/usr/local' '/usr' bootstrap Fsed '\(${cmake_bootstrap_system_libs}\)' '\1 -DENABLE_IPV6=1' bootstrap ./bootstrap $Fconfopts diff --git a/source/devel-extra/cmake/cmake-pkgconfig.patch b/source/devel-extra/cmake/cmake-pkgconfig.patch deleted file mode 100644 index 5dfea69..0000000 --- a/source/devel-extra/cmake/cmake-pkgconfig.patch +++ /dev/null @@ -1,55 +0,0 @@ -commit 8bd38d7070b1cec6ed27b71d0359f1b2ccd1e1c8 -Author: Rolf Eike Beer <[email protected]> -Date: Fri Apr 13 08:50:49 2012 +0200 - - FindPkgConfig.cmake: fix documented output variable no longer set (#13125) - - The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. - -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake -index 5d93ab1..30aab45 100644 ---- a/Modules/FindPkgConfig.cmake -+++ b/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 ---- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt -+++ b/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) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
