Upgrade to git-4.3.19

10 files changed, 148 insertions, 138 deletions

diff --git a/misc/git/Makefile b/misc/git/Makefile
index 203c78d899b4..6f3dc4485cb3 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	git
-# Version required:	4.3.17
+# Version required:	4.3.19
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	git-4.3.17
+DISTNAME=	git-4.3.19
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	git
@@ -15,7 +15,7 @@ MAINTAINER=	jseger@FreeBSD.org
 
 GNU_CONFIGURE=	YES
 MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 \
-		gitps.1 gitrgrep.1 gitview.1
+		gitrgrep.1 gitunpack.1
 
 pre-patch:
 	${CP} ${WRKSRC}/term/.gitrc.ansi \
diff --git a/misc/git/distinfo b/misc/git/distinfo
index dfff8f0ee19c..8d3faee53bf3 100644
--- a/misc/git/distinfo
+++ b/misc/git/distinfo
@@ -1 +1 @@
-MD5 (git-4.3.17.tar.gz) = cea08ad494a1b801acac00c14e5147f0
+MD5 (git-4.3.19.tar.gz) = 43b626807b80b7a540b96154594c09d2
diff --git a/misc/git/files/patch-ab b/misc/git/files/patch-ab
index 2756203389ac..9f762537c32d 100644
--- a/misc/git/files/patch-ab
+++ b/misc/git/files/patch-ab
@@ -1,11 +1,14 @@
---- term/Makefile.in.orig	Sat Mar 14 16:31:20 1998
-+++ term/Makefile.in	Sun May  3 13:01:42 1998
-@@ -46,7 +46,7 @@
- GIT_TERMS	= .gitrc.thix .gitrc.linux .gitrc.vt100 .gitrc.vt102\
- 		  .gitrc.xterm .gitrc.hpterm .gitrc.ansi .gitrc.generic\
- 		  .gitrc.minix .gitrc.aixterm .gitrc.hft .gitrc.mach\
--		  .gitrc.xterm-color
-+		  .gitrc.xterm-color .gitrc.cons25
+--- 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@
  
- GIT_GENERICS	= .gitrc.sun .gitrc.sun-cmd .gitrc.eterm .gitrc.pc3
+-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-ad b/misc/git/files/patch-ad
new file mode 100644
index 000000000000..5fe99f426b1c
--- /dev/null
+++ b/misc/git/files/patch-ad
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/misc/git/pkg-plist
index f435de5640e7..78a252d436fc 100644
--- a/misc/git/pkg-plist
+++ b/misc/git/pkg-plist
@@ -1,65 +1,56 @@
+bin/.gitaction
 bin/git
-bin/gitps
-bin/gitview
+bin/gitaction
 bin/gitkeys
-bin/gitwipe
+bin/gitmkdirs
 bin/gitmount
-bin/gitaction
+bin/gitps
 bin/gitrgrep
+bin/gitunpack
+bin/gitview
+bin/gitwhich
+bin/gitwipe
 bin/gitxgrep
-bin/.gitaction
-bin/gitregrep
-bin/gitrfgrep
 info/git.info
 info/git.info-1
 info/git.info-2
 info/git.info-3
-lib/git/html/git_1.html
-lib/git/html/git_10.html
-lib/git/html/git_2.html
-lib/git/html/git_3.html
-lib/git/html/git_4.html
-lib/git/html/git_5.html
-lib/git/html/git_6.html
-lib/git/html/git_7.html
-lib/git/html/git_8.html
-lib/git/html/git_9.html
-lib/git/html/git_toc.html
-lib/git/term/.gitrc.aixterm
-lib/git/term/.gitrc.ansi
-lib/git/term/.gitrc.common
-lib/git/term/.gitrc.cons25
-lib/git/term/.gitrc.console
-lib/git/term/.gitrc.dtterm
-lib/git/term/.gitrc.eterm
-lib/git/term/.gitrc.generic
-lib/git/term/.gitrc.hft
-lib/git/term/.gitrc.hp
-lib/git/term/.gitrc.hpterm
-lib/git/term/.gitrc.iris-ansi
-lib/git/term/.gitrc.iris-ansi-net
-lib/git/term/.gitrc.linux
-lib/git/term/.gitrc.mach
-lib/git/term/.gitrc.minix
-lib/git/term/.gitrc.pc3
-lib/git/term/.gitrc.screen
-lib/git/term/.gitrc.sun
-lib/git/term/.gitrc.sun-cmd
-lib/git/term/.gitrc.thix
-lib/git/term/.gitrc.vt100
-lib/git/term/.gitrc.vt102
-lib/git/term/.gitrc.vt125
-lib/git/term/.gitrc.vt200
-lib/git/term/.gitrc.vt201
-lib/git/term/.gitrc.vt220
-lib/git/term/.gitrc.vt240
-lib/git/term/.gitrc.vt300
-lib/git/term/.gitrc.vt320
-lib/git/term/.gitrc.vt400
-lib/git/term/.gitrc.vt420
-lib/git/term/.gitrc.xterm
-lib/git/term/.gitrc.xterm-color
-lib/git/term/.gitrc.xterms
-@dirrm lib/git/term
-@dirrm lib/git/html
-@dirrm lib/git
+share/git/.gitrc.aixterm
+share/git/.gitrc.ansi
+share/git/.gitrc.common
+share/git/.gitrc.cons25
+share/git/.gitrc.console
+share/git/.gitrc.dtterm
+share/git/.gitrc.eterm
+share/git/.gitrc.generic
+share/git/.gitrc.hft
+share/git/.gitrc.hp
+share/git/.gitrc.hpterm
+share/git/.gitrc.iris-ansi
+share/git/.gitrc.iris-ansi-net
+share/git/.gitrc.linux
+share/git/.gitrc.mach
+share/git/.gitrc.minix
+share/git/.gitrc.pc3
+share/git/.gitrc.rxvt
+share/git/.gitrc.screen
+share/git/.gitrc.sun
+share/git/.gitrc.sun-cmd
+share/git/.gitrc.thix
+share/git/.gitrc.vt100
+share/git/.gitrc.vt102
+share/git/.gitrc.vt125
+share/git/.gitrc.vt200
+share/git/.gitrc.vt201
+share/git/.gitrc.vt220
+share/git/.gitrc.vt240
+share/git/.gitrc.vt300
+share/git/.gitrc.vt320
+share/git/.gitrc.vt400
+share/git/.gitrc.vt420
+share/git/.gitrc.xterm
+share/git/.gitrc.xterm-color
+share/git/.gitrc.xterm-debian
+share/git/.gitrc.xterms
+share/git/git.html
+@dirrm share/git
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 203c78d899b4..6f3dc4485cb3 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	git
-# Version required:	4.3.17
+# Version required:	4.3.19
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	git-4.3.17
+DISTNAME=	git-4.3.19
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	git
@@ -15,7 +15,7 @@ MAINTAINER=	jseger@FreeBSD.org
 
 GNU_CONFIGURE=	YES
 MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 \
-		gitps.1 gitrgrep.1 gitview.1
+		gitrgrep.1 gitunpack.1
 
 pre-patch:
 	${CP} ${WRKSRC}/term/.gitrc.ansi \
diff --git a/misc/gnuit/distinfo b/misc/gnuit/distinfo
index dfff8f0ee19c..8d3faee53bf3 100644
--- a/misc/gnuit/distinfo
+++ b/misc/gnuit/distinfo
@@ -1 +1 @@
-MD5 (git-4.3.17.tar.gz) = cea08ad494a1b801acac00c14e5147f0
+MD5 (git-4.3.19.tar.gz) = 43b626807b80b7a540b96154594c09d2
diff --git a/misc/gnuit/files/patch-ab b/misc/gnuit/files/patch-ab
index 2756203389ac..9f762537c32d 100644
--- a/misc/gnuit/files/patch-ab
+++ b/misc/gnuit/files/patch-ab
@@ -1,11 +1,14 @@
---- term/Makefile.in.orig	Sat Mar 14 16:31:20 1998
-+++ term/Makefile.in	Sun May  3 13:01:42 1998
-@@ -46,7 +46,7 @@
- GIT_TERMS	= .gitrc.thix .gitrc.linux .gitrc.vt100 .gitrc.vt102\
- 		  .gitrc.xterm .gitrc.hpterm .gitrc.ansi .gitrc.generic\
- 		  .gitrc.minix .gitrc.aixterm .gitrc.hft .gitrc.mach\
--		  .gitrc.xterm-color
-+		  .gitrc.xterm-color .gitrc.cons25
+--- 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@
  
- GIT_GENERICS	= .gitrc.sun .gitrc.sun-cmd .gitrc.eterm .gitrc.pc3
+-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-ad b/misc/gnuit/files/patch-ad
new file mode 100644
index 000000000000..5fe99f426b1c
--- /dev/null
+++ b/misc/gnuit/files/patch-ad
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/misc/gnuit/pkg-plist
index f435de5640e7..78a252d436fc 100644
--- a/misc/gnuit/pkg-plist
+++ b/misc/gnuit/pkg-plist
@@ -1,65 +1,56 @@
+bin/.gitaction
 bin/git
-bin/gitps
-bin/gitview
+bin/gitaction
 bin/gitkeys
-bin/gitwipe
+bin/gitmkdirs
 bin/gitmount
-bin/gitaction
+bin/gitps
 bin/gitrgrep
+bin/gitunpack
+bin/gitview
+bin/gitwhich
+bin/gitwipe
 bin/gitxgrep
-bin/.gitaction
-bin/gitregrep
-bin/gitrfgrep
 info/git.info
 info/git.info-1
 info/git.info-2
 info/git.info-3
-lib/git/html/git_1.html
-lib/git/html/git_10.html
-lib/git/html/git_2.html
-lib/git/html/git_3.html
-lib/git/html/git_4.html
-lib/git/html/git_5.html
-lib/git/html/git_6.html
-lib/git/html/git_7.html
-lib/git/html/git_8.html
-lib/git/html/git_9.html
-lib/git/html/git_toc.html
-lib/git/term/.gitrc.aixterm
-lib/git/term/.gitrc.ansi
-lib/git/term/.gitrc.common
-lib/git/term/.gitrc.cons25
-lib/git/term/.gitrc.console
-lib/git/term/.gitrc.dtterm
-lib/git/term/.gitrc.eterm
-lib/git/term/.gitrc.generic
-lib/git/term/.gitrc.hft
-lib/git/term/.gitrc.hp
-lib/git/term/.gitrc.hpterm
-lib/git/term/.gitrc.iris-ansi
-lib/git/term/.gitrc.iris-ansi-net
-lib/git/term/.gitrc.linux
-lib/git/term/.gitrc.mach
-lib/git/term/.gitrc.minix
-lib/git/term/.gitrc.pc3
-lib/git/term/.gitrc.screen
-lib/git/term/.gitrc.sun
-lib/git/term/.gitrc.sun-cmd
-lib/git/term/.gitrc.thix
-lib/git/term/.gitrc.vt100
-lib/git/term/.gitrc.vt102
-lib/git/term/.gitrc.vt125
-lib/git/term/.gitrc.vt200
-lib/git/term/.gitrc.vt201
-lib/git/term/.gitrc.vt220
-lib/git/term/.gitrc.vt240
-lib/git/term/.gitrc.vt300
-lib/git/term/.gitrc.vt320
-lib/git/term/.gitrc.vt400
-lib/git/term/.gitrc.vt420
-lib/git/term/.gitrc.xterm
-lib/git/term/.gitrc.xterm-color
-lib/git/term/.gitrc.xterms
-@dirrm lib/git/term
-@dirrm lib/git/html
-@dirrm lib/git
+share/git/.gitrc.aixterm
+share/git/.gitrc.ansi
+share/git/.gitrc.common
+share/git/.gitrc.cons25
+share/git/.gitrc.console
+share/git/.gitrc.dtterm
+share/git/.gitrc.eterm
+share/git/.gitrc.generic
+share/git/.gitrc.hft
+share/git/.gitrc.hp
+share/git/.gitrc.hpterm
+share/git/.gitrc.iris-ansi
+share/git/.gitrc.iris-ansi-net
+share/git/.gitrc.linux
+share/git/.gitrc.mach
+share/git/.gitrc.minix
+share/git/.gitrc.pc3
+share/git/.gitrc.rxvt
+share/git/.gitrc.screen
+share/git/.gitrc.sun
+share/git/.gitrc.sun-cmd
+share/git/.gitrc.thix
+share/git/.gitrc.vt100
+share/git/.gitrc.vt102
+share/git/.gitrc.vt125
+share/git/.gitrc.vt200
+share/git/.gitrc.vt201
+share/git/.gitrc.vt220
+share/git/.gitrc.vt240
+share/git/.gitrc.vt300
+share/git/.gitrc.vt320
+share/git/.gitrc.vt400
+share/git/.gitrc.vt420
+share/git/.gitrc.xterm
+share/git/.gitrc.xterm-color
+share/git/.gitrc.xterm-debian
+share/git/.gitrc.xterms
+share/git/git.html
+@dirrm share/git