Date: Saturday, December 3, 2011 @ 12:49:51 Author: dan Revision: 144096
archrelease: copy trunk to extra-i686, extra-x86_64 Added: git/repos/extra-i686/ChangeLog (from rev 144095, git/trunk/ChangeLog) git/repos/extra-i686/PKGBUILD (from rev 144095, git/trunk/PKGBUILD) git/repos/extra-i686/git-daemon (from rev 144095, git/trunk/git-daemon) git/repos/extra-i686/git-daemon.conf (from rev 144095, git/trunk/git-daemon.conf) git/repos/extra-x86_64/ChangeLog (from rev 144095, git/trunk/ChangeLog) git/repos/extra-x86_64/PKGBUILD (from rev 144095, git/trunk/PKGBUILD) git/repos/extra-x86_64/git-daemon (from rev 144095, git/trunk/git-daemon) git/repos/extra-x86_64/git-daemon.conf (from rev 144095, git/trunk/git-daemon.conf) Deleted: git/repos/extra-i686/ChangeLog git/repos/extra-i686/PKGBUILD git/repos/extra-i686/git-daemon git/repos/extra-i686/git-daemon.conf git/repos/extra-x86_64/ChangeLog git/repos/extra-x86_64/PKGBUILD git/repos/extra-x86_64/git-daemon git/repos/extra-x86_64/git-daemon.conf ------------------------------+ extra-i686/ChangeLog | 114 +++++++++++++-------------- extra-i686/PKGBUILD | 172 ++++++++++++++++++++--------------------- extra-i686/git-daemon | 140 ++++++++++++++++----------------- extra-i686/git-daemon.conf | 10 +- extra-x86_64/ChangeLog | 114 +++++++++++++-------------- extra-x86_64/PKGBUILD | 172 ++++++++++++++++++++--------------------- extra-x86_64/git-daemon | 140 ++++++++++++++++----------------- extra-x86_64/git-daemon.conf | 10 +- 8 files changed, 436 insertions(+), 436 deletions(-) Deleted: extra-i686/ChangeLog =================================================================== --- extra-i686/ChangeLog 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-i686/ChangeLog 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <d...@archlinux.org> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <d...@archlinux.org> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <d...@archlinux.org> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <d...@archlinux.org> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <al...@archlinux.org> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <d...@archlinux.org> - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee <d...@archlinux.org> - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee <d...@archlinux.org> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <d...@archlinux.org> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <d...@archlinux.org> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <ke...@archlinux.org> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <e...@archlinux.org> - Version 1.5.3.5-2 - * Fix Perl module location Copied: git/repos/extra-i686/ChangeLog (from rev 144095, git/trunk/ChangeLog) =================================================================== --- extra-i686/ChangeLog (rev 0) +++ extra-i686/ChangeLog 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,57 @@ +Simple version bumps are omitted from the following ChangeLog. + +2011-08-16 Dan McGee <d...@archlinux.org> + Version 1.7.6.1-1 + * Enable USE_LIBPCRE for `git grep -P` usage + +2011-05-05 Dan McGee <d...@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <d...@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <d...@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <al...@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild + +2010-06-29 Dan McGee <d...@archlinux.org> + Version 1.7.1.1-1 + * Add emacs completion files (FS#17968) + * Add git-daemon RC scripts (FS#19291) + +2009-06-05 Dan McGee <d...@archlinux.org> + Version 1.6.3.2-1 + * Remove gitweb from /usr/share; it needs customization to be helpful + * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) + +2008-09-14 Dan McGee <d...@archlinux.org> + Version 1.6.0.2-1 + * Moved optional depends from install file to optdepends array + +2008-06-15 Dan McGee <d...@archlinux.org> + Version 1.5.6-1 + * Removed 'cpio' dependency, clone is now a builtin and no longer needs it + +2008-02-02 Dan McGee <d...@archlinux.org> + Version 1.5.4-1 + * Upstream version 1.5.4 + * Enable pthreads support in pack-objects. To use, set the pack.threads + git config option. Read manpages of pack-objects and config for more + details. + * Changelog added (with entries going back a bit). + +2008-01-28 Kevin Piche <ke...@archlinux.org> + Version 1.5.3.7-2 + * Updated for new perl policy (vendor dirs) + * Change license to GPL2 + +2007-11-01 Eric Belanger <e...@archlinux.org> + Version 1.5.3.5-2 + * Fix Perl module location Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-i686/PKGBUILD 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgname=git -pkgver=1.7.7.4 -pkgrel=1 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') -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://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 \ - 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 - - # bash completion - 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/ - # 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 - 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) - done - done - - # remove perllocal.pod, .packlist, and empty directories. - 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 -} - -sha1sums=('5b6920989480a37ec65977e756b24961578795dd' - 'cb21e55ae793865453c165a0e666348f2db8c740' - 'f2b41828bd912b72e2cb3e14677739c4f370de66' - '149e2da1ecb48872ddb31c0945afeaad1f9653d7') Copied: git/repos/extra-i686/PKGBUILD (from rev 144095, git/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=git +pkgver=1.7.8 +pkgrel=1 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') +makedepends=('python2' 'emacs') +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://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 \ + 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 + + # bash completion + 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/ + # 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 + 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) + done + done + + # remove perllocal.pod, .packlist, and empty directories. + 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 +} + +sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398' + '93315f7f51d7f27d3e421c9b0d64afa27f3d16df' + 'f2b41828bd912b72e2cb3e14677739c4f370de66' + '149e2da1ecb48872ddb31c0945afeaad1f9653d7') Deleted: extra-i686/git-daemon =================================================================== --- extra-i686/git-daemon 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-i686/git-daemon 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 Copied: git/repos/extra-i686/git-daemon (from rev 144095, git/trunk/git-daemon) =================================================================== --- extra-i686/git-daemon (rev 0) +++ extra-i686/git-daemon 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,70 @@ +#!/bin/bash + +daemon_bin="/usr/lib/git-core/git-daemon" +daemon_name=$(basename $daemon_bin) +PIDF="/var/run/$daemon_name.pid" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f $PIDF ] && rm -f $PIDF + # RUN + $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > $PIDF + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f $PIDF &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 Deleted: extra-i686/git-daemon.conf =================================================================== --- extra-i686/git-daemon.conf 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-i686/git-daemon.conf 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" Copied: git/repos/extra-i686/git-daemon.conf (from rev 144095, git/trunk/git-daemon.conf) =================================================================== --- extra-i686/git-daemon.conf (rev 0) +++ extra-i686/git-daemon.conf 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,5 @@ +# path to git repositories served +GIT_REPO="/srv/git/" +# see `man git-daemon` for all available options +# $GIT_REPO will be present twice in most configs +GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" Deleted: extra-x86_64/ChangeLog =================================================================== --- extra-x86_64/ChangeLog 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-x86_64/ChangeLog 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <d...@archlinux.org> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <d...@archlinux.org> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <d...@archlinux.org> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <d...@archlinux.org> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <al...@archlinux.org> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <d...@archlinux.org> - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee <d...@archlinux.org> - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee <d...@archlinux.org> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <d...@archlinux.org> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <d...@archlinux.org> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <ke...@archlinux.org> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <e...@archlinux.org> - Version 1.5.3.5-2 - * Fix Perl module location Copied: git/repos/extra-x86_64/ChangeLog (from rev 144095, git/trunk/ChangeLog) =================================================================== --- extra-x86_64/ChangeLog (rev 0) +++ extra-x86_64/ChangeLog 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,57 @@ +Simple version bumps are omitted from the following ChangeLog. + +2011-08-16 Dan McGee <d...@archlinux.org> + Version 1.7.6.1-1 + * Enable USE_LIBPCRE for `git grep -P` usage + +2011-05-05 Dan McGee <d...@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <d...@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <d...@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <al...@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild + +2010-06-29 Dan McGee <d...@archlinux.org> + Version 1.7.1.1-1 + * Add emacs completion files (FS#17968) + * Add git-daemon RC scripts (FS#19291) + +2009-06-05 Dan McGee <d...@archlinux.org> + Version 1.6.3.2-1 + * Remove gitweb from /usr/share; it needs customization to be helpful + * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) + +2008-09-14 Dan McGee <d...@archlinux.org> + Version 1.6.0.2-1 + * Moved optional depends from install file to optdepends array + +2008-06-15 Dan McGee <d...@archlinux.org> + Version 1.5.6-1 + * Removed 'cpio' dependency, clone is now a builtin and no longer needs it + +2008-02-02 Dan McGee <d...@archlinux.org> + Version 1.5.4-1 + * Upstream version 1.5.4 + * Enable pthreads support in pack-objects. To use, set the pack.threads + git config option. Read manpages of pack-objects and config for more + details. + * Changelog added (with entries going back a bit). + +2008-01-28 Kevin Piche <ke...@archlinux.org> + Version 1.5.3.7-2 + * Updated for new perl policy (vendor dirs) + * Change license to GPL2 + +2007-11-01 Eric Belanger <e...@archlinux.org> + Version 1.5.3.5-2 + * Fix Perl module location Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-x86_64/PKGBUILD 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgname=git -pkgver=1.7.7.4 -pkgrel=1 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') -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://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 \ - 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 - - # bash completion - 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/ - # 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 - 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) - done - done - - # remove perllocal.pod, .packlist, and empty directories. - 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 -} - -sha1sums=('5b6920989480a37ec65977e756b24961578795dd' - 'cb21e55ae793865453c165a0e666348f2db8c740' - 'f2b41828bd912b72e2cb3e14677739c4f370de66' - '149e2da1ecb48872ddb31c0945afeaad1f9653d7') Copied: git/repos/extra-x86_64/PKGBUILD (from rev 144095, git/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=git +pkgver=1.7.8 +pkgrel=1 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') +makedepends=('python2' 'emacs') +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://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 \ + 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 + + # bash completion + 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/ + # 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 + 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) + done + done + + # remove perllocal.pod, .packlist, and empty directories. + 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 +} + +sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398' + '93315f7f51d7f27d3e421c9b0d64afa27f3d16df' + 'f2b41828bd912b72e2cb3e14677739c4f370de66' + '149e2da1ecb48872ddb31c0945afeaad1f9653d7') Deleted: extra-x86_64/git-daemon =================================================================== --- extra-x86_64/git-daemon 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-x86_64/git-daemon 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 Copied: git/repos/extra-x86_64/git-daemon (from rev 144095, git/trunk/git-daemon) =================================================================== --- extra-x86_64/git-daemon (rev 0) +++ extra-x86_64/git-daemon 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,70 @@ +#!/bin/bash + +daemon_bin="/usr/lib/git-core/git-daemon" +daemon_name=$(basename $daemon_bin) +PIDF="/var/run/$daemon_name.pid" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f $PIDF ] && rm -f $PIDF + # RUN + $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > $PIDF + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f $PIDF &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 Deleted: extra-x86_64/git-daemon.conf =================================================================== --- extra-x86_64/git-daemon.conf 2011-12-03 17:49:28 UTC (rev 144095) +++ extra-x86_64/git-daemon.conf 2011-12-03 17:49:51 UTC (rev 144096) @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" Copied: git/repos/extra-x86_64/git-daemon.conf (from rev 144095, git/trunk/git-daemon.conf) =================================================================== --- extra-x86_64/git-daemon.conf (rev 0) +++ extra-x86_64/git-daemon.conf 2011-12-03 17:49:51 UTC (rev 144096) @@ -0,0 +1,5 @@ +# path to git repositories served +GIT_REPO="/srv/git/" +# see `man git-daemon` for all available options +# $GIT_REPO will be present twice in most configs +GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"