Upgrade to git-4.3.17

Change MAINTAINER from ports->me

10 files changed, 92 insertions, 28 deletions

diff --git a/misc/git/Makefile b/misc/git/Makefile
index adff7649bffb..3f85872875ad 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:	git
-# Version required:	4.3.16
+# Version required:	4.3.17
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp $
+# $Id: Makefile,v 1.9 1997/10/07 08:56:30 tg Exp $
 #
 
-DISTNAME=	git-4.3.16
+DISTNAME=	git-4.3.17
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	jseger@FreeBSD.ORG
 
 GNU_CONFIGURE=	YES
 MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 \
 		gitps.1 gitrgrep.1 gitview.1
 
-pre-install:
+pre-patch:
 	${CP} ${WRKSRC}/term/.gitrc.ansi \
 		${WRKSRC}/term/.gitrc.cons25
-	(cd ${WRKSRC}/term ; patch --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
 
 .include <bsd.port.mk>
diff --git a/misc/git/distinfo b/misc/git/distinfo
index 24e6f2d4daf5..dfff8f0ee19c 100644
--- a/misc/git/distinfo
+++ b/misc/git/distinfo
@@ -1 +1 @@
-MD5 (git-4.3.16.tar.gz) = 24573e5983e437ea0f4368e4b6308463
+MD5 (git-4.3.17.tar.gz) = cea08ad494a1b801acac00c14e5147f0
diff --git a/misc/git/files/patch-ab b/misc/git/files/patch-ab
index c912d1dfffa0..2756203389ac 100644
--- a/misc/git/files/patch-ab
+++ b/misc/git/files/patch-ab
@@ -1,11 +1,11 @@
---- term/Makefile.in.orig	Tue Dec  3 01:06:49 1996
-+++ term/Makefile.in	Tue Oct  7 10:24:36 1997
-@@ -43,7 +43,7 @@
+--- 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.common .gitrc.minix .gitrc.aixterm .gitrc.hft\
--		  .gitrc.mach .gitrc.xterm-color
-+		  .gitrc.mach .gitrc.xterm-color .gitrc.cons25
+ 		  .gitrc.minix .gitrc.aixterm .gitrc.hft .gitrc.mach\
+-		  .gitrc.xterm-color
++		  .gitrc.xterm-color .gitrc.cons25
  
- GIT_GENERICS	= .gitrc.sun .gitrc.sun-cmd .gitrc.pc3
+ 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
new file mode 100644
index 000000000000..5363a376f6b0
--- /dev/null
+++ b/misc/git/files/patch-ac
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/misc/git/pkg-plist
index 9451dfb61b7d..dd96d8cb80a7 100644
--- a/misc/git/pkg-plist
+++ b/misc/git/pkg-plist
@@ -14,17 +14,35 @@ 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
@@ -40,6 +58,7 @@ 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
 man/man1/git.1.gz
 man/man1/gitaction.1.gz
@@ -48,3 +67,6 @@ man/man1/gitkeys.1.gz
 man/man1/gitrgrep.1.gz
 man/man1/gitps.1.gz
 man/man1/gitview.1.gz
+@dirrm lib/git/term
+@dirrm lib/git/html
+@dirrm lib/git
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index adff7649bffb..3f85872875ad 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:	git
-# Version required:	4.3.16
+# Version required:	4.3.17
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp $
+# $Id: Makefile,v 1.9 1997/10/07 08:56:30 tg Exp $
 #
 
-DISTNAME=	git-4.3.16
+DISTNAME=	git-4.3.17
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	jseger@FreeBSD.ORG
 
 GNU_CONFIGURE=	YES
 MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 \
 		gitps.1 gitrgrep.1 gitview.1
 
-pre-install:
+pre-patch:
 	${CP} ${WRKSRC}/term/.gitrc.ansi \
 		${WRKSRC}/term/.gitrc.cons25
-	(cd ${WRKSRC}/term ; patch --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
 
 .include <bsd.port.mk>
diff --git a/misc/gnuit/distinfo b/misc/gnuit/distinfo
index 24e6f2d4daf5..dfff8f0ee19c 100644
--- a/misc/gnuit/distinfo
+++ b/misc/gnuit/distinfo
@@ -1 +1 @@
-MD5 (git-4.3.16.tar.gz) = 24573e5983e437ea0f4368e4b6308463
+MD5 (git-4.3.17.tar.gz) = cea08ad494a1b801acac00c14e5147f0
diff --git a/misc/gnuit/files/patch-ab b/misc/gnuit/files/patch-ab
index c912d1dfffa0..2756203389ac 100644
--- a/misc/gnuit/files/patch-ab
+++ b/misc/gnuit/files/patch-ab
@@ -1,11 +1,11 @@
---- term/Makefile.in.orig	Tue Dec  3 01:06:49 1996
-+++ term/Makefile.in	Tue Oct  7 10:24:36 1997
-@@ -43,7 +43,7 @@
+--- 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.common .gitrc.minix .gitrc.aixterm .gitrc.hft\
--		  .gitrc.mach .gitrc.xterm-color
-+		  .gitrc.mach .gitrc.xterm-color .gitrc.cons25
+ 		  .gitrc.minix .gitrc.aixterm .gitrc.hft .gitrc.mach\
+-		  .gitrc.xterm-color
++		  .gitrc.xterm-color .gitrc.cons25
  
- GIT_GENERICS	= .gitrc.sun .gitrc.sun-cmd .gitrc.pc3
+ 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
new file mode 100644
index 000000000000..5363a376f6b0
--- /dev/null
+++ b/misc/gnuit/files/patch-ac
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/misc/gnuit/pkg-plist
index 9451dfb61b7d..dd96d8cb80a7 100644
--- a/misc/gnuit/pkg-plist
+++ b/misc/gnuit/pkg-plist
@@ -14,17 +14,35 @@ 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
@@ -40,6 +58,7 @@ 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
 man/man1/git.1.gz
 man/man1/gitaction.1.gz
@@ -48,3 +67,6 @@ man/man1/gitkeys.1.gz
 man/man1/gitrgrep.1.gz
 man/man1/gitps.1.gz
 man/man1/gitview.1.gz
+@dirrm lib/git/term
+@dirrm lib/git/html
+@dirrm lib/git