Date: Saturday, June 8, 2013 @ 08:49:37 Author: andrea Revision: 187915
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cmake/repos/extra-i686/PKGBUILD (from rev 187914, cmake/trunk/PKGBUILD) cmake/repos/extra-i686/cmake.install (from rev 187914, cmake/trunk/cmake.install) cmake/repos/extra-x86_64/PKGBUILD (from rev 187914, cmake/trunk/PKGBUILD) cmake/repos/extra-x86_64/cmake.install (from rev 187914, cmake/trunk/cmake.install) Deleted: cmake/repos/extra-i686/PKGBUILD cmake/repos/extra-i686/cmake.install cmake/repos/extra-i686/imagemagick.patch cmake/repos/extra-x86_64/PKGBUILD cmake/repos/extra-x86_64/cmake.install cmake/repos/extra-x86_64/imagemagick.patch --------------------------------+ /PKGBUILD | 90 +++++++++++++++++++++++++++++++++++++++ /cmake.install | 24 ++++++++++ extra-i686/PKGBUILD | 52 ---------------------- extra-i686/cmake.install | 12 ----- extra-i686/imagemagick.patch | 27 ----------- extra-x86_64/PKGBUILD | 52 ---------------------- extra-x86_64/cmake.install | 12 ----- extra-x86_64/imagemagick.patch | 27 ----------- 8 files changed, 114 insertions(+), 182 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-06-08 06:49:28 UTC (rev 187914) +++ extra-i686/PKGBUILD 2013-06-08 06:49:37 UTC (rev 187915) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=cmake -pkgver=2.8.11 -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=('qt4' 'emacs') -optdepends=('qt4: cmake-gui') -install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'imagemagick.patch') -md5sums=('be6008f2299613d23fe82ab53ef7472e' - '19c4cf0e6e9c9a890f3698c9df8062f1') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/imagemagick.patch -} - -build() { - cd ${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 ${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 - emacs -batch -f batch-byte-compile "${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 187914, cmake/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-06-08 06:49:37 UTC (rev 187915) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=cmake +pkgver=2.8.11.1 +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=('qt4' 'emacs') +optdepends=('qt4: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('df5324a3b203373a9e0a04b924281a43') + +build() { + cd ${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 ${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 + emacs -batch -f batch-byte-compile "${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 2013-06-08 06:49:28 UTC (rev 187914) +++ extra-i686/cmake.install 2013-06-08 06:49:37 UTC (rev 187915) @@ -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 187914, cmake/trunk/cmake.install) =================================================================== --- extra-i686/cmake.install (rev 0) +++ extra-i686/cmake.install 2013-06-08 06:49:37 UTC (rev 187915) @@ -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 +} Deleted: extra-i686/imagemagick.patch =================================================================== --- extra-i686/imagemagick.patch 2013-06-08 06:49:28 UTC (rev 187914) +++ extra-i686/imagemagick.patch 2013-06-08 06:49:37 UTC (rev 187915) @@ -1,27 +0,0 @@ -From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 -From: Funda Wang <fundaw...@gmail.com> -Date: Tue, 28 May 2013 06:17:49 +0000 -Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) - -The header files of ImageMagick are now located at -<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. ---- - Modules/FindImageMagick.cmake | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake -index cd97b38..02a5777 100644 ---- a/Modules/FindImageMagick.cmake -+++ b/Modules/FindImageMagick.cmake -@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) - ${ImageMagick_INCLUDE_DIRS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" - PATH_SUFFIXES -- ImageMagick -+ ImageMagick ImageMagick-6 - DOC "Path to the ImageMagick include dir." - ) - find_library(ImageMagick_${component}_LIBRARY --- -1.7.0 - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-06-08 06:49:28 UTC (rev 187914) +++ extra-x86_64/PKGBUILD 2013-06-08 06:49:37 UTC (rev 187915) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=cmake -pkgver=2.8.11 -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=('qt4' 'emacs') -optdepends=('qt4: cmake-gui') -install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'imagemagick.patch') -md5sums=('be6008f2299613d23fe82ab53ef7472e' - '19c4cf0e6e9c9a890f3698c9df8062f1') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/imagemagick.patch -} - -build() { - cd ${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 ${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 - emacs -batch -f batch-byte-compile "${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 187914, cmake/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-06-08 06:49:37 UTC (rev 187915) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=cmake +pkgver=2.8.11.1 +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=('qt4' 'emacs') +optdepends=('qt4: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('df5324a3b203373a9e0a04b924281a43') + +build() { + cd ${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 ${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 + emacs -batch -f batch-byte-compile "${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 2013-06-08 06:49:28 UTC (rev 187914) +++ extra-x86_64/cmake.install 2013-06-08 06:49:37 UTC (rev 187915) @@ -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 187914, cmake/trunk/cmake.install) =================================================================== --- extra-x86_64/cmake.install (rev 0) +++ extra-x86_64/cmake.install 2013-06-08 06:49:37 UTC (rev 187915) @@ -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 +} Deleted: extra-x86_64/imagemagick.patch =================================================================== --- extra-x86_64/imagemagick.patch 2013-06-08 06:49:28 UTC (rev 187914) +++ extra-x86_64/imagemagick.patch 2013-06-08 06:49:37 UTC (rev 187915) @@ -1,27 +0,0 @@ -From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 -From: Funda Wang <fundaw...@gmail.com> -Date: Tue, 28 May 2013 06:17:49 +0000 -Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) - -The header files of ImageMagick are now located at -<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. ---- - Modules/FindImageMagick.cmake | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake -index cd97b38..02a5777 100644 ---- a/Modules/FindImageMagick.cmake -+++ b/Modules/FindImageMagick.cmake -@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) - ${ImageMagick_INCLUDE_DIRS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" - PATH_SUFFIXES -- ImageMagick -+ ImageMagick ImageMagick-6 - DOC "Path to the ImageMagick include dir." - ) - find_library(ImageMagick_${component}_LIBRARY --- -1.7.0 -