5 files changed, 20 insertions, 73 deletions

diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 8ed71e863409..994dea510a8e 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnuit
-PORTVERSION=	4.9.4
+PORTVERSION=	4.9.5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gnuit/distinfo b/misc/gnuit/distinfo
index 880245c0086b..a20ce39bb85b 100644
--- a/misc/gnuit/distinfo
+++ b/misc/gnuit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnuit-4.9.4.tar.gz) = 7f87f5b80b824cdc94de4ca71d7e5201
-SHA256 (gnuit-4.9.4.tar.gz) = 8dab82d10e14ea326e04217e3e97b54a913cee741bdf6d7eaba6db22d64b88f4
-SIZE (gnuit-4.9.4.tar.gz) = 800662
+MD5 (gnuit-4.9.5.tar.gz) = 6b88eea39361ead2ad48b33b17a870f5
+SHA256 (gnuit-4.9.5.tar.gz) = 6b6e96db13bafa5ad35c735b2277699d4244088c709a3e134fb1a3e8c8a8557c
+SIZE (gnuit-4.9.5.tar.gz) = 894362
diff --git a/misc/gnuit/files/patch-doc-Makefile b/misc/gnuit/files/patch-doc-Makefile
deleted file mode 100644
index 087165e2bc2d..000000000000
--- a/misc/gnuit/files/patch-doc-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
index bc0cb7cce588..8ab7c36d4a73 100644
--- a/misc/gnuit/files/patch-lib-Makefile
+++ b/misc/gnuit/files/patch-lib-Makefile
@@ -1,42 +1,11 @@
---- 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 \
+--- lib/Makefile.in.orig	2009-02-18 03:31:25.000000000 +0100
++++ lib/Makefile.in	2009-02-24 01:10:55.000000000 +0100
+@@ -1214,7 +1214,7 @@
+ 	  case '$(host_os)' in \
+ 	    darwin[56]*) \
+ 	      need_charset_alias=true ;; \
+-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++	    freebsd* | darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ 	      need_charset_alias=false ;; \
+ 	    *) \
+ 	      need_charset_alias=true ;; \
diff --git a/misc/gnuit/files/patch-src-Makefile.in b/misc/gnuit/files/patch-src-Makefile.in
index 451c72d80e10..a267367c4539 100644
--- a/misc/gnuit/files/patch-src-Makefile.in
+++ b/misc/gnuit/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/Makefile.in.orig	2009-02-18 03:31:26.000000000 +0100
++++ src/Makefile.in	2009-02-24 00:46:11.000000000 +0100
+@@ -575,7 +575,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  EXTRA_DIST = gitaction gitmkdirs gitmount gitrgrep gitunpack gitxgrep\
@@ -9,11 +9,11 @@
  
  bin_SCRIPTS = gitaction gitmkdirs gitmount gitrgrep gitunpack gitxgrep\
  	      .gitaction gitdpkgname
-@@ -796,7 +796,6 @@
+@@ -926,7 +926,6 @@
  
  
  install-exec-hook:
--@TRANSITION_TRUE@	$(INSTALL_PROGRAM) -m 755 $(srcdir)/git.transition $(DESTDIR)$(bindir)/git
+-@TRANSITION_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/git.transition $(DESTDIR)$(bindir)/git
  	ln -sf gitrgrep $(DESTDIR)$(bindir)/gitregrep
  	ln -sf gitrgrep $(DESTDIR)$(bindir)/gitrfgrep