6 files changed, 83 insertions, 36 deletions
diff --git a/misc/git/files/patch-ab b/misc/git/files/patch-ab
deleted file mode 100644
index 9f762537c32d..000000000000
--- a/misc/git/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- term/Makefile.in.orig	Mon Jun 28 23:41:13 1999
-+++ term/Makefile.in	Mon Nov 15 17:07:01 1999
-@@ -80,9 +80,9 @@
- PRODUCT = @PRODUCT@
- VERSION = @VERSION@
- 
--EXTRA_DIST = .gitrc.aixterm .gitrc.ansi .gitrc.common.in 	     .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux 	     .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 	     .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color
-+EXTRA_DIST = .gitrc.aixterm .gitrc.ansi .gitrc.common.in 	     .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux 	     .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 	     .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color .gitrc.cons25
- 
--pkgdata_DATA = .gitrc.aixterm .gitrc.ansi .gitrc.common 	       .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux 	       .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 	       .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color
-+pkgdata_DATA = .gitrc.aixterm .gitrc.ansi .gitrc.common 	       .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux 	       .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 	       .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color .gitrc.cons25
- 
- 
- GIT_GENERICS = .gitrc.sun .gitrc.sun-cmd .gitrc.eterm .gitrc.pc3
diff --git a/misc/git/files/patch-ac b/misc/git/files/patch-ac
deleted file mode 100644
index 5363a376f6b0..000000000000
--- a/misc/git/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- term/.gitrc.cons25.orig	Sat Jun 15 17:00:30 1996
-+++ term/.gitrc.cons25	Sat Jun 15 17:05:28 1996
-@@ -24,7 +24,7 @@
- [Setup]
- TempDirectory		= /tmp
- AnsiColors		= ON	# empty means OFF
--UseLastScreenChar	= OFF	# use the last character on the screen
-+UseLastScreenChar	= ON	# use the last character on the screen
- StartupScrollStep	=	# empty means half the number of lines
- 
- 
diff --git a/misc/git/files/patch-ad b/misc/git/files/patch-ad
deleted file mode 100644
index 5fe99f426b1c..000000000000
--- a/misc/git/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon Nov 15 19:23:15 1999
-+++ doc/Makefile.in	Mon Nov 15 19:23:32 1999
-@@ -82,7 +82,7 @@
- 
- info_TEXINFOS = git.texinfo
- man_MANS = git.1 gitaction.1 gitkeys.1 gitmount.1 gitrgrep.1 gitunpack.1
--htmldir = $(prefix)/doc/git-$(VERSION)
-+htmldir = $(prefix)/share/git
- html_DATA = git.html
- EXTRA_DIST = git.1 gitaction.1 gitkeys.1 gitmount.1 gitrgrep.1 gitunpack.1 	     git.html
- 
diff --git a/misc/git/files/patch-doc-Makefile b/misc/git/files/patch-doc-Makefile
new file mode 100644
index 000000000000..087165e2bc2d
--- /dev/null
+++ b/misc/git/files/patch-doc-Makefile
@@ -0,0 +1,22 @@
+--- doc/Makefile.am.orig	2008-06-29 01:14:36.000000000 +0200
++++ doc/Makefile.am	2008-12-26 13:27:43.000000000 +0100
+@@ -38,7 +38,7 @@
+ # ignoring git.1 in case the other git is using it
+ # The same applies for infodir, $(prefix)/info vs $(prefix)/share/info
+ install-data-hook:
+-	$(INSTALL_PROGRAM) -m 644 $(srcdir)/dpkg-help.txt $(DESTDIR)$(datadir)/gnuit/dpkg-help.txt
++	$(INSTALL_DATA) -m 644 $(srcdir)/dpkg-help.txt $(DESTDIR)$(datadir)/gnuit/dpkg-help.txt
+ 	for i in $(GIT_GREPS);\
+ 	do\
+ 	    rm -f $(DESTDIR)$(mandir)/man1/$${i}.1;\
+--- doc/Makefile.in.orig	2008-06-29 01:14:36.000000000 +0200
++++ doc/Makefile.in	2008-12-26 13:27:51.000000000 +0100
+@@ -815,7 +815,7 @@
+ # ignoring git.1 in case the other git is using it
+ # The same applies for infodir, $(prefix)/info vs $(prefix)/share/info
+ install-data-hook:
+-	$(INSTALL_PROGRAM) -m 644 $(srcdir)/dpkg-help.txt $(DESTDIR)$(datadir)/gnuit/dpkg-help.txt
++	$(INSTALL_DATA) -m 644 $(srcdir)/dpkg-help.txt $(DESTDIR)$(datadir)/gnuit/dpkg-help.txt
+ 	for i in $(GIT_GREPS);\
+ 	do\
+ 	    rm -f $(DESTDIR)$(mandir)/man1/$${i}.1;\
diff --git a/misc/git/files/patch-lib-Makefile b/misc/git/files/patch-lib-Makefile
new file mode 100644
index 000000000000..bc0cb7cce588
--- /dev/null
+++ b/misc/git/files/patch-lib-Makefile
@@ -0,0 +1,42 @@
+--- lib/Makefile.am.orig	2008-06-29 01:14:36.000000000 +0200
++++ lib/Makefile.am	2008-12-26 16:38:05.000000000 +0100
+@@ -324,18 +324,6 @@
+ charset_alias = $(DESTDIR)$(libdir)/charset.alias
+ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+ install-exec-local: all-local
+-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+-	if test -f $(charset_alias); then \
+-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	  rm -f $(charset_tmp) ; \
+-	else \
+-	  if test $(GLIBC21) = no; then \
+-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	    rm -f $(charset_tmp) ; \
+-	  fi ; \
+-	fi
+ 
+ uninstall-local: all-local
+ 	if test -f $(charset_alias); then \
+--- lib/Makefile.in.orig	2008-06-29 01:14:36.000000000 +0200
++++ lib/Makefile.in	2008-12-26 16:38:27.000000000 +0100
+@@ -920,18 +920,6 @@
+ 
+ all-local: charset.alias ref-add.sed ref-del.sed
+ install-exec-local: all-local
+-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+-	if test -f $(charset_alias); then \
+-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	  rm -f $(charset_tmp) ; \
+-	else \
+-	  if test $(GLIBC21) = no; then \
+-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	    rm -f $(charset_tmp) ; \
+-	  fi ; \
+-	fi
+ 
+ uninstall-local: all-local
+ 	if test -f $(charset_alias); then \
diff --git a/misc/git/files/patch-src-Makefile.in b/misc/git/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..451c72d80e10
--- /dev/null
+++ b/misc/git/files/patch-src-Makefile.in
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig	2008-12-26 13:14:46.000000000 +0100
++++ src/Makefile.in	2008-12-26 13:14:58.000000000 +0100
+@@ -445,7 +445,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = gitaction gitmkdirs gitmount gitrgrep gitunpack gitxgrep\
+-	     .gitaction .gdbinit git.transition gitdpkgname
++	     .gitaction .gdbinit gitdpkgname
+ 
+ bin_SCRIPTS = gitaction gitmkdirs gitmount gitrgrep gitunpack gitxgrep\
+ 	      .gitaction gitdpkgname
+@@ -796,7 +796,6 @@
+ 
+ 
+ install-exec-hook:
+-@TRANSITION_TRUE@	$(INSTALL_PROGRAM) -m 755 $(srcdir)/git.transition $(DESTDIR)$(bindir)/git
+ 	ln -sf gitrgrep $(DESTDIR)$(bindir)/gitregrep
+ 	ln -sf gitrgrep $(DESTDIR)$(bindir)/gitrfgrep
+