diff options
author | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
commit | 9fddb4d5b41c0b5e69d5ee138297e95eff290302 (patch) | |
tree | b353402b4af0ac5b912dc78ca7d996c397b8e2e3 /main/git/APKBUILD | |
parent | ccf26410d30adc8c1934dd553687157ed6e31d69 (diff) | |
parent | 8c1128e93e03012dabadb9a3f723dbd20eb60cd4 (diff) | |
download | aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.bz2 aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.xz |
Merged from Alpine main repository.
Merge
Conflicts:
main/abuild/APKBUILD
main/cramfs/APKBUILD
main/curl/APKBUILD
main/dialog/APKBUILD
main/libconfig/APKBUILD
main/snort/APKBUILD
main/syslinux/APKBUILD
Diffstat (limited to 'main/git/APKBUILD')
-rw-r--r-- | main/git/APKBUILD | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD index ca396675d..f8d9e8bb0 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.0.5 -pkgrel=0 +pkgver=1.7.1 +pkgrel=2 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -10,6 +10,7 @@ subpackages="$pkgname-doc $pkgname-perl" makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev" source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2 bb-tar.patch + git-do-not-dump-core-when-iconv-fails.patch " _makeopts="NO_ICONV=YesPlease @@ -17,14 +18,16 @@ _makeopts="NO_ICONV=YesPlease NO_TCLTK=YesPlease NO_SVN_TESTS=YesPlease" -build () { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../bb-tar.patch || return 1 +build() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/bb-tar.patch || return 1 + patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \ + || return 1 make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1 } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver make prefix=/usr DESTDIR="$pkgdir" $_makeopts install } @@ -42,5 +45,6 @@ perl() { } -md5sums="77d50f41ef282752dc69d9a47765f5c7 git-1.7.0.5.tar.bz2 -e63a201556c4f089de790805c09a2e5b bb-tar.patch" +md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 +e63a201556c4f089de790805c09a2e5b bb-tar.patch +7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch" |