** ghostscript55 has been repocopied to ghostscript-gnu **

Update to GNU Ghostscript 6.51. PR: ports/29579 Submitted by: KATO Tsuguru <tkato@prontomail.com>
author: Akinori MUSHA <knu@FreeBSD.org> 2001-09-11 19:12:20 +0000
committer: Akinori MUSHA <knu@FreeBSD.org> 2001-09-11 19:12:20 +0000
commit: f239ea291484a95575cd2ad99a43268434f80947 (patch)
tree: 277d612725807514b6721dbc45df94f3e0009f55
parent: Chase the libkakasi's version bump and bump PORTREVISION. (diff)
50 files changed, 2476 insertions, 972 deletions
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 80a20d521636..b5e7f7e246cf 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -6,34 +6,60 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	5.50a
+PORTVERSION=	6.51
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.cs.wisc.edu/ghost/gnu/gs550/ \
-		ftp://ftp.cs.wisc.edu/ghost/gnu/fonts/ \
+		${MASTER_SITE_SOURCEFORGE} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
-		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+		http://www.gelhaus.net/hp880c/1.4beta/ \
+		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
+		http://www.harsch.net/Download/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs651/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+PKGNAMESUFFIX=	-gnu
+
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP850_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \
+		${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract \
-		unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
-NO_LATEST_LINK=	"Older version."
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+CFLAGS+=	-DUPD_SIGNAL=0
+MAKEFILE=	src/unix-gcc.mak
+ALL_TARGET=	all pcl3opts escputil
+PLIST_SUB=	GS_VERSION=${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/gs5.50
+MAN1=		dvipdf.1 eps2eps.1 escputil.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
+		gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \
+		pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 \
+		ps2pdfwr.1 ps2ps.1 wftopfa.1
+MLINKS=		gslp.1 gsbj.1 \
+		gslp.1 gsdj.1 \
+		gslp.1 gsdj500.1 \
+		gslp.1 gslj.1 \
+		ps2pdf.1 ps2pdf12.1 \
+		ps2pdf.1 ps2pdf13.1
 
+.if defined(A4)
+CFLAGS+=	-DA4
+.endif
+
+.if !defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-gnu
 USE_XLIB=	yes
-USE_GMAKE=	yes
-MAKEFILE=	unix-gcc.mak
-MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
+.else
+PKGNAMESUFFIX=	-gnu-nox11
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
+.endif
 
-GS_SOURCES=	gnu-gs-5.50a.tar.gz
+GS_SOURCES=	${DISTNAME}${EXTRACT_SUFX}
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
@@ -41,52 +67,270 @@ GS_SOURCES=	gnu-gs-5.50a.tar.gz
 GS_FONTS_STD=	gnu-gs-fonts-std-6.0.tar.gz
 GS_FONTS_OTHER=	gnu-gs-fonts-other-6.0.tar.gz
 
-# Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
-HP850_DRV=	hp8xxs13.zip
+# Additional Drivers:
+
+# Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
+# http://www.gelhaus.net/hp880c/
+HP8XX=		cdj880
+HP8XX_DRV=	gdevcd8.tar.gz
+
+# HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
+# still present, just for the case pcl3 is missing some hpdj feature
+# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+HPDJ=		hpdj
+HPDJ_VERS=	2.6
+HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
+HPDJ_SRC=	${HPDJ_NAME}.tar.gz
+HPDJ_MAN1=	gs-hpdj.1
+
+# PCL3 (hpdj successor now in RELEASE quality)
+# additional driver for HP PCL3 Printers, by Martin Lottermoser
+# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+PCL3=		pcl3
+PCL3_VERS=	3.2
+PCL3_NAME=	${PCL3}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}.tar.gz
+PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
+
+# additional driver for HP DeskJet 970, supports duplex printing
+# http://www.harsch.net/Ghostscript/ghostscript.html
+HP970_DRV=	gdevdj9.c.gz
+
+# gimp-print - very high quality driver for Epson, HPs,...
+# http://gimp-print.sourceforge.net/
+GPRINT=		print
+GPRINT_DESC=	gimp-${GPRINT}
+GPRINT_VERS=	4.0.5
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_MAN1=	escputil.1
+
+# HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series
+# http://hpinkjet.sourceforge.net/
+HPIJS=		hpijs
+HPIJS_VERS=	0.97
+HPIJS_NAME=	${HPIJS}${HPIJS_VERS}
+HPIJS_SRC=	${HPIJS_NAME}.tar.gz
+
+# contributed uniprint profiles
+CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
+		stc740ih.upp stc740p.upp stc740pl.upp
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
 
-.if defined(A4)
-CFLAGS+=	-DA4
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+CFLAGS+=	-D_LITTLE_ENDIAN
 .endif
 
-pre-fetch:
+.SILENT:
+
+pre-everything:
 .if !defined(A4)
-	@${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+	${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
 .else
-	@${ECHO_MSG} "Using -DA4 for compilation."
+	${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
 post-extract:
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	unzip -L -q -aa -o ${DISTDIR}/${HP850_DRV} -d ${WRKSRC} -x devs.mak
+	${ECHO_MSG} ">>> in post-extract ..."
+	${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
+		${WRKSRC}/jpeg
+	${RM} -f ${WRKSRC}/man/de/*.1
+# ** 3rd party driver **
+# Note: don't forget to add those devices in scripts/configure and
+# configure.batch, which update unix-gcc.mak to build gs with these
+# new devices !
+#
+# for HP8XX driver
+	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+# for HPDJ driver
+	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
+# for PCL3 driver
+	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
+	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
+# for HP DeskJet 970 driver
+	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
+	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for gimp-print
+	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
+
+post-patch:
+	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
+		${WRKSRC}/src/unix-gcc.mak
+	find ${WRKSRC}/src -name '*.[ch]' | xargs ${PERL} -pi -e \
+		's|pputc|stream_putc|g; \
+		 s|pwrite|stream_write|g ; \
+		 s|pputs|stream_puts|g'
+# for HPinkjet driver
+	find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
+		's|#include <malloc.h>||g; \
+		 s|SRVPATH \"hpijs\"|SRVPATH \"${PREFIX}/libexec/hpijs\"|g'
+
+# here we apply the modifications necessary to build the 3rd party drivers
+# advantage: you see unmodified makefiles after a pure make extract
+pre-configure:
+	${ECHO_MSG} ">>> in pre-configure ..."
+# for HPDJ driver
+	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
+		>> ${WRKSRC}/src/contrib.mak
+# for PCL3 driver
+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
+		>> ${WRKSRC}/src/contrib.mak
+# for gimp-print
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+		${WRKSRC}/src
+	${ECHO_MSG} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	${ECHO_MSG} ">>>   adding make rules for escputil to contrib.mak ..."
+	${CAT} ${FILESDIR}/escputil.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   creating symlinks for ${HPIJS} ..."
+	${LN} -sf ${WRKSRC}/${HPIJS_NAME}/gdevhpij.[ch] \
+		${WRKSRC}/src
+	${ECHO_MSG} ">>>   adding ${HPIJS} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/hpijs.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
+	${ECHO_MSG} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
+	${ECHO_MSG} ">>> in pre-build ..."
+	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
+	${MKDIR} ${WRKSRC}/bin
+
+post-build:
+# for HPinkjet driver
+	cd ${WRKSRC}/${HPIJS_NAME} ; \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} makefile
 
 pre-install:
-	@${MKDIR} ${PREFIX}/share/ghostscript
-	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	${ECHO_MSG} ">>> in pre-install ..."
+	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript
+	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_STD}
+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
 
-# install the readme and license file of the hp8xxx driver as well
 post-install:
+	${ECHO_MSG} ">>> in post-install ..."
+	${ECHO_MSG} ">>>   stripping gs ..."
 	strip ${PREFIX}/bin/gs
-	${INSTALL_SCRIPT} ${WRKSRC}/unix-lpr.sh ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/lprsetup.sh ${PREFIX}/bin
-	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
-		${PREFIX}/share/ghostscript/5.50
-	${INSTALL_DATA} ${WRKSRC}/license.hp8 \
-		${PREFIX}/share/ghostscript/5.50/doc
-	${INSTALL_DATA} ${WRKSRC}/readme.hp8 \
-		${PREFIX}/share/ghostscript/5.50/doc
-
-.include <bsd.port.mk>
+# for HPDJ driver
+	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
+.for i in ${HPDJ_MAN1}
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+.endfor
+	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
+	${ECHO_MSG} ">>>   installing files in ${HPDJ} destdir ..."
+.for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
+	margins-Letter.ps margins-LetterRotated.ps
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
+.endfor
+# for PCL3 driver
+	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
+.for i in ${PCL3_MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+.endfor
+# other pcl3 stuff, which might be interesting for runtime
+	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+	${ECHO_MSG} ">>>   installing files in ${PCL3} destdir ..."
+.for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
+	ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
+	ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps \
+	ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
+	ps/margins-LetterRotated.ps
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+.endfor
+# for gimp-print driver
+	${ECHO_MSG} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	${ECHO_MSG} ">>>   installing ${GPRINT_DESC} manpages ..."
+.for i in ${GPRINT_MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/man/man1
+.endfor
+	${ECHO_MSG} ">>>   creating ${GPRINT_DESC} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	${ECHO_MSG} ">>>   installing files in gimp-print destdir ..."
+.for i in README
+	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+.endfor
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   installing ${HPIJS} server in libexecdir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/libexec
+	${ECHO_MSG} ">>>   creating ${HPIJS} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpijs
+	${ECHO_MSG} ">>>   installing files in ${HPIJS} destdir ..."
+.for i in hpijs_readme.html
+	${INSTALL_DATA} ${WRKSRC}/${HPIJS}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/hpijs
+.endfor
+# contributed UPP driver
+	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
+.for i in ${CONTRIB_UPP}
+	${INSTALL_DATA} ${FILESDIR}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+.endfor
+# for reading encrypted PDFs
+	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
+	${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+#
+# now NOPORTDOCS dependend stuff
+#
+.if !defined(NOPORTDOCS)
+	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
+# install hpdj docu, not necessary for runtime
+# note: old hpdj driver has its files in ${WRKSRC}/src
+	${ECHO_MSG} ">>>   creating ${HPDJ} docu destdir ..."
+	${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
+	${ECHO_MSG} ">>>   installing files in ${HPDJ} docu destdir ..."
+.for i in NEWS hpdj.html
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
+.endfor
+# install pcl3 docu, not necessary for runtime
+# note: new pcl3 driver has a subdir of its own
+	${ECHO_MSG} ">>>   creating ${PCL3} docu destdir ..."
+	${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
+	${ECHO_MSG} ">>>   installing files in ${PCL3} docu destdir ..."
+.for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
+.endfor
+.endif
+	${ECHO_MSG} "> post-installation tasks completed."
+
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index fd6451bcce61..4031e206ccb9 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -1,5 +1,10 @@
-MD5 (gnu-gs-5.50a.tar.gz) = c12ea8dd56cfc453c99bd8864dfc90db
+MD5 (ghostscript-6.51.tar.bz2) = 6b6d2123daaa1d217aadcbba7f2d6179
 MD5 (gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
 MD5 (gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
-MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
+MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
+MD5 (pcl3-3.2.tar.gz) = c98b9404dfc47d5ff907f9ad81dcbd46
+MD5 (gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
+MD5 (print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
+MD5 (hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/print/ghostscript-gnu/files/escputil.contrib.mak b/print/ghostscript-gnu/files/escputil.contrib.mak
new file mode 100644
index 000000000000..b0cea6064968
--- /dev/null
+++ b/print/ghostscript-gnu/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript-gnu/files/hpijs.contrib.mak b/print/ghostscript-gnu/files/hpijs.contrib.mak
new file mode 100644
index 000000000000..35eb9e6b06b1
--- /dev/null
+++ b/print/ghostscript-gnu/files/hpijs.contrib.mak
@@ -0,0 +1,31 @@
+### ------------- Hewlett-Packard Co. Inkjet Driver -------------- ###
+
+hpijs_=$(GLOBJ)gdevhpij.$(OBJ)
+
+$(DD)gdevhpij.$(OBJ): $(GLSRC)gdevhpij.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevhpij.$(OBJ) $(C_) $(GLSRC)gdevhpij.c
+
+$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) $(DD)hpijs $(hpijs_)
+
+$(DD)DJ630.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ630 $(hpijs_)
+
+$(DD)DJ6xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ6xx $(hpijs_)
+
+$(DD)DJ6xxP.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ6xxP $(hpijs_)
+
+$(DD)DJ8xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ8xx $(hpijs_)
+
+$(DD)DJ9xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ9xx $(hpijs_)
+
+$(DD)DJ9xxVIP.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ9xxVIP $(hpijs_)
+
+$(DD)AP21xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) AP21xx $(hpijs_)
+
diff --git a/print/ghostscript-gnu/files/lqx70ch.upp b/print/ghostscript-gnu/files/lqx70ch.upp
new file mode 100644
index 000000000000..b5d3cd49e912
--- /dev/null
+++ b/print/ghostscript-gnu/files/lqx70ch.upp
@@ -0,0 +1,26 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70ch.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x360DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r360x360
+-dupMargins="{ 9.0 0.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 0A
+   1b5501
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript-gnu/files/lqx70cl.upp b/print/ghostscript-gnu/files/lqx70cl.upp
new file mode 100644
index 000000000000..91fb1aa89906
--- /dev/null
+++ b/print/ghostscript-gnu/files/lqx70cl.upp
@@ -0,0 +1,26 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70cl.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 180x180DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r180x180
+-dupMargins="{ 9.0 0.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 14
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript-gnu/files/lqx70cm.upp b/print/ghostscript-gnu/files/lqx70cm.upp
new file mode 100644
index 000000000000..895af73aa8d8
--- /dev/null
+++ b/print/ghostscript-gnu/files/lqx70cm.upp
@@ -0,0 +1,25 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70cm.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x180DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r360x180
+-dupMargins="{ 9.0 24.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 14
+   1b5501
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript-gnu/files/patch-aa b/print/ghostscript-gnu/files/patch-aa
deleted file mode 100644
index 7aeee26276fe..000000000000
--- a/print/ghostscript-gnu/files/patch-aa
+++ /dev/null
@@ -1,150 +0,0 @@
---- unix-gcc.mak.orig	Mon Feb 14 11:28:41 2000
-+++ unix-gcc.mak	Sat Jul 29 00:40:45 2000
-@@ -54,12 +54,10 @@
- # the directories also define the default search path for the
- # initialization files (gs_*.ps) and the fonts.
- 
--# If your system has installbsd, change install to installbsd in the next line.
--INSTALL = install -c
--INSTALL_PROGRAM = $(INSTALL) -m 755
--INSTALL_DATA = $(INSTALL) -m 644
-+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
-+INSTALL_DATA = $(BSD_INSTALL_DATA)
- 
--prefix = /usr/local
-+prefix = $(PREFIX)
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- scriptdir = $(bindir)
-@@ -140,14 +138,14 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${LOCALBASE}/include
- PVERSION=96
- 
- # Choose whether to use a shared version of the PNG library, and if so,
- # what its name is.
- # See gs.mak and Make.htm for more information.
- 
--SHARE_LIBPNG=0
-+SHARE_LIBPNG=1
- LIBPNG_NAME=png
- 
- # Define the directory where the zlib sources are stored.
-@@ -159,7 +157,7 @@
- # what its name is (usually libz, but sometimes libgz).
- # See gs.mak and Make.htm for more information.
- 
--SHARE_ZLIB=0
-+SHARE_ZLIB=1
- #ZLIB_NAME=gz
- ZLIB_NAME=z
- 
-@@ -178,7 +176,7 @@
- 
- # Define the name of the C compiler.
- 
--CC=gcc
-+#CC=cc
- 
- # Define the name of the linker for the final link step.
- # Normally this is the same as the C compiler.
-@@ -211,7 +209,7 @@
- #   gcc to accept ANSI-style function prototypes and function definitions.
- XCFLAGS=
- 
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
- 
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -220,7 +218,7 @@
- #	-R /usr/local/xxx/lib:/usr/local/lib
- # giving the full path names of the shared library directories.
- # XLDFLAGS can be set from the command line.
--XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
- 
- LDFLAGS=$(XLDFLAGS) -fno-common
- 
-@@ -240,7 +238,7 @@
- # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
- # not in $(XINCLUDE).
- 
--XINCLUDE=-I/usr/local/X/include
-+XINCLUDE=-I$(X11BASE)/include
- 
- # Define the directory/ies and library names for the X11 library files.
- # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -252,12 +250,12 @@
- # Solaris and other SVR4 systems with dynamic linking probably want
- #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
- # X11R6 (on any platform) may need
--#XLIBS=Xt SM ICE Xext X11
-+XLIBS=Xt SM ICE Xext X11
- 
- #XLIBDIRS=-L/usr/local/X/lib
--XLIBDIRS=-L/usr/X11/lib
-+XLIBDIRS=-L$(X11BASE)/lib
- XLIBDIR=
--XLIBS=Xt Xext X11
-+#XLIBS=Xt X11
- 
- # Define whether this platform has floating point hardware:
- #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -298,27 +296,6 @@
- 
- FILE_IMPLEMENTATION=stdio
- 
--# Choose the device(s) to include.  See devs.mak for details,
--# devs.mak and contrib.mak for the list of available devices.
--
--DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11gray4.dev x11mono.dev
--#DEVICE_DEVS1=bmpmono.dev bmpamono.dev posync.dev
--DEVICE_DEVS1=
--DEVICE_DEVS2=
--DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
--DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
--DEVICE_DEVS5=uniprint.dev
--DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
--DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
--DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
--DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev
--DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
--DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
--DEVICE_DEVS12=psmono.dev psgray.dev psrgb.dev bit.dev bitrgb.dev bitcmyk.dev
--DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
--DEVICE_DEVS14=jpeg.dev jpeggray.dev
--DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
--
- # ---------------------------- End of options --------------------------- #
- 
- # Define the name of the partial makefile that specifies options --
-@@ -326,16 +303,10 @@
- 
- MAKEFILE=$(GLSRC)unix-gcc.mak
- 
--# Define the ANSI-to-K&R dependency.  There isn't one, but we do have to
--# detect whether we're running a version of gcc with the const optimization
--# bug.
--
--AK=$(GLGENDIR)/cc.tr
--
- # Define the compilation rules and flags.
- 
- CCFLAGS=$(GENOPT) $(CFLAGS)
--CC_=$(CC) `cat $(AK)` $(CCFLAGS)
-+CC_=$(CC) $(CCFLAGS)
- CCAUX=$(CC)
- #We can't use -fomit-frame-pointer with -pg....
- #CC_LEAF=$(CC_)
-@@ -356,7 +327,3 @@
- include $(GLSRC)unixtail.mak
- include $(GLSRC)unix-end.mak
- include $(GLSRC)unixinst.mak
--
--# This has to come last so it won't be taken as the default target.
--$(AK):
--	if ( gcc --version | grep "2.7.[01]" >/dev/null || test `gcc --version` = 2.7.2 ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript-gnu/files/patch-ab b/print/ghostscript-gnu/files/patch-ab
deleted file mode 100644
index aee04b39d512..000000000000
--- a/print/ghostscript-gnu/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- gs_init.ps.orig	Thu Jan  2 19:23:13 1997
-+++ gs_init.ps	Thu Jan  2 19:24:46 1997
-@@ -1363,3 +1363,7 @@
- (END GC) VMDEBUG
- 
- % The interpreter will run the initial procedure (start).
-+
-+% unofficial patch:
-+% make it possible to print from within acroread pdf viewer
-+/Default currenthalftone /Halftone defineresource pop
diff --git a/print/ghostscript-gnu/files/patch-ac b/print/ghostscript-gnu/files/patch-ac
deleted file mode 100644
index ebd487b9fa66..000000000000
--- a/print/ghostscript-gnu/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- contrib.mak.orig	Tue Sep 15 04:03:52 1998
-+++ contrib.mak	Tue Dec  1 15:37:58 1998
-@@ -435,6 +435,18 @@
- cdj850.dev: $(cdeskjet8_) page.dev
- 	$(SETPDEV) cdj850 $(cdeskjet8_)
- 
-+cdj670.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj670 $(cdeskjet8_)
-+
-+cdj890.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj890 $(cdeskjet8_)
-+
-+cdj1600.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj1600 $(cdeskjet8_)
-+
-+$(GLOBJ)gdevcd8.$(OBJ): $(GLSRC)gdevcd8.c $(GLSRC)gdevcd8.h $(PDEVH)
-+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
-+
- ### ------------ The H-P PaintJet color printer device ----------------- ###
- ### Note: this driver also supports the DEC LJ250 color printer, which   ###
- ###       has a PaintJet-compatible mode, and the PaintJet XL.           ###
diff --git a/print/ghostscript-gnu/files/patch-hpijs:makefile b/print/ghostscript-gnu/files/patch-hpijs:makefile
new file mode 100644
index 000000000000..8f53a8202f59
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-hpijs:makefile
@@ -0,0 +1,32 @@
+--- hpijs/makefile.orig	Fri Jun  8 06:10:57 2001
++++ hpijs/makefile	Tue Jul 10 03:09:21 2001
+@@ -1,17 +1,17 @@
+-FLAGS = -D_LITTLE_ENDIAN -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
++FLAGS = -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
+ 	-D_DJ9xxVIP -D_DJ630 -D_APOLLO2100 -D_DJ600 -D_DJ350
+ 
+ VERSION=0.97
+ INSTALLDIR=/usr/bin
+ 
+ 
+-CC = g++ -c -Wall -DVERSION=\"$(VERSION)\" $(FLAGS)
++CXXFLAGS += -DVERSION=\"$(VERSION)\" $(FLAGS)
+ #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" -DCAPTURE $(FLAGS)
+ #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" $(FLAGS)
+ 
+ .cpp.o:
+ 	echo "compiling $(<F)"
+-	$(CC) $(<F) -o $(*F).o
++	$(CXX) $(CXXFLAGS) -c $(<F) -o $(*F).o
+ 
+ OBJS = hpijs.o models.o breaks_open.o \
+ 	aladdin.o broadway.o capture.o \
+@@ -28,7 +28,7 @@
+ 
+ 
+ linkit: $(OBJS)
+-	g++ $(OBJS) -o hpijs
++	$(CXX) $(OBJS) -o hpijs
+ 
+ install:
+ 	install -m 0755 -s hpijs $(INSTALLDIR)
diff --git a/print/ghostscript-gnu/files/patch-lib:gs_init.ps b/print/ghostscript-gnu/files/patch-lib:gs_init.ps
new file mode 100644
index 000000000000..dd14a517967b
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-lib:gs_init.ps
@@ -0,0 +1,19 @@
+--- lib/gs_init.ps.orig	Tue Jun  5 16:42:40 2001
++++ lib/gs_init.ps	Wed Jun 20 04:16:46 2001
+@@ -1247,7 +1247,7 @@
+ % Set the default screen and BG/UCR.
+ /.setdefaultbgucr {
+   systemdict /setblackgeneration known {
+-    { pop 0 } dup setblackgeneration setundercolorremoval
++    {} dup setblackgeneration setundercolorremoval
+   } if
+ } bind def
+ /.useloresscreen {	% - .useloresscreen <bool>
+@@ -1799,3 +1799,7 @@
+ (END GC) VMDEBUG
+ 
+ % The interpreter will run the initial procedure (start).
++
++% unofficial patch:
++% make it possible to print from within acroread pdf viewer
++/Default currenthalftone /Halftone defineresource pop
diff --git a/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add b/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add
new file mode 100644
index 000000000000..1d2c46b8ea2e
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add
@@ -0,0 +1,14 @@
+--- src/contrib.mak-5.94.add.orig	Sun Oct 17 05:20:06 1999
++++ src/contrib.mak-5.94.add	Tue Jun 19 03:20:13 2001
+@@ -102,11 +102,6 @@
+ $(GLOBJ)hpdjprn.$(OBJ): $(GLSRC)hpdjprn.c
+ 	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)hpdjprn.c
+ 
+-$(GLOBJ)pclcomp.$(OBJ): $(GLSRC)pclcomp.c
+-	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pclcomp.c
+-
+-$(GLOBJ)pagecount.$(OBJ): $(GLSRC)pagecount.c
+-	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pagecount.c
+ 
+ 
+ $(DD)hpdj.dev: $(hpdj_) $(DD)page.dev
diff --git a/print/ghostscript-gnu/files/patch-src:gdevxini.c b/print/ghostscript-gnu/files/patch-src:gdevxini.c
new file mode 100644
index 000000000000..44bb6b3984f6
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-src:gdevxini.c
@@ -0,0 +1,14 @@
+--- src/gdevxini.c.orig	Tue Jun  5 15:38:57 2001
++++ src/gdevxini.c	Wed Jun 20 04:17:15 2001
+@@ -655,8 +655,10 @@
+     }
+     x_set_buffer(xdev);
+     /* Clear the destination pixmap to avoid initializing with garbage. */
+-    xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
++    if (xdev->dest == (Pixmap) 0) {
++    	xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
+ 		  xdev->bpixmap : (Pixmap) xdev->win);
++    }
+     if (xdev->dest != (Pixmap) 0) {
+ 	XSetForeground(xdev->dpy, xdev->gc, xdev->background);
+ 	XFillRectangle(xdev->dpy, xdev->dest, xdev->gc,
diff --git a/print/ghostscript-gnu/files/patch-src:genarch.c b/print/ghostscript-gnu/files/patch-src:genarch.c
new file mode 100644
index 000000000000..a015e69e758a
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-src:genarch.c
@@ -0,0 +1,34 @@
+--- src/genarch.c.orig	Tue Jun  5 15:38:57 2001
++++ src/genarch.c	Wed Jun 20 04:17:42 2001
+@@ -41,6 +41,7 @@
+     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
+ }
+ 
++#ifndef __FreeBSD__
+ private clock_t
+ time_clear(char *buf, int bsize, int nreps)
+ {
+@@ -51,6 +52,7 @@
+ 	memset(buf, 0, bsize);
+     return clock() - t;
+ }
++#endif /* __FreeBSD__ */
+ 
+ private void
+ define(FILE *f, const char *str)
+@@ -181,6 +183,7 @@
+     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
+ #undef PRINT_MAX
+ 
++#ifndef __FreeBSD__
+     section(f, "Cache sizes");
+ 
+     /*
+@@ -241,6 +244,7 @@
+ 	}
+ 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
+     }
++#endif /* __FreeBSD__ */
+ 
+     section(f, "Miscellaneous");
+ 
diff --git a/print/ghostscript7/files/patch-ad b/print/ghostscript-gnu/files/patch-src:gp_unifs.c
index 9688a7b217ff..e7db705ace5f 100644
--- a/print/ghostscript7/files/patch-ad
+++ b/print/ghostscript-gnu/files/patch-src:gp_unifs.c
@@ -1,6 +1,6 @@
---- gp_unifs.c.orig	Mon Feb 14 11:28:25 2000
-+++ gp_unifs.c	Fri Jul 28 23:53:04 2000
-@@ -33,6 +33,7 @@
+--- src/gp_unifs.c.orig	Tue Jun  5 15:38:58 2001
++++ src/gp_unifs.c	Wed Jun 20 04:18:03 2001
+@@ -29,6 +29,7 @@
  #include "stat_.h"
  #include "dirent_.h"
  #include <sys/param.h>		/* for MAXPATHLEN */
@@ -8,26 +8,26 @@
  
  /* Some systems (Interactive for example) don't define MAXPATHLEN,
   * so we define it here.  (This probably should be done via a Config-Script.)
-@@ -63,6 +64,8 @@
+@@ -59,6 +60,8 @@
  		     const char *mode)
  {				/* The -8 is for XXXXXX plus a possible final / and -. */
      int len = gp_file_name_sizeof - strlen(prefix) - 8;
 +    int fd;
 +    FILE *f;
  
-     if (gp_getenv("TEMP", fname, &len) != 0)
+     if (gp_gettmpdir(fname, &len) != 0)
  	strcpy(fname, "/tmp/");
-@@ -75,8 +78,12 @@
+@@ -71,8 +74,12 @@
      if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
  	strcat(fname, "-");
      strcat(fname, "XXXXXX");
 -    mktemp(fname);
--    return fopen(fname, mode);
+-    return gp_fopentemp(fname, mode);
 +    fd = mkstemp(fname);
 +    if (fd == -1)
-+    	return NULL;
++	return NULL;
 +    if ((f = fdopen(fd, mode)) == NULL)
-+    	close(fd);
++	close(fd);
 +    return f;
  }
  
diff --git a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
new file mode 100644
index 000000000000..c0082fdd6ecd
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
@@ -0,0 +1,135 @@
+--- src/unix-gcc.mak.orig	Tue Jun  5 16:54:10 2001
++++ src/unix-gcc.mak	Fri Jun 15 04:11:50 2001
+@@ -27,14 +27,15 @@
+ # source, generated intermediate file, and object directories
+ # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
+ 
+-BINDIR=./bin
+-GLSRCDIR=./src
+-GLGENDIR=./obj
+-GLOBJDIR=./obj
+-PSSRCDIR=./src
+-PSLIBDIR=./lib
+-PSGENDIR=./obj
+-PSOBJDIR=./obj
++.CURDIR?=.
++BINDIR=${.CURDIR}/bin
++GLSRCDIR=${.CURDIR}/src
++GLGENDIR=${.CURDIR}/obj
++GLOBJDIR=${.CURDIR}/obj
++PSSRCDIR=${.CURDIR}/src
++PSLIBDIR=${.CURDIR}/lib
++PSGENDIR=${.CURDIR}/obj
++PSOBJDIR=${.CURDIR}/obj
+ 
+ # Do not edit the next group of lines.
+ 
+@@ -53,17 +54,17 @@
+ # the directories also define the default search path for the
+ # initialization files (gs_*.ps) and the fonts.
+ 
+-INSTALL = $(GLSRCDIR)/instcopy -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ 
+-prefix = /usr/local
++prefix = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+ libdir = $(exec_prefix)/lib
+ mandir = $(prefix)/man
+ man1ext = 1
++man1dir = $(mandir)/man$(man1ext)
+ datadir = $(prefix)/share
+ gsdir = $(datadir)/ghostscript
+ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+@@ -129,7 +130,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+ 
+-JSRCDIR=jpeg
++JSRCDIR=${.CURDIR}/jpeg
+ JVERSION=6
+ 
+ # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
+@@ -149,14 +150,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=10008
+ 
+ # Choose whether to use a shared version of the PNG library, and if so,
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define the directory where the zlib sources are stored.
+@@ -168,7 +169,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+@@ -183,7 +184,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++CC?=cc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -218,7 +219,7 @@
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+ XCFLAGS=
+ 
+-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+@@ -227,7 +228,7 @@
+ #	-R /usr/local/xxx/lib:/usr/local/lib
+ # giving the full path names of the shared library directories.
+ # XLDFLAGS can be set from the command line.
+-XLDFLAGS=
++XLDFLAGS=-L${LOCALBASE}/lib
+ 
+ LDFLAGS=$(XLDFLAGS) -fno-common
+ 
+@@ -260,7 +261,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/X11R6/include
++XINCLUDE=-I${X11BASE}/include
+ 
+ # Define the directory/ies and library names for the X11 library files.
+ # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
+@@ -272,12 +273,12 @@
+ # Solaris and other SVR4 systems with dynamic linking probably want
+ #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
+ # X11R6 (on any platform) may need
+-#XLIBS=Xt SM ICE Xext X11
++XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11R6/lib
++XLIBDIRS=-L${X11BASE}/lib
+ XLIBDIR=
+-XLIBS=Xt Xext X11
++#XLIBS=Xt Xext X11
+ 
+ # Define whether this platform has floating point hardware:
+ #	FPU_TYPE=2 means floating point is faster than fixed point.
diff --git a/print/ghostscript-gnu/files/patch-src:zmedia2.c b/print/ghostscript-gnu/files/patch-src:zmedia2.c
new file mode 100644
index 000000000000..6e19c2ddfd8e
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-src:zmedia2.c
@@ -0,0 +1,25 @@
+--- src/zmedia2.c.orig	Tue Jun  5 15:39:08 2001
++++ src/zmedia2.c	Wed Jun 20 04:18:27 2001
+@@ -430,11 +430,17 @@
+ 
+ 	rx = ry, ry = temp;
+     }
+-    /* Adjust the medium size if flexible. */ 
+-    if (medium->p.x < MIN_MEDIA_SIZE && mx > rx)
+-	mx = rx;
+-    if (medium->p.y < MIN_MEDIA_SIZE && my > ry)
+-	my = ry;
++    /* If 'medium' is flexible, adjust 'mx' and 'my' towards 'rx' and 'ry',
++	respectively. Note that 'mx' and 'my' have just acquired the largest
++	permissible value, medium->q. */
++    if (medium->p.x < mx)     /* non-empty width range */
++	if (rx < medium->p.x) mx = medium->p.x; /* minimum */
++	else if (mx > rx) mx = rx;      /* fits */
++	/* else use medium->q.x, i.e., the maximum */
++    if (medium->p.y < my)     /* non-empty height range */
++	if (ry < medium->p.y) my = medium->p.y; /* minimum */
++	else if (my > ry) my = ry;      /* fits */
++	/* else use medium->q.y, i.e., the maximum */
+ 
+     /* Translate to align the centers. */ 
+     gs_make_translation(mx / 2, my / 2, pmat);
diff --git a/print/ghostscript-gnu/files/stc740ih.upp b/print/ghostscript-gnu/files/stc740ih.upp
new file mode 100644
index 000000000000..bb9805f55fb8
--- /dev/null
+++ b/print/ghostscript-gnu/files/stc740ih.upp
@@ -0,0 +1,60 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740ih.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 1440x720DpI, Inkjet Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2XY
+-r1440x720
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupBlackTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupCyanTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupMagentaTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupYellowTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveXPasses=2
+-dupOutputXStep=2
+-dupWeaveYPasses=6
+-dupOutputPins=46
+-dupWeaveYFeeds="{23 23 23 23 23 23 23 23 23 23 23 23}"
+-dupWeaveXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
+-dupWeaveYOffset=50
+-dupWeaveInitialYFeeds="{ 5  5  5  5  5  5  5  5  5  5  5 23}"
+-dupWeaveInitialXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
+-dupWeaveInitialPins="{ 13 16 19 22 25 28 31 34 37 40 43 46}"
+-dupFormatYabsolute
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 05
+   1b2873 0100 02
+   1b5501
+   1b2865 0200 0001
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupXStepCommand="<1b285c 0400 a005 0100 0000>"
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript-gnu/files/stc740p.upp b/print/ghostscript-gnu/files/stc740p.upp
new file mode 100644
index 000000000000..a4e7f5441793
--- /dev/null
+++ b/print/ghostscript-gnu/files/stc740p.upp
@@ -0,0 +1,36 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740p.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 720x720DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2
+-r720x720
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupBlackTransfer="{   0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupCyanTransfer="{    0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupMagentaTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupYellowTransfer="{  0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveYPasses=6
+-dupOutputPins=48
+-dupWeaveYFeeds="{47 47 47 53 47 47}"
+-dupWeaveInitialYFeeds="{1  1  1  1  1  43}"
+-dupWeaveInitialPins="{ 8 48 40 31 23 15}"
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 05
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript-gnu/files/stc740pl.upp b/print/ghostscript-gnu/files/stc740pl.upp
new file mode 100644
index 000000000000..b2fdb0dbbc06
--- /dev/null
+++ b/print/ghostscript-gnu/files/stc740pl.upp
@@ -0,0 +1,32 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740pl.upp,v 1.2 2000/04/21 18:48:01 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 360x360DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2
+-r360x360
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveYPasses=3
+-dupOutputPins=48
+-dupWeaveYFeeds="{47 50 47}"
+-dupWeaveInitialYFeeds="{1 1 46}"
+-dupWeaveInitialPins="{ 16 48 32}"
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 0A
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript-gnu/pkg-descr b/print/ghostscript-gnu/pkg-descr
index 2cdd4ae58b9d..2ac1b40d16e7 100644
--- a/print/ghostscript-gnu/pkg-descr
+++ b/print/ghostscript-gnu/pkg-descr
@@ -1,22 +1,25 @@
-GNU Ghostscript is the name of a set of software that provides:
+Ghostscript is the well-known PostScript interpreter which is available for
+all common and most esoteric platforms and supports many different printers
+and some displays.
 
-	- An interpreter for the PostScript (TM) language, and
+Versions entitled "GNU Ghostscript" are distributed with the GNU General
+Public License, which allows free use, and free copying and redistribution
+under certain conditions (including, in some cases, commercial distribution).
 
-	- A set of C procedures (the Ghostscript library) that implement
-the graphics capabilities that appear as primitive operations in the
-PostScript language.
-
-GNU Ghostscript comes with NO WARRANTY and NO SUPPORT.  
-
-This FreeBSD port includes two useful add-on packages:
-	o Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
-	  see announcement on
-		 http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
+This port includes add-on packages (not part of the official gs release)
 	o Support for pdfencrypt, see description on
-	  	http://www.ozemail.com.au/~geoffk/pdfencrypt/
+	  - http://members.ozemail.com.au/~geoffk/pdfencrypt/
+	o HP8XX driver for HP DeskJet 880C/882C/895C
+	  - http://www.gelhaus.net/hp880c/
+	o HP970 driver for HP DeskJet 970CXi
+	  - http://www.harsch.net/Ghostscript/ghostscript.html
+	o PCL3 and HPDJ driver for HP DeskJet series
+	  - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+	o Gimp-Print driver for Canon/Epson/Lexmark/HP printers
+	  - http://gimp-print.sourceforge.net/
+	o HPinkjet driver for HP PhotoSmart/DeskJet series
+	  - http://hpinkjet.sourceforge.net/
+	o Additional contributed uniprint driver profiles for
+	  - Epson Stylus Color 740 and Epson LQ-1170
 		
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-PostScript is a trademark of Adobe Systems, Incorporated.
-
 WWW: http://www.gnu.org/software/ghostscript/ghostscript.html
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index 9956c4894535..1407da4877e3 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -1,5 +1,8 @@
 bin/bdftops
 bin/dvipdf
+bin/eps2eps
+bin/escputil
+bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
@@ -11,189 +14,305 @@ bin/gsnd
 bin/lprsetup.sh
 bin/pdf2dsc
 bin/pdf2ps
+bin/pdfopt
+bin/pf2afm
+bin/pfbtopfa
+bin/pj-gs.sh
 bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
+bin/ps2pdf12
+bin/ps2pdf13
+bin/ps2pdfwr
 bin/ps2ps
+bin/pv.sh
+bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
-share/ghostscript/5.50/Fontmap
-share/ghostscript/5.50/acctest.ps
-share/ghostscript/5.50/align.ps
-share/ghostscript/5.50/bdftops.ps
-share/ghostscript/5.50/bjc610a0.upp
-share/ghostscript/5.50/bjc610a1.upp
-share/ghostscript/5.50/bjc610a2.upp
-share/ghostscript/5.50/bjc610a3.upp
-share/ghostscript/5.50/bjc610a4.upp
-share/ghostscript/5.50/bjc610a5.upp
-share/ghostscript/5.50/bjc610a6.upp
-share/ghostscript/5.50/bjc610a7.upp
-share/ghostscript/5.50/bjc610a8.upp
-share/ghostscript/5.50/bjc610b1.upp
-share/ghostscript/5.50/bjc610b2.upp
-share/ghostscript/5.50/bjc610b3.upp
-share/ghostscript/5.50/bjc610b4.upp
-share/ghostscript/5.50/bjc610b6.upp
-share/ghostscript/5.50/bjc610b7.upp
-share/ghostscript/5.50/bjc610b8.upp
-share/ghostscript/5.50/caption.ps
-share/ghostscript/5.50/cbjc600.ppd
-share/ghostscript/5.50/cbjc800.ppd
-share/ghostscript/5.50/cdj550.upp
-share/ghostscript/5.50/cid2code.ps
-share/ghostscript/5.50/decrypt.ps
-share/ghostscript/5.50/doc/Bug-form.htm
-share/ghostscript/5.50/doc/C-style.htm
-share/ghostscript/5.50/doc/Commprod.htm
-share/ghostscript/5.50/doc/Current.htm
-share/ghostscript/5.50/doc/DLL.htm
-share/ghostscript/5.50/doc/Devices.htm
-share/ghostscript/5.50/doc/Drivers.htm
-share/ghostscript/5.50/doc/Fonts.htm
-share/ghostscript/5.50/doc/Helpers.htm
-share/ghostscript/5.50/doc/Hershey.htm
-share/ghostscript/5.50/doc/History1.htm
-share/ghostscript/5.50/doc/History2.htm
-share/ghostscript/5.50/doc/History3.htm
-share/ghostscript/5.50/doc/History4.htm
-share/ghostscript/5.50/doc/Htmstyle.htm
-share/ghostscript/5.50/doc/Humor.htm
-share/ghostscript/5.50/doc/Install.htm
-share/ghostscript/5.50/doc/Language.htm
-share/ghostscript/5.50/doc/Lib.htm
-share/ghostscript/5.50/doc/Make.htm
-share/ghostscript/5.50/doc/New-user.htm
-share/ghostscript/5.50/doc/News.htm
-share/ghostscript/5.50/doc/Ps2pdf.htm
-share/ghostscript/5.50/doc/Psfiles.htm
-share/ghostscript/5.50/doc/Readme.htm
-share/ghostscript/5.50/doc/Source.htm
-share/ghostscript/5.50/doc/Unix-lpr.htm
-share/ghostscript/5.50/doc/Use.htm
-share/ghostscript/5.50/doc/Xfonts.htm
-share/ghostscript/5.50/doc/license.hp8
-share/ghostscript/5.50/doc/ps2epsi.txt
-share/ghostscript/5.50/doc/readme.hp8
-share/ghostscript/5.50/docie.ps
-share/ghostscript/5.50/examples/alphabet.ps
-share/ghostscript/5.50/examples/cheq.ps
-share/ghostscript/5.50/examples/chess.ps
-share/ghostscript/5.50/examples/colorcir.ps
-share/ghostscript/5.50/examples/escher.ps
-share/ghostscript/5.50/examples/golfer.ps
-share/ghostscript/5.50/examples/grayalph.ps
-share/ghostscript/5.50/examples/ridt91.eps
-share/ghostscript/5.50/examples/snowflak.ps
-share/ghostscript/5.50/examples/tiger.ps
-share/ghostscript/5.50/examples/vasarely.ps
-share/ghostscript/5.50/examples/waterfal.ps
-share/ghostscript/5.50/font2c.ps
-share/ghostscript/5.50/font2pcl.ps
-share/ghostscript/5.50/gs_btokn.ps
-share/ghostscript/5.50/gs_ccfnt.ps
-share/ghostscript/5.50/gs_cff.ps
-share/ghostscript/5.50/gs_cidfn.ps
-share/ghostscript/5.50/gs_cmap.ps
-share/ghostscript/5.50/gs_dbt_e.ps
-share/ghostscript/5.50/gs_diskf.ps
-share/ghostscript/5.50/gs_dpnxt.ps
-share/ghostscript/5.50/gs_dps.ps
-share/ghostscript/5.50/gs_dps1.ps
-share/ghostscript/5.50/gs_dps2.ps
-share/ghostscript/5.50/gs_epsf.ps
-share/ghostscript/5.50/gs_fonts.ps
-share/ghostscript/5.50/gs_init.ps
-share/ghostscript/5.50/gs_iso_e.ps
-share/ghostscript/5.50/gs_kanji.ps
-share/ghostscript/5.50/gs_ksb_e.ps
-share/ghostscript/5.50/gs_l2img.ps
-share/ghostscript/5.50/gs_lev2.ps
-share/ghostscript/5.50/gs_ll3.ps
-share/ghostscript/5.50/gs_mex_e.ps
-share/ghostscript/5.50/gs_mro_e.ps
-share/ghostscript/5.50/gs_pdf_e.ps
-share/ghostscript/5.50/gs_pdfwr.ps
-share/ghostscript/5.50/gs_pfile.ps
-share/ghostscript/5.50/gs_res.ps
-share/ghostscript/5.50/gs_setpd.ps
-share/ghostscript/5.50/gs_statd.ps
-share/ghostscript/5.50/gs_std_e.ps
-share/ghostscript/5.50/gs_sym_e.ps
-share/ghostscript/5.50/gs_ttf.ps
-share/ghostscript/5.50/gs_typ32.ps
-share/ghostscript/5.50/gs_typ42.ps
-share/ghostscript/5.50/gs_type1.ps
-share/ghostscript/5.50/gs_wan_e.ps
-share/ghostscript/5.50/gslp.ps
-share/ghostscript/5.50/impath.ps
-share/ghostscript/5.50/landscap.ps
-share/ghostscript/5.50/level1.ps
-share/ghostscript/5.50/lines.ps
-share/ghostscript/5.50/markhint.ps
-share/ghostscript/5.50/markpath.ps
-share/ghostscript/5.50/necp2x.upp
-share/ghostscript/5.50/necp2x6.upp
-share/ghostscript/5.50/packfile.ps
-share/ghostscript/5.50/pcharstr.ps
-share/ghostscript/5.50/pdf2dsc.ps
-share/ghostscript/5.50/pdf_base.ps
-share/ghostscript/5.50/pdf_draw.ps
-share/ghostscript/5.50/pdf_font.ps
-share/ghostscript/5.50/pdf_main.ps
-share/ghostscript/5.50/pdf_ops.ps
-share/ghostscript/5.50/pdf_sec.ps
-share/ghostscript/5.50/pf2afm.ps
-share/ghostscript/5.50/ppath.ps
-share/ghostscript/5.50/prfont.ps
-share/ghostscript/5.50/printafm.ps
-share/ghostscript/5.50/ps2ai.ps
-share/ghostscript/5.50/ps2ascii.ps
-share/ghostscript/5.50/ps2epsi.ps
-share/ghostscript/5.50/quit.ps
-share/ghostscript/5.50/ras1.upp
-share/ghostscript/5.50/ras24.upp
-share/ghostscript/5.50/ras3.upp
-share/ghostscript/5.50/ras32.upp
-share/ghostscript/5.50/ras4.upp
-share/ghostscript/5.50/ras8m.upp
-share/ghostscript/5.50/showchar.ps
-share/ghostscript/5.50/showpage.ps
-share/ghostscript/5.50/stc.upp
-share/ghostscript/5.50/stc1520h.upp
-share/ghostscript/5.50/stc2.upp
-share/ghostscript/5.50/stc2_h.upp
-share/ghostscript/5.50/stc2s_h.upp
-share/ghostscript/5.50/stc500p.upp
-share/ghostscript/5.50/stc500ph.upp
-share/ghostscript/5.50/stc600ih.upp
-share/ghostscript/5.50/stc600p.upp
-share/ghostscript/5.50/stc600pl.upp
-share/ghostscript/5.50/stc800ih.upp
-share/ghostscript/5.50/stc800p.upp
-share/ghostscript/5.50/stc800pl.upp
-share/ghostscript/5.50/stc_h.upp
-share/ghostscript/5.50/stc_l.upp
-share/ghostscript/5.50/stcany.upp
-share/ghostscript/5.50/stcinfo.ps
-share/ghostscript/5.50/stcolor.ps
-share/ghostscript/5.50/traceimg.ps
-share/ghostscript/5.50/traceop.ps
-share/ghostscript/5.50/type1enc.ps
-share/ghostscript/5.50/type1ops.ps
-share/ghostscript/5.50/uninfo.ps
-share/ghostscript/5.50/unprot.ps
-share/ghostscript/5.50/viewcmyk.ps
-share/ghostscript/5.50/viewgif.ps
-share/ghostscript/5.50/viewjpeg.ps
-share/ghostscript/5.50/viewpbm.ps
-share/ghostscript/5.50/viewpcx.ps
-share/ghostscript/5.50/viewps2a.ps
-share/ghostscript/5.50/wftopfa.ps
-share/ghostscript/5.50/winmaps.ps
-share/ghostscript/5.50/wrfont.ps
-share/ghostscript/5.50/zeroline.ps
+libexec/hpijs
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
+share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
+share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
+share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
+share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
+share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
+share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
+share/ghostscript/%%GS_VERSION%%/doc/Current.htm
+share/ghostscript/%%GS_VERSION%%/doc/DLL.htm
+share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
+share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
+share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
+share/ghostscript/%%GS_VERSION%%/doc/Helpers.htm
+share/ghostscript/%%GS_VERSION%%/doc/Hershey.htm
+share/ghostscript/%%GS_VERSION%%/doc/History1.htm
+share/ghostscript/%%GS_VERSION%%/doc/History2.htm
+share/ghostscript/%%GS_VERSION%%/doc/History3.htm
+share/ghostscript/%%GS_VERSION%%/doc/History4.htm
+share/ghostscript/%%GS_VERSION%%/doc/History5.htm
+share/ghostscript/%%GS_VERSION%%/doc/History6.htm
+share/ghostscript/%%GS_VERSION%%/doc/Htmstyle.htm
+share/ghostscript/%%GS_VERSION%%/doc/Humor.htm
+share/ghostscript/%%GS_VERSION%%/doc/Install.htm
+share/ghostscript/%%GS_VERSION%%/doc/Language.htm
+share/ghostscript/%%GS_VERSION%%/doc/Lib.htm
+share/ghostscript/%%GS_VERSION%%/doc/Make.htm
+share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
+share/ghostscript/%%GS_VERSION%%/doc/News.htm
+share/ghostscript/%%GS_VERSION%%/doc/PUBLIC
+share/ghostscript/%%GS_VERSION%%/doc/Projects.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps2epsi.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps2pdf.htm
+share/ghostscript/%%GS_VERSION%%/doc/Psfiles.htm
+share/ghostscript/%%GS_VERSION%%/doc/Public.htm
+share/ghostscript/%%GS_VERSION%%/doc/README
+share/ghostscript/%%GS_VERSION%%/doc/Readme.htm
+share/ghostscript/%%GS_VERSION%%/doc/Release.htm
+share/ghostscript/%%GS_VERSION%%/doc/Source.htm
+share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
+share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
+share/ghostscript/%%GS_VERSION%%/doc/Use.htm
+share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
+share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
+share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
+share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
+share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
+share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
+share/ghostscript/%%GS_VERSION%%/examples/chess.ps
+share/ghostscript/%%GS_VERSION%%/examples/colorcir.ps
+share/ghostscript/%%GS_VERSION%%/examples/doretree.ps
+share/ghostscript/%%GS_VERSION%%/examples/escher.ps
+share/ghostscript/%%GS_VERSION%%/examples/golfer.ps
+share/ghostscript/%%GS_VERSION%%/examples/grayalph.ps
+share/ghostscript/%%GS_VERSION%%/examples/ridt91.eps
+share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
+share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
+share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
+share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
+share/ghostscript/%%GS_VERSION%%/lib/Fontmap
+share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
+share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
+share/ghostscript/%%GS_VERSION%%/lib/addxchar.ps
+share/ghostscript/%%GS_VERSION%%/lib/align.ps
+share/ghostscript/%%GS_VERSION%%/lib/bdftops.ps
+share/ghostscript/%%GS_VERSION%%/lib/bj8.rpd
+share/ghostscript/%%GS_VERSION%%/lib/bj8gc12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8hg12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8oh06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8pa06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8pp12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8ts06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a0.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a1.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a2.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a3.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a4.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a5.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a6.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a7.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a8.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b1.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b2.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b3.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b4.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b6.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b7.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b8.upp
+share/ghostscript/%%GS_VERSION%%/lib/caption.ps
+share/ghostscript/%%GS_VERSION%%/lib/cbjc600.ppd
+share/ghostscript/%%GS_VERSION%%/lib/cbjc800.ppd
+share/ghostscript/%%GS_VERSION%%/lib/cdj550.upp
+share/ghostscript/%%GS_VERSION%%/lib/cdj690.upp
+share/ghostscript/%%GS_VERSION%%/lib/cdj690ec.upp
+share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
+share/ghostscript/%%GS_VERSION%%/lib/decrypt.ps
+share/ghostscript/%%GS_VERSION%%/lib/dnj750c.upp
+share/ghostscript/%%GS_VERSION%%/lib/dnj750m.upp
+share/ghostscript/%%GS_VERSION%%/lib/docie.ps
+share/ghostscript/%%GS_VERSION%%/lib/errpage.ps
+share/ghostscript/%%GS_VERSION%%/lib/font2c.ps
+share/ghostscript/%%GS_VERSION%%/lib/font2pcl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_agl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_btokn.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ccfnt.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ce_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cff.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cmdl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_css_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dbt_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_diskf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dpnxt.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dps.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dps1.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dps2.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_il1_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_il2_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_kanji.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ksb_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_l.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_l.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_l2img.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_l_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_lev2.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_lgo_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_lgx_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ll3.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_m.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_m_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_mex_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_mgl_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_mro_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_pdf_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_pdfwr.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_pfile.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_rdlin.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_res.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_s.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_s.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_s_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_setpd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_statd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_std_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_sym_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_t.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_t.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_t_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_trap.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ttf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_typ32.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_typ42.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_type1.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wan_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wl1_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wl2_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wl5_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gslp.ps
+share/ghostscript/%%GS_VERSION%%/lib/gsnup.ps
+share/ghostscript/%%GS_VERSION%%/lib/ht_ccsto.ps
+share/ghostscript/%%GS_VERSION%%/lib/image-qa.ps
+share/ghostscript/%%GS_VERSION%%/lib/impath.ps
+share/ghostscript/%%GS_VERSION%%/lib/jispaper.ps
+share/ghostscript/%%GS_VERSION%%/lib/landscap.ps
+share/ghostscript/%%GS_VERSION%%/lib/level1.ps
+share/ghostscript/%%GS_VERSION%%/lib/lines.ps
+share/ghostscript/%%GS_VERSION%%/lib/lqx70ch.upp
+share/ghostscript/%%GS_VERSION%%/lib/lqx70cl.upp
+share/ghostscript/%%GS_VERSION%%/lib/lqx70cm.upp
+share/ghostscript/%%GS_VERSION%%/lib/markhint.ps
+share/ghostscript/%%GS_VERSION%%/lib/markpath.ps
+share/ghostscript/%%GS_VERSION%%/lib/necp2x.upp
+share/ghostscript/%%GS_VERSION%%/lib/necp2x6.upp
+share/ghostscript/%%GS_VERSION%%/lib/packfile.ps
+share/ghostscript/%%GS_VERSION%%/lib/pcharstr.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf2dsc.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_base.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_draw.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_font.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_main.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_ops.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_sec.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdfopt.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdfwrite.ps
+share/ghostscript/%%GS_VERSION%%/lib/pf2afm.ps
+share/ghostscript/%%GS_VERSION%%/lib/pfbtopfa.ps
+share/ghostscript/%%GS_VERSION%%/lib/ppath.ps
+share/ghostscript/%%GS_VERSION%%/lib/prfont.ps
+share/ghostscript/%%GS_VERSION%%/lib/printafm.ps
+share/ghostscript/%%GS_VERSION%%/lib/ps2ai.ps
+share/ghostscript/%%GS_VERSION%%/lib/ps2ascii.ps
+share/ghostscript/%%GS_VERSION%%/lib/ps2epsi.ps
+share/ghostscript/%%GS_VERSION%%/lib/quit.ps
+share/ghostscript/%%GS_VERSION%%/lib/ras1.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras24.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras3.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras32.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras4.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras8m.upp
+share/ghostscript/%%GS_VERSION%%/lib/rollconv.ps
+share/ghostscript/%%GS_VERSION%%/lib/showchar.ps
+share/ghostscript/%%GS_VERSION%%/lib/showpage.ps
+share/ghostscript/%%GS_VERSION%%/lib/st640ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640ihg.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640p.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640pg.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640plg.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc1520h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc2.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc200_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc2_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc2s_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc500p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc500ph.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc600ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc600p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc600pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc640p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc740ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc740p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc740pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc800ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc800p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc800pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc_l.upp
+share/ghostscript/%%GS_VERSION%%/lib/stcany.upp
+share/ghostscript/%%GS_VERSION%%/lib/stcany_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stcinfo.ps
+share/ghostscript/%%GS_VERSION%%/lib/stcolor.ps
+share/ghostscript/%%GS_VERSION%%/lib/stocht.ps
+share/ghostscript/%%GS_VERSION%%/lib/traceimg.ps
+share/ghostscript/%%GS_VERSION%%/lib/traceop.ps
+share/ghostscript/%%GS_VERSION%%/lib/type1enc.ps
+share/ghostscript/%%GS_VERSION%%/lib/type1ops.ps
+share/ghostscript/%%GS_VERSION%%/lib/uninfo.ps
+share/ghostscript/%%GS_VERSION%%/lib/unprot.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewcmyk.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewgif.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewjpeg.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewmiff.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewpbm.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewpcx.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewps2a.ps
+share/ghostscript/%%GS_VERSION%%/lib/wftopfa.ps
+share/ghostscript/%%GS_VERSION%%/lib/winmaps.ps
+share/ghostscript/%%GS_VERSION%%/lib/wrfont.ps
+share/ghostscript/%%GS_VERSION%%/lib/zeroline.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/BUGS
+share/ghostscript/%%GS_VERSION%%/pcl3/NEWS
+share/ghostscript/%%GS_VERSION%%/pcl3/README
+share/ghostscript/%%GS_VERSION%%/pcl3/calign.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/dumppdd.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/example.mcf
+share/ghostscript/%%GS_VERSION%%/pcl3/if-pcl3
+share/ghostscript/%%GS_VERSION%%/pcl3/levels-test.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -362,8 +481,17 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+@dirrm share/ghostscript/%%GS_VERSION%%/pcl3
+@dirrm share/ghostscript/%%GS_VERSION%%/lib
+@dirrm share/ghostscript/%%GS_VERSION%%/hpijs
+@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
+@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
+@dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/doc
+@dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
-@dirrm share/ghostscript/5.50/doc
-@dirrm share/ghostscript/5.50/examples
-@dirrm share/ghostscript/5.50
 @dirrm share/ghostscript
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%
+%%PORTDOCS%%@dirrm share/doc/ghostscript
diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure
index 518e25b9706f..47eef6b4e3cf 100644
--- a/print/ghostscript-gnu/scripts/configure
+++ b/print/ghostscript-gnu/scripts/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # driverselection
-/usr/bin/dialog --title "Ghostscript 5 driver configuration" --clear \
+/usr/bin/dialog --title "GNU Ghostscript driver configuration" --clear \
 	--checklist "\n\
 This new ghostscript driver configuration dialog allows you to choose \n\
 only those gs drivers, you really need. Don't think too economical, since \n\
@@ -13,77 +13,103 @@ Have fun with this new configuration style !     -andreas \n\n\
   "iwhi"     "Apple Imagewriter, high-resolution mode" OFF \
   "iwlo"     "Apple Imagewriter, low-resolution mode" OFF \
   "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
-  "hl7x0"    "Brother HL 720 and HL 730" OFF \
+  "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" OFF \
   "bj10e"    "Canon BubbleJet BJ10e" ON \
   "bj200"    "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \
-  "bjc600"   "Canon Color BJC-240/600/4000/70 + Apple StyleWriter 2x00" ON \
+  "bjc600"   "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" ON \
   "bjc800"   "Canon Color BubbleJet BJC-240/800" ON \
   "lbp8"     "Canon LBP-8II laser printer" OFF \
-  "lips3"    "Canon LIPS III laser printer in English/CaPSL mode" OFF \
+  "lips3"    "Canon LIPS III laser printer in English (CaPSL) mode" OFF \
   "m8510"    "C.Itoh M8510 printer" OFF \
-  "uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
-  "la50"     "DEC LA50 printer" OFF \
-  "la70"     "DEC LA70 printer" OFF \
-  "la75"     "DEC LA75 printer" OFF \
-  "la75plus" "DEC LA75plus printer" OFF \
+  "coslw2p"  "CoStar LabelWriter II II/Plus" OFF \
+  "coslwxl"  "CoStar LabelWriter XL" OFF \
+  "stp"      "Configurable Canon/Epson/Lexmark/HP driver (Gimp-Print)" ON \
+  "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
+  "dl2100"   "DEClaser 2100" OFF \
+  "la50"     "DEC LA50" OFF \
+  "la70"     "DEC LA70" OFF \
+  "la75"     "DEC LA75" OFF \
+  "la75plus" "DEC LA75plus" OFF \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
-  "ln03"     "DEC LN03 printer" OFF \
-  "ap3250"   "Epson AP3250" OFF \
+  "ln03"     "DEC LN03" OFF \
+  "ap3250"   "Epson ActionPrinter 3250" OFF \
   "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
-  "eps9mid"  "Epson-compatible 9-pin, medium resol" OFF \
-  "eps9high" "Epson-compatible 9-pin, high resol" OFF \
+  "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
+  "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" OFF \
   "lp8000"   "Epson LP-8000 line printer" OFF \
   "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \
   "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
   "st800"    "Epson Stylus 800 printer" OFF \
-  "stcolor"  "Epson Stylus Color" OFF \
+  "stcolor"  "Epson Stylus Color and II/IIs/1500 (see driver docu)" OFF \
+  "photoex"  "Epson Stylus Color Photo, Photo EX, Photo 700" OFF \
   "lp2563"   "HP 2563B line printer" OFF \
   "dnj650c"  "HP DesignJet 650C" OFF \
   "deskjet"  "HP DeskJet and DeskJet Plus" ON \
-  "djet500"  "HP DeskJet 500" ON \
+  "djet500"  "HP DeskJet 500 (for DeskJet 600 use -r600)" ON \
   "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
   "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
-  "cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
+  "cdjcolor" "HP DeskJet 500C/540C, 24bit/pxl+FS dith, Citizen Projet IIc" ON \
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
-  "cdj500"   "HP DeskJet 500C (same as cdjcolor)" OFF \
-  "cdj550"   "HP DeskJet 550C/560C" ON \
-  "cdj670"   "HP DeskJet 670/690" OFF \
-  "cdj850"   "HP DeskJet 850/855/870/1100" OFF \
-  "cdj890"   "HP DeskJet 890" OFF \
-  "cdj1600"  "HP DeskJet 1600" OFF \
+  "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
+  "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
+  "cdj670"   "HP DeskJet 670/690 (HP8XX driver)" ON \
+  "cdj850"   "HP DeskJet 850/855/870/1100 (HP8XX driver)" ON \
+  "cdj880"   "HP DeskJet 880 (HP8XX driver)" ON \
+  "cdj890"   "HP DeskJet 890 (HP8XX driver)" ON \
+  "cdj1600"  "HP DeskJet 1600 (HP8XX driver)" ON \
+  "cdj970"   "HP DeskJet 970CXi (HP970 driver)" ON \
   "laserjet" "HP LaserJet" ON \
   "ljetplus" "HP LaserJet Plus" ON \
   "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
   "ljet3"    "HP LaserJet III* with Delta Row compression" ON \
-  "ljet3d"   "HP LaserJet IIID with duplex capability" OFF \
-  "ljet4"    "HP LaserJet 4 (defaults to 600 dpi)" ON \
+  "ljet3d"   "HP LaserJet IIID with duplex capability" ON \
+  "ljet4"    "HP LaserJet 4 and 5L/5P (not real LJ5), defaults to 600 dpi" ON \
+  "ljet4d"   "HP LaserJet 4 (defaults to 600 dpi) with duplex" ON \
   "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
-  "cljet5"   "HP LaserJet 5/5M Color " OFF \
-  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" OFF \
-  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" OFF \
+  "cljet5"   "HP LaserJet 5/5M Color (new driver, old=cljet5pr)" ON \
+  "cljet5c"  "HP LaserJet 5/5M Color Simple" ON \
+  "cljet5pr" "HP LaserJet 5/5M Color (old drv. with rotation hacks/flaws)" ON \
+  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
+  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
   "pj"       "HP PaintJet XL driver " ON \
   "pjetxl"   "HP PaintJet XL driver (alternate)" OFF \
   "pjxl"     "HP PaintJet XL color printer" ON \
   "paintjet" "HP PaintJet color printer (alternate)" OFF \
-  "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
+  "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
-  "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
+  "pcl3"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
+  "hpdj"     "HP PCL 3+ (old drv.)" ON \
+  "hpijs"    "HP PhotoSmart/DeskJet series (HP developed driver)" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
+  "fs600"    "Kyocera FS-600 (600 dpi)" OFF \
+  "lxm5700m" "Lexmark 5700 monotone" OFF \
   "cp50"     "Mitsubishi CP50 color" OFF \
-  "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
+  "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" OFF \
   "oce9050"  "OCE 9050 printer" OFF \
   "oki182"   "Okidata MicroLine 182" OFF \
   "okiibm"   "Okidata MicroLine IBM-compatible printers" OFF \
+  "atx23"    "Practical Automation ATX-23 label printer" OFF \
+  "atx24"    "Practical Automation ATX-24 label printer" OFF \
+  "atx38"    "Practical Automation ATX-38 label printer" OFF \
   "r4081"    "Ricoh 4081 laser printer" OFF \
   "sj48"     "StarJet 48 inkjet printer" OFF \
-  "xes"      "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
-  "bmpmono"  "BMP Monochrome" OFF \
-  "bmp16"    "BMP 4-bit EGA/VGA" OFF \
-  "bmp256"   "BMP 8-bit 256-color" OFF \
+  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
+  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
+  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
+  "tek4696"  "Tektronix 4695/4696 inkjet plotter" OFF \
+  "xes"      "Xerox XES 2700/3700/4045" OFF \
+  "bmpmono"  "BMP Monochrome" ON \
+  "bmpgray"  "BMP 8-bit gray" ON \
+  "bmp16"    "BMP 4-bit EGA/VGA" ON \
+  "bmp256"   "BMP 8-bit 256-color" ON \
   "bmp16m"   "BMP 24-bit" ON \
+  "bmp32b"   "BMP 32-bit pseudo-.BMP" ON \
+  "bmpsep1"  "BMP Separated 1-bit CMYK" ON \
+  "bmpsep8"  "BMP Separated 8-bit CMYK" ON \
   "ccr"      "CalComp Raster format" OFF \
   "cgmmono"  "CGM Monochrome -- LOW LEVEL OUTPUT ONLY" OFF \
   "cgm8"     "CGM 8-bit 256-color -- DITTO" OFF \
@@ -128,38 +154,39 @@ Have fun with this new configuration style !     -andreas \n\n\
   "ppmraw"   "Portable Pixmap,  raw format RGB" ON \
   "pkm"      "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
   "pkmraw"   "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
+  "pksm"     "Portable Separated map (plain) (4-bit CMYK => 4 pages)" ON \
+  "pksmraw"  "Portable Separated map (raw) (4-bit CMYK => 4 pages)" ON \
   "pngmono"  "PNG Monochrome Portable Network Graphics" ON \
   "pnggray"  "PNG 8-bit gray Portable Network Graphics" ON \
   "png16"    "PNG 4-bit color Portable Network Graphics" ON \
   "png256"   "PNG 8-bit color Portable Network Graphics" ON \
   "png16m"   "PNG 24-bit color Portable Network Graphics" ON \
-  "psmono"   "PostScript, Level 1, monochrome image" ON \
+  "psmono"   "PostScript (Level 1) monochrome image" ON \
   "psgray"   "PostScript (Level 1) 8-bit gray image" ON \
   "psrgb"    "PostScript (Level 2) 24-bit color image" ON \
   "pswrite"  "PostScript output (like PostScript Distillery)" ON \
   "epswrite" "EPS output (like PostScript Distillery)" ON \
   "sgirgb"   "SGI RGB pixmap format" OFF \
-  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
-  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
-  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
-  "tek4696"  "Tektronix 4695/4696 inkjet plotter" OFF \
+  "sunhmono" "Harlequin variant of 1-bit Sun raster file" OFF \
   "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" ON \
   "tiffg3"   "TIFF Group 3 fax with EOLs" ON \
   "tiffg32d" "TIFF Group 3 2-D fax" ON \
   "tiffg4"   "TIFF Group 4 fax" ON \
   "tiff12nc" "TIFF 12-bit RGB, no compression" ON \
-  "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
+  "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" ON \
   "tifflzw"  "TIFF LZW,      tag = 5,     mono" ON \
   "tiffpack" "TIFF PackBits, tag = 32773, mono" ON \
-  "x11"      "X Windows version 11, release >=4" ON \
-  "x11alpha" "X Windows masquer. as device with alpha capability" ON \
-  "x11cmyk"  "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
-  "x11cmyk2" "X Windows as a 2-bit-per-plane CMYK device" OFF \
-  "x11cmyk4" "X Windows as a 4-bit-per-plane CMYK device" OFF \
-  "x11cmyk8" "X Windows as an 8-bit-per-plane CMYK device" OFF \
-  "x11gray2" "X Windows as a 2-bit gray-scale device" ON \
-  "x11gray4" "X Windows as a 4-bit gray-scale device" ON \
-  "x11mono"  "X Windows masquer. as black-and-white device" ON \
+  "x11"      "X Window System version 11, release >=4" ON \
+  "x11alpha" "X Window System masquer. as device with alpha capability" ON \
+  "x11cmyk"  "X Window System masquer. as 1-bit-per-plane CMYK device" ON \
+  "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" OFF \
+  "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" OFF \
+  "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" OFF \
+  "x11gray2" "X Window System as a 2-bit gray-scale device" ON \
+  "x11gray4" "X Window System as a 4-bit gray-scale device" ON \
+  "x11mono"  "X Window System masquer. as black-and-white device" ON \
+  "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \
+  "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -179,12 +206,18 @@ case $retval in
 esac
 
 # bring it into the right format with '.dev' appended to each driver name
+#old:
+#echo "DEVICE_DEVS=$choice" \
+#	| sed -e "s/\"//g" \
+#	| sed -e "s/ /.dev /g" \
+#	| sed -e "s/$/.dev/g" \
+#	> ${WRKSRC}/src/unix-gcc.mak.new
+# XXX new:
 echo "DEVICE_DEVS=$choice" \
-	| sed -e "s/\"//g" \
-	| sed -e "s/ /.dev /g" \
-	| sed -e "s/$/.dev/g" \
-	> ${WRKSRC}/unix-gcc.mak.new
+	| perl -pe 's|"([a-z0-9]+)"|\$(DD)\1.dev|g' \
+	> ${WRKSRC}/src/unix-gcc.mak.new
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
-cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
-mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
+sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
+	>> ${WRKSRC}/src/unix-gcc.mak.new
+mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak
diff --git a/print/ghostscript-gnu/scripts/configure.batch b/print/ghostscript-gnu/scripts/configure.batch
index 75c2755395b9..b4d015d2b98c 100644
--- a/print/ghostscript-gnu/scripts/configure.batch
+++ b/print/ghostscript-gnu/scripts/configure.batch
@@ -1,9 +1,14 @@
 #! /bin/sh
 
-cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=appledmp.dev iwhi.dev iwlo.dev iwlq.dev hl7x0.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev lbp8.dev lips3.dev m8510.dev uniprint.dev la50.dev la70.dev la75.dev la75plus.dev lj250.dev declj250.dev ln03.dev ap3250.dev epson.dev eps9mid.dev eps9high.dev lp8000.dev lq850.dev epsonc.dev st800.dev stcolor.dev lp2563.dev dnj650c.dev deskjet.dev djet500.dev cdeskjet.dev djet500c.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj670.dev cdj850.dev cdj890.dev cdj1600.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev cljet5.dev lj5mono.dev lj5gray.dev pj.dev pjetxl.dev pjxl.dev paintjet.dev pjxl300.dev pxlmono.dev pxlcolor.dev ibmpro.dev jetp3852.dev imagen.dev cp50.dev necp6.dev oce9050.dev oki182.dev okiibm.dev r4081.dev sj48.dev xes.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev ccr.dev cgmmono.dev cgm8.dev cgm24.dev sxlcrt.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev bit.dev bitrgb.dev bitcmyk.dev cif.dev miff24.dev inferno.dev jpeg.dev jpeggray.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pdfwrite.dev plan9bm.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev pswrite.dev epswrite.dev sgirgb.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev
+cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
+ifndef WITHOUT_X11
+DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
+endif
+
+DEVICE_DEVS+= \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dl2100.dev \$(DD)la50.dev \$(DD)la70.dev \$(DD)la75.dev \$(DD)la75plus.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ln03.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)hpijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)xes.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)sxlcrt.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
-cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
-mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
+sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
+	>> ${WRKSRC}/src/unix-gcc.mak.new
+mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 80a20d521636..b5e7f7e246cf 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -6,34 +6,60 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	5.50a
+PORTVERSION=	6.51
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.cs.wisc.edu/ghost/gnu/gs550/ \
-		ftp://ftp.cs.wisc.edu/ghost/gnu/fonts/ \
+		${MASTER_SITE_SOURCEFORGE} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
-		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+		http://www.gelhaus.net/hp880c/1.4beta/ \
+		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
+		http://www.harsch.net/Download/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs651/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+PKGNAMESUFFIX=	-gnu
+
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP850_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \
+		${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract \
-		unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
-NO_LATEST_LINK=	"Older version."
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+CFLAGS+=	-DUPD_SIGNAL=0
+MAKEFILE=	src/unix-gcc.mak
+ALL_TARGET=	all pcl3opts escputil
+PLIST_SUB=	GS_VERSION=${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/gs5.50
+MAN1=		dvipdf.1 eps2eps.1 escputil.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
+		gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \
+		pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 \
+		ps2pdfwr.1 ps2ps.1 wftopfa.1
+MLINKS=		gslp.1 gsbj.1 \
+		gslp.1 gsdj.1 \
+		gslp.1 gsdj500.1 \
+		gslp.1 gslj.1 \
+		ps2pdf.1 ps2pdf12.1 \
+		ps2pdf.1 ps2pdf13.1
 
+.if defined(A4)
+CFLAGS+=	-DA4
+.endif
+
+.if !defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-gnu
 USE_XLIB=	yes
-USE_GMAKE=	yes
-MAKEFILE=	unix-gcc.mak
-MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
+.else
+PKGNAMESUFFIX=	-gnu-nox11
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
+.endif
 
-GS_SOURCES=	gnu-gs-5.50a.tar.gz
+GS_SOURCES=	${DISTNAME}${EXTRACT_SUFX}
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
@@ -41,52 +67,270 @@ GS_SOURCES=	gnu-gs-5.50a.tar.gz
 GS_FONTS_STD=	gnu-gs-fonts-std-6.0.tar.gz
 GS_FONTS_OTHER=	gnu-gs-fonts-other-6.0.tar.gz
 
-# Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
-HP850_DRV=	hp8xxs13.zip
+# Additional Drivers:
+
+# Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
+# http://www.gelhaus.net/hp880c/
+HP8XX=		cdj880
+HP8XX_DRV=	gdevcd8.tar.gz
+
+# HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
+# still present, just for the case pcl3 is missing some hpdj feature
+# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+HPDJ=		hpdj
+HPDJ_VERS=	2.6
+HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
+HPDJ_SRC=	${HPDJ_NAME}.tar.gz
+HPDJ_MAN1=	gs-hpdj.1
+
+# PCL3 (hpdj successor now in RELEASE quality)
+# additional driver for HP PCL3 Printers, by Martin Lottermoser
+# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+PCL3=		pcl3
+PCL3_VERS=	3.2
+PCL3_NAME=	${PCL3}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}.tar.gz
+PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
+
+# additional driver for HP DeskJet 970, supports duplex printing
+# http://www.harsch.net/Ghostscript/ghostscript.html
+HP970_DRV=	gdevdj9.c.gz
+
+# gimp-print - very high quality driver for Epson, HPs,...
+# http://gimp-print.sourceforge.net/
+GPRINT=		print
+GPRINT_DESC=	gimp-${GPRINT}
+GPRINT_VERS=	4.0.5
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_MAN1=	escputil.1
+
+# HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series
+# http://hpinkjet.sourceforge.net/
+HPIJS=		hpijs
+HPIJS_VERS=	0.97
+HPIJS_NAME=	${HPIJS}${HPIJS_VERS}
+HPIJS_SRC=	${HPIJS_NAME}.tar.gz
+
+# contributed uniprint profiles
+CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
+		stc740ih.upp stc740p.upp stc740pl.upp
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
 
-.if defined(A4)
-CFLAGS+=	-DA4
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+CFLAGS+=	-D_LITTLE_ENDIAN
 .endif
 
-pre-fetch:
+.SILENT:
+
+pre-everything:
 .if !defined(A4)
-	@${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+	${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
 .else
-	@${ECHO_MSG} "Using -DA4 for compilation."
+	${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
 post-extract:
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	unzip -L -q -aa -o ${DISTDIR}/${HP850_DRV} -d ${WRKSRC} -x devs.mak
+	${ECHO_MSG} ">>> in post-extract ..."
+	${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
+		${WRKSRC}/jpeg
+	${RM} -f ${WRKSRC}/man/de/*.1
+# ** 3rd party driver **
+# Note: don't forget to add those devices in scripts/configure and
+# configure.batch, which update unix-gcc.mak to build gs with these
+# new devices !
+#
+# for HP8XX driver
+	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+# for HPDJ driver
+	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
+# for PCL3 driver
+	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
+	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
+# for HP DeskJet 970 driver
+	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
+	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for gimp-print
+	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
+
+post-patch:
+	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
+		${WRKSRC}/src/unix-gcc.mak
+	find ${WRKSRC}/src -name '*.[ch]' | xargs ${PERL} -pi -e \
+		's|pputc|stream_putc|g; \
+		 s|pwrite|stream_write|g ; \
+		 s|pputs|stream_puts|g'
+# for HPinkjet driver
+	find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
+		's|#include <malloc.h>||g; \
+		 s|SRVPATH \"hpijs\"|SRVPATH \"${PREFIX}/libexec/hpijs\"|g'
+
+# here we apply the modifications necessary to build the 3rd party drivers
+# advantage: you see unmodified makefiles after a pure make extract
+pre-configure:
+	${ECHO_MSG} ">>> in pre-configure ..."
+# for HPDJ driver
+	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
+		>> ${WRKSRC}/src/contrib.mak
+# for PCL3 driver
+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
+		>> ${WRKSRC}/src/contrib.mak
+# for gimp-print
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+		${WRKSRC}/src
+	${ECHO_MSG} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	${ECHO_MSG} ">>>   adding make rules for escputil to contrib.mak ..."
+	${CAT} ${FILESDIR}/escputil.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   creating symlinks for ${HPIJS} ..."
+	${LN} -sf ${WRKSRC}/${HPIJS_NAME}/gdevhpij.[ch] \
+		${WRKSRC}/src
+	${ECHO_MSG} ">>>   adding ${HPIJS} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/hpijs.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
+	${ECHO_MSG} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
+	${ECHO_MSG} ">>> in pre-build ..."
+	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
+	${MKDIR} ${WRKSRC}/bin
+
+post-build:
+# for HPinkjet driver
+	cd ${WRKSRC}/${HPIJS_NAME} ; \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} makefile
 
 pre-install:
-	@${MKDIR} ${PREFIX}/share/ghostscript
-	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	${ECHO_MSG} ">>> in pre-install ..."
+	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript
+	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_STD}
+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
 
-# install the readme and license file of the hp8xxx driver as well
 post-install:
+	${ECHO_MSG} ">>> in post-install ..."
+	${ECHO_MSG} ">>>   stripping gs ..."
 	strip ${PREFIX}/bin/gs
-	${INSTALL_SCRIPT} ${WRKSRC}/unix-lpr.sh ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/lprsetup.sh ${PREFIX}/bin
-	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
-		${PREFIX}/share/ghostscript/5.50
-	${INSTALL_DATA} ${WRKSRC}/license.hp8 \
-		${PREFIX}/share/ghostscript/5.50/doc
-	${INSTALL_DATA} ${WRKSRC}/readme.hp8 \
-		${PREFIX}/share/ghostscript/5.50/doc
-
-.include <bsd.port.mk>
+# for HPDJ driver
+	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
+.for i in ${HPDJ_MAN1}
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+.endfor
+	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
+	${ECHO_MSG} ">>>   installing files in ${HPDJ} destdir ..."
+.for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
+	margins-Letter.ps margins-LetterRotated.ps
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
+.endfor
+# for PCL3 driver
+	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
+.for i in ${PCL3_MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+.endfor
+# other pcl3 stuff, which might be interesting for runtime
+	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+	${ECHO_MSG} ">>>   installing files in ${PCL3} destdir ..."
+.for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
+	ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
+	ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps \
+	ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
+	ps/margins-LetterRotated.ps
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+.endfor
+# for gimp-print driver
+	${ECHO_MSG} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	${ECHO_MSG} ">>>   installing ${GPRINT_DESC} manpages ..."
+.for i in ${GPRINT_MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/man/man1
+.endfor
+	${ECHO_MSG} ">>>   creating ${GPRINT_DESC} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	${ECHO_MSG} ">>>   installing files in gimp-print destdir ..."
+.for i in README
+	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+.endfor
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   installing ${HPIJS} server in libexecdir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/libexec
+	${ECHO_MSG} ">>>   creating ${HPIJS} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpijs
+	${ECHO_MSG} ">>>   installing files in ${HPIJS} destdir ..."
+.for i in hpijs_readme.html
+	${INSTALL_DATA} ${WRKSRC}/${HPIJS}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/hpijs
+.endfor
+# contributed UPP driver
+	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
+.for i in ${CONTRIB_UPP}
+	${INSTALL_DATA} ${FILESDIR}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+.endfor
+# for reading encrypted PDFs
+	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
+	${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+#
+# now NOPORTDOCS dependend stuff
+#
+.if !defined(NOPORTDOCS)
+	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
+# install hpdj docu, not necessary for runtime
+# note: old hpdj driver has its files in ${WRKSRC}/src
+	${ECHO_MSG} ">>>   creating ${HPDJ} docu destdir ..."
+	${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
+	${ECHO_MSG} ">>>   installing files in ${HPDJ} docu destdir ..."
+.for i in NEWS hpdj.html
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
+.endfor
+# install pcl3 docu, not necessary for runtime
+# note: new pcl3 driver has a subdir of its own
+	${ECHO_MSG} ">>>   creating ${PCL3} docu destdir ..."
+	${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
+	${ECHO_MSG} ">>>   installing files in ${PCL3} docu destdir ..."
+.for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
+.endfor
+.endif
+	${ECHO_MSG} "> post-installation tasks completed."
+
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index fd6451bcce61..4031e206ccb9 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -1,5 +1,10 @@
-MD5 (gnu-gs-5.50a.tar.gz) = c12ea8dd56cfc453c99bd8864dfc90db
+MD5 (ghostscript-6.51.tar.bz2) = 6b6d2123daaa1d217aadcbba7f2d6179
 MD5 (gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
 MD5 (gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
-MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
+MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
+MD5 (pcl3-3.2.tar.gz) = c98b9404dfc47d5ff907f9ad81dcbd46
+MD5 (gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
+MD5 (print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
+MD5 (hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/print/ghostscript7/files/escputil.contrib.mak b/print/ghostscript7/files/escputil.contrib.mak
new file mode 100644
index 000000000000..b0cea6064968
--- /dev/null
+++ b/print/ghostscript7/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript7/files/hpijs.contrib.mak b/print/ghostscript7/files/hpijs.contrib.mak
new file mode 100644
index 000000000000..35eb9e6b06b1
--- /dev/null
+++ b/print/ghostscript7/files/hpijs.contrib.mak
@@ -0,0 +1,31 @@
+### ------------- Hewlett-Packard Co. Inkjet Driver -------------- ###
+
+hpijs_=$(GLOBJ)gdevhpij.$(OBJ)
+
+$(DD)gdevhpij.$(OBJ): $(GLSRC)gdevhpij.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevhpij.$(OBJ) $(C_) $(GLSRC)gdevhpij.c
+
+$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) $(DD)hpijs $(hpijs_)
+
+$(DD)DJ630.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ630 $(hpijs_)
+
+$(DD)DJ6xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ6xx $(hpijs_)
+
+$(DD)DJ6xxP.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ6xxP $(hpijs_)
+
+$(DD)DJ8xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ8xx $(hpijs_)
+
+$(DD)DJ9xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ9xx $(hpijs_)
+
+$(DD)DJ9xxVIP.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ9xxVIP $(hpijs_)
+
+$(DD)AP21xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) AP21xx $(hpijs_)
+
diff --git a/print/ghostscript7/files/lqx70ch.upp b/print/ghostscript7/files/lqx70ch.upp
new file mode 100644
index 000000000000..b5d3cd49e912
--- /dev/null
+++ b/print/ghostscript7/files/lqx70ch.upp
@@ -0,0 +1,26 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70ch.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x360DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r360x360
+-dupMargins="{ 9.0 0.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 0A
+   1b5501
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/lqx70cl.upp b/print/ghostscript7/files/lqx70cl.upp
new file mode 100644
index 000000000000..91fb1aa89906
--- /dev/null
+++ b/print/ghostscript7/files/lqx70cl.upp
@@ -0,0 +1,26 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70cl.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 180x180DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r180x180
+-dupMargins="{ 9.0 0.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 14
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/lqx70cm.upp b/print/ghostscript7/files/lqx70cm.upp
new file mode 100644
index 000000000000..895af73aa8d8
--- /dev/null
+++ b/print/ghostscript7/files/lqx70cm.upp
@@ -0,0 +1,25 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70cm.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x180DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r360x180
+-dupMargins="{ 9.0 24.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 14
+   1b5501
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/patch-aa b/print/ghostscript7/files/patch-aa
deleted file mode 100644
index 7aeee26276fe..000000000000
--- a/print/ghostscript7/files/patch-aa
+++ /dev/null
@@ -1,150 +0,0 @@
---- unix-gcc.mak.orig	Mon Feb 14 11:28:41 2000
-+++ unix-gcc.mak	Sat Jul 29 00:40:45 2000
-@@ -54,12 +54,10 @@
- # the directories also define the default search path for the
- # initialization files (gs_*.ps) and the fonts.
- 
--# If your system has installbsd, change install to installbsd in the next line.
--INSTALL = install -c
--INSTALL_PROGRAM = $(INSTALL) -m 755
--INSTALL_DATA = $(INSTALL) -m 644
-+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
-+INSTALL_DATA = $(BSD_INSTALL_DATA)
- 
--prefix = /usr/local
-+prefix = $(PREFIX)
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- scriptdir = $(bindir)
-@@ -140,14 +138,14 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${LOCALBASE}/include
- PVERSION=96
- 
- # Choose whether to use a shared version of the PNG library, and if so,
- # what its name is.
- # See gs.mak and Make.htm for more information.
- 
--SHARE_LIBPNG=0
-+SHARE_LIBPNG=1
- LIBPNG_NAME=png
- 
- # Define the directory where the zlib sources are stored.
-@@ -159,7 +157,7 @@
- # what its name is (usually libz, but sometimes libgz).
- # See gs.mak and Make.htm for more information.
- 
--SHARE_ZLIB=0
-+SHARE_ZLIB=1
- #ZLIB_NAME=gz
- ZLIB_NAME=z
- 
-@@ -178,7 +176,7 @@
- 
- # Define the name of the C compiler.
- 
--CC=gcc
-+#CC=cc
- 
- # Define the name of the linker for the final link step.
- # Normally this is the same as the C compiler.
-@@ -211,7 +209,7 @@
- #   gcc to accept ANSI-style function prototypes and function definitions.
- XCFLAGS=
- 
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
- 
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -220,7 +218,7 @@
- #	-R /usr/local/xxx/lib:/usr/local/lib
- # giving the full path names of the shared library directories.
- # XLDFLAGS can be set from the command line.
--XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
- 
- LDFLAGS=$(XLDFLAGS) -fno-common
- 
-@@ -240,7 +238,7 @@
- # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
- # not in $(XINCLUDE).
- 
--XINCLUDE=-I/usr/local/X/include
-+XINCLUDE=-I$(X11BASE)/include
- 
- # Define the directory/ies and library names for the X11 library files.
- # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -252,12 +250,12 @@
- # Solaris and other SVR4 systems with dynamic linking probably want
- #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
- # X11R6 (on any platform) may need
--#XLIBS=Xt SM ICE Xext X11
-+XLIBS=Xt SM ICE Xext X11
- 
- #XLIBDIRS=-L/usr/local/X/lib
--XLIBDIRS=-L/usr/X11/lib
-+XLIBDIRS=-L$(X11BASE)/lib
- XLIBDIR=
--XLIBS=Xt Xext X11
-+#XLIBS=Xt X11
- 
- # Define whether this platform has floating point hardware:
- #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -298,27 +296,6 @@
- 
- FILE_IMPLEMENTATION=stdio
- 
--# Choose the device(s) to include.  See devs.mak for details,
--# devs.mak and contrib.mak for the list of available devices.
--
--DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11gray4.dev x11mono.dev
--#DEVICE_DEVS1=bmpmono.dev bmpamono.dev posync.dev
--DEVICE_DEVS1=
--DEVICE_DEVS2=
--DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
--DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
--DEVICE_DEVS5=uniprint.dev
--DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
--DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
--DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
--DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev
--DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
--DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
--DEVICE_DEVS12=psmono.dev psgray.dev psrgb.dev bit.dev bitrgb.dev bitcmyk.dev
--DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
--DEVICE_DEVS14=jpeg.dev jpeggray.dev
--DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
--
- # ---------------------------- End of options --------------------------- #
- 
- # Define the name of the partial makefile that specifies options --
-@@ -326,16 +303,10 @@
- 
- MAKEFILE=$(GLSRC)unix-gcc.mak
- 
--# Define the ANSI-to-K&R dependency.  There isn't one, but we do have to
--# detect whether we're running a version of gcc with the const optimization
--# bug.
--
--AK=$(GLGENDIR)/cc.tr
--
- # Define the compilation rules and flags.
- 
- CCFLAGS=$(GENOPT) $(CFLAGS)
--CC_=$(CC) `cat $(AK)` $(CCFLAGS)
-+CC_=$(CC) $(CCFLAGS)
- CCAUX=$(CC)
- #We can't use -fomit-frame-pointer with -pg....
- #CC_LEAF=$(CC_)
-@@ -356,7 +327,3 @@
- include $(GLSRC)unixtail.mak
- include $(GLSRC)unix-end.mak
- include $(GLSRC)unixinst.mak
--
--# This has to come last so it won't be taken as the default target.
--$(AK):
--	if ( gcc --version | grep "2.7.[01]" >/dev/null || test `gcc --version` = 2.7.2 ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript7/files/patch-ab b/print/ghostscript7/files/patch-ab
deleted file mode 100644
index aee04b39d512..000000000000
--- a/print/ghostscript7/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- gs_init.ps.orig	Thu Jan  2 19:23:13 1997
-+++ gs_init.ps	Thu Jan  2 19:24:46 1997
-@@ -1363,3 +1363,7 @@
- (END GC) VMDEBUG
- 
- % The interpreter will run the initial procedure (start).
-+
-+% unofficial patch:
-+% make it possible to print from within acroread pdf viewer
-+/Default currenthalftone /Halftone defineresource pop
diff --git a/print/ghostscript7/files/patch-ac b/print/ghostscript7/files/patch-ac
deleted file mode 100644
index ebd487b9fa66..000000000000
--- a/print/ghostscript7/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- contrib.mak.orig	Tue Sep 15 04:03:52 1998
-+++ contrib.mak	Tue Dec  1 15:37:58 1998
-@@ -435,6 +435,18 @@
- cdj850.dev: $(cdeskjet8_) page.dev
- 	$(SETPDEV) cdj850 $(cdeskjet8_)
- 
-+cdj670.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj670 $(cdeskjet8_)
-+
-+cdj890.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj890 $(cdeskjet8_)
-+
-+cdj1600.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj1600 $(cdeskjet8_)
-+
-+$(GLOBJ)gdevcd8.$(OBJ): $(GLSRC)gdevcd8.c $(GLSRC)gdevcd8.h $(PDEVH)
-+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
-+
- ### ------------ The H-P PaintJet color printer device ----------------- ###
- ### Note: this driver also supports the DEC LJ250 color printer, which   ###
- ###       has a PaintJet-compatible mode, and the PaintJet XL.           ###
diff --git a/print/ghostscript7/files/patch-hpijs:makefile b/print/ghostscript7/files/patch-hpijs:makefile
new file mode 100644
index 000000000000..8f53a8202f59
--- /dev/null
+++ b/print/ghostscript7/files/patch-hpijs:makefile
@@ -0,0 +1,32 @@
+--- hpijs/makefile.orig	Fri Jun  8 06:10:57 2001
++++ hpijs/makefile	Tue Jul 10 03:09:21 2001
+@@ -1,17 +1,17 @@
+-FLAGS = -D_LITTLE_ENDIAN -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
++FLAGS = -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
+ 	-D_DJ9xxVIP -D_DJ630 -D_APOLLO2100 -D_DJ600 -D_DJ350
+ 
+ VERSION=0.97
+ INSTALLDIR=/usr/bin
+ 
+ 
+-CC = g++ -c -Wall -DVERSION=\"$(VERSION)\" $(FLAGS)
++CXXFLAGS += -DVERSION=\"$(VERSION)\" $(FLAGS)
+ #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" -DCAPTURE $(FLAGS)
+ #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" $(FLAGS)
+ 
+ .cpp.o:
+ 	echo "compiling $(<F)"
+-	$(CC) $(<F) -o $(*F).o
++	$(CXX) $(CXXFLAGS) -c $(<F) -o $(*F).o
+ 
+ OBJS = hpijs.o models.o breaks_open.o \
+ 	aladdin.o broadway.o capture.o \
+@@ -28,7 +28,7 @@
+ 
+ 
+ linkit: $(OBJS)
+-	g++ $(OBJS) -o hpijs
++	$(CXX) $(OBJS) -o hpijs
+ 
+ install:
+ 	install -m 0755 -s hpijs $(INSTALLDIR)
diff --git a/print/ghostscript7/files/patch-lib:gs_init.ps b/print/ghostscript7/files/patch-lib:gs_init.ps
new file mode 100644
index 000000000000..dd14a517967b
--- /dev/null
+++ b/print/ghostscript7/files/patch-lib:gs_init.ps
@@ -0,0 +1,19 @@
+--- lib/gs_init.ps.orig	Tue Jun  5 16:42:40 2001
++++ lib/gs_init.ps	Wed Jun 20 04:16:46 2001
+@@ -1247,7 +1247,7 @@
+ % Set the default screen and BG/UCR.
+ /.setdefaultbgucr {
+   systemdict /setblackgeneration known {
+-    { pop 0 } dup setblackgeneration setundercolorremoval
++    {} dup setblackgeneration setundercolorremoval
+   } if
+ } bind def
+ /.useloresscreen {	% - .useloresscreen <bool>
+@@ -1799,3 +1799,7 @@
+ (END GC) VMDEBUG
+ 
+ % The interpreter will run the initial procedure (start).
++
++% unofficial patch:
++% make it possible to print from within acroread pdf viewer
++/Default currenthalftone /Halftone defineresource pop
diff --git a/print/ghostscript7/files/patch-src:contrib.mak-5.94.add b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
new file mode 100644
index 000000000000..1d2c46b8ea2e
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
@@ -0,0 +1,14 @@
+--- src/contrib.mak-5.94.add.orig	Sun Oct 17 05:20:06 1999
++++ src/contrib.mak-5.94.add	Tue Jun 19 03:20:13 2001
+@@ -102,11 +102,6 @@
+ $(GLOBJ)hpdjprn.$(OBJ): $(GLSRC)hpdjprn.c
+ 	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)hpdjprn.c
+ 
+-$(GLOBJ)pclcomp.$(OBJ): $(GLSRC)pclcomp.c
+-	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pclcomp.c
+-
+-$(GLOBJ)pagecount.$(OBJ): $(GLSRC)pagecount.c
+-	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pagecount.c
+ 
+ 
+ $(DD)hpdj.dev: $(hpdj_) $(DD)page.dev
diff --git a/print/ghostscript7/files/patch-src:gdevxini.c b/print/ghostscript7/files/patch-src:gdevxini.c
new file mode 100644
index 000000000000..44bb6b3984f6
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:gdevxini.c
@@ -0,0 +1,14 @@
+--- src/gdevxini.c.orig	Tue Jun  5 15:38:57 2001
++++ src/gdevxini.c	Wed Jun 20 04:17:15 2001
+@@ -655,8 +655,10 @@
+     }
+     x_set_buffer(xdev);
+     /* Clear the destination pixmap to avoid initializing with garbage. */
+-    xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
++    if (xdev->dest == (Pixmap) 0) {
++    	xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
+ 		  xdev->bpixmap : (Pixmap) xdev->win);
++    }
+     if (xdev->dest != (Pixmap) 0) {
+ 	XSetForeground(xdev->dpy, xdev->gc, xdev->background);
+ 	XFillRectangle(xdev->dpy, xdev->dest, xdev->gc,
diff --git a/print/ghostscript7/files/patch-src:genarch.c b/print/ghostscript7/files/patch-src:genarch.c
new file mode 100644
index 000000000000..a015e69e758a
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:genarch.c
@@ -0,0 +1,34 @@
+--- src/genarch.c.orig	Tue Jun  5 15:38:57 2001
++++ src/genarch.c	Wed Jun 20 04:17:42 2001
+@@ -41,6 +41,7 @@
+     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
+ }
+ 
++#ifndef __FreeBSD__
+ private clock_t
+ time_clear(char *buf, int bsize, int nreps)
+ {
+@@ -51,6 +52,7 @@
+ 	memset(buf, 0, bsize);
+     return clock() - t;
+ }
++#endif /* __FreeBSD__ */
+ 
+ private void
+ define(FILE *f, const char *str)
+@@ -181,6 +183,7 @@
+     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
+ #undef PRINT_MAX
+ 
++#ifndef __FreeBSD__
+     section(f, "Cache sizes");
+ 
+     /*
+@@ -241,6 +244,7 @@
+ 	}
+ 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
+     }
++#endif /* __FreeBSD__ */
+ 
+     section(f, "Miscellaneous");
+ 
diff --git a/print/ghostscript-gnu/files/patch-ad b/print/ghostscript7/files/patch-src:gp_unifs.c
index 9688a7b217ff..e7db705ace5f 100644
--- a/print/ghostscript-gnu/files/patch-ad
+++ b/print/ghostscript7/files/patch-src:gp_unifs.c
@@ -1,6 +1,6 @@
---- gp_unifs.c.orig	Mon Feb 14 11:28:25 2000
-+++ gp_unifs.c	Fri Jul 28 23:53:04 2000
-@@ -33,6 +33,7 @@
+--- src/gp_unifs.c.orig	Tue Jun  5 15:38:58 2001
++++ src/gp_unifs.c	Wed Jun 20 04:18:03 2001
+@@ -29,6 +29,7 @@
  #include "stat_.h"
  #include "dirent_.h"
  #include <sys/param.h>		/* for MAXPATHLEN */
@@ -8,26 +8,26 @@
  
  /* Some systems (Interactive for example) don't define MAXPATHLEN,
   * so we define it here.  (This probably should be done via a Config-Script.)
-@@ -63,6 +64,8 @@
+@@ -59,6 +60,8 @@
  		     const char *mode)
  {				/* The -8 is for XXXXXX plus a possible final / and -. */
      int len = gp_file_name_sizeof - strlen(prefix) - 8;
 +    int fd;
 +    FILE *f;
  
-     if (gp_getenv("TEMP", fname, &len) != 0)
+     if (gp_gettmpdir(fname, &len) != 0)
  	strcpy(fname, "/tmp/");
-@@ -75,8 +78,12 @@
+@@ -71,8 +74,12 @@
      if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
  	strcat(fname, "-");
      strcat(fname, "XXXXXX");
 -    mktemp(fname);
--    return fopen(fname, mode);
+-    return gp_fopentemp(fname, mode);
 +    fd = mkstemp(fname);
 +    if (fd == -1)
-+    	return NULL;
++	return NULL;
 +    if ((f = fdopen(fd, mode)) == NULL)
-+    	close(fd);
++	close(fd);
 +    return f;
  }
  
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
new file mode 100644
index 000000000000..c0082fdd6ecd
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -0,0 +1,135 @@
+--- src/unix-gcc.mak.orig	Tue Jun  5 16:54:10 2001
++++ src/unix-gcc.mak	Fri Jun 15 04:11:50 2001
+@@ -27,14 +27,15 @@
+ # source, generated intermediate file, and object directories
+ # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
+ 
+-BINDIR=./bin
+-GLSRCDIR=./src
+-GLGENDIR=./obj
+-GLOBJDIR=./obj
+-PSSRCDIR=./src
+-PSLIBDIR=./lib
+-PSGENDIR=./obj
+-PSOBJDIR=./obj
++.CURDIR?=.
++BINDIR=${.CURDIR}/bin
++GLSRCDIR=${.CURDIR}/src
++GLGENDIR=${.CURDIR}/obj
++GLOBJDIR=${.CURDIR}/obj
++PSSRCDIR=${.CURDIR}/src
++PSLIBDIR=${.CURDIR}/lib
++PSGENDIR=${.CURDIR}/obj
++PSOBJDIR=${.CURDIR}/obj
+ 
+ # Do not edit the next group of lines.
+ 
+@@ -53,17 +54,17 @@
+ # the directories also define the default search path for the
+ # initialization files (gs_*.ps) and the fonts.
+ 
+-INSTALL = $(GLSRCDIR)/instcopy -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ 
+-prefix = /usr/local
++prefix = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+ libdir = $(exec_prefix)/lib
+ mandir = $(prefix)/man
+ man1ext = 1
++man1dir = $(mandir)/man$(man1ext)
+ datadir = $(prefix)/share
+ gsdir = $(datadir)/ghostscript
+ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+@@ -129,7 +130,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+ 
+-JSRCDIR=jpeg
++JSRCDIR=${.CURDIR}/jpeg
+ JVERSION=6
+ 
+ # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
+@@ -149,14 +150,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=10008
+ 
+ # Choose whether to use a shared version of the PNG library, and if so,
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define the directory where the zlib sources are stored.
+@@ -168,7 +169,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+@@ -183,7 +184,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++CC?=cc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -218,7 +219,7 @@
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+ XCFLAGS=
+ 
+-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+@@ -227,7 +228,7 @@
+ #	-R /usr/local/xxx/lib:/usr/local/lib
+ # giving the full path names of the shared library directories.
+ # XLDFLAGS can be set from the command line.
+-XLDFLAGS=
++XLDFLAGS=-L${LOCALBASE}/lib
+ 
+ LDFLAGS=$(XLDFLAGS) -fno-common
+ 
+@@ -260,7 +261,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/X11R6/include
++XINCLUDE=-I${X11BASE}/include
+ 
+ # Define the directory/ies and library names for the X11 library files.
+ # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
+@@ -272,12 +273,12 @@
+ # Solaris and other SVR4 systems with dynamic linking probably want
+ #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
+ # X11R6 (on any platform) may need
+-#XLIBS=Xt SM ICE Xext X11
++XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11R6/lib
++XLIBDIRS=-L${X11BASE}/lib
+ XLIBDIR=
+-XLIBS=Xt Xext X11
++#XLIBS=Xt Xext X11
+ 
+ # Define whether this platform has floating point hardware:
+ #	FPU_TYPE=2 means floating point is faster than fixed point.
diff --git a/print/ghostscript7/files/patch-src:zmedia2.c b/print/ghostscript7/files/patch-src:zmedia2.c
new file mode 100644
index 000000000000..6e19c2ddfd8e
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:zmedia2.c
@@ -0,0 +1,25 @@
+--- src/zmedia2.c.orig	Tue Jun  5 15:39:08 2001
++++ src/zmedia2.c	Wed Jun 20 04:18:27 2001
+@@ -430,11 +430,17 @@
+ 
+ 	rx = ry, ry = temp;
+     }
+-    /* Adjust the medium size if flexible. */ 
+-    if (medium->p.x < MIN_MEDIA_SIZE && mx > rx)
+-	mx = rx;
+-    if (medium->p.y < MIN_MEDIA_SIZE && my > ry)
+-	my = ry;
++    /* If 'medium' is flexible, adjust 'mx' and 'my' towards 'rx' and 'ry',
++	respectively. Note that 'mx' and 'my' have just acquired the largest
++	permissible value, medium->q. */
++    if (medium->p.x < mx)     /* non-empty width range */
++	if (rx < medium->p.x) mx = medium->p.x; /* minimum */
++	else if (mx > rx) mx = rx;      /* fits */
++	/* else use medium->q.x, i.e., the maximum */
++    if (medium->p.y < my)     /* non-empty height range */
++	if (ry < medium->p.y) my = medium->p.y; /* minimum */
++	else if (my > ry) my = ry;      /* fits */
++	/* else use medium->q.y, i.e., the maximum */
+ 
+     /* Translate to align the centers. */ 
+     gs_make_translation(mx / 2, my / 2, pmat);
diff --git a/print/ghostscript7/files/stc740ih.upp b/print/ghostscript7/files/stc740ih.upp
new file mode 100644
index 000000000000..bb9805f55fb8
--- /dev/null
+++ b/print/ghostscript7/files/stc740ih.upp
@@ -0,0 +1,60 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740ih.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 1440x720DpI, Inkjet Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2XY
+-r1440x720
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupBlackTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupCyanTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupMagentaTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupYellowTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveXPasses=2
+-dupOutputXStep=2
+-dupWeaveYPasses=6
+-dupOutputPins=46
+-dupWeaveYFeeds="{23 23 23 23 23 23 23 23 23 23 23 23}"
+-dupWeaveXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
+-dupWeaveYOffset=50
+-dupWeaveInitialYFeeds="{ 5  5  5  5  5  5  5  5  5  5  5 23}"
+-dupWeaveInitialXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
+-dupWeaveInitialPins="{ 13 16 19 22 25 28 31 34 37 40 43 46}"
+-dupFormatYabsolute
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 05
+   1b2873 0100 02
+   1b5501
+   1b2865 0200 0001
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupXStepCommand="<1b285c 0400 a005 0100 0000>"
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/stc740p.upp b/print/ghostscript7/files/stc740p.upp
new file mode 100644
index 000000000000..a4e7f5441793
--- /dev/null
+++ b/print/ghostscript7/files/stc740p.upp
@@ -0,0 +1,36 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740p.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 720x720DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2
+-r720x720
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupBlackTransfer="{   0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupCyanTransfer="{    0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupMagentaTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupYellowTransfer="{  0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveYPasses=6
+-dupOutputPins=48
+-dupWeaveYFeeds="{47 47 47 53 47 47}"
+-dupWeaveInitialYFeeds="{1  1  1  1  1  43}"
+-dupWeaveInitialPins="{ 8 48 40 31 23 15}"
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 05
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/stc740pl.upp b/print/ghostscript7/files/stc740pl.upp
new file mode 100644
index 000000000000..b2fdb0dbbc06
--- /dev/null
+++ b/print/ghostscript7/files/stc740pl.upp
@@ -0,0 +1,32 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740pl.upp,v 1.2 2000/04/21 18:48:01 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 360x360DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2
+-r360x360
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveYPasses=3
+-dupOutputPins=48
+-dupWeaveYFeeds="{47 50 47}"
+-dupWeaveInitialYFeeds="{1 1 46}"
+-dupWeaveInitialPins="{ 16 48 32}"
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 0A
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/pkg-descr b/print/ghostscript7/pkg-descr
index 2cdd4ae58b9d..2ac1b40d16e7 100644
--- a/print/ghostscript7/pkg-descr
+++ b/print/ghostscript7/pkg-descr
@@ -1,22 +1,25 @@
-GNU Ghostscript is the name of a set of software that provides:
+Ghostscript is the well-known PostScript interpreter which is available for
+all common and most esoteric platforms and supports many different printers
+and some displays.
 
-	- An interpreter for the PostScript (TM) language, and
+Versions entitled "GNU Ghostscript" are distributed with the GNU General
+Public License, which allows free use, and free copying and redistribution
+under certain conditions (including, in some cases, commercial distribution).
 
-	- A set of C procedures (the Ghostscript library) that implement
-the graphics capabilities that appear as primitive operations in the
-PostScript language.
-
-GNU Ghostscript comes with NO WARRANTY and NO SUPPORT.  
-
-This FreeBSD port includes two useful add-on packages:
-	o Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
-	  see announcement on
-		 http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
+This port includes add-on packages (not part of the official gs release)
 	o Support for pdfencrypt, see description on
-	  	http://www.ozemail.com.au/~geoffk/pdfencrypt/
+	  - http://members.ozemail.com.au/~geoffk/pdfencrypt/
+	o HP8XX driver for HP DeskJet 880C/882C/895C
+	  - http://www.gelhaus.net/hp880c/
+	o HP970 driver for HP DeskJet 970CXi
+	  - http://www.harsch.net/Ghostscript/ghostscript.html
+	o PCL3 and HPDJ driver for HP DeskJet series
+	  - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+	o Gimp-Print driver for Canon/Epson/Lexmark/HP printers
+	  - http://gimp-print.sourceforge.net/
+	o HPinkjet driver for HP PhotoSmart/DeskJet series
+	  - http://hpinkjet.sourceforge.net/
+	o Additional contributed uniprint driver profiles for
+	  - Epson Stylus Color 740 and Epson LQ-1170
 		
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-PostScript is a trademark of Adobe Systems, Incorporated.
-
 WWW: http://www.gnu.org/software/ghostscript/ghostscript.html
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index 9956c4894535..1407da4877e3 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -1,5 +1,8 @@
 bin/bdftops
 bin/dvipdf
+bin/eps2eps
+bin/escputil
+bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
@@ -11,189 +14,305 @@ bin/gsnd
 bin/lprsetup.sh
 bin/pdf2dsc
 bin/pdf2ps
+bin/pdfopt
+bin/pf2afm
+bin/pfbtopfa
+bin/pj-gs.sh
 bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
+bin/ps2pdf12
+bin/ps2pdf13
+bin/ps2pdfwr
 bin/ps2ps
+bin/pv.sh
+bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
-share/ghostscript/5.50/Fontmap
-share/ghostscript/5.50/acctest.ps
-share/ghostscript/5.50/align.ps
-share/ghostscript/5.50/bdftops.ps
-share/ghostscript/5.50/bjc610a0.upp
-share/ghostscript/5.50/bjc610a1.upp
-share/ghostscript/5.50/bjc610a2.upp
-share/ghostscript/5.50/bjc610a3.upp
-share/ghostscript/5.50/bjc610a4.upp
-share/ghostscript/5.50/bjc610a5.upp
-share/ghostscript/5.50/bjc610a6.upp
-share/ghostscript/5.50/bjc610a7.upp
-share/ghostscript/5.50/bjc610a8.upp
-share/ghostscript/5.50/bjc610b1.upp
-share/ghostscript/5.50/bjc610b2.upp
-share/ghostscript/5.50/bjc610b3.upp
-share/ghostscript/5.50/bjc610b4.upp
-share/ghostscript/5.50/bjc610b6.upp
-share/ghostscript/5.50/bjc610b7.upp
-share/ghostscript/5.50/bjc610b8.upp
-share/ghostscript/5.50/caption.ps
-share/ghostscript/5.50/cbjc600.ppd
-share/ghostscript/5.50/cbjc800.ppd
-share/ghostscript/5.50/cdj550.upp
-share/ghostscript/5.50/cid2code.ps
-share/ghostscript/5.50/decrypt.ps
-share/ghostscript/5.50/doc/Bug-form.htm
-share/ghostscript/5.50/doc/C-style.htm
-share/ghostscript/5.50/doc/Commprod.htm
-share/ghostscript/5.50/doc/Current.htm
-share/ghostscript/5.50/doc/DLL.htm
-share/ghostscript/5.50/doc/Devices.htm
-share/ghostscript/5.50/doc/Drivers.htm
-share/ghostscript/5.50/doc/Fonts.htm
-share/ghostscript/5.50/doc/Helpers.htm
-share/ghostscript/5.50/doc/Hershey.htm
-share/ghostscript/5.50/doc/History1.htm
-share/ghostscript/5.50/doc/History2.htm
-share/ghostscript/5.50/doc/History3.htm
-share/ghostscript/5.50/doc/History4.htm
-share/ghostscript/5.50/doc/Htmstyle.htm
-share/ghostscript/5.50/doc/Humor.htm
-share/ghostscript/5.50/doc/Install.htm
-share/ghostscript/5.50/doc/Language.htm
-share/ghostscript/5.50/doc/Lib.htm
-share/ghostscript/5.50/doc/Make.htm
-share/ghostscript/5.50/doc/New-user.htm
-share/ghostscript/5.50/doc/News.htm
-share/ghostscript/5.50/doc/Ps2pdf.htm
-share/ghostscript/5.50/doc/Psfiles.htm
-share/ghostscript/5.50/doc/Readme.htm
-share/ghostscript/5.50/doc/Source.htm
-share/ghostscript/5.50/doc/Unix-lpr.htm
-share/ghostscript/5.50/doc/Use.htm
-share/ghostscript/5.50/doc/Xfonts.htm
-share/ghostscript/5.50/doc/license.hp8
-share/ghostscript/5.50/doc/ps2epsi.txt
-share/ghostscript/5.50/doc/readme.hp8
-share/ghostscript/5.50/docie.ps
-share/ghostscript/5.50/examples/alphabet.ps
-share/ghostscript/5.50/examples/cheq.ps
-share/ghostscript/5.50/examples/chess.ps
-share/ghostscript/5.50/examples/colorcir.ps
-share/ghostscript/5.50/examples/escher.ps
-share/ghostscript/5.50/examples/golfer.ps
-share/ghostscript/5.50/examples/grayalph.ps
-share/ghostscript/5.50/examples/ridt91.eps
-share/ghostscript/5.50/examples/snowflak.ps
-share/ghostscript/5.50/examples/tiger.ps
-share/ghostscript/5.50/examples/vasarely.ps
-share/ghostscript/5.50/examples/waterfal.ps
-share/ghostscript/5.50/font2c.ps
-share/ghostscript/5.50/font2pcl.ps
-share/ghostscript/5.50/gs_btokn.ps
-share/ghostscript/5.50/gs_ccfnt.ps
-share/ghostscript/5.50/gs_cff.ps
-share/ghostscript/5.50/gs_cidfn.ps
-share/ghostscript/5.50/gs_cmap.ps
-share/ghostscript/5.50/gs_dbt_e.ps
-share/ghostscript/5.50/gs_diskf.ps
-share/ghostscript/5.50/gs_dpnxt.ps
-share/ghostscript/5.50/gs_dps.ps
-share/ghostscript/5.50/gs_dps1.ps
-share/ghostscript/5.50/gs_dps2.ps
-share/ghostscript/5.50/gs_epsf.ps
-share/ghostscript/5.50/gs_fonts.ps
-share/ghostscript/5.50/gs_init.ps
-share/ghostscript/5.50/gs_iso_e.ps
-share/ghostscript/5.50/gs_kanji.ps
-share/ghostscript/5.50/gs_ksb_e.ps
-share/ghostscript/5.50/gs_l2img.ps
-share/ghostscript/5.50/gs_lev2.ps
-share/ghostscript/5.50/gs_ll3.ps
-share/ghostscript/5.50/gs_mex_e.ps
-share/ghostscript/5.50/gs_mro_e.ps
-share/ghostscript/5.50/gs_pdf_e.ps
-share/ghostscript/5.50/gs_pdfwr.ps
-share/ghostscript/5.50/gs_pfile.ps
-share/ghostscript/5.50/gs_res.ps
-share/ghostscript/5.50/gs_setpd.ps
-share/ghostscript/5.50/gs_statd.ps
-share/ghostscript/5.50/gs_std_e.ps
-share/ghostscript/5.50/gs_sym_e.ps
-share/ghostscript/5.50/gs_ttf.ps
-share/ghostscript/5.50/gs_typ32.ps
-share/ghostscript/5.50/gs_typ42.ps
-share/ghostscript/5.50/gs_type1.ps
-share/ghostscript/5.50/gs_wan_e.ps
-share/ghostscript/5.50/gslp.ps
-share/ghostscript/5.50/impath.ps
-share/ghostscript/5.50/landscap.ps
-share/ghostscript/5.50/level1.ps
-share/ghostscript/5.50/lines.ps
-share/ghostscript/5.50/markhint.ps
-share/ghostscript/5.50/markpath.ps
-share/ghostscript/5.50/necp2x.upp
-share/ghostscript/5.50/necp2x6.upp
-share/ghostscript/5.50/packfile.ps
-share/ghostscript/5.50/pcharstr.ps
-share/ghostscript/5.50/pdf2dsc.ps
-share/ghostscript/5.50/pdf_base.ps
-share/ghostscript/5.50/pdf_draw.ps
-share/ghostscript/5.50/pdf_font.ps
-share/ghostscript/5.50/pdf_main.ps
-share/ghostscript/5.50/pdf_ops.ps
-share/ghostscript/5.50/pdf_sec.ps
-share/ghostscript/5.50/pf2afm.ps
-share/ghostscript/5.50/ppath.ps
-share/ghostscript/5.50/prfont.ps
-share/ghostscript/5.50/printafm.ps
-share/ghostscript/5.50/ps2ai.ps
-share/ghostscript/5.50/ps2ascii.ps
-share/ghostscript/5.50/ps2epsi.ps
-share/ghostscript/5.50/quit.ps
-share/ghostscript/5.50/ras1.upp
-share/ghostscript/5.50/ras24.upp
-share/ghostscript/5.50/ras3.upp
-share/ghostscript/5.50/ras32.upp
-share/ghostscript/5.50/ras4.upp
-share/ghostscript/5.50/ras8m.upp
-share/ghostscript/5.50/showchar.ps
-share/ghostscript/5.50/showpage.ps
-share/ghostscript/5.50/stc.upp
-share/ghostscript/5.50/stc1520h.upp
-share/ghostscript/5.50/stc2.upp
-share/ghostscript/5.50/stc2_h.upp
-share/ghostscript/5.50/stc2s_h.upp
-share/ghostscript/5.50/stc500p.upp
-share/ghostscript/5.50/stc500ph.upp
-share/ghostscript/5.50/stc600ih.upp
-share/ghostscript/5.50/stc600p.upp
-share/ghostscript/5.50/stc600pl.upp
-share/ghostscript/5.50/stc800ih.upp
-share/ghostscript/5.50/stc800p.upp
-share/ghostscript/5.50/stc800pl.upp
-share/ghostscript/5.50/stc_h.upp
-share/ghostscript/5.50/stc_l.upp
-share/ghostscript/5.50/stcany.upp
-share/ghostscript/5.50/stcinfo.ps
-share/ghostscript/5.50/stcolor.ps
-share/ghostscript/5.50/traceimg.ps
-share/ghostscript/5.50/traceop.ps
-share/ghostscript/5.50/type1enc.ps
-share/ghostscript/5.50/type1ops.ps
-share/ghostscript/5.50/uninfo.ps
-share/ghostscript/5.50/unprot.ps
-share/ghostscript/5.50/viewcmyk.ps
-share/ghostscript/5.50/viewgif.ps
-share/ghostscript/5.50/viewjpeg.ps
-share/ghostscript/5.50/viewpbm.ps
-share/ghostscript/5.50/viewpcx.ps
-share/ghostscript/5.50/viewps2a.ps
-share/ghostscript/5.50/wftopfa.ps
-share/ghostscript/5.50/winmaps.ps
-share/ghostscript/5.50/wrfont.ps
-share/ghostscript/5.50/zeroline.ps
+libexec/hpijs
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
+share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
+share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
+share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
+share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
+share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
+share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
+share/ghostscript/%%GS_VERSION%%/doc/Current.htm
+share/ghostscript/%%GS_VERSION%%/doc/DLL.htm
+share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
+share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
+share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
+share/ghostscript/%%GS_VERSION%%/doc/Helpers.htm
+share/ghostscript/%%GS_VERSION%%/doc/Hershey.htm
+share/ghostscript/%%GS_VERSION%%/doc/History1.htm
+share/ghostscript/%%GS_VERSION%%/doc/History2.htm
+share/ghostscript/%%GS_VERSION%%/doc/History3.htm
+share/ghostscript/%%GS_VERSION%%/doc/History4.htm
+share/ghostscript/%%GS_VERSION%%/doc/History5.htm
+share/ghostscript/%%GS_VERSION%%/doc/History6.htm
+share/ghostscript/%%GS_VERSION%%/doc/Htmstyle.htm
+share/ghostscript/%%GS_VERSION%%/doc/Humor.htm
+share/ghostscript/%%GS_VERSION%%/doc/Install.htm
+share/ghostscript/%%GS_VERSION%%/doc/Language.htm
+share/ghostscript/%%GS_VERSION%%/doc/Lib.htm
+share/ghostscript/%%GS_VERSION%%/doc/Make.htm
+share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
+share/ghostscript/%%GS_VERSION%%/doc/News.htm
+share/ghostscript/%%GS_VERSION%%/doc/PUBLIC
+share/ghostscript/%%GS_VERSION%%/doc/Projects.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps2epsi.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps2pdf.htm
+share/ghostscript/%%GS_VERSION%%/doc/Psfiles.htm
+share/ghostscript/%%GS_VERSION%%/doc/Public.htm
+share/ghostscript/%%GS_VERSION%%/doc/README
+share/ghostscript/%%GS_VERSION%%/doc/Readme.htm
+share/ghostscript/%%GS_VERSION%%/doc/Release.htm
+share/ghostscript/%%GS_VERSION%%/doc/Source.htm
+share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
+share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
+share/ghostscript/%%GS_VERSION%%/doc/Use.htm
+share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
+share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
+share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
+share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
+share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
+share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
+share/ghostscript/%%GS_VERSION%%/examples/chess.ps
+share/ghostscript/%%GS_VERSION%%/examples/colorcir.ps
+share/ghostscript/%%GS_VERSION%%/examples/doretree.ps
+share/ghostscript/%%GS_VERSION%%/examples/escher.ps
+share/ghostscript/%%GS_VERSION%%/examples/golfer.ps
+share/ghostscript/%%GS_VERSION%%/examples/grayalph.ps
+share/ghostscript/%%GS_VERSION%%/examples/ridt91.eps
+share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
+share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
+share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
+share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
+share/ghostscript/%%GS_VERSION%%/lib/Fontmap
+share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
+share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
+share/ghostscript/%%GS_VERSION%%/lib/addxchar.ps
+share/ghostscript/%%GS_VERSION%%/lib/align.ps
+share/ghostscript/%%GS_VERSION%%/lib/bdftops.ps
+share/ghostscript/%%GS_VERSION%%/lib/bj8.rpd
+share/ghostscript/%%GS_VERSION%%/lib/bj8gc12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8hg12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8oh06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8pa06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8pp12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8ts06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a0.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a1.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a2.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a3.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a4.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a5.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a6.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a7.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610a8.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b1.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b2.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b3.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b4.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b6.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b7.upp
+share/ghostscript/%%GS_VERSION%%/lib/bjc610b8.upp
+share/ghostscript/%%GS_VERSION%%/lib/caption.ps
+share/ghostscript/%%GS_VERSION%%/lib/cbjc600.ppd
+share/ghostscript/%%GS_VERSION%%/lib/cbjc800.ppd
+share/ghostscript/%%GS_VERSION%%/lib/cdj550.upp
+share/ghostscript/%%GS_VERSION%%/lib/cdj690.upp
+share/ghostscript/%%GS_VERSION%%/lib/cdj690ec.upp
+share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
+share/ghostscript/%%GS_VERSION%%/lib/decrypt.ps
+share/ghostscript/%%GS_VERSION%%/lib/dnj750c.upp
+share/ghostscript/%%GS_VERSION%%/lib/dnj750m.upp
+share/ghostscript/%%GS_VERSION%%/lib/docie.ps
+share/ghostscript/%%GS_VERSION%%/lib/errpage.ps
+share/ghostscript/%%GS_VERSION%%/lib/font2c.ps
+share/ghostscript/%%GS_VERSION%%/lib/font2pcl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_agl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_btokn.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ccfnt.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ce_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cff.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cmdl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_css_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dbt_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_diskf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dpnxt.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dps.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dps1.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dps2.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_il1_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_il2_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_kanji.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ksb_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_l.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_l.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_l2img.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_l_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_lev2.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_lgo_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_lgx_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ll3.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_m.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_m_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_mex_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_mgl_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_mro_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_pdf_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_pdfwr.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_pfile.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_rdlin.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_res.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_s.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_s.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_s_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_setpd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_statd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_std_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_sym_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_t.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_t.xpm
+share/ghostscript/%%GS_VERSION%%/lib/gs_t_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_trap.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ttf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_typ32.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_typ42.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_type1.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wan_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wl1_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wl2_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_wl5_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gslp.ps
+share/ghostscript/%%GS_VERSION%%/lib/gsnup.ps
+share/ghostscript/%%GS_VERSION%%/lib/ht_ccsto.ps
+share/ghostscript/%%GS_VERSION%%/lib/image-qa.ps
+share/ghostscript/%%GS_VERSION%%/lib/impath.ps
+share/ghostscript/%%GS_VERSION%%/lib/jispaper.ps
+share/ghostscript/%%GS_VERSION%%/lib/landscap.ps
+share/ghostscript/%%GS_VERSION%%/lib/level1.ps
+share/ghostscript/%%GS_VERSION%%/lib/lines.ps
+share/ghostscript/%%GS_VERSION%%/lib/lqx70ch.upp
+share/ghostscript/%%GS_VERSION%%/lib/lqx70cl.upp
+share/ghostscript/%%GS_VERSION%%/lib/lqx70cm.upp
+share/ghostscript/%%GS_VERSION%%/lib/markhint.ps
+share/ghostscript/%%GS_VERSION%%/lib/markpath.ps
+share/ghostscript/%%GS_VERSION%%/lib/necp2x.upp
+share/ghostscript/%%GS_VERSION%%/lib/necp2x6.upp
+share/ghostscript/%%GS_VERSION%%/lib/packfile.ps
+share/ghostscript/%%GS_VERSION%%/lib/pcharstr.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf2dsc.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_base.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_draw.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_font.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_main.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_ops.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdf_sec.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdfopt.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdfwrite.ps
+share/ghostscript/%%GS_VERSION%%/lib/pf2afm.ps
+share/ghostscript/%%GS_VERSION%%/lib/pfbtopfa.ps
+share/ghostscript/%%GS_VERSION%%/lib/ppath.ps
+share/ghostscript/%%GS_VERSION%%/lib/prfont.ps
+share/ghostscript/%%GS_VERSION%%/lib/printafm.ps
+share/ghostscript/%%GS_VERSION%%/lib/ps2ai.ps
+share/ghostscript/%%GS_VERSION%%/lib/ps2ascii.ps
+share/ghostscript/%%GS_VERSION%%/lib/ps2epsi.ps
+share/ghostscript/%%GS_VERSION%%/lib/quit.ps
+share/ghostscript/%%GS_VERSION%%/lib/ras1.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras24.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras3.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras32.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras4.upp
+share/ghostscript/%%GS_VERSION%%/lib/ras8m.upp
+share/ghostscript/%%GS_VERSION%%/lib/rollconv.ps
+share/ghostscript/%%GS_VERSION%%/lib/showchar.ps
+share/ghostscript/%%GS_VERSION%%/lib/showpage.ps
+share/ghostscript/%%GS_VERSION%%/lib/st640ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640ihg.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640p.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640pg.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640plg.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc1520h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc2.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc200_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc2_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc2s_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc500p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc500ph.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc600ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc600p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc600pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc640p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc740ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc740p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc740pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc800ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc800p.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc800pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc_l.upp
+share/ghostscript/%%GS_VERSION%%/lib/stcany.upp
+share/ghostscript/%%GS_VERSION%%/lib/stcany_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stcinfo.ps
+share/ghostscript/%%GS_VERSION%%/lib/stcolor.ps
+share/ghostscript/%%GS_VERSION%%/lib/stocht.ps
+share/ghostscript/%%GS_VERSION%%/lib/traceimg.ps
+share/ghostscript/%%GS_VERSION%%/lib/traceop.ps
+share/ghostscript/%%GS_VERSION%%/lib/type1enc.ps
+share/ghostscript/%%GS_VERSION%%/lib/type1ops.ps
+share/ghostscript/%%GS_VERSION%%/lib/uninfo.ps
+share/ghostscript/%%GS_VERSION%%/lib/unprot.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewcmyk.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewgif.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewjpeg.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewmiff.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewpbm.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewpcx.ps
+share/ghostscript/%%GS_VERSION%%/lib/viewps2a.ps
+share/ghostscript/%%GS_VERSION%%/lib/wftopfa.ps
+share/ghostscript/%%GS_VERSION%%/lib/winmaps.ps
+share/ghostscript/%%GS_VERSION%%/lib/wrfont.ps
+share/ghostscript/%%GS_VERSION%%/lib/zeroline.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/BUGS
+share/ghostscript/%%GS_VERSION%%/pcl3/NEWS
+share/ghostscript/%%GS_VERSION%%/pcl3/README
+share/ghostscript/%%GS_VERSION%%/pcl3/calign.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/dumppdd.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/example.mcf
+share/ghostscript/%%GS_VERSION%%/pcl3/if-pcl3
+share/ghostscript/%%GS_VERSION%%/pcl3/levels-test.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -362,8 +481,17 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+@dirrm share/ghostscript/%%GS_VERSION%%/pcl3
+@dirrm share/ghostscript/%%GS_VERSION%%/lib
+@dirrm share/ghostscript/%%GS_VERSION%%/hpijs
+@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
+@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
+@dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/doc
+@dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
-@dirrm share/ghostscript/5.50/doc
-@dirrm share/ghostscript/5.50/examples
-@dirrm share/ghostscript/5.50
 @dirrm share/ghostscript
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%
+%%PORTDOCS%%@dirrm share/doc/ghostscript
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index 518e25b9706f..47eef6b4e3cf 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # driverselection
-/usr/bin/dialog --title "Ghostscript 5 driver configuration" --clear \
+/usr/bin/dialog --title "GNU Ghostscript driver configuration" --clear \
 	--checklist "\n\
 This new ghostscript driver configuration dialog allows you to choose \n\
 only those gs drivers, you really need. Don't think too economical, since \n\
@@ -13,77 +13,103 @@ Have fun with this new configuration style !     -andreas \n\n\
   "iwhi"     "Apple Imagewriter, high-resolution mode" OFF \
   "iwlo"     "Apple Imagewriter, low-resolution mode" OFF \
   "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
-  "hl7x0"    "Brother HL 720 and HL 730" OFF \
+  "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" OFF \
   "bj10e"    "Canon BubbleJet BJ10e" ON \
   "bj200"    "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \
-  "bjc600"   "Canon Color BJC-240/600/4000/70 + Apple StyleWriter 2x00" ON \
+  "bjc600"   "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" ON \
   "bjc800"   "Canon Color BubbleJet BJC-240/800" ON \
   "lbp8"     "Canon LBP-8II laser printer" OFF \
-  "lips3"    "Canon LIPS III laser printer in English/CaPSL mode" OFF \
+  "lips3"    "Canon LIPS III laser printer in English (CaPSL) mode" OFF \
   "m8510"    "C.Itoh M8510 printer" OFF \
-  "uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
-  "la50"     "DEC LA50 printer" OFF \
-  "la70"     "DEC LA70 printer" OFF \
-  "la75"     "DEC LA75 printer" OFF \
-  "la75plus" "DEC LA75plus printer" OFF \
+  "coslw2p"  "CoStar LabelWriter II II/Plus" OFF \
+  "coslwxl"  "CoStar LabelWriter XL" OFF \
+  "stp"      "Configurable Canon/Epson/Lexmark/HP driver (Gimp-Print)" ON \
+  "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
+  "dl2100"   "DEClaser 2100" OFF \
+  "la50"     "DEC LA50" OFF \
+  "la70"     "DEC LA70" OFF \
+  "la75"     "DEC LA75" OFF \
+  "la75plus" "DEC LA75plus" OFF \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
-  "ln03"     "DEC LN03 printer" OFF \
-  "ap3250"   "Epson AP3250" OFF \
+  "ln03"     "DEC LN03" OFF \
+  "ap3250"   "Epson ActionPrinter 3250" OFF \
   "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
-  "eps9mid"  "Epson-compatible 9-pin, medium resol" OFF \
-  "eps9high" "Epson-compatible 9-pin, high resol" OFF \
+  "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
+  "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" OFF \
   "lp8000"   "Epson LP-8000 line printer" OFF \
   "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \
   "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
   "st800"    "Epson Stylus 800 printer" OFF \
-  "stcolor"  "Epson Stylus Color" OFF \
+  "stcolor"  "Epson Stylus Color and II/IIs/1500 (see driver docu)" OFF \
+  "photoex"  "Epson Stylus Color Photo, Photo EX, Photo 700" OFF \
   "lp2563"   "HP 2563B line printer" OFF \
   "dnj650c"  "HP DesignJet 650C" OFF \
   "deskjet"  "HP DeskJet and DeskJet Plus" ON \
-  "djet500"  "HP DeskJet 500" ON \
+  "djet500"  "HP DeskJet 500 (for DeskJet 600 use -r600)" ON \
   "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
   "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
-  "cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
+  "cdjcolor" "HP DeskJet 500C/540C, 24bit/pxl+FS dith, Citizen Projet IIc" ON \
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
-  "cdj500"   "HP DeskJet 500C (same as cdjcolor)" OFF \
-  "cdj550"   "HP DeskJet 550C/560C" ON \
-  "cdj670"   "HP DeskJet 670/690" OFF \
-  "cdj850"   "HP DeskJet 850/855/870/1100" OFF \
-  "cdj890"   "HP DeskJet 890" OFF \
-  "cdj1600"  "HP DeskJet 1600" OFF \
+  "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
+  "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
+  "cdj670"   "HP DeskJet 670/690 (HP8XX driver)" ON \
+  "cdj850"   "HP DeskJet 850/855/870/1100 (HP8XX driver)" ON \
+  "cdj880"   "HP DeskJet 880 (HP8XX driver)" ON \
+  "cdj890"   "HP DeskJet 890 (HP8XX driver)" ON \
+  "cdj1600"  "HP DeskJet 1600 (HP8XX driver)" ON \
+  "cdj970"   "HP DeskJet 970CXi (HP970 driver)" ON \
   "laserjet" "HP LaserJet" ON \
   "ljetplus" "HP LaserJet Plus" ON \
   "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
   "ljet3"    "HP LaserJet III* with Delta Row compression" ON \
-  "ljet3d"   "HP LaserJet IIID with duplex capability" OFF \
-  "ljet4"    "HP LaserJet 4 (defaults to 600 dpi)" ON \
+  "ljet3d"   "HP LaserJet IIID with duplex capability" ON \
+  "ljet4"    "HP LaserJet 4 and 5L/5P (not real LJ5), defaults to 600 dpi" ON \
+  "ljet4d"   "HP LaserJet 4 (defaults to 600 dpi) with duplex" ON \
   "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
-  "cljet5"   "HP LaserJet 5/5M Color " OFF \
-  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" OFF \
-  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" OFF \
+  "cljet5"   "HP LaserJet 5/5M Color (new driver, old=cljet5pr)" ON \
+  "cljet5c"  "HP LaserJet 5/5M Color Simple" ON \
+  "cljet5pr" "HP LaserJet 5/5M Color (old drv. with rotation hacks/flaws)" ON \
+  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
+  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
   "pj"       "HP PaintJet XL driver " ON \
   "pjetxl"   "HP PaintJet XL driver (alternate)" OFF \
   "pjxl"     "HP PaintJet XL color printer" ON \
   "paintjet" "HP PaintJet color printer (alternate)" OFF \
-  "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
+  "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
-  "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
+  "pcl3"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
+  "hpdj"     "HP PCL 3+ (old drv.)" ON \
+  "hpijs"    "HP PhotoSmart/DeskJet series (HP developed driver)" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
+  "fs600"    "Kyocera FS-600 (600 dpi)" OFF \
+  "lxm5700m" "Lexmark 5700 monotone" OFF \
   "cp50"     "Mitsubishi CP50 color" OFF \
-  "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
+  "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" OFF \
   "oce9050"  "OCE 9050 printer" OFF \
   "oki182"   "Okidata MicroLine 182" OFF \
   "okiibm"   "Okidata MicroLine IBM-compatible printers" OFF \
+  "atx23"    "Practical Automation ATX-23 label printer" OFF \
+  "atx24"    "Practical Automation ATX-24 label printer" OFF \
+  "atx38"    "Practical Automation ATX-38 label printer" OFF \
   "r4081"    "Ricoh 4081 laser printer" OFF \
   "sj48"     "StarJet 48 inkjet printer" OFF \
-  "xes"      "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
-  "bmpmono"  "BMP Monochrome" OFF \
-  "bmp16"    "BMP 4-bit EGA/VGA" OFF \
-  "bmp256"   "BMP 8-bit 256-color" OFF \
+  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
+  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
+  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
+  "tek4696"  "Tektronix 4695/4696 inkjet plotter" OFF \
+  "xes"      "Xerox XES 2700/3700/4045" OFF \
+  "bmpmono"  "BMP Monochrome" ON \
+  "bmpgray"  "BMP 8-bit gray" ON \
+  "bmp16"    "BMP 4-bit EGA/VGA" ON \
+  "bmp256"   "BMP 8-bit 256-color" ON \
   "bmp16m"   "BMP 24-bit" ON \
+  "bmp32b"   "BMP 32-bit pseudo-.BMP" ON \
+  "bmpsep1"  "BMP Separated 1-bit CMYK" ON \
+  "bmpsep8"  "BMP Separated 8-bit CMYK" ON \
   "ccr"      "CalComp Raster format" OFF \
   "cgmmono"  "CGM Monochrome -- LOW LEVEL OUTPUT ONLY" OFF \
   "cgm8"     "CGM 8-bit 256-color -- DITTO" OFF \
@@ -128,38 +154,39 @@ Have fun with this new configuration style !     -andreas \n\n\
   "ppmraw"   "Portable Pixmap,  raw format RGB" ON \
   "pkm"      "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
   "pkmraw"   "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
+  "pksm"     "Portable Separated map (plain) (4-bit CMYK => 4 pages)" ON \
+  "pksmraw"  "Portable Separated map (raw) (4-bit CMYK => 4 pages)" ON \
   "pngmono"  "PNG Monochrome Portable Network Graphics" ON \
   "pnggray"  "PNG 8-bit gray Portable Network Graphics" ON \
   "png16"    "PNG 4-bit color Portable Network Graphics" ON \
   "png256"   "PNG 8-bit color Portable Network Graphics" ON \
   "png16m"   "PNG 24-bit color Portable Network Graphics" ON \
-  "psmono"   "PostScript, Level 1, monochrome image" ON \
+  "psmono"   "PostScript (Level 1) monochrome image" ON \
   "psgray"   "PostScript (Level 1) 8-bit gray image" ON \
   "psrgb"    "PostScript (Level 2) 24-bit color image" ON \
   "pswrite"  "PostScript output (like PostScript Distillery)" ON \
   "epswrite" "EPS output (like PostScript Distillery)" ON \
   "sgirgb"   "SGI RGB pixmap format" OFF \
-  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
-  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
-  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
-  "tek4696"  "Tektronix 4695/4696 inkjet plotter" OFF \
+  "sunhmono" "Harlequin variant of 1-bit Sun raster file" OFF \
   "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" ON \
   "tiffg3"   "TIFF Group 3 fax with EOLs" ON \
   "tiffg32d" "TIFF Group 3 2-D fax" ON \
   "tiffg4"   "TIFF Group 4 fax" ON \
   "tiff12nc" "TIFF 12-bit RGB, no compression" ON \
-  "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
+  "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" ON \
   "tifflzw"  "TIFF LZW,      tag = 5,     mono" ON \
   "tiffpack" "TIFF PackBits, tag = 32773, mono" ON \
-  "x11"      "X Windows version 11, release >=4" ON \
-  "x11alpha" "X Windows masquer. as device with alpha capability" ON \
-  "x11cmyk"  "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
-  "x11cmyk2" "X Windows as a 2-bit-per-plane CMYK device" OFF \
-  "x11cmyk4" "X Windows as a 4-bit-per-plane CMYK device" OFF \
-  "x11cmyk8" "X Windows as an 8-bit-per-plane CMYK device" OFF \
-  "x11gray2" "X Windows as a 2-bit gray-scale device" ON \
-  "x11gray4" "X Windows as a 4-bit gray-scale device" ON \
-  "x11mono"  "X Windows masquer. as black-and-white device" ON \
+  "x11"      "X Window System version 11, release >=4" ON \
+  "x11alpha" "X Window System masquer. as device with alpha capability" ON \
+  "x11cmyk"  "X Window System masquer. as 1-bit-per-plane CMYK device" ON \
+  "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" OFF \
+  "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" OFF \
+  "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" OFF \
+  "x11gray2" "X Window System as a 2-bit gray-scale device" ON \
+  "x11gray4" "X Window System as a 4-bit gray-scale device" ON \
+  "x11mono"  "X Window System masquer. as black-and-white device" ON \
+  "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \
+  "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -179,12 +206,18 @@ case $retval in
 esac
 
 # bring it into the right format with '.dev' appended to each driver name
+#old:
+#echo "DEVICE_DEVS=$choice" \
+#	| sed -e "s/\"//g" \
+#	| sed -e "s/ /.dev /g" \
+#	| sed -e "s/$/.dev/g" \
+#	> ${WRKSRC}/src/unix-gcc.mak.new
+# XXX new:
 echo "DEVICE_DEVS=$choice" \
-	| sed -e "s/\"//g" \
-	| sed -e "s/ /.dev /g" \
-	| sed -e "s/$/.dev/g" \
-	> ${WRKSRC}/unix-gcc.mak.new
+	| perl -pe 's|"([a-z0-9]+)"|\$(DD)\1.dev|g' \
+	> ${WRKSRC}/src/unix-gcc.mak.new
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
-cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
-mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
+sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
+	>> ${WRKSRC}/src/unix-gcc.mak.new
+mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak
diff --git a/print/ghostscript7/scripts/configure.batch b/print/ghostscript7/scripts/configure.batch
index 75c2755395b9..b4d015d2b98c 100644
--- a/print/ghostscript7/scripts/configure.batch
+++ b/print/ghostscript7/scripts/configure.batch
@@ -1,9 +1,14 @@
 #! /bin/sh
 
-cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=appledmp.dev iwhi.dev iwlo.dev iwlq.dev hl7x0.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev lbp8.dev lips3.dev m8510.dev uniprint.dev la50.dev la70.dev la75.dev la75plus.dev lj250.dev declj250.dev ln03.dev ap3250.dev epson.dev eps9mid.dev eps9high.dev lp8000.dev lq850.dev epsonc.dev st800.dev stcolor.dev lp2563.dev dnj650c.dev deskjet.dev djet500.dev cdeskjet.dev djet500c.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj670.dev cdj850.dev cdj890.dev cdj1600.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev cljet5.dev lj5mono.dev lj5gray.dev pj.dev pjetxl.dev pjxl.dev paintjet.dev pjxl300.dev pxlmono.dev pxlcolor.dev ibmpro.dev jetp3852.dev imagen.dev cp50.dev necp6.dev oce9050.dev oki182.dev okiibm.dev r4081.dev sj48.dev xes.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev ccr.dev cgmmono.dev cgm8.dev cgm24.dev sxlcrt.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev bit.dev bitrgb.dev bitcmyk.dev cif.dev miff24.dev inferno.dev jpeg.dev jpeggray.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pdfwrite.dev plan9bm.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev pswrite.dev epswrite.dev sgirgb.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev
+cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
+ifndef WITHOUT_X11
+DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
+endif
+
+DEVICE_DEVS+= \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dl2100.dev \$(DD)la50.dev \$(DD)la70.dev \$(DD)la75.dev \$(DD)la75plus.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ln03.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)hpijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)xes.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)sxlcrt.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
-cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
-mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
+sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
+	>> ${WRKSRC}/src/unix-gcc.mak.new
+mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak
author	Akinori MUSHA <knu@FreeBSD.org>	2001-09-11 19:12:20 +0000
committer	Akinori MUSHA <knu@FreeBSD.org>	2001-09-11 19:12:20 +0000
commit	f239ea291484a95575cd2ad99a43268434f80947 (patch)
tree	277d612725807514b6721dbc45df94f3e0009f55
parent	Chase the libkakasi's version bump and bump PORTREVISION. (diff)