[arch-commits] Commit in cdargs/trunk (PKGBUILD cdargs.install)

[Andrea Scarpino]

    Date: Wednesday, January 5, 2011 @ 10:20:14
  Author: andrea
Revision: 104921

upgpkg: cdargs 1.35-3
switch to arch any; use package(); remove deprecated startdir reference

Modified:
  cdargs/trunk/PKGBUILD
  cdargs/trunk/cdargs.install

----------------+
 PKGBUILD       |   34 +++++++++++++++++++++-------------
 cdargs.install |    3 ---
 2 files changed, 21 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-05 15:15:36 UTC (rev 104920)
+++ PKGBUILD	2011-01-05 15:20:14 UTC (rev 104921)
@@ -1,28 +1,36 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=cdargs
 pkgver=1.35
-pkgrel=2
+pkgrel=3
 pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation"
-arch=('i686' 'x86_64')
+arch=('any')
 license=('GPL')
 url="http://www.skamphausen.de/cgi-bin/ska/CDargs"
-depends=('glibc' 'ncurses' 'gcc-libs')
-source=(http://www.skamphausen.de/downloads/$pkgname/$pkgname-$pkgver.tar.gz)
-install=$pkgname.install
+depends=('ncurses' 'gcc-libs')
+source=("http://www.skamphausen.de/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+install=${pkgname}.install
 md5sums=('50be618d67f0b9f2439526193c69c567')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+  
+  cd contrib
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  
   # install helper scripts
-  mkdir -p $startdir/pkg/usr/share/cdargs
   cd contrib
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install $pkgname-{tcsh.csh,bash.sh} $startdir/pkg/usr/share/cdargs
+  make DESTDIR=${pkgdir} install
+  
+  install -d ${pkgdir}/usr/share/cdargs
+  install $pkgname-{tcsh.csh,bash.sh} ${pkgdir}/usr/share/cdargs
 }

Modified: cdargs.install
===================================================================
--- cdargs.install	2011-01-05 15:15:36 UTC (rev 104920)
+++ cdargs.install	2011-01-05 15:20:14 UTC (rev 104921)
@@ -1,10 +1,7 @@
-# arg 1:  the new package version
 post_install() {
   echo "cdargs: helper scripts are in /usr/share/cdargs/"
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   echo "cdargs: helper scripts are in /usr/share/cdargs/"
 }