ed: up to latest

2 files changed, 16 insertions, 21 deletions

diff --git a/abs/core/ed/PKGBUILD b/abs/core/ed/PKGBUILD
index 09188d1..6b152aa 100644
--- a/abs/core/ed/PKGBUILD
+++ b/abs/core/ed/PKGBUILD
@@ -1,36 +1,29 @@
-# $Id: PKGBUILD 17077 2008-10-24 19:45:39Z andyrtr $
+# $Id: PKGBUILD 90096 2010-09-07 19:14:19Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=ed
-pkgver=1.1
-pkgrel=2
+pkgver=1.5
+pkgrel=1
 pkgdesc="A POSIX-compliant line editor"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/ed/ed.html"
 install=ed.install
-groups=('base-devel')
-depends=('glibc' 'texinfo')
+depends=('glibc' 'sh')
 options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d190a6e8937f552118e2822085037099')
+source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e66c03d7e4c67b025d5b6093ec678267')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/
+  ./configure --prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info
   make || return 1
-# installing executable
-  install -D -m755 ed ${pkgdir}/bin/ed
-  cd ${pkgdir}/bin
-  ln ed red
-# installing man page
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -D -m644 doc/ed.1 ${pkgdir}/usr/share/man/man1/ed.1
-  cd ${pkgdir}/usr/share/man/man1
-  ln ed.1 red.1
-# installing info files
+}
+
+package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  install -D -m644 doc/ed.info ${pkgdir}/usr/share/info/ed.info
+  make DESTDIR=${pkgdir} install || return 1
+
   cd ${pkgdir}/usr/share/info
   ln ed.info red.info
 }
diff --git a/abs/core/ed/ed.install b/abs/core/ed/ed.install
index 1a6e983..637807f 100644
--- a/abs/core/ed/ed.install
+++ b/abs/core/ed/ed.install
@@ -2,8 +2,9 @@ infodir=/usr/share/info
 filelist=(ed.info red.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,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
 }