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

[Allan McRae]

    Date: Sunday, April 18, 2010 @ 00:29:16
  Author: allan
Revision: 77807

upgpkg: findutils 4.4.2-2
make sure sh is available for install script, compress info pages

Modified:
  findutils/trunk/PKGBUILD
  findutils/trunk/findutils.install

-------------------+
 PKGBUILD          |   32 ++++++++++++++++----------------
 findutils.install |    4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-18 04:15:00 UTC (rev 77806)
+++ PKGBUILD	2010-04-18 04:29:16 UTC (rev 77807)
@@ -1,32 +1,32 @@
 # $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: 
+
 pkgname=findutils
 pkgver=4.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU utilities to locate files"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL3')
 groups=('base')
-depends=('glibc>=2.8')
+depends=('glibc' 'sh')
 url="http://www.gnu.org/software/findutils"
 source=(ftp://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.gz)
 install=findutils.install
 md5sums=('351cc4adb07d54877fa15f75fb77d39f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
-  # believe it or not, the Makefile really wants to remove /usr/var, so
-  # we let it...
-  mkdir -p $startdir/pkg/usr/var
-  make DESTDIR=$startdir/pkg install
-  rm -rf $startdir/pkg/usr/libexec
+}
 
-  # remove locate utils (we use slocate instead)
-  rm -f $startdir/pkg/usr/bin/{locate,updatedb}
-  rm -f $startdir/pkg/usr/share/man/man1/{updatedb.1,locate.1}
-  rm -f $startdir/pkg/usr/share/man/man5/locatedb.5
-  rmdir $startdir/pkg/usr/var
-  rm -f $pkgdir/usr/share/info/dir
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  rm -rf $pkgdir/usr/{libexec,var}
+
+  # remove locate utils (we use mlocate instead)
+  rm -f $pkgdir/usr/bin/{locate,updatedb}
+  rm -f $pkgdir/usr/share/man/man1/{updatedb.1,locate.1}
+  rm -f $pkgdir/usr/share/man/man5/locatedb.5
 }

Modified: findutils.install
===================================================================
--- findutils.install	2010-04-18 04:15:00 UTC (rev 77806)
+++ findutils.install	2010-04-18 04:29:16 UTC (rev 77807)
@@ -4,7 +4,7 @@
 post_install() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -15,7 +15,7 @@
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }