From 34aef214f34f0aad93c29368aa58ca82f36d8d31 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Wed, 15 Oct 2008 07:25:46 +0000 Subject: [PATCH] Update to 1.6.0.2. --- git/build.sh | 4 ++-- git/meta/depend | 1 + git/src/git-1.5.3.4-symlinks.patch | 11 ----------- git/src/git-1.6.0.2-symlinks.patch | 22 ++++++++++++++++++++++ 4 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 git/meta/depend delete mode 100644 git/src/git-1.5.3.4-symlinks.patch create mode 100644 git/src/git-1.6.0.2-symlinks.patch diff --git a/git/build.sh b/git/build.sh index 38d1476..9264ed0 100755 --- a/git/build.sh +++ b/git/build.sh @@ -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 diff --git a/git/meta/depend b/git/meta/depend new file mode 100644 index 0000000..58b74d2 --- /dev/null +++ b/git/meta/depend @@ -0,0 +1 @@ +TGCgit TGCplerr auto diff --git a/git/src/git-1.5.3.4-symlinks.patch b/git/src/git-1.5.3.4-symlinks.patch deleted file mode 100644 index 57965aa..0000000 --- a/git/src/git-1.5.3.4-symlinks.patch +++ /dev/null @@ -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 diff --git a/git/src/git-1.6.0.2-symlinks.patch b/git/src/git-1.6.0.2-symlinks.patch new file mode 100644 index 0000000..a4f6934 --- /dev/null +++ b/git/src/git-1.6.0.2-symlinks.patch @@ -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"