Update to V3.4.17

5 files changed, 41 insertions, 21 deletions

diff --git a/misc/git/Makefile b/misc/git/Makefile
index b22d3913a90..79050deaffb 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -3,11 +3,11 @@
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $NetBSD: Makefile,v 1.5 1998/02/09 07:10:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/03/16 08:52:11 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
 #
 
-DISTNAME=	git-4.3.11
+DISTNAME=	git-4.3.17
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 
@@ -27,6 +27,8 @@ pre-install:
 	(cd ${WRKSRC}/term ; ${PATCH} --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
 
 post-install:
-	@install-info ${PREFIX}/info/git.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/git.info ${PREFIX}/info/dir
+	${MKDIR} ${PREFIX}/share/doc
+	${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git
 
 .include <bsd.port.mk>
diff --git a/misc/git/files/md5 b/misc/git/files/md5
index 9ccebb79fb7..dfff8f0ee19 100644
--- a/misc/git/files/md5
+++ b/misc/git/files/md5
@@ -1 +1 @@
-MD5 (git-4.3.11.tar.gz) = c29d348a9559860766cf97f043010a2b
+MD5 (git-4.3.17.tar.gz) = cea08ad494a1b801acac00c14e5147f0
diff --git a/misc/git/patches/patch-aa b/misc/git/patches/patch-aa
index ecc6c8db386..e82ac97ac0d 100644
--- a/misc/git/patches/patch-aa
+++ b/misc/git/patches/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Sat Jun 15 16:30:57 1996
-+++ src/Makefile.in	Sat Jun 15 16:36:16 1996
-@@ -100,7 +100,7 @@
+]2;feyrer@yui:/usr/pkgsrc/misc/git/work/git-4.3.17 ]1;yui--- src/Makefile.in.orig	Mon Mar 16 09:14:52 1998
++++ src/Makefile.in	Mon Mar 16 09:15:03 1998
+@@ -132,7 +132,7 @@
  	for i in $(GIT_SCRIPTS);\
  	do\
  	    rm -f $(bindir)/$$i;\
 -	    $(INSTALL_PROGRAM) $(srcdir)/$$i $(bindir)/$$i;\
-+	    $(INSTALL) $(srcdir)/$$i $(bindir)/$$i;\
++	    $(BSD_INSTALL_SCRIPT) $(srcdir)/$$i $(bindir)/$$i;\
  	done
  	for i in $(GIT_RGREPS);\
  	do\
diff --git a/misc/git/patches/patch-ab b/misc/git/patches/patch-ab
index 17e8d727ae1..6c756926263 100644
--- a/misc/git/patches/patch-ab
+++ b/misc/git/patches/patch-ab
@@ -1,12 +1,11 @@
---- term/Makefile.in.orig	Sat Jun 15 17:11:32 1996
-+++ term/Makefile.in	Sat Jun 15 17:11:57 1996
-@@ -42,7 +42,8 @@
- 
+]2;feyrer@yui:/usr/pkgsrc/misc/git/work/git-4.3.17 ]1;yui--- term/Makefile.in.orig	Mon Mar 16 09:16:27 1998
++++ term/Makefile.in	Mon Mar 16 09:16:46 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.common .gitrc.minix .gitrc.aixterm .gitrc.hft\
-+		  .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
+ GIT_GENERICS	= .gitrc.sun .gitrc.sun-cmd .gitrc.eterm .gitrc.pc3
  
diff --git a/misc/git/pkg/PLIST b/misc/git/pkg/PLIST
index 038d327f21e..68985cc05eb 100644
--- a/misc/git/pkg/PLIST
+++ b/misc/git/pkg/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 1998/01/24 21:05:51 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/03/16 08:52:12 hubertf Exp $
 bin/git
 bin/gitps
 bin/gitview
-bin/gitcmp
 bin/gitkeys
 bin/gitwipe
 bin/gitmount
 bin/gitaction
-bin/gitredir
 bin/gitrgrep
 bin/gitxgrep
 bin/.gitaction
 bin/gitregrep
 bin/gitrfgrep
+bin/gitunpack
+bin/gitmkdirs
 @unexec %D/bin/install-info --delete %D/info/git.info %D/info/dir
 info/git.info
 info/git.info-1
@@ -46,14 +46,33 @@ lib/git/term/.gitrc.vt400
 lib/git/term/.gitrc.vt420
 lib/git/term/.gitrc.xterm
 lib/git/term/.gitrc.xterms
+lib/git/term/.gitrc.mach
+lib/git/term/.gitrc.xterm-color
+lib/git/term/.gitrc.dtterm
+lib/git/term/.gitrc.eterm
+lib/git/term/.gitrc.pc3
+lib/git/term/.gitrc.screen
+lib/git/term/.gitrc.iris-ansi
+lib/git/term/.gitrc.iris-ansi-net
 @dirrm lib/git/term
 @dirrm lib/git
+share/doc/git/git_1.html
+share/doc/git/git_10.html
+share/doc/git/git_2.html
+share/doc/git/git_3.html
+share/doc/git/git_4.html
+share/doc/git/git_5.html
+share/doc/git/git_6.html
+share/doc/git/git_7.html
+share/doc/git/git_8.html
+share/doc/git/git_9.html
+share/doc/git/git_toc.html
+@dirrm share/doc/git
 man/man1/git.1.gz
 man/man1/gitaction.1.gz
 man/man1/gitmount.1.gz
-man/man1/gitcmp.1.gz
 man/man1/gitkeys.1.gz
-man/man1/gitredir.1.gz
 man/man1/gitrgrep.1.gz
 man/man1/gitps.1.gz
 man/man1/gitview.1.gz
+man/man1/gitunpack.1