From 09fdcb6e5bb6043e66fca16a92f1a9c72340d33c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 17 Jul 2012 17:14:41 +0200
Subject: update to latest upstream version

---
 package/git/Makefile               |  6 ++--
 package/git/patches/patch-Makefile | 57 --------------------------------------
 2 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 package/git/patches/patch-Makefile

(limited to 'package/git')

diff --git a/package/git/Makefile b/package/git/Makefile
index ad415a8fd..86f70a5ca 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.7.7
+PKG_VERSION:=		1.7.11.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5d645884e688921e773186783b65ce33
+PKG_MD5SUM:=		91e01a22032f5d0ca2941ae7fd49d587
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		openssl curl expat
@@ -18,7 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 NO_INSTALL_HARDLINKS=1 \
 			CURLDIR=${STAGING_TARGET_DIR} EXPATDIR=${STAGING_TARGET_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
deleted file mode 100644
index 03923cc01..000000000
--- a/package/git/patches/patch-Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
---- git-1.7.3.2.orig/Makefile	2010-10-22 05:49:16.000000000 +0200
-+++ git-1.7.3.2/Makefile	2010-11-23 23:14:56.960685586 +0100
-@@ -1615,9 +1615,7 @@ builtin/help.s builtin/help.o: EXTRA_CPP
- 
- $(BUILT_INS): git$X
- 	$(QUIET_BUILT_IN)$(RM) $@ && \
--	ln git$X $@ 2>/dev/null || \
--	ln -s git$X $@ 2>/dev/null || \
--	cp git$X $@
-+	ln -s git$X $@ 2>/dev/null
- 
- common-cmds.h: ./generate-cmdlist.sh command-list.txt
- 
-@@ -1932,9 +1930,7 @@ git-http-push$X: revision.o http.o http-
- 
- $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
- 	$(QUIET_LNCP)$(RM) $@ && \
--	ln $< $@ 2>/dev/null || \
--	ln -s $< $@ 2>/dev/null || \
--	cp $< $@
-+	ln -s $< $@ 2>/dev/null
- 
- $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-@@ -2123,29 +2119,21 @@ endif
- 	{ test "$$bindir/" = "$$execdir/" || \
- 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
- 		$(RM) "$$execdir/$$p" && \
--		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
- 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
- 	  done; \
- 	} && \
- 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
- 		$(RM) "$$bindir/$$p" && \
--		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
--		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
--		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
-+		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || exit; \
- 	done && \
- 	for p in $(BUILT_INS); do \
- 		$(RM) "$$execdir/$$p" && \
--		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
--		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
--		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
-+		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || exit; \
- 	done && \
- 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
- 	for p in $$remote_curl_aliases; do \
- 		$(RM) "$$execdir/$$p" && \
--		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
--		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
--		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
-+		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || exit; \
- 	done && \
- 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
- 
-- 
cgit v1.2.3