Install documentation in a canonical pkgsrc directory.

Sort and clean PLIST.
Bump PKGREVISION.

4 files changed, 63 insertions, 43 deletions

diff --git a/misc/git/Makefile b/misc/git/Makefile
index ea9af764a89..7f7e30fd658 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2003/08/03 00:02:44 seb Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/03 00:12:30 seb Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
 #
 
 DISTNAME=	git-4.3.17
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=git/}
 
@@ -21,8 +22,4 @@ pre-install:
 		${WRKSRC}/term/.gitrc.cons25
 	(cd ${WRKSRC}/term ; ${PATCH} --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc
-	${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/git/PLIST b/misc/git/PLIST
index 1b31048a4e6..15a47ee4968 100644
--- a/misc/git/PLIST
+++ b/misc/git/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/03 00:02:44 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/08/03 00:12:30 seb Exp $
+bin/.gitaction
 bin/git
-bin/gitps
-bin/gitview
+bin/gitaction
 bin/gitkeys
-bin/gitwipe
+bin/gitmkdirs
 bin/gitmount
-bin/gitaction
-bin/gitrgrep
-bin/gitxgrep
-bin/.gitaction
+bin/gitps
 bin/gitregrep
 bin/gitrfgrep
+bin/gitrgrep
 bin/gitunpack
-bin/gitmkdirs
+bin/gitview
+bin/gitwipe
+bin/gitxgrep
 info/git.info
 info/git.info-1
 info/git.info-2
@@ -22,12 +22,19 @@ 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
@@ -43,34 +50,27 @@ lib/git/term/.gitrc.vt320
 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
+lib/git/term/.gitrc.xterms
+man/man1/git.1
+man/man1/gitaction.1
+man/man1/gitkeys.1
+man/man1/gitmount.1
+man/man1/gitps.1
+man/man1/gitrgrep.1
+man/man1/gitunpack.1
+man/man1/gitview.1
+share/doc/html/git/git_1.html
+share/doc/html/git/git_10.html
+share/doc/html/git/git_2.html
+share/doc/html/git/git_3.html
+share/doc/html/git/git_4.html
+share/doc/html/git/git_5.html
+share/doc/html/git/git_6.html
+share/doc/html/git/git_7.html
+share/doc/html/git/git_8.html
+share/doc/html/git/git_9.html
+share/doc/html/git/git_toc.html
+@dirrm share/doc/html/git
 @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/gitkeys.1.gz
-man/man1/gitmount.1.gz
-man/man1/gitps.1.gz
-man/man1/gitrgrep.1.gz
-man/man1/gitunpack.1.gz
-man/man1/gitview.1.gz
diff --git a/misc/git/distinfo b/misc/git/distinfo
index 5561ee45f47..4b7ac146771 100644
--- a/misc/git/distinfo
+++ b/misc/git/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/08/03 00:12:31 seb Exp $
 
 SHA1 (git-4.3.17.tar.gz) = f822365367508a2b6900092a2c36c9d82dcc250b
 Size (git-4.3.17.tar.gz) = 402888 bytes
 SHA1 (patch-aa) = f8c73bf43f75a7b58293cc16afa60f2d70125ae0
 SHA1 (patch-ab) = 53f4e2d24435db4aed7e61904dafe1d2e5de6463
+SHA1 (patch-ac) = 3c4a15ed06fb8c7e82aebf4933234e37cc378134
diff --git a/misc/git/patches/patch-ac b/misc/git/patches/patch-ac
new file mode 100644
index 00000000000..a4da3795df3
--- /dev/null
+++ b/misc/git/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2003/08/03 00:12:31 seb Exp $
+
+--- html/Makefile.in.orig	1998-03-14 21:31:20.000000000 +0000
++++ html/Makefile.in
+@@ -32,7 +32,7 @@ srcdir		= @srcdir@
+ VPATH		= @srcdir@
+ 
+ prefix		= @prefix@
+-htmldir		= $(prefix)/lib/git/html
++htmldir		= $(prefix)/share/doc/html/git
+ 
+ SHELL		= /bin/sh
+ TEXI2HTML	= @TEXI2HTML@
+@@ -55,7 +55,7 @@ git_toc.html: $(srcdir)/../info/git.texi
+ 
+ install-strip: install
+ 
+-install: all install-only
++install: all install-dirs install-only
+ 
+ install-only:
+ 	for i in git_*.html;\