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

[Allan McRae]

    Date: Friday, February 8, 2013 @ 05:39:33
  Author: allan
Revision: 177615

upgpkg: groff 1.22.2-1

upsream update, add to base-devel, remove fix for utf8 as it appears unneeded now...

Modified:
  groff/trunk/PKGBUILD
  groff/trunk/groff.install

---------------+
 PKGBUILD      |   41 +++++++++++++++++------------------------
 groff.install |    2 ++
 2 files changed, 19 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-08 04:14:38 UTC (rev 177614)
+++ PKGBUILD	2013-02-08 04:39:33 UTC (rev 177615)
@@ -1,27 +1,27 @@
 # $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: 
+
 pkgname=groff
-pkgver=1.21
-pkgrel=2
+pkgver=1.22.2
+pkgrel=1
 pkgdesc="GNU troff text-formatting system"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/groff/groff.html"
 license=('GPL')
-depends=('perl' 'gcc-libs' 'texinfo')
+groups=('base-devel')
+depends=('perl' 'gcc-libs')
 makedepends=('netpbm' 'psutils' 'ghostscript')
 optdepends=('netpbm: for use together with man -H command interaction in browsers'
             'psutils: for use together with man -H command interaction in browsers')
-source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz
-        site.tmac)
-options=(!makeflags !docs)
+source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz{,.sig})
+options=('!docs' '!emptydirs')
 install=groff.install
-md5sums=('8b8cd29385b97616a0f0d96d0951c5bf'
-         'a1fedafd7863b37968d32ad9ae1d8c13')
+md5sums=('9f4cd592a5efc7e36481d8d8d8af6d16'
+         '65207deb0a9b54324cb947f25ec9164f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --without-x
-  mkdir -p $pkgdir/usr
   make
 }
 
@@ -32,17 +32,10 @@
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-	cd $pkgdir/usr/bin
-	# needed for xman
-	ln -s eqn geqn
-	ln -s tbl gtbl
-	ln -s soelim zsoelim
-  rm -rf $pkgdir/usr/lib/groff/site-tmac
-  # Fix some issues when encoding to utf8 man pages
-  #  The output chars don't match keyboard chars...
-  cat $srcdir/site.tmac >> \
-    $pkgdir/usr/share/groff/site-tmac/man.local
-  cat $srcdir/site.tmac >> \
-    $pkgdir/usr/share/groff/site-tmac/mdoc.local
+  make DESTDIR=$pkgdir install
+  
+  # add compatibility symlinks
+  ln -s eqn $pkgdir/usr/bin/geqn
+  ln -s tbl $pkgdir/usr/bin/gtbl
+  ln -s soelim $pkgdir/usr/bin/zsoelim
 }

Modified: groff.install
===================================================================
--- groff.install	2013-02-08 04:14:38 UTC (rev 177614)
+++ groff.install	2013-02-08 04:39:33 UTC (rev 177615)
@@ -2,6 +2,7 @@
 filelist=(groff.info groff.info-1 groff.info-2 groff.info-3)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,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
   done