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

[Dave Reisner]

    Date: Wednesday, November 2, 2011 @ 08:18:33
  Author: dreisner
Revision: 141694

upgpkg: ed 1.5-3

Rebuild to add sig and cleanup PKGBUILD 
- Remove info page
- add check() function

Modified:
  ed/trunk/PKGBUILD
Deleted:
  ed/trunk/ed.install

------------+
 PKGBUILD   |   33 +++++++++++++++++++++------------
 ed.install |   22 ----------------------
 2 files changed, 21 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-02 12:18:21 UTC (rev 141693)
+++ PKGBUILD	2011-11-02 12:18:33 UTC (rev 141694)
@@ -1,32 +1,41 @@
 # $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=ed
 pkgver=1.5
-pkgrel=2
-pkgdesc="A POSIX-compliant line editor"
+pkgrel=3
+pkgdesc="A POSIX-compliant line-oriented text editor"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/ed/ed.html"
-install=ed.install
 depends=('glibc' 'sh')
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e66c03d7e4c67b025d5b6093ec678267')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/ \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info \
-	CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-  make || return 1
+              --mandir=/usr/share/man \
+              "CFLAGS=$CFLAGS" \
+              "LDFLAGS=$LDFLAGS"
+
+  make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make check
+}
+
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
 
-  cd ${pkgdir}/usr/share/info
-  ln ed.info red.info
+  make "DESTDIR=$pkgdir" install
+
+  # nuke info pages
+  rm -r "$pkgdir/usr/share"
 }

Deleted: ed.install
===================================================================
--- ed.install	2011-11-02 12:18:21 UTC (rev 141693)
+++ ed.install	2011-11-02 12:18:33 UTC (rev 141694)
@@ -1,22 +0,0 @@
-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.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et: