[arch-commits] Commit in indent/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Aaron Griffin]

    Date: Friday, September 12, 2008 @ 15:22:38
  Author: aaron
Revision: 12317

Resolved merge conflicts

Modified:
  indent/repos/extra-x86_64/	(properties)
  indent/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)


Property changes on: indent/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /indent/trunk:1
   + /indent/trunk:1-12316

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-12 19:20:49 UTC (rev 12316)
+++ extra-x86_64/PKGBUILD	2008-09-12 19:22:38 UTC (rev 12317)
@@ -1,22 +1,26 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
+# 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.9
+pkgver=2.2.10
 pkgrel=1
 pkgdesc="The GNU Pretty-printer"
+url="http://indent.isidore-it.eu/beautify.html"
+depends=('glibc')
 arch=(i686 x86_64)
-url="http://mysite.freeserve.com/indent/beautify.html"
-depends=('glibc')
-source=(http://mysite.freeserve.com/$pkgname/${pkgname}_$pkgver.tar.gz)
-[ "$CARCH" = "x86_64" ] && source=(${source[@]} 'indent-2.2.9-file.diff') # from frugal
-md5sums=('dcdbb163bef928306dee2a0cfc581c89')
-[ "$CARCH" = "x86_64" ] && md5sums=(${md5sums[@]} '0dfaa78c1bb80dd0223c42675b57cba1')
+license=('GPL3')
+source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
+md5sums=('be35ea62705733859fbf8caf816d8959')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
- [ "$CARCH" = "x86_64" ] && patch -Np1 -i ../indent-2.2.9-file.diff || return 1
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --datadir=/usr/share/
   make || return 1
   make prefix=$startdir/pkg/usr install
+
+  # 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
 }