[arch-commits] Commit in indent/repos (3 files)

[Eric Bélanger]

    Date: Saturday, October 3, 2009 @ 16:30:12
  Author: eric
Revision: 53908

Merged revisions 53902 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/indent/trunk

........
  r53902 | eric | 2009-10-03 16:21:06 -0400 (Sat, 03 Oct 2009) | 2 lines
  
  upgpkg: indent 2.2.10-4
      Fixed man page and missing locales (close FS#13067)
........

Modified:
  indent/repos/extra-i686/	(properties)
  indent/repos/extra-i686/PKGBUILD
  indent/repos/extra-i686/indent.install

----------------+
 PKGBUILD       |   31 +++++++++++++++----------------
 indent.install |   10 +++-------
 2 files changed, 18 insertions(+), 23 deletions(-)


Property changes on: indent/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /indent/trunk:1-25652
   + /indent/trunk:1-53907

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-03 20:26:04 UTC (rev 53907)
+++ extra-i686/PKGBUILD	2009-10-03 20:30:12 UTC (rev 53908)
@@ -2,31 +2,30 @@
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Contributor: aurelien <aurelien at archlinux.org>
 # Contributor: Herb Rose (hrose56 at yahoo.com)
+
 pkgname=indent
 pkgver=2.2.10
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Pretty-printer"
+arch=('i686' 'x86_64')
 url="http://indent.isidore-it.eu/beautify.html"
 depends=('glibc' 'texinfo')
-arch=(i686 x86_64)
 license=('GPL3')
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
 install=indent.install
+source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
 md5sums=('be35ea62705733859fbf8caf816d8959')
+sha1sums=('20fa8a7a4af6670c3254c8b87020291c3db37ed1')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --datadir=/usr/share/
-  make || return 1
-  make prefix=$startdir/pkg/usr install
+  cd "$srcdir/$pkgname-$pkgver"
+  # Fix doc install path
+  sed -i 's|^docdir = .*$|docdir = @docdir@|' doc/Makefile.in || return 1
+  
+  # Fix manpage installation
+  sed -i 's|\(info texinfo2man\)\.c  Makefile\.am|\1|' man/Makefile.in || return 1
+  rm man/indent.1
 
-  # The makefile for docs uses $(prefix) stupidly
-  # fix that the easiest way
-  mkdir -p $startdir/pkg/usr/share
-  mv $startdir/pkg/usr/doc $startdir/pkg/usr/share
-
-  rm -f $startdir/pkg/usr/share/info/dir
-  gzip -9 ${pkgdir}/usr/share/info/indent.info
-
-  #TODO this tarball installs texinfo2man as well... we probably don't want that
+  ./configure --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/indent || return 1
+  make || return 1
+  make DESTDIR="$pkgdir" install || return 1
 }

Modified: extra-i686/indent.install
===================================================================
--- extra-i686/indent.install	2009-10-03 20:26:04 UTC (rev 53907)
+++ extra-i686/indent.install	2009-10-03 20:30:12 UTC (rev 53908)
@@ -1,10 +1,8 @@
 info_dir=/usr/share/info
-info_files=(indent.info)
+info_file=indent.info.gz
 
 post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
+    install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
 }
 
 post_upgrade() {
@@ -12,7 +10,5 @@
 }
 
 pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
+    install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
 }