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

[Allan McRae]

    Date: Saturday, February 13, 2010 @ 19:29:45
  Author: allan
Revision: 68712

upgpkg: diffutils 2.9-1
upstream update, tidy PKGBUILD, make texinfo optional

Modified:
  diffutils/trunk/PKGBUILD
  diffutils/trunk/diffutils.install

-------------------+
 PKGBUILD          |   23 +++++++++++++----------
 diffutils.install |    7 ++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-13 22:53:30 UTC (rev 68711)
+++ PKGBUILD	2010-02-14 00:29:45 UTC (rev 68712)
@@ -1,24 +1,27 @@
 # $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=diffutils
-pkgver=2.8.1
-pkgrel=6
+pkgver=2.9
+pkgrel=1
 pkgdesc="Utility programs used for creating patch files"
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/diffutils"
+license=('GPL3')
 groups=('base')
+depends=('glibc')
 install=diffutils.install
-url="http://www.gnu.org/software/diffutils"
-depends=('glibc' 'texinfo')
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('71f9c5ae19b60608f6c7f162da86a428')
+md5sums=('d6bc1bdc874ddb14cfed4d1655a0dbbe')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
-
-  rm -rf ${pkgdir}/usr/share/info/dir
 }

Modified: diffutils.install
===================================================================
--- diffutils.install	2010-02-13 22:53:30 UTC (rev 68711)
+++ diffutils.install	2010-02-14 00:29:45 UTC (rev 68712)
@@ -2,8 +2,9 @@
 filelist=(diff.info)
 
 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
 }
 
@@ -12,8 +13,8 @@
 }
 
 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
 }
-