update to 4.9.5

3 files changed, 57 insertions, 29 deletions

diff --git a/misc/git/patches/patch-ab b/misc/git/patches/patch-ab
index 0ad8fe63999..82c477f1446 100644
--- a/misc/git/patches/patch-ab
+++ b/misc/git/patches/patch-ab
@@ -1,16 +1,45 @@
-$NetBSD: patch-ab,v 1.5 2006/01/31 20:29:40 reed Exp $
+$NetBSD: patch-ab,v 1.6 2010/01/18 02:23:52 christos Exp $
 
---- term/Makefile.in.orig	2006-01-26 09:20:04.000000000 -0800
-+++ term/Makefile.in	2006-01-26 09:22:36.000000000 -0800
-@@ -79,9 +79,9 @@
- PRODUCT = @PRODUCT@
- VERSION = @VERSION@
+--- term/Makefile.in.orig	2009-02-17 21:31:26.000000000 -0500
++++ term/Makefile.in	2010-01-09 17:20:37.000000000 -0500
+@@ -105,7 +105,7 @@
+ CONFIG_CLEAN_FILES = gnuitrc.aixterm gnuitrc.ansi gnuitrc.generic \
+ 	gnuitrc.hft gnuitrc.hpterm gnuitrc.linux gnuitrc.linux-m \
+ 	gnuitrc.mach gnuitrc.minix gnuitrc.thix gnuitrc.vt100 \
+-	gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color
++	gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color gnuitrc.cons25
+ SOURCES =
+ DIST_SOURCES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -545,18 +545,19 @@
+ EXTRA_DIST = gnuitrc.aixterm.in gnuitrc.ansi.in gnuitrc.common.IN\
+ 	     gnuitrc.generic.in gnuitrc.hft.in gnuitrc.hpterm.in gnuitrc.linux.in\
+ 	     gnuitrc.mach.in gnuitrc.minix.in gnuitrc.thix.in gnuitrc.vt100.in\
+-	     gnuitrc.vt102.in gnuitrc.xterm.in gnuitrc.xterm-color.in gnuitrc.linux-m.in
++	     gnuitrc.vt102.in gnuitrc.xterm.in gnuitrc.xterm-color.in gnuitrc.linux-m.in gnuitrc.cons25.in
  
--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 = gnuitrc.aixterm gnuitrc.ansi gnuitrc.common\
+ 	       gnuitrc.generic gnuitrc.hft gnuitrc.hpterm gnuitrc.linux\
+ 	       gnuitrc.mach gnuitrc.minix gnuitrc.thix gnuitrc.vt100\
+-	       gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color gnuitrc.linux-m
++	       gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color gnuitrc.linux-m\
++	       gnuitrc.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
+ GIT_GENERICS = gnuitrc.sun gnuitrc.sun-cmd gnuitrc.eterm gnuitrc.pc3
+ GIT_XTERMS = gnuitrc.xterms
+ GIT_ANSIS = gnuitrc.iris-ansi gnuitrc.iris-ansi-net gnuitrc.cygwin
+ GIT_COLOR_XTERMS = gnuitrc.dtterm gnuitrc.rxvt gnuitrc.xterm-debian gnuitrc.Eterm gnuitrc.rxvt-unicode
+-GIT_LINUXS = gnuitrc.console
++GIT_LINUXS = gnuitrc.console gnuitrc.cons25
+ GIT_HPTERMS = gnuitrc.hp
+ GIT_VT100S = gnuitrc.vt125 gnuitrc.vt200 gnuitrc.vt201 gnuitrc.vt220\
+ 		   gnuitrc.vt240 gnuitrc.vt300 gnuitrc.vt320 gnuitrc.vt400\
+@@ -596,6 +597,8 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ gnuitrc.aixterm: $(top_builddir)/config.status $(srcdir)/gnuitrc.aixterm.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++gnuitrc.cons25: $(top_builddir)/config.status $(srcdir)/gnuitrc.cons25.in
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ gnuitrc.ansi: $(top_builddir)/config.status $(srcdir)/gnuitrc.ansi.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ gnuitrc.generic: $(top_builddir)/config.status $(srcdir)/gnuitrc.generic.in
diff --git a/misc/git/patches/patch-ac b/misc/git/patches/patch-ac
index 43ed32010c4..9d543529cb3 100644
--- a/misc/git/patches/patch-ac
+++ b/misc/git/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2006/01/31 20:29:40 reed Exp $
+$NetBSD: patch-ac,v 1.3 2010/01/18 02:23:52 christos Exp $
 
---- doc/Makefile.in.orig	2006-01-26 09:24:53.000000000 -0800
-+++ doc/Makefile.in	2006-01-26 09:25:44.000000000 -0800
-@@ -81,7 +81,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/doc/git
- html_DATA = git.html
- EXTRA_DIST = git.1 gitaction.1 gitkeys.1 gitmount.1 gitrgrep.1 gitunpack.1 	     git.html
- 
+--- configure.orig	2010-01-09 17:34:34.000000000 -0500
++++ configure	2010-01-09 17:37:54.000000000 -0500
+@@ -31259,6 +31259,7 @@
+     "term/gnuitrc.vt100") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.vt100" ;;
+     "term/gnuitrc.vt102") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.vt102" ;;
+     "term/gnuitrc.xterm") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.xterm" ;;
++    "term/gnuitrc.cons25") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.cons25" ;;
+     "term/gnuitrc.xterm-color") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.xterm-color" ;;
+     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
diff --git a/misc/git/patches/patch-ad b/misc/git/patches/patch-ad
index 0db4504f59d..cd96d7e6af5 100644
--- a/misc/git/patches/patch-ad
+++ b/misc/git/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/01/26 17:58:18 reed Exp $
+$NetBSD: patch-ad,v 1.2 2010/01/18 02:23:52 christos Exp $
 
---- term/.gitrc.cons25.orig	2006-01-26 09:32:11.000000000 -0800
-+++ term/.gitrc.cons25	2006-01-26 09:33:17.000000000 -0800
-@@ -24,7 +24,7 @@
+--- term/gnuitrc.cons25.in.orig	2010-01-08 23:43:40.000000000 -0500
++++ term/gnuitrc.cons25.in	2010-01-09 17:27:03.000000000 -0500
+@@ -38,7 +38,7 @@
  
  [Setup]
  AnsiColors		= ON	# empty means OFF