Date: Wednesday, April 25, 2012 @ 02:58:42 Author: andrea Revision: 157165
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cmake/repos/extra-i686/PKGBUILD (from rev 157164, cmake/trunk/PKGBUILD) cmake/repos/extra-i686/cmake.install (from rev 157164, cmake/trunk/cmake.install) cmake/repos/extra-i686/fix-pkg-config.patch (from rev 157164, cmake/trunk/fix-pkg-config.patch) cmake/repos/extra-x86_64/PKGBUILD (from rev 157164, cmake/trunk/PKGBUILD) cmake/repos/extra-x86_64/cmake.install (from rev 157164, cmake/trunk/cmake.install) cmake/repos/extra-x86_64/fix-pkg-config.patch (from rev 157164, cmake/trunk/fix-pkg-config.patch) Deleted: cmake/repos/extra-i686/PKGBUILD cmake/repos/extra-i686/cmake.install cmake/repos/extra-x86_64/PKGBUILD cmake/repos/extra-x86_64/cmake.install -----------------------------------+ extra-i686/PKGBUILD | 87 +++++++++++++++++++----------------- extra-i686/cmake.install | 24 ++++----- extra-i686/fix-pkg-config.patch | 31 ++++++++++++ extra-x86_64/PKGBUILD | 87 +++++++++++++++++++----------------- extra-x86_64/cmake.install | 24 ++++----- extra-x86_64/fix-pkg-config.patch | 31 ++++++++++++ 6 files changed, 178 insertions(+), 106 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-04-25 06:58:02 UTC (rev 157164) +++ extra-i686/PKGBUILD 2012-04-25 06:58:42 UTC (rev 157165) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=cmake -pkgver=2.8.8 -pkgrel=1 -pkgdesc="A cross-platform open-source make system" -arch=('i686' 'x86_64') -url="http://www.cmake.org/" -license=('custom') -depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt') -optdepends=('qt: cmake-gui') -install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba74b22c788a0c8547976b880cd02b17') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - ./bootstrap --prefix=/usr \ - --mandir=/share/man \ - --docdir=/share/doc/cmake \ - --system-libs \ - --qt-gui \ - --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - vimpath="$pkgdir/usr/share/vim/vimfiles" - install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim - install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim - install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el - - install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} Copied: cmake/repos/extra-i686/PKGBUILD (from rev 157164, cmake/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-04-25 06:58:42 UTC (rev 157165) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=cmake +pkgver=2.8.8 +pkgrel=2 +pkgdesc="A cross-platform open-source make system" +arch=('i686' 'x86_64') +url="http://www.cmake.org/" +license=('custom') +depends=('curl' 'libarchive' 'shared-mime-info') +makedepends=('qt') +optdepends=('qt: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'fix-pkg-config.patch') +md5sums=('ba74b22c788a0c8547976b880cd02b17' + '32c6a4360a2ba12dc77b6a840fa7672b') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # FS#29545 + patch -p1 -i "${srcdir}"/fix-pkg-config.patch + + ./bootstrap --prefix=/usr \ + --mandir=/share/man \ + --docdir=/share/doc/cmake \ + --system-libs \ + --qt-gui \ + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + vimpath="$pkgdir/usr/share/vim/vimfiles" + install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim + install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim + install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el + + install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} Deleted: extra-i686/cmake.install =================================================================== --- extra-i686/cmake.install 2012-04-25 06:58:02 UTC (rev 157164) +++ extra-i686/cmake.install 2012-04-25 06:58:42 UTC (rev 157165) @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: cmake/repos/extra-i686/cmake.install (from rev 157164, cmake/trunk/cmake.install) =================================================================== --- extra-i686/cmake.install (rev 0) +++ extra-i686/cmake.install 2012-04-25 06:58:42 UTC (rev 157165) @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: cmake/repos/extra-i686/fix-pkg-config.patch (from rev 157164, cmake/trunk/fix-pkg-config.patch) =================================================================== --- extra-i686/fix-pkg-config.patch (rev 0) +++ extra-i686/fix-pkg-config.patch 2012-04-25 06:58:42 UTC (rev 157165) @@ -0,0 +1,31 @@ +X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 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 "") Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-04-25 06:58:02 UTC (rev 157164) +++ extra-x86_64/PKGBUILD 2012-04-25 06:58:42 UTC (rev 157165) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=cmake -pkgver=2.8.8 -pkgrel=1 -pkgdesc="A cross-platform open-source make system" -arch=('i686' 'x86_64') -url="http://www.cmake.org/" -license=('custom') -depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt') -optdepends=('qt: cmake-gui') -install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba74b22c788a0c8547976b880cd02b17') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - ./bootstrap --prefix=/usr \ - --mandir=/share/man \ - --docdir=/share/doc/cmake \ - --system-libs \ - --qt-gui \ - --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - vimpath="$pkgdir/usr/share/vim/vimfiles" - install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim - install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim - install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el - - install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} Copied: cmake/repos/extra-x86_64/PKGBUILD (from rev 157164, cmake/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-04-25 06:58:42 UTC (rev 157165) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=cmake +pkgver=2.8.8 +pkgrel=2 +pkgdesc="A cross-platform open-source make system" +arch=('i686' 'x86_64') +url="http://www.cmake.org/" +license=('custom') +depends=('curl' 'libarchive' 'shared-mime-info') +makedepends=('qt') +optdepends=('qt: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'fix-pkg-config.patch') +md5sums=('ba74b22c788a0c8547976b880cd02b17' + '32c6a4360a2ba12dc77b6a840fa7672b') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # FS#29545 + patch -p1 -i "${srcdir}"/fix-pkg-config.patch + + ./bootstrap --prefix=/usr \ + --mandir=/share/man \ + --docdir=/share/doc/cmake \ + --system-libs \ + --qt-gui \ + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + vimpath="$pkgdir/usr/share/vim/vimfiles" + install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim + install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim + install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el + + install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} Deleted: extra-x86_64/cmake.install =================================================================== --- extra-x86_64/cmake.install 2012-04-25 06:58:02 UTC (rev 157164) +++ extra-x86_64/cmake.install 2012-04-25 06:58:42 UTC (rev 157165) @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: cmake/repos/extra-x86_64/cmake.install (from rev 157164, cmake/trunk/cmake.install) =================================================================== --- extra-x86_64/cmake.install (rev 0) +++ extra-x86_64/cmake.install 2012-04-25 06:58:42 UTC (rev 157165) @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: cmake/repos/extra-x86_64/fix-pkg-config.patch (from rev 157164, cmake/trunk/fix-pkg-config.patch) =================================================================== --- extra-x86_64/fix-pkg-config.patch (rev 0) +++ extra-x86_64/fix-pkg-config.patch 2012-04-25 06:58:42 UTC (rev 157165) @@ -0,0 +1,31 @@ +X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 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 "")