Update to 1.6.0.2.

This commit is contained in:
Tom G. Christensen 2008-10-15 07:25:46 +00:00 committed by Tom G. Christensen
parent 4bc555e6e3
commit 34aef214f3
4 changed files with 25 additions and 13 deletions

View File

@ -9,12 +9,12 @@
###########################################################
# Check the following 4 variables before running the script
topdir=git
version=1.5.5.1
version=1.6.0.2
pkgver=1
source[0]=$topdir-$version.tar.bz2
source[1]=$topdir-manpages-$version.tar.bz2
# If there are no patches, simply comment this
patch[0]=git-1.5.3.4-symlinks.patch
patch[0]=git-1.6.0.2-symlinks.patch
patch[1]=git-1.5.5.1-socklen_t.patch
patch[2]=git-1.5.5.1-sunos56.patch

1
git/meta/depend Normal file
View File

@ -0,0 +1 @@
TGCgit TGCplerr auto

View File

@ -1,11 +0,0 @@
--- git-1.5.3.4/Makefile.crap 2007-10-25 13:42:07.970429000 +0200
+++ git-1.5.3.4/Makefile 2007-10-25 13:46:41.045712000 +0200
@@ -1003,7 +1003,7 @@
cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
fi
- $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln -s '$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
ifneq (,$X)
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
endif

View File

@ -0,0 +1,22 @@
--- git-1.6.0.2/Makefile.orig 2008-10-04 20:39:42.864022000 +0200
+++ git-1.6.0.2/Makefile 2008-10-04 20:42:18.194159000 +0200
@@ -1125,7 +1125,6 @@
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
- ln git$X $@ 2>/dev/null || \
ln -s git$X $@ 2>/dev/null || \
cp git$X $@
@@ -1387,10 +1386,9 @@
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
{ $(RM) "$$execdir/git-add$X" && \
- ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \
+ ln -s git-add$X "$$execdir/git-add$X" 2>/dev/null || \
cp git-add$X "$$execdir/git-add$X"; } && \
{ $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \
- ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \
ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \
cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"