[arch-commits] CVS update of extra/devel/git (PKGBUILD)

[Eric Belanger]

    Date: Wednesday, October 31, 2007 @ 21:55:09
  Author: eric
    Path: /home/cvs-extra/extra/devel/git

Modified: PKGBUILD (1.41 -> 1.42)

upgpkg: git 1.5.3.5-2
fixed perl module location


----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)


Index: extra/devel/git/PKGBUILD
diff -u extra/devel/git/PKGBUILD:1.41 extra/devel/git/PKGBUILD:1.42
--- extra/devel/git/PKGBUILD:1.41	Wed Oct 31 19:29:25 2007
+++ extra/devel/git/PKGBUILD	Wed Oct 31 21:55:08 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.41 2007/10/31 23:29:25 dan Exp $
+# $Id: PKGBUILD,v 1.42 2007/11/01 01:55:08 eric Exp $
 # Maintainer: Simo Leone <simo at archlinux.org>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=git
 pkgver=1.5.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="GIT - the stupid content tracker"
 arch=(i686 x86_64)
 url="http://git.or.cz/"
@@ -15,13 +15,15 @@
 install=git.install
 source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \
 	"http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2")
-md5sums=('3fdff0bdb3638fce1c4bc6795ed81fb3'
-         '2cc722f80968b1c2f99a217457b056d4')
+md5sums=('3fdff0bdb3638fce1c4bc6795ed81fb3' '2cc722f80968b1c2f99a217457b056d4')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  eval `perl -V:archname`
   make prefix=/usr || return 1
-  make prefix=/usr DESTDIR=${startdir}/pkg install
+  make prefix=/usr INSTALLARCHLIB=/usr/lib/perl5/current/${archname} \
+    INSTALLSITELIB=/usr/lib/perl5/site_perl/current \
+    INSTALLSITEARCH=/usr/lib/perl5/site_perl/current/${archname} DESTDIR=${startdir}/pkg install
   
   # let's plop gitweb in /usr/share
   cp -dR ./gitweb ${startdir}/pkg/usr/share/gitweb
@@ -38,9 +40,8 @@
     install -D -m644 $i ${startdir}/pkg/usr/man/man7/`basename $i`
   done
 
-  # remove perllocal and .packlist files
-  # this is a bad way to do this
-  rm -fr $startdir/pkg/usr/lib/perl5/5.8.8
-  rm -fr $startdir/pkg/usr/lib/perl5/site_perl/5.8.8/$CARCH-linux-thread-multi
+  # remove perllocal.pod and .packlist
+  find ${startdir}/pkg -name perllocal.pod -delete
+  find ${startdir}/pkg -name .packlist -delete
 }