[arch-commits] Commit in git/repos (extra-i686 extra-i686/PKGBUILD)

[Dan McGee]

    Date: Tuesday, August 19, 2008 @ 12:07:48
  Author: dan
Revision: 9852

Merged revisions 8140-9851 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/git/trunk

........
  r9851 | dan | 2008-08-19 11:07:34 -0500 (Tue, 19 Aug 2008) | 1 line
  
  upgpkg: git 1.6.0-1
........

Modified:
  git/repos/extra-i686/	(properties)
  git/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)


Property changes on: git/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /git/trunk:1-8139
   + /git/trunk:1-9851

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-19 16:07:34 UTC (rev 9851)
+++ extra-i686/PKGBUILD	2008-08-19 16:07:48 UTC (rev 9852)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=git
-pkgver=1.5.6.5
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="GIT - the stupid content tracker"
 arch=(i686 x86_64)
@@ -16,28 +16,31 @@
         "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2")
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  make THREADED_DELTA_SEARCH=1 prefix=/usr || return 1
-  make THREADED_DELTA_SEARCH=1 prefix=/usr \
-    INSTALLDIRS=vendor DESTDIR=${startdir}/pkg install
+  cd $srcdir/$pkgname-$pkgver
+  make THREADED_DELTA_SEARCH=1 \
+    prefix=/usr gitexecdir=/usr/lib/git-core || return 1
+  make THREADED_DELTA_SEARCH=1 \
+    prefix=/usr gitexecdir=/usr/lib/git-core \
+	INSTALLDIRS=vendor DESTDIR=${pkgdir} install
   
   # let's plop gitweb in /usr/share
-  cp -dR ./gitweb ${startdir}/pkg/usr/share/gitweb
+  mkdir -p $pkgdir/usr/share/ || return 1
+  cp -dR ./gitweb $pkgdir/usr/share/gitweb || return 1
 
   #bash completion
-  mkdir -p ${startdir}/pkg/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash ${startdir}/pkg/etc/bash_completion.d/git
+  mkdir -p $pkgdir/etc/bash_completion.d/ || return 1
+  install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do
-    for manpage in ${startdir}/src/${mansect}/*; do
-      install -D -m644 $manpage ${startdir}/pkg/usr/share/man/${mansect}/$(basename $manpage)
+    for manpage in $srcdir/$mansect/*; do
+      install -D -m644 $manpage $pkgdir/usr/share/man/$mansect/$(basename $manpage)
     done
   done
 
   # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf ${startdir}/pkg/usr/lib
+  rm -rf $pkgdir/usr/lib/perl5
 }
 
-md5sums=('5175d142ad0745b9e22a64904aa86c45'
-         'fd0632919f14b28a7af6abccf8c2d796')
+md5sums=('3d37e1f1e93c7828236e2af04ea0d071'
+         '0154019dc417fb72e682a98afeac9cbc')