git: updated to 1.7.7.1

-removed emacs from PKGBUILD

4 files changed, 67 insertions, 34 deletions

diff --git a/abs/core/git/ChangeLog b/abs/core/git/ChangeLog
index 8ed0884..f0c1523 100644
--- a/abs/core/git/ChangeLog
+++ b/abs/core/git/ChangeLog
@@ -1,4 +1,25 @@
-Simple version bumps are ommitted from the following ChangeLog.
+Simple version bumps are omitted from the following ChangeLog.
+
+2011-08-16 Dan McGee <dan@archlinux.org>
+	Version 1.7.6.1-1
+	* Enable USE_LIBPCRE for `git grep -P` usage
+
+2011-05-05 Dan McGee <dan@archlinux.org>
+	Version 1.7.5.1-1
+	* Byte compile emacs files (FS#20874)
+	* Respect CFLAGS/LDFLAGS (FS#23963)
+
+2011-04-27 Dan McGee <dan@archlinux.org>
+	Version 1.7.5-1
+	* Add missing optdepends for git send-email (FS#20923)
+
+2011-01-05 Dan McGee <dan@archlinux.org>
+	Version 1.7.3.5-1
+	* More flexible git-daemon RC scripts (FS#20575)
+
+2010-10-01 Allan McRae <allan@archlinux.org>
+	Version 1.7.3.1-2
+	* Python 2/3 rebuild
 
 2010-06-29 Dan McGee <dan@archlinux.org>
 	Version 1.7.1.1-1
diff --git a/abs/core/git/PKGBUILD b/abs/core/git/PKGBUILD
index 335d85d..e6a7db4 100644
--- a/abs/core/git/PKGBUILD
+++ b/abs/core/git/PKGBUILD
@@ -1,80 +1,91 @@
-# $Id: PKGBUILD 96573 2010-10-22 13:12:55Z dan $
+# $Id: PKGBUILD 141151 2011-10-24 22:00:23Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.3.2
-pkgrel=1
+pkgver=1.7.7.1
+pkgrel=2
 pkgdesc="the fast distributed version control system"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://git-scm.com/"
 license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.0')
-makedepends=('python2')
+#depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
+depends=('curl' 'expat>=2.0' 'perl-error' 'perl' 'openssl' 'pcre')
+makedepends=('python2' )
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
+            'perl-mime-tools: git send-email'
             'perl-net-smtp-ssl: git send-email TLS support'
+            'perl-authen-sasl: git send-email TLS support'
             'python2: various helper scripts'
             'subversion: git svn'
             'cvsps: git cvsimport')
 replaces=('git-core')
 provides=('git-core')
 backup=('etc/conf.d/git-daemon.conf')
-source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \
-        "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2"
+#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2"
+#        "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2"
+source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
+        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
         git-daemon
         git-daemon.conf)
+changelog=ChangeLog
 
 build() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core || return 1
+  make prefix=/usr gitexecdir=/usr/lib/git-core \
+    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+    USE_LIBPCRE=1 \
+    NO_CROSS_DIRECTORY_HARDLINKS=1
+
+#  cd contrib/emacs
+#  make prefix=/usr
 }
 
 package() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr gitexecdir=/usr/lib/git-core \
+    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+    USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1
+    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
 
   # bash completion
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
-
+  mkdir -p "$pkgdir"/etc/bash_completion.d/
+  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
   # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/git/ || return 1
-
+  cp -a ./contrib $pkgdir/usr/share/git/ 
   # scripts are for python 2.x
   sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
     "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview}
 
   # emacs interface
-  mkdir -p $pkgdir/usr/share/emacs/site-lisp
-  mv $pkgdir/usr/share/git/emacs $pkgdir/usr/share/emacs/site-lisp/git
-  rm $pkgdir/usr/share/emacs/site-lisp/git/.gitignore
+#  cd contrib/emacs
+#  make prefix=/usr DESTDIR="$pkgdir" install
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do
-    for manpage in $srcdir/$mansect/*; do
-      install -D -m644 $manpage $pkgdir/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 $pkgdir/usr/lib/perl5
+  rm -rf "$pkgdir"/usr/lib/perl5
 
   # git daemon script
-  install -D -m755 $srcdir/git-daemon $pkgdir/etc/rc.d/git-daemon
-  install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf
+  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
+  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('902f7f07a789fedc0d2ac03656b85969'
-         '80bbef2adeaae852f04a9f143aaa5204'
-         'd777ff1a239b3d810dcf5d89f9d894af'
-         '9d065134210aa0dd3f2b40d12d915040')
-sha256sums=('bc4cf6bc7c116056050ef43b051691828d7101327b23311d424b02eaee553e71'
-            'ce6ca1cb1c62b7dd8d258cf9a94cda7de90a9476b7bb315968f3ed1976dc621e'
-            'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113'
-            '6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7')
+md5sums=('7cfb3e7ea585037272a7ad8e35f4ac0a'
+         'b6ec6c3a08855b7393284675643be95c'
+         '8e2648910fd5dd4f1c41d3c7fa9e9156'
+         '2e42bf97779a1c6411d89043334c9e78')
+sha256sums=('6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f'
+            '28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5'
+            '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
+            'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/abs/core/git/git-daemon b/abs/core/git/git-daemon
index 83e41a3..21ba73e 100644
--- a/abs/core/git/git-daemon
+++ b/abs/core/git/git-daemon
@@ -20,7 +20,7 @@ case "$1" in
     if [ -z "$PID" ]; then
       [ -f $PIDF ] && rm -f $PIDF
       # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS $GIT_REPO
+      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
       #
       if [ $? -gt 0 ]; then
         stat_fail
diff --git a/abs/core/git/git-daemon.conf b/abs/core/git/git-daemon.conf
index a183733..3f9a120 100644
--- a/abs/core/git/git-daemon.conf
+++ b/abs/core/git/git-daemon.conf
@@ -1,4 +1,5 @@
 # path to git repositories served
 GIT_REPO="/srv/git/"
 # see `man git-daemon` for all available options
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO"
+# $GIT_REPO will be present twice in most configs
+GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"