Move HTML documentation to ${PREFIX}/share/doc/html/ghostscript.

4 files changed, 51 insertions, 47 deletions

diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 0579f814de0..7b97f91c97f 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2001/05/03 04:50:05 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2001/05/03 05:11:43 jlam Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -142,6 +142,7 @@ MAKEFRAGS+=		${FILESDIR}/devs.nox11
 
 GSINST_DIR=		${PREFIX}/share/ghostscript/${GS_VERS}vflib
 DOC_DIR=		${PREFIX}/share/doc/ghostscript
+HTML_DIR=		${PREFIX}/share/doc/html/ghostscript
 LIB_DIR=		${GSINST_DIR}/lib
 
 post-extract:
@@ -203,7 +204,8 @@ do-configure:
 
 post-install:
 	strip ${PREFIX}/bin/gs
-	${INSTALL_DATA} ${WRKDIR}/${LIPS_DRV}/Gdevlips.htm ${DOC_DIR}
+	${INSTALL_DATA_DIR} ${DOC_DIR}
+	${INSTALL_DATA} ${WRKDIR}/${LIPS_DRV}/Gdevlips.htm ${HTML_DIR}
 	${INSTALL_DATA} ${WRKDIR}/${BJ10V_DRV}/gdev10v.jis ${DOC_DIR}
 	${INSTALL_DATA} ${WRKDIR}/gdevdmpr.sj ${DOC_DIR}
 	${INSTALL_DATA} ${WRKDIR}/dmp_init.ps ${LIB_DIR}
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index 2e60f7718c5..4513ebb411f 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/05/03 04:50:05 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/05/03 05:11:43 jlam Exp $
 
 SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
 Size (ghostscript/ghostscript-6.01.tar.bz2) = 2974476 bytes
@@ -26,6 +26,7 @@ SHA1 (ghostscript/gdevprsc-0.2.1.tar.gz) = 2f20889b06b2fee27a47e0aa0ef2de65a63be
 Size (ghostscript/gdevprsc-0.2.1.tar.gz) = 12206 bytes
 SHA1 (ghostscript/gs6.01-jpdf-exp.patch.gz) = 21f427a4c80871edab8c4d748b1fe1b7796cd876
 Size (ghostscript/gs6.01-jpdf-exp.patch.gz) = 59034 bytes
+SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
 SHA1 (patch-aa) = 0d3591e0b50530c2b2dc517979757c9b6304bf3d
 SHA1 (patch-ab) = 26cea522dbe2e2cc57a5fdc60130f309c76c6991
 SHA1 (patch-ac) = 576e0bc659d771f9d634921a0cc6752ab9739a92
@@ -45,7 +46,7 @@ SHA1 (patch-ap) = f742c454b1a058786be0239d84e5fc0b09dc538f
 SHA1 (patch-aq) = 5ff3c415eaae3398a2f39037e439955b95161942
 SHA1 (patch-ar) = 71d21692dfcbd95798743169d73f6b0611f4c007
 SHA1 (patch-as) = 9c1581562be288aba109a2c42db50e1923d60f02
-SHA1 (patch-at) = 47fa47098098ca3db32543a94b21c63a19bac0ba
+SHA1 (patch-at) = f92ad91b5a8278f019a2b4f496447a58e5abf299
 SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
 SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
 SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
diff --git a/print/ghostscript-nox11/patches/patch-at b/print/ghostscript-nox11/patches/patch-at
index 35fc369b5f1..3971c847772 100644
--- a/print/ghostscript-nox11/patches/patch-at
+++ b/print/ghostscript-nox11/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-at,v 1.2 2001/05/03 05:11:43 jlam Exp $
 
 --- src/unix-gcc.mak.orig	Mon May  1 22:07:38 2000
 +++ src/unix-gcc.mak	Mon May  1 22:08:39 2000
@@ -17,7 +17,7 @@ $NetBSD: patch-at,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
  
 -docdir=$(gsdatadir)/doc
 -exdir=$(gsdatadir)/examples
-+docdir=$(datadir)/doc/ghostscript
++docdir=$(datadir)/doc/html/ghostscript
 +exdir=$(datadir)/examples/ghostscript
  vfdir=$(gsdatadir)/vflib
  GS_DOCDIR=$(docdir)
diff --git a/print/ghostscript-nox11/pkg/PLIST b/print/ghostscript-nox11/pkg/PLIST
index 96d0310b2d8..d9dd6d101d4 100644
--- a/print/ghostscript-nox11/pkg/PLIST
+++ b/print/ghostscript-nox11/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/05/28 11:17:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/05/03 05:11:44 jlam Exp $
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
@@ -53,54 +53,54 @@ man/man1/ps2pdf13.1
 man/man1/ps2pdfwr.1
 man/man1/ps2ps.1
 man/man1/wftopfa.1
-share/doc/ghostscript/Bug-form.htm
-share/doc/ghostscript/C-style.htm
-share/doc/ghostscript/Commprod.htm
-share/doc/ghostscript/Copying.htm
-share/doc/ghostscript/Current.htm
-share/doc/ghostscript/DLL.htm
-share/doc/ghostscript/Devices.htm
-share/doc/ghostscript/Drivers.htm
-share/doc/ghostscript/Fonts.htm
-share/doc/ghostscript/Gdevlips.htm
-share/doc/ghostscript/Helpers.htm
-share/doc/ghostscript/Hershey.htm
-share/doc/ghostscript/History1.htm
-share/doc/ghostscript/History2.htm
-share/doc/ghostscript/History3.htm
-share/doc/ghostscript/History4.htm
-share/doc/ghostscript/History5.htm
-share/doc/ghostscript/History6.htm
-share/doc/ghostscript/Htmstyle.htm
-share/doc/ghostscript/Humor.htm
-share/doc/ghostscript/Install.htm
-share/doc/ghostscript/Language.htm
-share/doc/ghostscript/Lib.htm
-share/doc/ghostscript/Make.htm
-share/doc/ghostscript/New-user.htm
-share/doc/ghostscript/News.htm
-share/doc/ghostscript/PUBLIC
-share/doc/ghostscript/Ps2pdf.htm
-share/doc/ghostscript/Psfiles.htm
-share/doc/ghostscript/Public.htm
-share/doc/ghostscript/README
-share/doc/ghostscript/Readme.htm
-share/doc/ghostscript/Release.htm
-share/doc/ghostscript/Source.htm
-share/doc/ghostscript/Tester.htm
-share/doc/ghostscript/Unix-lpr.htm
-share/doc/ghostscript/Use.htm
-share/doc/ghostscript/Xfonts.htm
 share/doc/ghostscript/gdev10v.jis
 share/doc/ghostscript/gdevdmpr.sj
 share/doc/ghostscript/gdevmjc-0.8/MJ700V2C.FAQ
 share/doc/ghostscript/gdevmjc-0.8/README.mjc
 share/doc/ghostscript/gdevmjc-0.8/README.mje
 share/doc/ghostscript/gdevmjc-0.8/README.noz
-share/doc/ghostscript/gdevmjc-0.8/cpem.doc
+share/doc/ghostscript/gdevmjc-0.8/cpem.doc   
 share/doc/ghostscript/gdevprsc.en
 share/doc/ghostscript/gdevprsc.ja
-share/doc/ghostscript/ps2epsi.txt
+share/doc/html/ghostscript/Bug-form.htm
+share/doc/html/ghostscript/C-style.htm
+share/doc/html/ghostscript/Commprod.htm
+share/doc/html/ghostscript/Copying.htm
+share/doc/html/ghostscript/Current.htm
+share/doc/html/ghostscript/DLL.htm
+share/doc/html/ghostscript/Devices.htm
+share/doc/html/ghostscript/Drivers.htm
+share/doc/html/ghostscript/Fonts.htm
+share/doc/html/ghostscript/Gdevlips.htm
+share/doc/html/ghostscript/Helpers.htm
+share/doc/html/ghostscript/Hershey.htm
+share/doc/html/ghostscript/History1.htm
+share/doc/html/ghostscript/History2.htm
+share/doc/html/ghostscript/History3.htm
+share/doc/html/ghostscript/History4.htm
+share/doc/html/ghostscript/History5.htm
+share/doc/html/ghostscript/History6.htm
+share/doc/html/ghostscript/Htmstyle.htm
+share/doc/html/ghostscript/Humor.htm
+share/doc/html/ghostscript/Install.htm
+share/doc/html/ghostscript/Language.htm
+share/doc/html/ghostscript/Lib.htm
+share/doc/html/ghostscript/Make.htm
+share/doc/html/ghostscript/New-user.htm
+share/doc/html/ghostscript/News.htm
+share/doc/html/ghostscript/PUBLIC
+share/doc/html/ghostscript/Ps2pdf.htm
+share/doc/html/ghostscript/Psfiles.htm
+share/doc/html/ghostscript/Public.htm
+share/doc/html/ghostscript/README
+share/doc/html/ghostscript/Readme.htm
+share/doc/html/ghostscript/Release.htm
+share/doc/html/ghostscript/Source.htm
+share/doc/html/ghostscript/Tester.htm
+share/doc/html/ghostscript/Unix-lpr.htm
+share/doc/html/ghostscript/Use.htm
+share/doc/html/ghostscript/Xfonts.htm
+share/doc/html/ghostscript/ps2epsi.txt
 share/examples/ghostscript/alphabet.ps
 share/examples/ghostscript/cheq.ps
 share/examples/ghostscript/chess.ps
@@ -315,5 +315,6 @@ share/ghostscript/6.01vflib/vflib/vchars.ps
 @dirrm share/ghostscript/6.01vflib/lib
 @dirrm share/ghostscript/6.01vflib
 @dirrm share/examples/ghostscript
+@dirrm share/doc/html/ghostscript
 @dirrm share/doc/ghostscript/gdevmjc-0.8
 @dirrm share/doc/ghostscript