diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-09 20:52:21 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-09 20:52:21 -0300 |
commit | aabab2c530c33c1beb40ac3dacb95e19ab99eac3 (patch) | |
tree | 1417c10b601a05725676a727a25901a32e7fd94c /extra/cmake | |
parent | 3357db80ffa8a795fb5cdad0fc726470887706b0 (diff) | |
parent | d1e588afc2779754c0abd1122ecf4f8e3c863d7a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/cinepaint/PKGBUILD
extra/cmake/PKGBUILD
extra/fltk/PKGBUILD
extra/foomatic/PKGBUILD
extra/kdegraphics/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/libxi/PKGBUILD
extra/monica/PKGBUILD
extra/rasqal/PKGBUILD
extra/soprano/PKGBUILD
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/cmake')
-rw-r--r-- | extra/cmake/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/cmake/cmake.install | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 0312bf46a..93c48895d 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 110150 2011-02-16 19:31:21Z andrea $ +# $Id: PKGBUILD 130915 2011-07-09 03:24:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: damir <damir@archlinux.org> # Contributor: Konstantinos Pachnis <kpachnis@mes-direct.com> pkgname=cmake -pkgver=2.8.4 -pkgrel=2 +pkgver=2.8.5 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.cmake.org" -depends=('expat' 'curl' 'gcc-libs' 'shared-mime-info') +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=('209b7d1d04b2e00986538d74ba764fcf') +md5sums=('3c5d32cec0f4c2dc45f4c2e84f4a20c5') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./bootstrap --prefix=/usr \ --mandir=/share/man \ @@ -31,8 +31,8 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + 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 diff --git a/extra/cmake/cmake.install b/extra/cmake/cmake.install index 7c8a8bd2b..64e7020ea 100644 --- a/extra/cmake/cmake.install +++ b/extra/cmake/cmake.install @@ -1,5 +1,6 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + [ -x usr/bin/update-desktop-database ] && update-desktop-database -q } post_upgrade() { |