Update to gnuit version 4.9.4 now that the project is active again, up

from the old version 4.3.20 dating back to 2000 which was still called
git.

Most configuration files, environment variables, the HTML documention,
subdirectory names, etc have been renamed to carry gnuit instead of git
in their names.  Support for large files has been improved, new terminal
types rxvt-unicode, linux-m, cygwin, and Eterm, have been added, and
many bugs have been fixed.

The git file manager is now called gitfm, there is no longer a command
called git.  Among others this helps reduce confusing with devel/git.

PR:		126234

18 files changed, 284 insertions, 174 deletions

diff --git a/misc/git/Makefile b/misc/git/Makefile
index 4ad0b4d..8ed71e8 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	git
-PORTVERSION=	4.3.20
+PORTNAME=	gnuit
+PORTVERSION=	4.9.4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,15 +15,15 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Interactive Tools - a file system browser for UNIX systems
 
 CONFLICTS=	git-1.* cogito-[0-9]*
-LATEST_LINK=	gnu-git
 
 GNU_CONFIGURE=	YES
-MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 \
-		gitrgrep.1 gitunpack.1
-INFO=		git
+MAN1=		git.1 gitaction.1 gitdpkgname.1 gitfm.1 gitinternal.1 \
+		gitkeys.1 gitmount.1 gitps.1 gitregrep.1 gitrfgrep.1 \
+		gitrgrep.1 gitunpack.1 gitview.1 gitwipe.1
 
-pre-patch:
-	${CP} ${WRKSRC}/term/.gitrc.ansi \
-		${WRKSRC}/term/.gitrc.cons25
+post-install:
+	 ${RM} -f ${PREFIX}/man/man1/gitmkdirs.1
+	 ${RM} -f ${PREFIX}/man/man1/gitwhich.1
+	 ${RM} -f ${PREFIX}/man/man1/gitxgrep.1
 
 .include <bsd.port.mk>
diff --git a/misc/git/distinfo b/misc/git/distinfo
index 78cdd18..880245c 100644
--- a/misc/git/distinfo
+++ b/misc/git/distinfo
@@ -1,3 +1,3 @@
-MD5 (git-4.3.20.tar.gz) = 72b01d5f9905951137ac1bb87d7e431c
-SHA256 (git-4.3.20.tar.gz) = ead279859d647a3b973c5f248415649fc0fbea91d9fb2f100a2621bf37b18acf
-SIZE (git-4.3.20.tar.gz) = 426648
+MD5 (gnuit-4.9.4.tar.gz) = 7f87f5b80b824cdc94de4ca71d7e5201
+SHA256 (gnuit-4.9.4.tar.gz) = 8dab82d10e14ea326e04217e3e97b54a913cee741bdf6d7eaba6db22d64b88f4
+SIZE (gnuit-4.9.4.tar.gz) = 800662
diff --git a/misc/git/files/patch-ab b/misc/git/files/patch-ab
deleted file mode 100644
index 9f76253..0000000
--- 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 5363a37..0000000
--- 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 5fe99f4..0000000
--- 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 0000000..087165e
--- /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 0000000..bc0cb7c
--- /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 0000000..451c72d
--- /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
+ 
diff --git a/misc/git/pkg-plist b/misc/git/pkg-plist
index 11723b9..15a4be9 100644
--- a/misc/git/pkg-plist
+++ b/misc/git/pkg-plist
@@ -1,52 +1,60 @@
 bin/.gitaction
-bin/git
 bin/gitaction
+bin/gitdpkgname
+bin/gitfm
 bin/gitkeys
 bin/gitmkdirs
 bin/gitmount
 bin/gitps
+bin/gitregrep
+bin/gitrfgrep
 bin/gitrgrep
 bin/gitunpack
 bin/gitview
 bin/gitwhich
 bin/gitwipe
 bin/gitxgrep
-%%DATADIR%%/.gitrc.aixterm
-%%DATADIR%%/.gitrc.ansi
-%%DATADIR%%/.gitrc.common
-%%DATADIR%%/.gitrc.cons25
-%%DATADIR%%/.gitrc.console
-%%DATADIR%%/.gitrc.dtterm
-%%DATADIR%%/.gitrc.eterm
-%%DATADIR%%/.gitrc.generic
-%%DATADIR%%/.gitrc.hft
-%%DATADIR%%/.gitrc.hp
-%%DATADIR%%/.gitrc.hpterm
-%%DATADIR%%/.gitrc.iris-ansi
-%%DATADIR%%/.gitrc.iris-ansi-net
-%%DATADIR%%/.gitrc.linux
-%%DATADIR%%/.gitrc.mach
-%%DATADIR%%/.gitrc.minix
-%%DATADIR%%/.gitrc.pc3
-%%DATADIR%%/.gitrc.rxvt
-%%DATADIR%%/.gitrc.screen
-%%DATADIR%%/.gitrc.sun
-%%DATADIR%%/.gitrc.sun-cmd
-%%DATADIR%%/.gitrc.thix
-%%DATADIR%%/.gitrc.vt100
-%%DATADIR%%/.gitrc.vt102
-%%DATADIR%%/.gitrc.vt125
-%%DATADIR%%/.gitrc.vt200
-%%DATADIR%%/.gitrc.vt201
-%%DATADIR%%/.gitrc.vt220
-%%DATADIR%%/.gitrc.vt240
-%%DATADIR%%/.gitrc.vt300
-%%DATADIR%%/.gitrc.vt320
-%%DATADIR%%/.gitrc.vt400
-%%DATADIR%%/.gitrc.vt420
-%%DATADIR%%/.gitrc.xterm
-%%DATADIR%%/.gitrc.xterm-color
-%%DATADIR%%/.gitrc.xterm-debian
-%%DATADIR%%/.gitrc.xterms
-%%DATADIR%%/git.html
+%%DATADIR%%/dpkg-help.txt
+%%DATADIR%%/gnuitrc.Eterm
+%%DATADIR%%/gnuitrc.aixterm
+%%DATADIR%%/gnuitrc.ansi
+%%DATADIR%%/gnuitrc.common
+%%DATADIR%%/gnuitrc.console
+%%DATADIR%%/gnuitrc.cygwin
+%%DATADIR%%/gnuitrc.dtterm
+%%DATADIR%%/gnuitrc.eterm
+%%DATADIR%%/gnuitrc.generic
+%%DATADIR%%/gnuitrc.hft
+%%DATADIR%%/gnuitrc.hp
+%%DATADIR%%/gnuitrc.hpterm
+%%DATADIR%%/gnuitrc.iris-ansi
+%%DATADIR%%/gnuitrc.iris-ansi-net
+%%DATADIR%%/gnuitrc.linux
+%%DATADIR%%/gnuitrc.linux-m
+%%DATADIR%%/gnuitrc.mach
+%%DATADIR%%/gnuitrc.minix
+%%DATADIR%%/gnuitrc.pc3
+%%DATADIR%%/gnuitrc.rxvt
+%%DATADIR%%/gnuitrc.rxvt-unicode
+%%DATADIR%%/gnuitrc.screen
+%%DATADIR%%/gnuitrc.sun
+%%DATADIR%%/gnuitrc.sun-cmd
+%%DATADIR%%/gnuitrc.thix
+%%DATADIR%%/gnuitrc.vt100
+%%DATADIR%%/gnuitrc.vt102
+%%DATADIR%%/gnuitrc.vt125
+%%DATADIR%%/gnuitrc.vt200
+%%DATADIR%%/gnuitrc.vt201
+%%DATADIR%%/gnuitrc.vt220
+%%DATADIR%%/gnuitrc.vt240
+%%DATADIR%%/gnuitrc.vt300
+%%DATADIR%%/gnuitrc.vt320
+%%DATADIR%%/gnuitrc.vt400
+%%DATADIR%%/gnuitrc.vt420
+%%DATADIR%%/gnuitrc.xterm
+%%DATADIR%%/gnuitrc.xterm-color
+%%DATADIR%%/gnuitrc.xterm-debian
+%%DATADIR%%/gnuitrc.xterms
 @dirrm %%DATADIR%%
+%%DOCSDIR%%/gnuit.html
+@dirrm %%DOCSDIR%%
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 4ad0b4d..8ed71e8 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	git
-PORTVERSION=	4.3.20
+PORTNAME=	gnuit
+PORTVERSION=	4.9.4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,15 +15,15 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Interactive Tools - a file system browser for UNIX systems
 
 CONFLICTS=	git-1.* cogito-[0-9]*
-LATEST_LINK=	gnu-git
 
 GNU_CONFIGURE=	YES
-MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 \
-		gitrgrep.1 gitunpack.1
-INFO=		git
+MAN1=		git.1 gitaction.1 gitdpkgname.1 gitfm.1 gitinternal.1 \
+		gitkeys.1 gitmount.1 gitps.1 gitregrep.1 gitrfgrep.1 \
+		gitrgrep.1 gitunpack.1 gitview.1 gitwipe.1
 
-pre-patch:
-	${CP} ${WRKSRC}/term/.gitrc.ansi \
-		${WRKSRC}/term/.gitrc.cons25
+post-install:
+	 ${RM} -f ${PREFIX}/man/man1/gitmkdirs.1
+	 ${RM} -f ${PREFIX}/man/man1/gitwhich.1
+	 ${RM} -f ${PREFIX}/man/man1/gitxgrep.1
 
 .include <bsd.port.mk>
diff --git a/misc/gnuit/distinfo b/misc/gnuit/distinfo
index 78cdd18..880245c 100644
--- a/misc/gnuit/distinfo
+++ b/misc/gnuit/distinfo
@@ -1,3 +1,3 @@
-MD5 (git-4.3.20.tar.gz) = 72b01d5f9905951137ac1bb87d7e431c
-SHA256 (git-4.3.20.tar.gz) = ead279859d647a3b973c5f248415649fc0fbea91d9fb2f100a2621bf37b18acf
-SIZE (git-4.3.20.tar.gz) = 426648
+MD5 (gnuit-4.9.4.tar.gz) = 7f87f5b80b824cdc94de4ca71d7e5201
+SHA256 (gnuit-4.9.4.tar.gz) = 8dab82d10e14ea326e04217e3e97b54a913cee741bdf6d7eaba6db22d64b88f4
+SIZE (gnuit-4.9.4.tar.gz) = 800662
diff --git a/misc/gnuit/files/patch-ab b/misc/gnuit/files/patch-ab
deleted file mode 100644
index 9f76253..0000000
--- a/misc/gnuit/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/gnuit/files/patch-ac b/misc/gnuit/files/patch-ac
deleted file mode 100644
index 5363a37..0000000
--- a/misc/gnuit/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/gnuit/files/patch-ad b/misc/gnuit/files/patch-ad
deleted file mode 100644
index 5fe99f4..0000000
--- a/misc/gnuit/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/gnuit/files/patch-doc-Makefile b/misc/gnuit/files/patch-doc-Makefile
new file mode 100644
index 0000000..087165e
--- /dev/null
+++ b/misc/gnuit/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/gnuit/files/patch-lib-Makefile b/misc/gnuit/files/patch-lib-Makefile
new file mode 100644
index 0000000..bc0cb7c
--- /dev/null
+++ b/misc/gnuit/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/gnuit/files/patch-src-Makefile.in b/misc/gnuit/files/patch-src-Makefile.in
new file mode 100644
index 0000000..451c72d
--- /dev/null
+++ b/misc/gnuit/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
+ 
diff --git a/misc/gnuit/pkg-plist b/misc/gnuit/pkg-plist
index 11723b9..15a4be9 100644
--- a/misc/gnuit/pkg-plist
+++ b/misc/gnuit/pkg-plist
@@ -1,52 +1,60 @@
 bin/.gitaction
-bin/git
 bin/gitaction
+bin/gitdpkgname
+bin/gitfm
 bin/gitkeys
 bin/gitmkdirs
 bin/gitmount
 bin/gitps
+bin/gitregrep
+bin/gitrfgrep
 bin/gitrgrep
 bin/gitunpack
 bin/gitview
 bin/gitwhich
 bin/gitwipe
 bin/gitxgrep
-%%DATADIR%%/.gitrc.aixterm
-%%DATADIR%%/.gitrc.ansi
-%%DATADIR%%/.gitrc.common
-%%DATADIR%%/.gitrc.cons25
-%%DATADIR%%/.gitrc.console
-%%DATADIR%%/.gitrc.dtterm
-%%DATADIR%%/.gitrc.eterm
-%%DATADIR%%/.gitrc.generic
-%%DATADIR%%/.gitrc.hft
-%%DATADIR%%/.gitrc.hp
-%%DATADIR%%/.gitrc.hpterm
-%%DATADIR%%/.gitrc.iris-ansi
-%%DATADIR%%/.gitrc.iris-ansi-net
-%%DATADIR%%/.gitrc.linux
-%%DATADIR%%/.gitrc.mach
-%%DATADIR%%/.gitrc.minix
-%%DATADIR%%/.gitrc.pc3
-%%DATADIR%%/.gitrc.rxvt
-%%DATADIR%%/.gitrc.screen
-%%DATADIR%%/.gitrc.sun
-%%DATADIR%%/.gitrc.sun-cmd
-%%DATADIR%%/.gitrc.thix
-%%DATADIR%%/.gitrc.vt100
-%%DATADIR%%/.gitrc.vt102
-%%DATADIR%%/.gitrc.vt125
-%%DATADIR%%/.gitrc.vt200
-%%DATADIR%%/.gitrc.vt201
-%%DATADIR%%/.gitrc.vt220
-%%DATADIR%%/.gitrc.vt240
-%%DATADIR%%/.gitrc.vt300
-%%DATADIR%%/.gitrc.vt320
-%%DATADIR%%/.gitrc.vt400
-%%DATADIR%%/.gitrc.vt420
-%%DATADIR%%/.gitrc.xterm
-%%DATADIR%%/.gitrc.xterm-color
-%%DATADIR%%/.gitrc.xterm-debian
-%%DATADIR%%/.gitrc.xterms
-%%DATADIR%%/git.html
+%%DATADIR%%/dpkg-help.txt
+%%DATADIR%%/gnuitrc.Eterm
+%%DATADIR%%/gnuitrc.aixterm
+%%DATADIR%%/gnuitrc.ansi
+%%DATADIR%%/gnuitrc.common
+%%DATADIR%%/gnuitrc.console
+%%DATADIR%%/gnuitrc.cygwin
+%%DATADIR%%/gnuitrc.dtterm
+%%DATADIR%%/gnuitrc.eterm
+%%DATADIR%%/gnuitrc.generic
+%%DATADIR%%/gnuitrc.hft
+%%DATADIR%%/gnuitrc.hp
+%%DATADIR%%/gnuitrc.hpterm
+%%DATADIR%%/gnuitrc.iris-ansi
+%%DATADIR%%/gnuitrc.iris-ansi-net
+%%DATADIR%%/gnuitrc.linux
+%%DATADIR%%/gnuitrc.linux-m
+%%DATADIR%%/gnuitrc.mach
+%%DATADIR%%/gnuitrc.minix
+%%DATADIR%%/gnuitrc.pc3
+%%DATADIR%%/gnuitrc.rxvt
+%%DATADIR%%/gnuitrc.rxvt-unicode
+%%DATADIR%%/gnuitrc.screen
+%%DATADIR%%/gnuitrc.sun
+%%DATADIR%%/gnuitrc.sun-cmd
+%%DATADIR%%/gnuitrc.thix
+%%DATADIR%%/gnuitrc.vt100
+%%DATADIR%%/gnuitrc.vt102
+%%DATADIR%%/gnuitrc.vt125
+%%DATADIR%%/gnuitrc.vt200
+%%DATADIR%%/gnuitrc.vt201
+%%DATADIR%%/gnuitrc.vt220
+%%DATADIR%%/gnuitrc.vt240
+%%DATADIR%%/gnuitrc.vt300
+%%DATADIR%%/gnuitrc.vt320
+%%DATADIR%%/gnuitrc.vt400
+%%DATADIR%%/gnuitrc.vt420
+%%DATADIR%%/gnuitrc.xterm
+%%DATADIR%%/gnuitrc.xterm-color
+%%DATADIR%%/gnuitrc.xterm-debian
+%%DATADIR%%/gnuitrc.xterms
 @dirrm %%DATADIR%%
+%%DOCSDIR%%/gnuit.html
+@dirrm %%DOCSDIR%%