We have a ${PREFIX}/share/doc/html for HTML documentation, so use it.

4 files changed, 36 insertions, 28 deletions

diff --git a/print/gv/files/patch-sum b/print/gv/files/patch-sum
index 40937b5cfb5..3c009d7343f 100644
--- a/print/gv/files/patch-sum
+++ b/print/gv/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/04/10 00:06:11 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/08 16:23:16 jlam Exp $
 
-MD5 (patch-aa) = 02c1e58d4e1a363525bb0f2387e24412
-MD5 (patch-ab) = 58d7eb2947154b064b8a94917dea314e
+MD5 (patch-aa) = e6b36d900698dc8ee56c9a13639ff8c6
+MD5 (patch-ab) = 71f0f719f89a7dec2236173c0f2d8d5c
 MD5 (patch-ae) = d7a3d75beab5e22a40317e6424a80e1a
 MD5 (patch-af) = 933e6c31e18d915bda649e7b2634f13d
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
index c11cbec04fe..29733a4b632 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 1998/12/23 23:21:26 frueauf Exp $
+$NetBSD: patch-aa,v 1.6 2000/12/08 16:23:16 jlam Exp $
 
---- config.Unix.orig	Sat Jun  7 00:00:00 1997
-+++ config.Unix	Thu Dec 24 00:12:17 1998
-@@ -32,10 +32,10 @@
+--- config.Unix.orig	Fri Jun  6 18:00:00 1997
++++ config.Unix
+@@ -32,10 +32,11 @@
  XCOMM --------------------------------------------------------------------
  XCOMM  Destination directories.
  XCOMM --------------------------------------------------------------------
@@ -12,12 +12,13 @@ $NetBSD: patch-aa,v 1.5 1998/12/23 23:21:26 frueauf Exp $
 -      GV_MANDIR    = /usr/local/man/man1/
 +      GV_BINDIR    = $(BINDIR)
 +      GV_DOCDIR    = $(BINDIR)/../share/doc/gv
++      GV_HTMLDIR   = $(BINDIR)/../share/doc/html/gv
 +      GV_LIBDIR    = $(LIBDIR)/gv/
 +      GV_MANDIR    = $(MANDIR)
  
  XCOMM --------------------------------------------------------------------
  XCOMM --- The name of the Xaw3d library.
-@@ -110,7 +110,7 @@
+@@ -110,7 +111,7 @@
  XCOMM --------------------------------------------------------------------
  XCOMM --- Use extra code for setenv() and getenv() ?
  XCOMM --------------------------------------------------------------------
diff --git a/print/gv/patches/patch-ab b/print/gv/patches/patch-ab
index cc45fcd8dfd..afd4bcf5dff 100644
--- a/print/gv/patches/patch-ab
+++ b/print/gv/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 1998/12/23 23:09:59 frueauf Exp $
+$NetBSD: patch-ab,v 1.4 2000/12/08 16:23:16 jlam Exp $
 
 --- doc/Imakefile.orig	Fri Jun  6 18:00:00 1997
-+++ doc/Imakefile	Tue Dec 22 01:28:02 1998
++++ doc/Imakefile
 @@ -27,10 +27,6 @@
  GV_CONFIG_FILE = ../config.Unix
  #include "../config.Unix"
@@ -13,3 +13,9 @@ $NetBSD: patch-ab,v 1.3 1998/12/23 23:09:59 frueauf Exp $
  #ifndef InstallDocFiles
  #define InstallDocFiles(file,destdir)				@@\
  install.doc::							@@\
+@@ -52,4 +48,4 @@
+ InstallDocFile(key-bindings.txt-gz,key-bindings.txt.gz,$(GV_DOCDIR))
+ InstallDocFile(comments.doc-gz,comments.doc.gz,$(GV_DOCDIR))
+ InstallDocFile(gv.ps-gz,gv.ps.gz,$(GV_DOCDIR))
+-InstallDocFiles(gv*.html,$(GV_DOCDIR))
++InstallDocFiles(gv*.html,$(GV_HTMLDIR))
diff --git a/print/gv/pkg/PLIST b/print/gv/pkg/PLIST
index 0a095c329d3..77a5fed94ef 100644
--- a/print/gv/pkg/PLIST
+++ b/print/gv/pkg/PLIST
@@ -1,29 +1,30 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/24 22:39:04 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/12/08 16:23:17 jlam Exp $
 bin/gv
 lib/X11/app-defaults/GV
 lib/X11/gv/gv_class.ad
 lib/X11/gv/gv_system.ad
 lib/X11/gv/gv_user.ad
-man/cat1/gv.0.gz
+man/cat1/gv.0
 share/doc/gv/comments.doc.gz
 share/doc/gv/gs.interface.gz
-share/doc/gv/gv-1.html
-share/doc/gv/gv-10.html
-share/doc/gv/gv-11.html
-share/doc/gv/gv-12.html
-share/doc/gv/gv-13.html
-share/doc/gv/gv-2.html
-share/doc/gv/gv-3.html
-share/doc/gv/gv-4.html
-share/doc/gv/gv-5.html
-share/doc/gv/gv-6.html
-share/doc/gv/gv-7.html
-share/doc/gv/gv-8.html
-share/doc/gv/gv-9.html
-share/doc/gv/gv-faq.html
 share/doc/gv/gv-faq.txt.gz
-share/doc/gv/gv.html
 share/doc/gv/gv.ps.gz
 share/doc/gv/key-bindings.txt.gz
-@dirrm lib/X11/gv
+share/doc/html/gv/gv-1.html
+share/doc/html/gv/gv-10.html
+share/doc/html/gv/gv-11.html
+share/doc/html/gv/gv-12.html
+share/doc/html/gv/gv-13.html
+share/doc/html/gv/gv-2.html
+share/doc/html/gv/gv-3.html
+share/doc/html/gv/gv-4.html
+share/doc/html/gv/gv-5.html
+share/doc/html/gv/gv-6.html
+share/doc/html/gv/gv-7.html
+share/doc/html/gv/gv-8.html
+share/doc/html/gv/gv-9.html
+share/doc/html/gv/gv-faq.html
+share/doc/html/gv/gv.html
+@dirrm share/doc/html/gv
 @dirrm share/doc/gv
+@dirrm lib/X11/gv