Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

2 files changed, 21 insertions, 14 deletions

diff --git a/abs/core-testing/libtool/PKGBUILD b/abs/core-testing/libtool/PKGBUILD
index f861926..c6f5f7a 100644
--- a/abs/core-testing/libtool/PKGBUILD
+++ b/abs/core-testing/libtool/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 12053 2008-09-08 14:37:58Z andyrtr $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 82294 2010-06-10 03:52:16Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+# NOTE: requires rebuilt with each new gcc version
+
 pkgname=libtool
-pkgver=2.2.6a
+pkgver=2.2.10
 pkgrel=1
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
-license=('GPL')
 url="http://www.gnu.org/software/libtool"
-install=libtool.install
+license=('GPL')
+depends=('sh' 'tar' 'texinfo')
 groups=('base-devel')
-depends=('sh' 'tar')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8ca1ea241cd27ff9832e045fe9afe4fd')
 options=('!libtool')
+install=libtool.install
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz)
+md5sums=('b745d220e88163fcd9eea0a90ccf21b0')
 
 build() {
-  #cd ${startdir}/src/${pkgname}-${pkgver}
-  cd ${startdir}/src/${pkgname}-2.2.6
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+}
 
-  rm -f ${pkgdir}/usr/share/info/dir
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }
diff --git a/abs/core-testing/libtool/libtool.install b/abs/core-testing/libtool/libtool.install
index 1794742..424c8cb 100644
--- a/abs/core-testing/libtool/libtool.install
+++ b/abs/core-testing/libtool/libtool.install
@@ -2,8 +2,9 @@ infodir=/usr/share/info
 filelist=(libtool.info  libtool.info-1  libtool.info-2)
 
 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,9 @@ post_upgrade() {
 }
 
 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
 }