Cosmetics: use doc/ghostscript instead of doc/html/ghostscript; use SUBST framework

5 files changed, 68 insertions, 70 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index d66fbe07af0..5b5db37d3e6 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/22 17:20:39 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2006/05/23 09:37:46 adam Exp $
 
 DISTNAME=	ghostscript-8.54
 PKGNAME=	ghostscript-afpl-8.54
@@ -23,17 +23,18 @@ EXTRACT_ONLY=		${GS_SRCS}
 
 GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
 
+SUBST_CLASSES+=		resdir
+SUBST_STAGE.resdir=	post-extract
+SUBST_MESSAGE.resdir=	Fixing resource directory path
+SUBST_FILES.resdir=	lib/gs_res.ps
+SUBST_SED.resdir=	-e "s|/Resource/|${GS_RESOURCEDIR}/|g"
+
 post-extract:
 	${MKDIR} ${WRKSRC}/bin
 	${MKDIR} ${WRKSRC}/obj
 	${MV} ${WRKSRC}/jasper ${WRKSRC}/jasper.dontuse
 	${MV} ${WRKSRC}/libpng ${WRKSRC}/libpng.dontuse
 	${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib.dontuse
-	cd ${WRKSRC}/lib; for file in gs_res.ps; do			\
-		${SED}  -e "s|/Resource/|${GS_RESOURCEDIR}/|g"		\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/print/ghostscript-afpl/PLIST b/print/ghostscript-afpl/PLIST
index bb11bec9092..78209178a59 100644
--- a/print/ghostscript-afpl/PLIST
+++ b/print/ghostscript-afpl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/22 17:20:39 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/23 09:37:46 adam Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
@@ -68,55 +68,55 @@ man/man1/ps2pdf13.1
 man/man1/ps2pdfwr.1
 man/man1/ps2ps.1
 man/man1/wftopfa.1
-share/doc/html/ghostscript/API.htm
-share/doc/html/ghostscript/C-style.htm
-share/doc/html/ghostscript/Changes.htm
-share/doc/html/ghostscript/Commprod.htm
-share/doc/html/ghostscript/Copying.htm
-share/doc/html/ghostscript/DLL.htm
-share/doc/html/ghostscript/Deprecated.htm
-share/doc/html/ghostscript/Details.htm
-share/doc/html/ghostscript/Details8.htm
-share/doc/html/ghostscript/Develop.htm
-share/doc/html/ghostscript/Devices.htm
-share/doc/html/ghostscript/Drivers.htm
-share/doc/html/ghostscript/Fonts.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/History7.htm
-share/doc/html/ghostscript/History8.htm
-share/doc/html/ghostscript/Htmstyle.htm
-share/doc/html/ghostscript/Humor.htm
-share/doc/html/ghostscript/Install.htm
-share/doc/html/ghostscript/Issues.htm
-share/doc/html/ghostscript/Language.htm
-share/doc/html/ghostscript/Lib.htm
-share/doc/html/ghostscript/Maintain.htm
-share/doc/html/ghostscript/Make.htm
-share/doc/html/ghostscript/News.htm
-share/doc/html/ghostscript/PUBLIC
-share/doc/html/ghostscript/Projects.htm
-share/doc/html/ghostscript/Ps-style.htm
-share/doc/html/ghostscript/Ps2epsi.htm
-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/Testing.htm
-share/doc/html/ghostscript/Unix-lpr.htm
-share/doc/html/ghostscript/Use.htm
-share/doc/html/ghostscript/Xfonts.htm
-share/doc/html/ghostscript/gs.css
-share/doc/html/ghostscript/index.html
+share/doc/ghostscript/API.htm
+share/doc/ghostscript/C-style.htm
+share/doc/ghostscript/Changes.htm
+share/doc/ghostscript/Commprod.htm
+share/doc/ghostscript/Copying.htm
+share/doc/ghostscript/DLL.htm
+share/doc/ghostscript/Deprecated.htm
+share/doc/ghostscript/Details.htm
+share/doc/ghostscript/Details8.htm
+share/doc/ghostscript/Develop.htm
+share/doc/ghostscript/Devices.htm
+share/doc/ghostscript/Drivers.htm
+share/doc/ghostscript/Fonts.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/History7.htm
+share/doc/ghostscript/History8.htm
+share/doc/ghostscript/Htmstyle.htm
+share/doc/ghostscript/Humor.htm
+share/doc/ghostscript/Install.htm
+share/doc/ghostscript/Issues.htm
+share/doc/ghostscript/Language.htm
+share/doc/ghostscript/Lib.htm
+share/doc/ghostscript/Maintain.htm
+share/doc/ghostscript/Make.htm
+share/doc/ghostscript/News.htm
+share/doc/ghostscript/PUBLIC
+share/doc/ghostscript/Projects.htm
+share/doc/ghostscript/Ps-style.htm
+share/doc/ghostscript/Ps2epsi.htm
+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/Testing.htm
+share/doc/ghostscript/Unix-lpr.htm
+share/doc/ghostscript/Use.htm
+share/doc/ghostscript/Xfonts.htm
+share/doc/ghostscript/gs.css
+share/doc/ghostscript/index.html
 share/examples/ghostscript/alphabet.ps
 share/examples/ghostscript/annots.pdf
 share/examples/ghostscript/chess.ps
@@ -599,4 +599,4 @@ share/ghostscript/${PKGVERSION}/lib/zeroline.ps
 @dirrm share/ghostscript/${PKGVERSION}
 @dirrm share/ghostscript
 @dirrm share/examples/ghostscript
-@dirrm share/doc/html/ghostscript
+@dirrm share/doc/ghostscript
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 2f91dbe6db3..8acafde0cf3 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/05/22 17:20:39 drochner Exp $
+$NetBSD: distinfo,v 1.5 2006/05/23 09:37:46 adam Exp $
 
 SHA1 (ghostscript-8.54.tar.bz2) = 72bf35b3bf89f5187530162aece6bfc401f5512f
 RMD160 (ghostscript-8.54.tar.bz2) = 01e4f2e7132ad59b83211594913410483a42d99c
 Size (ghostscript-8.54.tar.bz2) = 12385895 bytes
-SHA1 (jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
-RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
-Size (jpegsrc.v6b.tar.gz) = 613261 bytes
-SHA1 (patch-aa) = f9d706b19430c32f568316c0b02eee792e311236
-SHA1 (patch-ab) = e0e06f3de9d8930288b1af48ba0aa7b3069e80c3
+SHA1 (patch-aa) = 9ac0ae294042e69c41fc8579e71971ad57656a8b
+SHA1 (patch-ab) = 2477242c4c5f6b6feaaa217deb1aa37485f2fac5
 SHA1 (patch-ad) = ed75f35c19ae2b19bc8902522b5d4828dfa278fe
diff --git a/print/ghostscript-afpl/patches/patch-aa b/print/ghostscript-afpl/patches/patch-aa
index f4f917dbea4..167b013621f 100644
--- a/print/ghostscript-afpl/patches/patch-aa
+++ b/print/ghostscript-afpl/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/08/12 19:20:20 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2006/05/23 09:37:46 adam Exp $
 
---- src/Makefile.in.orig	Fri Apr 19 15:23:09 2002
+--- src/Makefile.in.orig	2006-05-15 19:35:26.000000000 +0200
 +++ src/Makefile.in
-@@ -63,8 +63,8 @@ datadir = @datadir@
+@@ -60,8 +60,8 @@ datadir = @datadir@
  gsdir = $(datadir)/ghostscript
  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
  
 -docdir=$(gsdatadir)/doc
 -exdir=$(gsdatadir)/examples
-+docdir=$(datadir)/doc/html/ghostscript
++docdir=$(datadir)/doc/ghostscript
 +exdir=$(datadir)/examples/ghostscript
  GS_DOCDIR=$(docdir)
  
diff --git a/print/ghostscript-afpl/patches/patch-ab b/print/ghostscript-afpl/patches/patch-ab
index c4c56f1ff9b..c1b10bc9ba0 100644
--- a/print/ghostscript-afpl/patches/patch-ab
+++ b/print/ghostscript-afpl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/01/22 08:18:49 adam Exp $
+$NetBSD: patch-ab,v 1.3 2006/05/23 09:37:46 adam Exp $
 
---- src/unixinst.mak.orig	2005-06-29 16:21:27.000000000 +0200
+--- src/unixinst.mak.orig	2006-03-13 17:18:19.000000000 +0100
 +++ src/unixinst.mak
-@@ -152,7 +152,7 @@ install-man: $(PSMANDIR)/gs.1
+@@ -148,7 +148,7 @@ install-man: $(PSMANDIR)/gs.1
  			  ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
  	      done ;\
  	    fi ;\