63 files changed, 1797 insertions, 1800 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 08b5950c0020..0a61cda1ecbb 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -6,30 +6,21 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	6.50
-PORTREVISION=	6
+PORTVERSION=	7.00
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/gs650/ \
-	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/fonts/ \
-	http://www.gelhaus.net/hp880c/1.4beta/ \
-	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
-	http://www.harsch.net/Download/ \
-	http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
-	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
-	http://download.sourceforge.net/ghostscript/ \
-	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/gs650/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/fonts/ \
-	ftp://munnari.oz.au/ghost/aladdin/gs650/ \
-	ftp://munnari.oz.au/ghost/aladdin/fonts/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/gs650/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/fonts/
-# note: russian mirror isn't up to date
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
+		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/AFPL/gs700/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+PKGNAMESUFFIX=	-afpl
+
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \
-		${HP970_DRV} ${GPRINT_SRC}
+		${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -37,30 +28,41 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+NO_CDROM=	"Can only be distributed for free"
+
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
+
+USE_GMAKE=	yes
+CFLAGS+=	-DUPD_SIGNAL=0
+MAKEFILE=	src/unix-gcc.mak
 ALL_TARGET=	all pcl3opts escputil
+PLIST_SUB=	GS_VERSION=${PORTVERSION}
+
+MAN1=		ansi2knr.1 dvipdf.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 \
+		ps2ps.1 eps2eps.1
+
+.if defined(A4)
+CFLAGS+=	-DA4
+.endif
 
 .if !defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-afpl
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
-# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
-# sure that NO_X is defined *and* has a value.
-MAKE_ENV+=	NO_X=true
+PKGNAMESUFFIX=	-afpl-nox11
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
-USE_GMAKE=	yes
-MAKEFILE=	src/unix-gcc.mak
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
-# Note: the order that the manpages are listed here matters because
-# some of them are symbolic links
-MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
-		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
-		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
-		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
-
-GS_SOURCES=	ghostscript-${PORTVERSION}.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
@@ -72,13 +74,12 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
 # http://www.gelhaus.net/hp880c/
-# driver names:	cdj880
-HP8XX=		cdj850
+HP8XX=		cdj880
 HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
-# ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
 # 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}
@@ -95,17 +96,25 @@ 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://sourceforge.net/projects/gimp-print/
+# http://gimp-print.sourceforge.net/
 GPRINT=		print
 GPRINT_DESC=	gimp-${GPRINT}
-GPRINT_VERS=	4.0.4
+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
@@ -113,200 +122,222 @@ CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.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
 
-CFLAGS+=	-DUPD_SIGNAL=0
+.SILENT:
 
-pre-fetch:
+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:
-	@${ECHO} ">>> in post-extract ..."
-	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
+	${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} ">>>   extracting ${HP8XX_DRV} ..."
-	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
-	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
+	${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} ">>>   extracting ${PCL3_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+	${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} ">>>   extracting ${HP970_DRV} ..."
-	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
-	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
+	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
-	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
+	${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
 
-# here we apply unofficial patches from 3rd party drivers
 post-patch:
-# from PCL3 driver
-	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from ${PCL3} ..."
-	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
+	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
+		${WRKSRC}/src/unix-gcc.mak
+# 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} ">>> in pre-configure ..."
+	${ECHO_MSG} ">>> in pre-configure ..."
 # for HP8XX driver
-	@${ECHO} ">>>   adding ${HP8XX} driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/cdj850.contrib.mak \
+	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for HPDJ driver
-	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
+	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
-	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/dj970.contrib.mak \
+	${ECHO_MSG} ">>>   adding DJ970 driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for gimp-print
-	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
-	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
 		${WRKSRC}/src
-	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+	${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
-	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
-	@${CAT} ${FILESDIR}/escputil.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} ">>> in do-configure ..."
+	${ECHO_MSG} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	# XXX diable dialog based configure, needs some rework later...
-	#@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
-	@${ECHO} ">>> in pre-build ..."
-	@${ECHO} ">>>   creating directories for compilation ..."
-	@${MKDIR} ${WRKSRC}/obj
-	@${MKDIR} ${WRKSRC}/bin
+	${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:
-	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating ghostscript destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting ghostscript fonts..."
-	@${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}
 
 post-install:
-	@${ECHO} ">>> in post-install ..."
-	@${ECHO} ">>>   stripping gs ..."
-	@strip ${PREFIX}/bin/gs
-	@${ECHO} ">>>   installing additional scripts ..."
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	${ECHO_MSG} ">>> in post-install ..."
+	${ECHO_MSG} ">>>   stripping gs ..."
+	strip ${PREFIX}/bin/gs
 # for HPDJ driver
-	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
+	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
+	${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} \
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing ${PCL3} manpages ..."
+	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating ${PCL3} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
+	${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} \
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
 # for gimp-print driver
-	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
-	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
-	@strip ${PREFIX}/bin/escputil
-	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+	${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} \
+	${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
 		${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
-	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+	${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} \
+	${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} ">>> installing contributed UPP profiles ..."
+	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
-	@${INSTALL_DATA} ${FILESDIR}/${i} \
+	${INSTALL_DATA} ${FILESDIR}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endfor
 # for reading encrypted PDFs
-	@${ECHO} ">>> installing support for encrypted PDF files ..."
-	@${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+	${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} ">>> installing PORTDOC stuff ..."
+	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
-.for i in LGPL.txt NEWS hpdj.html
-	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
+	${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} ">>>   creating ${PCL3} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
-.for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+	${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} "> post-installation tasks completed."
+	${ECHO_MSG} "> post-installation tasks completed."
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 2e40ae3888a2..a985fb0e65e6 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript-6.50.tar.gz) = 8f52f724f692cf06c94ad7da45eb7ec1
+MD5 (ghostscript-7.00.tar.gz) = 7e11f6408fd2305b926cd44c5577440f
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
@@ -6,4 +6,5 @@ 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.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
+MD5 (print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
+MD5 (hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/print/ghostscript-afpl/files/cdj850.contrib.mak b/print/ghostscript-afpl/files/cdj850.contrib.mak
index ffb099b0caf8..8faefec5fe4e 100644
--- a/print/ghostscript-afpl/files/cdj850.contrib.mak
+++ b/print/ghostscript-afpl/files/cdj850.contrib.mak
@@ -1,13 +1,21 @@
-
 ###- cdj850 - HP 850 Driver under development -------- ###
+cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
-cdj8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
+$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
 
-$(DD)cdj850.dev : $(cdj8_) $(DD)page.dev
-	$(SETPDEV) $(DD)cdj850 $(cdj8_)
+$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
 
-$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(std_h) $(PDEVH)\
- $(gsparam_h) $(gsstate_h) $(gxlum_h)\
- $(gdevbjc_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
+
+$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
 
+$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
+
+$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
+ $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
diff --git a/print/ghostscript-afpl/files/hpijs.contrib.mak b/print/ghostscript-afpl/files/hpijs.contrib.mak
new file mode 100644
index 000000000000..35eb9e6b06b1
--- /dev/null
+++ b/print/ghostscript-afpl/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-afpl/files/patch-aa b/print/ghostscript-afpl/files/patch-aa
deleted file mode 100644
index d4e6fa42b073..000000000000
--- a/print/ghostscript-afpl/files/patch-aa
+++ /dev/null
@@ -1,224 +0,0 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
-+++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
-@@ -26,14 +26,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.
- 
-@@ -52,11 +53,10 @@
- # 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)
-@@ -128,7 +128,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).
-@@ -148,14 +148,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.
-@@ -167,7 +167,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
- 
-@@ -182,7 +182,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.
-@@ -215,7 +215,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.
-@@ -224,7 +224,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
- 
-@@ -244,7 +244,7 @@
- # All reasonable platforms require -lm, but Rhapsody and perhaps one or
- # two others fold libm into libc and don't require any additional library.
- 
--STDLIBS=-lpthread -lm
-+STDLIBS= -lm
- 
- # Define the include switch(es) for the X11 header files.
- # This can be null if handled in some other way (e.g., the files are
-@@ -254,7 +254,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
-@@ -266,12 +266,16 @@
- # 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
-+ifdef NO_X
-+XLIBS=
-+else
-+XLIBS=Xt SM ICE Xext X11
-+endif
- 
- #XLIBDIRS=-L/usr/local/X/lib
--XLIBDIRS=-L/usr/X11/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.
-@@ -329,7 +333,7 @@
- # Choose the device(s) to include.  See devs.mak for details,
- # devs.mak and contrib.mak for the list of available devices.
- 
--DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
-+#DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
- 
- #DEVICE_DEVS1=
- #DEVICE_DEVS2=
-@@ -352,27 +356,27 @@
- #DEVICE_DEVS19=
- #DEVICE_DEVS20=
- 
--DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
--DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
--DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
--DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
--DEVICE_DEVS5=$(DD)uniprint.dev
--DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
--DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
--DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
--DEVICE_DEVS9=$(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
--DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
--DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev
--DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
--DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev
--DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
--DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
--
--DEVICE_DEVS16=
--DEVICE_DEVS17=
--DEVICE_DEVS18=
--DEVICE_DEVS19=
--DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
-+#DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
-+#DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
-+#DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
-+#DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
-+#DEVICE_DEVS5=$(DD)uniprint.dev
-+#DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
-+#DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
-+#DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
-+#DEVICE_DEVS9=$(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
-+#DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
-+#DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev
-+#DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
-+#DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev
-+#DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
-+#DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
-+
-+#DEVICE_DEVS16=
-+#DEVICE_DEVS17=
-+#DEVICE_DEVS18=
-+#DEVICE_DEVS19=
-+#DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
- 
- # ---------------------------- End of options --------------------------- #
- 
-@@ -386,13 +390,13 @@
- # detect whether we're running a version of gcc with the const optimization
- # bug.
- 
--AK=$(GLGENDIR)/cc.tr
-+#AK=$(GLGENDIR)/cc.tr
- 
- # Define the compilation rules and flags.
- 
- CCFLAGS=$(GENOPT) $(CFLAGS)
--CC_=$(CC) `cat $(AK)` $(CCFLAGS)
--CCAUX=$(CC) `cat $(AK)`
-+CC_=$(CC) $(CCFLAGS)
-+CCAUX=$(CC)
- CC_LEAF=$(CC_) -fomit-frame-pointer
- # gcc can't use -fomit-frame-pointer with -pg.
- CC_LEAF_PG=$(CC_)
-@@ -419,5 +423,5 @@
- include $(GLSRCDIR)/unixinst.mak
- 
- # This has to come last so it won't be taken as the default target.
--$(AK):
--	if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
-+#$(AK):
-+#	if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript-afpl/files/patch-ac b/print/ghostscript-afpl/files/patch-ac
deleted file mode 100644
index 148e0e556d33..000000000000
--- a/print/ghostscript-afpl/files/patch-ac
+++ /dev/null
@@ -1,86 +0,0 @@
-begin patches/patch-ac:
-This patch removes the  code that tries to figure out  the cache size of
-the host. The  algorithm may very well fail under  some circumstances --
-it  makes too  many  assumptions  about the  cache  behaviour, but  most
-importantly,  the  figured out  values  ARE  NOT  USED anywhere  in  the
-ghostscript code anymore.
-
-	-mi
-
---- src/genarch.c	Thu Mar  9 03:40:41 2000
-+++ src/genarch.c	Wed Jul 19 09:37:30 2000
-@@ -43,11 +42,0 @@
--private clock_t
--time_clear(char *buf, int bsize, int nreps)
--{
--    clock_t t = clock();
--    int i;
--
--    for (i = 0; i < nreps; ++i)
--	memset(buf, 0, bsize);
--    return clock() - t;
--}
--
-@@ -181,63 +170,2 @@
- #undef PRINT_MAX
--
--    section(f, "Cache sizes");
--
--    /*
--     * Determine the primary and secondary cache sizes by looking for a
--     * non-linearity in the time required to fill blocks with memset.
--     */
--    {
--#define MAX_BLOCK (1 << 20)
--	static char buf[MAX_BLOCK];
--	int bsize = 1 << 10;
--	int nreps = 1;
--	clock_t t = 0;
--	clock_t t_eps;
--
--	/*
--	 * Increase the number of repetitions until the time is
--	 * long enough to exceed the likely uncertainty.
--	 */
--
--	while ((t = time_clear(buf, bsize, nreps)) == 0)
--	    nreps <<= 1;
--	t_eps = t;
--	while ((t = time_clear(buf, bsize, nreps)) < t_eps * 10)
--	    nreps <<= 1;
--
--	/*
--	 * Increase the block size until the time jumps non-linearly.
--	 */
--	for (; bsize <= MAX_BLOCK;) {
--	    clock_t dt = time_clear(buf, bsize, nreps);
--
--	    if (dt > t + (t >> 1)) {
--		t = dt;
--		break;
--	    }
--	    bsize <<= 1;
--	    nreps >>= 1;
--	    if (nreps == 0)
--		nreps = 1, t <<= 1;
--	}
--	define_int(f, "ARCH_CACHE1_SIZE", bsize >> 1);
--	/*
--	 * Do the same thing a second time for the secondary cache.
--	 */
--	if (nreps > 1)
--	    nreps >>= 1, t >>= 1;
--	for (; bsize <= MAX_BLOCK;) {
--	    clock_t dt = time_clear(buf, bsize, nreps);
--
--	    if (dt > t * 1.25) {
--		t = dt;
--		break;
--	    }
--	    bsize <<= 1;
--	    nreps >>= 1;
--	    if (nreps == 0)
--		nreps = 1, t <<= 1;
--	}
--	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
--    }
diff --git a/print/ghostscript-afpl/files/patch-hpijs:makefile b/print/ghostscript-afpl/files/patch-hpijs:makefile
new file mode 100644
index 000000000000..8f53a8202f59
--- /dev/null
+++ b/print/ghostscript-afpl/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-afpl/files/patch-lib,gs_init.ps b/print/ghostscript-afpl/files/patch-lib,gs_init.ps
deleted file mode 100644
index a2f5d54ee5b7..000000000000
--- a/print/ghostscript-afpl/files/patch-lib,gs_init.ps
+++ /dev/null
@@ -1,31 +0,0 @@
-  File:     @(#)$Id: README,v 2.6 2000/11/09 18:33:58 Martin Beta $
-  Contents: README file for the pcl3 distribution
-  Author:   Martin Lottermoser, Greifswaldstrasse 28, 38124 Braunschweig,
-            Germany. E-mail: Martin.Lottermoser@t-online.de.
-[...]
- 8. There is also a bug in ghostscript's default configuration for the
-    undercolour removal and black generation functions. It shows up when
-    printing PostScript documents using the RGB colour space ("setrgbcolor" or
-    "sethsbcolor") on a device where the CMYK space is the native colour space;
-    this is the case for pcl3 if you specify "-sColourModel=CMYK". The bug
-    results in black being printed as a mixture of cyan, magenta, and yellow.
-    On my printer, this is a slightly greenish grey with fuzzy edges. My
-    subjective impression is that correcting this bug leads to sharper-looking
-    images.
-[...]
-
-I generated a patch as suggested from Martin Lottermoser
-
-	-andreas
-
---- lib/gs_init.ps.orig	Mon Jan  8 20:47:39 2001
-+++ lib/gs_init.ps	Mon Jan  8 20:49:02 2001
-@@ -1229,7 +1229,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>
diff --git a/print/ghostscript-afpl/files/patch-lib:gs_init.ps b/print/ghostscript-afpl/files/patch-lib:gs_init.ps
new file mode 100644
index 000000000000..d3e7e8130021
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lib:gs_init.ps
@@ -0,0 +1,19 @@
+--- lib/gs_init.ps.orig	Mon Apr  9 15:20:03 2001
++++ lib/gs_init.ps	Wed Jun 20 04:05:12 2001
+@@ -1263,7 +1263,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>
+@@ -1815,3 +1815,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-afpl/files/patch-pcl3:eprn:gdeveprn.c b/print/ghostscript-afpl/files/patch-pcl3:eprn:gdeveprn.c
new file mode 100644
index 000000000000..605148be439c
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-pcl3:eprn:gdeveprn.c
@@ -0,0 +1,12 @@
+--- pcl3/eprn/gdeveprn.c.orig	Sun Mar 25 13:59:11 2001
++++ pcl3/eprn/gdeveprn.c	Tue Apr 10 17:53:03 2001
+@@ -81,6 +81,9 @@
+ #include "gstypes.h"	/* needed by gsstate.h */
+ #include "gsstate.h"	/* needed by icstate.h */
+ #include "icstate.h"	/* for struct gs_context_state_s */
++#if !defined(GS_REVISION) || GS_REVISION >= 700
++#include "iapi.h"	/* needed by iminst.h */
++#endif
+ #include "iminst.h"	/* for struct gs_main_instance_s */
+ #include "imain.h"	/* for gs_main_instance_default() */
+ #include "gscoord.h"	/* for gs_setdefaultmatrix() */
diff --git a/print/ghostscript-afpl/files/patch-src.gdevxini.c b/print/ghostscript-afpl/files/patch-src.gdevxini.c
deleted file mode 100644
index 5c072ec041e4..000000000000
--- a/print/ghostscript-afpl/files/patch-src.gdevxini.c
+++ /dev/null
@@ -1,47 +0,0 @@
-Message-ID: <3AB64C01.54380C00@we.lc.ehu.es>
-Date: Mon, 19 Mar 2001 19:12:17 +0100
-From: "Jose M. Alcaide" <jose@we.lc.ehu.es>
-Organization: Universidad del Pais Vasco - Dpto. de Electricidad y Electronica
-Subject: new patch for ghostscript 6.50
-
-Hello Andreas,
-
-About a month ago I sent you a patch for GhostScript 6.50. Without that
-patch, LyX 1.1.6 cannot show included EPS figures. Now that the LyX
-port has been updated this problem will begin to hit many LyX users,
-and the ports freeze is coming soon...
-
-The problem is described in:
-
-http://sourceforge.net/bugs/?func=detailbug&bug_id=124957&group_id=1897
-
-I am resending the patch attached to this message. I am using Ghostscript
-with this patch applied and everything (including LyX) seems to work OK.
-
-Cheers,
--- JMA
-****** Jose M. Alcaide  //  jose@we.lc.ehu.es  //  jmas@FreeBSD.org ******
-** "Beware of Programmers who carry screwdrivers" --  Leonard Brandwein **
---------------8E7698D95DE1CB06D5711335
-Content-Type: text/plain; charset=us-ascii;
- name="patch-src,gdevxini.c"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline;
- filename="patch-src,gdevxini.c"
-
---- src/gdevxini.c.orig	Tue Sep 19 21:00:23 2000
-+++ src/gdevxini.c	Tue Feb 20 18:07:09 2001
-@@ -654,8 +654,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-afpl/files/patch-src:contrib.mak-5.94.add b/print/ghostscript-afpl/files/patch-src:contrib.mak-5.94.add
new file mode 100644
index 000000000000..1d2c46b8ea2e
--- /dev/null
+++ b/print/ghostscript-afpl/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-afpl/files/patch-src:genarch.c b/print/ghostscript-afpl/files/patch-src:genarch.c
new file mode 100644
index 000000000000..3b74ac7e6145
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:genarch.c
@@ -0,0 +1,34 @@
+--- src/genarch.c.orig	Wed Sep 20 04:00:23 2000
++++ src/genarch.c	Wed Jun 20 04:05:36 2001
+@@ -40,6 +40,7 @@
+     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
+ }
+ 
++#ifndef __FreeBSD__
+ private clock_t
+ time_clear(char *buf, int bsize, int nreps)
+ {
+@@ -50,6 +51,7 @@
+ 	memset(buf, 0, bsize);
+     return clock() - t;
+ }
++#endif /* __FreeBSD__ */
+ 
+ private void
+ define(FILE *f, const char *str)
+@@ -180,6 +182,7 @@
+     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
+ #undef PRINT_MAX
+ 
++#ifndef __FreeBSD__
+     section(f, "Cache sizes");
+ 
+     /*
+@@ -240,6 +243,7 @@
+ 	}
+ 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
+     }
++#endif /* __FreeBSD__ */
+ 
+     section(f, "Miscellaneous");
+ 
diff --git a/print/ghostscript-afpl/files/patch-src:gp_unifs.c b/print/ghostscript-afpl/files/patch-src:gp_unifs.c
new file mode 100644
index 000000000000..68c9bcaf175b
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:gp_unifs.c
@@ -0,0 +1,34 @@
+--- src/gp_unifs.c.orig	Tue Mar 13 15:51:39 2001
++++ src/gp_unifs.c	Wed Jun 20 04:06:02 2001
+@@ -28,6 +28,7 @@
+ #include "stat_.h"
+ #include "dirent_.h"
+ #include <sys/param.h>		/* for MAXPATHLEN */
++#include <unistd.h>
+ 
+ /* Some systems (Interactive for example) don't define MAXPATHLEN,
+  * so we define it here.  (This probably should be done via a Config-Script.)
+@@ -58,6 +59,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_gettmpdir(fname, &len) != 0)
+ 	strcpy(fname, "/tmp/");
+@@ -70,8 +73,12 @@
+     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
+ 	strcat(fname, "-");
+     strcat(fname, "XXXXXX");
+-    mktemp(fname);
+-    return gp_fopentemp(fname, mode);
++    fd = mkstemp(fname);
++    if (fd == -1)
++	return NULL;
++    if ((f = fdopen(fd, mode)) == NULL)
++	close(fd);
++    return f;
+ }
+ 
+ /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
new file mode 100644
index 000000000000..32c9f2b531d5
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
@@ -0,0 +1,130 @@
+--- src/unix-gcc.mak.orig	Mon Apr  9 14:52:57 2001
++++ src/unix-gcc.mak	Fri Jun 15 21:47:42 2001
+@@ -26,14 +26,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.
+ 
+@@ -52,11 +53,10 @@
+ # 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)
+@@ -128,7 +128,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).
+@@ -148,14 +148,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=10010
+ 
+ # 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.
+@@ -167,7 +167,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
+ 
+@@ -187,7 +187,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.
+@@ -222,7 +222,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.
+@@ -231,7 +231,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
+ 
+@@ -264,7 +264,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/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
+@@ -277,11 +277,16 @@
+ #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
+ # X11R6 (on any platform) may need
+ #XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
++XLIBS=Xt SM ICE Xext X11
++endif
+ 
+ #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:
diff --git a/print/ghostscript-afpl/files/patch-src:zmedia2.c b/print/ghostscript-afpl/files/patch-src:zmedia2.c
new file mode 100644
index 000000000000..7db33eaecc44
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:zmedia2.c
@@ -0,0 +1,25 @@
+--- src/zmedia2.c.orig	Wed Sep 20 04:00:54 2000
++++ src/zmedia2.c	Wed Jun 20 04:06:24 2001
+@@ -427,11 +427,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-afpl/pkg-comment b/print/ghostscript-afpl/pkg-comment
index 1e371cace06a..dd6a867e3c83 100644
--- a/print/ghostscript-afpl/pkg-comment
+++ b/print/ghostscript-afpl/pkg-comment
@@ -1 +1 @@
-Aladdin Postscript interpreter version 6
+AFPL Postscript interpreter version 7
diff --git a/print/ghostscript-afpl/pkg-descr b/print/ghostscript-afpl/pkg-descr
index 39e0177bea17..4489409d3260 100644
--- a/print/ghostscript-afpl/pkg-descr
+++ b/print/ghostscript-afpl/pkg-descr
@@ -1,24 +1,25 @@
-This is Aladdin Ghostscript, the non-GPL version that comes with a licence
-different from the GPL. Read the file PUBLIC in the work/gsX.Y directory or
-in ${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
-
 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.
 
+Versions entitled "AFPL Ghostscript" are distributed with a licence different
+from the GPL. Read the file PUBLIC in the work/gsX.Y directory or in
+${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
+
 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/
-	o Additional driver support
-	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
-	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
+	  - 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
 		
-Thomas Merz has written a Ghostscript manual in PDF format:
-	http://www.cs.wisc.edu/~ghost/merz.html
-
-The manual is also available in German language, see:
-	http://www.muc.de/~tm/free/free.html
-
 WWW: http://www.cs.wisc.edu/~ghost/index.html
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 228305ea212a..0089e7022f71 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -30,14 +30,14 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/LGPL.txt
+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/LGPL
 %%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/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
 share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
@@ -47,6 +47,7 @@ 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/Develop.htm
 share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
 share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
 share/ghostscript/%%GS_VERSION%%/doc/Helpers.htm
@@ -62,6 +63,7 @@ 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/Maintain.htm
 share/ghostscript/%%GS_VERSION%%/doc/Make.htm
 share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
 share/ghostscript/%%GS_VERSION%%/doc/News.htm
@@ -70,6 +72,7 @@ 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/Ps-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Public.htm
 share/ghostscript/%%GS_VERSION%%/doc/README
 share/ghostscript/%%GS_VERSION%%/doc/Readme.htm
@@ -86,6 +89,7 @@ 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
@@ -163,6 +167,7 @@ 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_icc.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
@@ -263,6 +268,9 @@ 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/stc300.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bm.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500p.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500ph.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc600ih.upp
@@ -481,16 +489,17 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
-@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
-@dirrm share/doc/ghostscript/%%GS_VERSION%%
-@dirrm share/doc/ghostscript
-@dirrm share/ghostscript/%%GS_VERSION%%/doc
-@dirrm share/ghostscript/%%GS_VERSION%%/examples
-@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
-@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/ghostscript/%%GS_VERSION%%/lib
 @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
+%%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-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 4b86359db1d0..31c7d3d85b44 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -5,13 +5,8 @@
 # configure - gs driver preconfiguration, manual driver selection
 # by Andreas Klemm <andreas@FreeBSD.org>
 
-#
-# XXX - needs some rework for gs v 6.50,
-#       therefore currently disabled in Makefile
-#
-
 # driverselection
-/usr/bin/dialog --title "Ghostscript 6 driver configuration" --clear \
+/usr/bin/dialog --title "AFPL 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\
@@ -33,10 +28,11 @@ Have fun with this new configuration style !     -andreas \n\n\
   "m8510"    "C.Itoh M8510 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 \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
-  "ap3250"   "Epson AP3250" OFF \
+  "ap3250"   "Epson ActionPrinter 3250" OFF \
   "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
   "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
   "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" OFF \
@@ -45,6 +41,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
   "st800"    "Epson Stylus 800 printer" 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 \
@@ -55,8 +52,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
   "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
   "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
-  "cdj850"   "HP DeskJet 670/690/850/855/870/890/1100/1600" ON \
-  "cdj970"   "HP DeskJet 970, 3rd party" 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 \
@@ -76,20 +77,29 @@ Have fun with this new configuration style !     -andreas \n\n\
   "paintjet" "HP PaintJet color printer (alternate)" OFF \
   "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 \
+  "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 \
   "bmpmono"  "BMP Monochrome" ON \
   "bmpgray"  "BMP 8-bit gray" ON \
   "bmp16"    "BMP 4-bit EGA/VGA" ON \
@@ -148,36 +158,32 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
   "sunhmono" "Harlequin variant of 1-bit Sun raster file" 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 \
   "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 \
-  "x11rg16x" "X Windows with G5/B5/R6 pixel layout for testing" ON \
-  "x11rg32x" "X Windows with G11/B10/R11 pixel layout for testing" 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=$?
diff --git a/print/ghostscript-afpl/scripts/configure.batch b/print/ghostscript-afpl/scripts/configure.batch
index 95f0c51bb2e3..87bdc1eb7377 100644
--- a/print/ghostscript-afpl/scripts/configure.batch
+++ b/print/ghostscript-afpl/scripts/configure.batch
@@ -6,11 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-ifndef NO_X
-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
+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)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.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)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)cdj850.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+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)lj250.dev \$(DD)declj250.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)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)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)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.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
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 08b5950c0020..0a61cda1ecbb 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -6,30 +6,21 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	6.50
-PORTREVISION=	6
+PORTVERSION=	7.00
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/gs650/ \
-	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/fonts/ \
-	http://www.gelhaus.net/hp880c/1.4beta/ \
-	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
-	http://www.harsch.net/Download/ \
-	http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
-	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
-	http://download.sourceforge.net/ghostscript/ \
-	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/gs650/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/fonts/ \
-	ftp://munnari.oz.au/ghost/aladdin/gs650/ \
-	ftp://munnari.oz.au/ghost/aladdin/fonts/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/gs650/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/fonts/
-# note: russian mirror isn't up to date
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
+		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/AFPL/gs700/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+PKGNAMESUFFIX=	-afpl
+
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \
-		${HP970_DRV} ${GPRINT_SRC}
+		${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -37,30 +28,41 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+NO_CDROM=	"Can only be distributed for free"
+
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
+
+USE_GMAKE=	yes
+CFLAGS+=	-DUPD_SIGNAL=0
+MAKEFILE=	src/unix-gcc.mak
 ALL_TARGET=	all pcl3opts escputil
+PLIST_SUB=	GS_VERSION=${PORTVERSION}
+
+MAN1=		ansi2knr.1 dvipdf.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 \
+		ps2ps.1 eps2eps.1
+
+.if defined(A4)
+CFLAGS+=	-DA4
+.endif
 
 .if !defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-afpl
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
-# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
-# sure that NO_X is defined *and* has a value.
-MAKE_ENV+=	NO_X=true
+PKGNAMESUFFIX=	-afpl-nox11
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
-USE_GMAKE=	yes
-MAKEFILE=	src/unix-gcc.mak
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
-# Note: the order that the manpages are listed here matters because
-# some of them are symbolic links
-MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
-		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
-		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
-		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
-
-GS_SOURCES=	ghostscript-${PORTVERSION}.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
@@ -72,13 +74,12 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
 # http://www.gelhaus.net/hp880c/
-# driver names:	cdj880
-HP8XX=		cdj850
+HP8XX=		cdj880
 HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
-# ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
 # 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}
@@ -95,17 +96,25 @@ 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://sourceforge.net/projects/gimp-print/
+# http://gimp-print.sourceforge.net/
 GPRINT=		print
 GPRINT_DESC=	gimp-${GPRINT}
-GPRINT_VERS=	4.0.4
+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
@@ -113,200 +122,222 @@ CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.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
 
-CFLAGS+=	-DUPD_SIGNAL=0
+.SILENT:
 
-pre-fetch:
+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:
-	@${ECHO} ">>> in post-extract ..."
-	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
+	${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} ">>>   extracting ${HP8XX_DRV} ..."
-	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
-	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
+	${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} ">>>   extracting ${PCL3_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+	${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} ">>>   extracting ${HP970_DRV} ..."
-	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
-	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
+	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
-	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
+	${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
 
-# here we apply unofficial patches from 3rd party drivers
 post-patch:
-# from PCL3 driver
-	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from ${PCL3} ..."
-	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
+	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
+		${WRKSRC}/src/unix-gcc.mak
+# 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} ">>> in pre-configure ..."
+	${ECHO_MSG} ">>> in pre-configure ..."
 # for HP8XX driver
-	@${ECHO} ">>>   adding ${HP8XX} driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/cdj850.contrib.mak \
+	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for HPDJ driver
-	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
+	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
-	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/dj970.contrib.mak \
+	${ECHO_MSG} ">>>   adding DJ970 driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for gimp-print
-	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
-	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
 		${WRKSRC}/src
-	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+	${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
-	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
-	@${CAT} ${FILESDIR}/escputil.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} ">>> in do-configure ..."
+	${ECHO_MSG} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	# XXX diable dialog based configure, needs some rework later...
-	#@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
-	@${ECHO} ">>> in pre-build ..."
-	@${ECHO} ">>>   creating directories for compilation ..."
-	@${MKDIR} ${WRKSRC}/obj
-	@${MKDIR} ${WRKSRC}/bin
+	${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:
-	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating ghostscript destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting ghostscript fonts..."
-	@${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}
 
 post-install:
-	@${ECHO} ">>> in post-install ..."
-	@${ECHO} ">>>   stripping gs ..."
-	@strip ${PREFIX}/bin/gs
-	@${ECHO} ">>>   installing additional scripts ..."
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	${ECHO_MSG} ">>> in post-install ..."
+	${ECHO_MSG} ">>>   stripping gs ..."
+	strip ${PREFIX}/bin/gs
 # for HPDJ driver
-	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
+	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
+	${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} \
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing ${PCL3} manpages ..."
+	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating ${PCL3} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
+	${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} \
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
 # for gimp-print driver
-	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
-	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
-	@strip ${PREFIX}/bin/escputil
-	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+	${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} \
+	${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
 		${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
-	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+	${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} \
+	${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} ">>> installing contributed UPP profiles ..."
+	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
-	@${INSTALL_DATA} ${FILESDIR}/${i} \
+	${INSTALL_DATA} ${FILESDIR}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endfor
 # for reading encrypted PDFs
-	@${ECHO} ">>> installing support for encrypted PDF files ..."
-	@${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+	${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} ">>> installing PORTDOC stuff ..."
+	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
-.for i in LGPL.txt NEWS hpdj.html
-	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
+	${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} ">>>   creating ${PCL3} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
-.for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+	${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} "> post-installation tasks completed."
+	${ECHO_MSG} "> post-installation tasks completed."
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 2e40ae3888a2..a985fb0e65e6 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript-6.50.tar.gz) = 8f52f724f692cf06c94ad7da45eb7ec1
+MD5 (ghostscript-7.00.tar.gz) = 7e11f6408fd2305b926cd44c5577440f
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
@@ -6,4 +6,5 @@ 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.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
+MD5 (print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
+MD5 (hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/print/ghostscript-gpl/files/cdj850.contrib.mak b/print/ghostscript-gpl/files/cdj850.contrib.mak
index ffb099b0caf8..8faefec5fe4e 100644
--- a/print/ghostscript-gpl/files/cdj850.contrib.mak
+++ b/print/ghostscript-gpl/files/cdj850.contrib.mak
@@ -1,13 +1,21 @@
-
 ###- cdj850 - HP 850 Driver under development -------- ###
+cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
-cdj8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
+$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
 
-$(DD)cdj850.dev : $(cdj8_) $(DD)page.dev
-	$(SETPDEV) $(DD)cdj850 $(cdj8_)
+$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
 
-$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(std_h) $(PDEVH)\
- $(gsparam_h) $(gsstate_h) $(gxlum_h)\
- $(gdevbjc_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
+
+$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
 
+$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
+
+$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
+ $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
diff --git a/print/ghostscript-gpl/files/hpijs.contrib.mak b/print/ghostscript-gpl/files/hpijs.contrib.mak
new file mode 100644
index 000000000000..35eb9e6b06b1
--- /dev/null
+++ b/print/ghostscript-gpl/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-gpl/files/patch-aa b/print/ghostscript-gpl/files/patch-aa
deleted file mode 100644
index d4e6fa42b073..000000000000
--- a/print/ghostscript-gpl/files/patch-aa
+++ /dev/null
@@ -1,224 +0,0 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
-+++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
-@@ -26,14 +26,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.
- 
-@@ -52,11 +53,10 @@
- # 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)
-@@ -128,7 +128,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).
-@@ -148,14 +148,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.
-@@ -167,7 +167,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
- 
-@@ -182,7 +182,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.
-@@ -215,7 +215,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.
-@@ -224,7 +224,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
- 
-@@ -244,7 +244,7 @@
- # All reasonable platforms require -lm, but Rhapsody and perhaps one or
- # two others fold libm into libc and don't require any additional library.
- 
--STDLIBS=-lpthread -lm
-+STDLIBS= -lm
- 
- # Define the include switch(es) for the X11 header files.
- # This can be null if handled in some other way (e.g., the files are
-@@ -254,7 +254,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
-@@ -266,12 +266,16 @@
- # 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
-+ifdef NO_X
-+XLIBS=
-+else
-+XLIBS=Xt SM ICE Xext X11
-+endif
- 
- #XLIBDIRS=-L/usr/local/X/lib
--XLIBDIRS=-L/usr/X11/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.
-@@ -329,7 +333,7 @@
- # Choose the device(s) to include.  See devs.mak for details,
- # devs.mak and contrib.mak for the list of available devices.
- 
--DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
-+#DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
- 
- #DEVICE_DEVS1=
- #DEVICE_DEVS2=
-@@ -352,27 +356,27 @@
- #DEVICE_DEVS19=
- #DEVICE_DEVS20=
- 
--DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
--DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
--DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
--DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
--DEVICE_DEVS5=$(DD)uniprint.dev
--DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
--DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
--DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
--DEVICE_DEVS9=$(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
--DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
--DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev
--DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
--DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev
--DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
--DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
--
--DEVICE_DEVS16=
--DEVICE_DEVS17=
--DEVICE_DEVS18=
--DEVICE_DEVS19=
--DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
-+#DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
-+#DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
-+#DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
-+#DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
-+#DEVICE_DEVS5=$(DD)uniprint.dev
-+#DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
-+#DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
-+#DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
-+#DEVICE_DEVS9=$(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
-+#DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
-+#DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev
-+#DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
-+#DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev
-+#DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
-+#DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
-+
-+#DEVICE_DEVS16=
-+#DEVICE_DEVS17=
-+#DEVICE_DEVS18=
-+#DEVICE_DEVS19=
-+#DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
- 
- # ---------------------------- End of options --------------------------- #
- 
-@@ -386,13 +390,13 @@
- # detect whether we're running a version of gcc with the const optimization
- # bug.
- 
--AK=$(GLGENDIR)/cc.tr
-+#AK=$(GLGENDIR)/cc.tr
- 
- # Define the compilation rules and flags.
- 
- CCFLAGS=$(GENOPT) $(CFLAGS)
--CC_=$(CC) `cat $(AK)` $(CCFLAGS)
--CCAUX=$(CC) `cat $(AK)`
-+CC_=$(CC) $(CCFLAGS)
-+CCAUX=$(CC)
- CC_LEAF=$(CC_) -fomit-frame-pointer
- # gcc can't use -fomit-frame-pointer with -pg.
- CC_LEAF_PG=$(CC_)
-@@ -419,5 +423,5 @@
- include $(GLSRCDIR)/unixinst.mak
- 
- # This has to come last so it won't be taken as the default target.
--$(AK):
--	if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
-+#$(AK):
-+#	if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript-gpl/files/patch-ac b/print/ghostscript-gpl/files/patch-ac
deleted file mode 100644
index 148e0e556d33..000000000000
--- a/print/ghostscript-gpl/files/patch-ac
+++ /dev/null
@@ -1,86 +0,0 @@
-begin patches/patch-ac:
-This patch removes the  code that tries to figure out  the cache size of
-the host. The  algorithm may very well fail under  some circumstances --
-it  makes too  many  assumptions  about the  cache  behaviour, but  most
-importantly,  the  figured out  values  ARE  NOT  USED anywhere  in  the
-ghostscript code anymore.
-
-	-mi
-
---- src/genarch.c	Thu Mar  9 03:40:41 2000
-+++ src/genarch.c	Wed Jul 19 09:37:30 2000
-@@ -43,11 +42,0 @@
--private clock_t
--time_clear(char *buf, int bsize, int nreps)
--{
--    clock_t t = clock();
--    int i;
--
--    for (i = 0; i < nreps; ++i)
--	memset(buf, 0, bsize);
--    return clock() - t;
--}
--
-@@ -181,63 +170,2 @@
- #undef PRINT_MAX
--
--    section(f, "Cache sizes");
--
--    /*
--     * Determine the primary and secondary cache sizes by looking for a
--     * non-linearity in the time required to fill blocks with memset.
--     */
--    {
--#define MAX_BLOCK (1 << 20)
--	static char buf[MAX_BLOCK];
--	int bsize = 1 << 10;
--	int nreps = 1;
--	clock_t t = 0;
--	clock_t t_eps;
--
--	/*
--	 * Increase the number of repetitions until the time is
--	 * long enough to exceed the likely uncertainty.
--	 */
--
--	while ((t = time_clear(buf, bsize, nreps)) == 0)
--	    nreps <<= 1;
--	t_eps = t;
--	while ((t = time_clear(buf, bsize, nreps)) < t_eps * 10)
--	    nreps <<= 1;
--
--	/*
--	 * Increase the block size until the time jumps non-linearly.
--	 */
--	for (; bsize <= MAX_BLOCK;) {
--	    clock_t dt = time_clear(buf, bsize, nreps);
--
--	    if (dt > t + (t >> 1)) {
--		t = dt;
--		break;
--	    }
--	    bsize <<= 1;
--	    nreps >>= 1;
--	    if (nreps == 0)
--		nreps = 1, t <<= 1;
--	}
--	define_int(f, "ARCH_CACHE1_SIZE", bsize >> 1);
--	/*
--	 * Do the same thing a second time for the secondary cache.
--	 */
--	if (nreps > 1)
--	    nreps >>= 1, t >>= 1;
--	for (; bsize <= MAX_BLOCK;) {
--	    clock_t dt = time_clear(buf, bsize, nreps);
--
--	    if (dt > t * 1.25) {
--		t = dt;
--		break;
--	    }
--	    bsize <<= 1;
--	    nreps >>= 1;
--	    if (nreps == 0)
--		nreps = 1, t <<= 1;
--	}
--	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
--    }
diff --git a/print/ghostscript-gpl/files/patch-hpijs:makefile b/print/ghostscript-gpl/files/patch-hpijs:makefile
new file mode 100644
index 000000000000..8f53a8202f59
--- /dev/null
+++ b/print/ghostscript-gpl/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-gpl/files/patch-lib,gs_init.ps b/print/ghostscript-gpl/files/patch-lib,gs_init.ps
deleted file mode 100644
index a2f5d54ee5b7..000000000000
--- a/print/ghostscript-gpl/files/patch-lib,gs_init.ps
+++ /dev/null
@@ -1,31 +0,0 @@
-  File:     @(#)$Id: README,v 2.6 2000/11/09 18:33:58 Martin Beta $
-  Contents: README file for the pcl3 distribution
-  Author:   Martin Lottermoser, Greifswaldstrasse 28, 38124 Braunschweig,
-            Germany. E-mail: Martin.Lottermoser@t-online.de.
-[...]
- 8. There is also a bug in ghostscript's default configuration for the
-    undercolour removal and black generation functions. It shows up when
-    printing PostScript documents using the RGB colour space ("setrgbcolor" or
-    "sethsbcolor") on a device where the CMYK space is the native colour space;
-    this is the case for pcl3 if you specify "-sColourModel=CMYK". The bug
-    results in black being printed as a mixture of cyan, magenta, and yellow.
-    On my printer, this is a slightly greenish grey with fuzzy edges. My
-    subjective impression is that correcting this bug leads to sharper-looking
-    images.
-[...]
-
-I generated a patch as suggested from Martin Lottermoser
-
-	-andreas
-
---- lib/gs_init.ps.orig	Mon Jan  8 20:47:39 2001
-+++ lib/gs_init.ps	Mon Jan  8 20:49:02 2001
-@@ -1229,7 +1229,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>
diff --git a/print/ghostscript-gpl/files/patch-lib:gs_init.ps b/print/ghostscript-gpl/files/patch-lib:gs_init.ps
new file mode 100644
index 000000000000..d3e7e8130021
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lib:gs_init.ps
@@ -0,0 +1,19 @@
+--- lib/gs_init.ps.orig	Mon Apr  9 15:20:03 2001
++++ lib/gs_init.ps	Wed Jun 20 04:05:12 2001
+@@ -1263,7 +1263,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>
+@@ -1815,3 +1815,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-gpl/files/patch-pcl3:eprn:gdeveprn.c b/print/ghostscript-gpl/files/patch-pcl3:eprn:gdeveprn.c
new file mode 100644
index 000000000000..605148be439c
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-pcl3:eprn:gdeveprn.c
@@ -0,0 +1,12 @@
+--- pcl3/eprn/gdeveprn.c.orig	Sun Mar 25 13:59:11 2001
++++ pcl3/eprn/gdeveprn.c	Tue Apr 10 17:53:03 2001
+@@ -81,6 +81,9 @@
+ #include "gstypes.h"	/* needed by gsstate.h */
+ #include "gsstate.h"	/* needed by icstate.h */
+ #include "icstate.h"	/* for struct gs_context_state_s */
++#if !defined(GS_REVISION) || GS_REVISION >= 700
++#include "iapi.h"	/* needed by iminst.h */
++#endif
+ #include "iminst.h"	/* for struct gs_main_instance_s */
+ #include "imain.h"	/* for gs_main_instance_default() */
+ #include "gscoord.h"	/* for gs_setdefaultmatrix() */
diff --git a/print/ghostscript-gpl/files/patch-src.gdevxini.c b/print/ghostscript-gpl/files/patch-src.gdevxini.c
deleted file mode 100644
index 5c072ec041e4..000000000000
--- a/print/ghostscript-gpl/files/patch-src.gdevxini.c
+++ /dev/null
@@ -1,47 +0,0 @@
-Message-ID: <3AB64C01.54380C00@we.lc.ehu.es>
-Date: Mon, 19 Mar 2001 19:12:17 +0100
-From: "Jose M. Alcaide" <jose@we.lc.ehu.es>
-Organization: Universidad del Pais Vasco - Dpto. de Electricidad y Electronica
-Subject: new patch for ghostscript 6.50
-
-Hello Andreas,
-
-About a month ago I sent you a patch for GhostScript 6.50. Without that
-patch, LyX 1.1.6 cannot show included EPS figures. Now that the LyX
-port has been updated this problem will begin to hit many LyX users,
-and the ports freeze is coming soon...
-
-The problem is described in:
-
-http://sourceforge.net/bugs/?func=detailbug&bug_id=124957&group_id=1897
-
-I am resending the patch attached to this message. I am using Ghostscript
-with this patch applied and everything (including LyX) seems to work OK.
-
-Cheers,
--- JMA
-****** Jose M. Alcaide  //  jose@we.lc.ehu.es  //  jmas@FreeBSD.org ******
-** "Beware of Programmers who carry screwdrivers" --  Leonard Brandwein **
---------------8E7698D95DE1CB06D5711335
-Content-Type: text/plain; charset=us-ascii;
- name="patch-src,gdevxini.c"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline;
- filename="patch-src,gdevxini.c"
-
---- src/gdevxini.c.orig	Tue Sep 19 21:00:23 2000
-+++ src/gdevxini.c	Tue Feb 20 18:07:09 2001
-@@ -654,8 +654,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-gpl/files/patch-src:contrib.mak-5.94.add b/print/ghostscript-gpl/files/patch-src:contrib.mak-5.94.add
new file mode 100644
index 000000000000..1d2c46b8ea2e
--- /dev/null
+++ b/print/ghostscript-gpl/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-gpl/files/patch-src:genarch.c b/print/ghostscript-gpl/files/patch-src:genarch.c
new file mode 100644
index 000000000000..3b74ac7e6145
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:genarch.c
@@ -0,0 +1,34 @@
+--- src/genarch.c.orig	Wed Sep 20 04:00:23 2000
++++ src/genarch.c	Wed Jun 20 04:05:36 2001
+@@ -40,6 +40,7 @@
+     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
+ }
+ 
++#ifndef __FreeBSD__
+ private clock_t
+ time_clear(char *buf, int bsize, int nreps)
+ {
+@@ -50,6 +51,7 @@
+ 	memset(buf, 0, bsize);
+     return clock() - t;
+ }
++#endif /* __FreeBSD__ */
+ 
+ private void
+ define(FILE *f, const char *str)
+@@ -180,6 +182,7 @@
+     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
+ #undef PRINT_MAX
+ 
++#ifndef __FreeBSD__
+     section(f, "Cache sizes");
+ 
+     /*
+@@ -240,6 +243,7 @@
+ 	}
+ 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
+     }
++#endif /* __FreeBSD__ */
+ 
+     section(f, "Miscellaneous");
+ 
diff --git a/print/ghostscript-gpl/files/patch-src:gp_unifs.c b/print/ghostscript-gpl/files/patch-src:gp_unifs.c
new file mode 100644
index 000000000000..68c9bcaf175b
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gp_unifs.c
@@ -0,0 +1,34 @@
+--- src/gp_unifs.c.orig	Tue Mar 13 15:51:39 2001
++++ src/gp_unifs.c	Wed Jun 20 04:06:02 2001
+@@ -28,6 +28,7 @@
+ #include "stat_.h"
+ #include "dirent_.h"
+ #include <sys/param.h>		/* for MAXPATHLEN */
++#include <unistd.h>
+ 
+ /* Some systems (Interactive for example) don't define MAXPATHLEN,
+  * so we define it here.  (This probably should be done via a Config-Script.)
+@@ -58,6 +59,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_gettmpdir(fname, &len) != 0)
+ 	strcpy(fname, "/tmp/");
+@@ -70,8 +73,12 @@
+     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
+ 	strcat(fname, "-");
+     strcat(fname, "XXXXXX");
+-    mktemp(fname);
+-    return gp_fopentemp(fname, mode);
++    fd = mkstemp(fname);
++    if (fd == -1)
++	return NULL;
++    if ((f = fdopen(fd, mode)) == NULL)
++	close(fd);
++    return f;
+ }
+ 
+ /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
new file mode 100644
index 000000000000..32c9f2b531d5
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -0,0 +1,130 @@
+--- src/unix-gcc.mak.orig	Mon Apr  9 14:52:57 2001
++++ src/unix-gcc.mak	Fri Jun 15 21:47:42 2001
+@@ -26,14 +26,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.
+ 
+@@ -52,11 +53,10 @@
+ # 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)
+@@ -128,7 +128,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).
+@@ -148,14 +148,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=10010
+ 
+ # 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.
+@@ -167,7 +167,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
+ 
+@@ -187,7 +187,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.
+@@ -222,7 +222,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.
+@@ -231,7 +231,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
+ 
+@@ -264,7 +264,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/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
+@@ -277,11 +277,16 @@
+ #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
+ # X11R6 (on any platform) may need
+ #XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
++XLIBS=Xt SM ICE Xext X11
++endif
+ 
+ #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:
diff --git a/print/ghostscript-gpl/files/patch-src:zmedia2.c b/print/ghostscript-gpl/files/patch-src:zmedia2.c
new file mode 100644
index 000000000000..7db33eaecc44
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:zmedia2.c
@@ -0,0 +1,25 @@
+--- src/zmedia2.c.orig	Wed Sep 20 04:00:54 2000
++++ src/zmedia2.c	Wed Jun 20 04:06:24 2001
+@@ -427,11 +427,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-gpl/pkg-comment b/print/ghostscript-gpl/pkg-comment
index 1e371cace06a..dd6a867e3c83 100644
--- a/print/ghostscript-gpl/pkg-comment
+++ b/print/ghostscript-gpl/pkg-comment
@@ -1 +1 @@
-Aladdin Postscript interpreter version 6
+AFPL Postscript interpreter version 7
diff --git a/print/ghostscript-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index 39e0177bea17..4489409d3260 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -1,24 +1,25 @@
-This is Aladdin Ghostscript, the non-GPL version that comes with a licence
-different from the GPL. Read the file PUBLIC in the work/gsX.Y directory or
-in ${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
-
 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.
 
+Versions entitled "AFPL Ghostscript" are distributed with a licence different
+from the GPL. Read the file PUBLIC in the work/gsX.Y directory or in
+${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
+
 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/
-	o Additional driver support
-	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
-	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
+	  - 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
 		
-Thomas Merz has written a Ghostscript manual in PDF format:
-	http://www.cs.wisc.edu/~ghost/merz.html
-
-The manual is also available in German language, see:
-	http://www.muc.de/~tm/free/free.html
-
 WWW: http://www.cs.wisc.edu/~ghost/index.html
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 228305ea212a..0089e7022f71 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -30,14 +30,14 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/LGPL.txt
+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/LGPL
 %%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/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
 share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
@@ -47,6 +47,7 @@ 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/Develop.htm
 share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
 share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
 share/ghostscript/%%GS_VERSION%%/doc/Helpers.htm
@@ -62,6 +63,7 @@ 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/Maintain.htm
 share/ghostscript/%%GS_VERSION%%/doc/Make.htm
 share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
 share/ghostscript/%%GS_VERSION%%/doc/News.htm
@@ -70,6 +72,7 @@ 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/Ps-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Public.htm
 share/ghostscript/%%GS_VERSION%%/doc/README
 share/ghostscript/%%GS_VERSION%%/doc/Readme.htm
@@ -86,6 +89,7 @@ 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
@@ -163,6 +167,7 @@ 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_icc.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
@@ -263,6 +268,9 @@ 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/stc300.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bm.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500p.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500ph.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc600ih.upp
@@ -481,16 +489,17 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
-@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
-@dirrm share/doc/ghostscript/%%GS_VERSION%%
-@dirrm share/doc/ghostscript
-@dirrm share/ghostscript/%%GS_VERSION%%/doc
-@dirrm share/ghostscript/%%GS_VERSION%%/examples
-@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
-@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/ghostscript/%%GS_VERSION%%/lib
 @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
+%%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-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index 4b86359db1d0..31c7d3d85b44 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -5,13 +5,8 @@
 # configure - gs driver preconfiguration, manual driver selection
 # by Andreas Klemm <andreas@FreeBSD.org>
 
-#
-# XXX - needs some rework for gs v 6.50,
-#       therefore currently disabled in Makefile
-#
-
 # driverselection
-/usr/bin/dialog --title "Ghostscript 6 driver configuration" --clear \
+/usr/bin/dialog --title "AFPL 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\
@@ -33,10 +28,11 @@ Have fun with this new configuration style !     -andreas \n\n\
   "m8510"    "C.Itoh M8510 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 \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
-  "ap3250"   "Epson AP3250" OFF \
+  "ap3250"   "Epson ActionPrinter 3250" OFF \
   "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
   "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
   "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" OFF \
@@ -45,6 +41,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
   "st800"    "Epson Stylus 800 printer" 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 \
@@ -55,8 +52,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
   "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
   "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
-  "cdj850"   "HP DeskJet 670/690/850/855/870/890/1100/1600" ON \
-  "cdj970"   "HP DeskJet 970, 3rd party" 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 \
@@ -76,20 +77,29 @@ Have fun with this new configuration style !     -andreas \n\n\
   "paintjet" "HP PaintJet color printer (alternate)" OFF \
   "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 \
+  "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 \
   "bmpmono"  "BMP Monochrome" ON \
   "bmpgray"  "BMP 8-bit gray" ON \
   "bmp16"    "BMP 4-bit EGA/VGA" ON \
@@ -148,36 +158,32 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
   "sunhmono" "Harlequin variant of 1-bit Sun raster file" 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 \
   "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 \
-  "x11rg16x" "X Windows with G5/B5/R6 pixel layout for testing" ON \
-  "x11rg32x" "X Windows with G11/B10/R11 pixel layout for testing" 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=$?
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index 95f0c51bb2e3..87bdc1eb7377 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -6,11 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-ifndef NO_X
-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
+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)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.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)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)cdj850.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+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)lj250.dev \$(DD)declj250.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)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)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)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.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
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 08b5950c0020..0a61cda1ecbb 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -6,30 +6,21 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	6.50
-PORTREVISION=	6
+PORTVERSION=	7.00
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/gs650/ \
-	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/fonts/ \
-	http://www.gelhaus.net/hp880c/1.4beta/ \
-	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
-	http://www.harsch.net/Download/ \
-	http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
-	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
-	http://download.sourceforge.net/ghostscript/ \
-	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/gs650/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/fonts/ \
-	ftp://munnari.oz.au/ghost/aladdin/gs650/ \
-	ftp://munnari.oz.au/ghost/aladdin/fonts/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/gs650/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/fonts/
-# note: russian mirror isn't up to date
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
+		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/AFPL/gs700/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+PKGNAMESUFFIX=	-afpl
+
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \
-		${HP970_DRV} ${GPRINT_SRC}
+		${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -37,30 +28,41 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+NO_CDROM=	"Can only be distributed for free"
+
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
+
+USE_GMAKE=	yes
+CFLAGS+=	-DUPD_SIGNAL=0
+MAKEFILE=	src/unix-gcc.mak
 ALL_TARGET=	all pcl3opts escputil
+PLIST_SUB=	GS_VERSION=${PORTVERSION}
+
+MAN1=		ansi2knr.1 dvipdf.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 \
+		ps2ps.1 eps2eps.1
+
+.if defined(A4)
+CFLAGS+=	-DA4
+.endif
 
 .if !defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-afpl
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
-# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
-# sure that NO_X is defined *and* has a value.
-MAKE_ENV+=	NO_X=true
+PKGNAMESUFFIX=	-afpl-nox11
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
-USE_GMAKE=	yes
-MAKEFILE=	src/unix-gcc.mak
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
-# Note: the order that the manpages are listed here matters because
-# some of them are symbolic links
-MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
-		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
-		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
-		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
-
-GS_SOURCES=	ghostscript-${PORTVERSION}.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
@@ -72,13 +74,12 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
 # http://www.gelhaus.net/hp880c/
-# driver names:	cdj880
-HP8XX=		cdj850
+HP8XX=		cdj880
 HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
-# ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
 # 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}
@@ -95,17 +96,25 @@ 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://sourceforge.net/projects/gimp-print/
+# http://gimp-print.sourceforge.net/
 GPRINT=		print
 GPRINT_DESC=	gimp-${GPRINT}
-GPRINT_VERS=	4.0.4
+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
@@ -113,200 +122,222 @@ CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.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
 
-CFLAGS+=	-DUPD_SIGNAL=0
+.SILENT:
 
-pre-fetch:
+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:
-	@${ECHO} ">>> in post-extract ..."
-	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
+	${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} ">>>   extracting ${HP8XX_DRV} ..."
-	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
-	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
+	${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} ">>>   extracting ${PCL3_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+	${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} ">>>   extracting ${HP970_DRV} ..."
-	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
-	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
+	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
-	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
+	${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
 
-# here we apply unofficial patches from 3rd party drivers
 post-patch:
-# from PCL3 driver
-	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from ${PCL3} ..."
-	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
+	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
+		${WRKSRC}/src/unix-gcc.mak
+# 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} ">>> in pre-configure ..."
+	${ECHO_MSG} ">>> in pre-configure ..."
 # for HP8XX driver
-	@${ECHO} ">>>   adding ${HP8XX} driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/cdj850.contrib.mak \
+	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for HPDJ driver
-	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
+	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
-	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/dj970.contrib.mak \
+	${ECHO_MSG} ">>>   adding DJ970 driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for gimp-print
-	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
-	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
 		${WRKSRC}/src
-	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+	${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
-	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
-	@${CAT} ${FILESDIR}/escputil.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} ">>> in do-configure ..."
+	${ECHO_MSG} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	# XXX diable dialog based configure, needs some rework later...
-	#@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
-	@${ECHO} ">>> in pre-build ..."
-	@${ECHO} ">>>   creating directories for compilation ..."
-	@${MKDIR} ${WRKSRC}/obj
-	@${MKDIR} ${WRKSRC}/bin
+	${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:
-	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating ghostscript destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting ghostscript fonts..."
-	@${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}
 
 post-install:
-	@${ECHO} ">>> in post-install ..."
-	@${ECHO} ">>>   stripping gs ..."
-	@strip ${PREFIX}/bin/gs
-	@${ECHO} ">>>   installing additional scripts ..."
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	${ECHO_MSG} ">>> in post-install ..."
+	${ECHO_MSG} ">>>   stripping gs ..."
+	strip ${PREFIX}/bin/gs
 # for HPDJ driver
-	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
+	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
+	${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} \
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing ${PCL3} manpages ..."
+	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating ${PCL3} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
+	${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} \
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
 # for gimp-print driver
-	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
-	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
-	@strip ${PREFIX}/bin/escputil
-	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+	${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} \
+	${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
 		${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
-	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+	${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} \
+	${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} ">>> installing contributed UPP profiles ..."
+	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
-	@${INSTALL_DATA} ${FILESDIR}/${i} \
+	${INSTALL_DATA} ${FILESDIR}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endfor
 # for reading encrypted PDFs
-	@${ECHO} ">>> installing support for encrypted PDF files ..."
-	@${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+	${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} ">>> installing PORTDOC stuff ..."
+	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
-.for i in LGPL.txt NEWS hpdj.html
-	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
+	${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} ">>>   creating ${PCL3} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
-.for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+	${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} "> post-installation tasks completed."
+	${ECHO_MSG} "> post-installation tasks completed."
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 2e40ae3888a2..a985fb0e65e6 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript-6.50.tar.gz) = 8f52f724f692cf06c94ad7da45eb7ec1
+MD5 (ghostscript-7.00.tar.gz) = 7e11f6408fd2305b926cd44c5577440f
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
@@ -6,4 +6,5 @@ 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.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
+MD5 (print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
+MD5 (hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/print/ghostscript8/files/cdj850.contrib.mak b/print/ghostscript8/files/cdj850.contrib.mak
index ffb099b0caf8..8faefec5fe4e 100644
--- a/print/ghostscript8/files/cdj850.contrib.mak
+++ b/print/ghostscript8/files/cdj850.contrib.mak
@@ -1,13 +1,21 @@
-
 ###- cdj850 - HP 850 Driver under development -------- ###
+cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
-cdj8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
+$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
 
-$(DD)cdj850.dev : $(cdj8_) $(DD)page.dev
-	$(SETPDEV) $(DD)cdj850 $(cdj8_)
+$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
 
-$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(std_h) $(PDEVH)\
- $(gsparam_h) $(gsstate_h) $(gxlum_h)\
- $(gdevbjc_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
+
+$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
 
+$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
+
+$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
+ $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
diff --git a/print/ghostscript8/files/hpijs.contrib.mak b/print/ghostscript8/files/hpijs.contrib.mak
new file mode 100644
index 000000000000..35eb9e6b06b1
--- /dev/null
+++ b/print/ghostscript8/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/ghostscript8/files/patch-aa b/print/ghostscript8/files/patch-aa
deleted file mode 100644
index d4e6fa42b073..000000000000
--- a/print/ghostscript8/files/patch-aa
+++ /dev/null
@@ -1,224 +0,0 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
-+++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
-@@ -26,14 +26,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.
- 
-@@ -52,11 +53,10 @@
- # 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)
-@@ -128,7 +128,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).
-@@ -148,14 +148,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.
-@@ -167,7 +167,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
- 
-@@ -182,7 +182,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.
-@@ -215,7 +215,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.
-@@ -224,7 +224,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
- 
-@@ -244,7 +244,7 @@
- # All reasonable platforms require -lm, but Rhapsody and perhaps one or
- # two others fold libm into libc and don't require any additional library.
- 
--STDLIBS=-lpthread -lm
-+STDLIBS= -lm
- 
- # Define the include switch(es) for the X11 header files.
- # This can be null if handled in some other way (e.g., the files are
-@@ -254,7 +254,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
-@@ -266,12 +266,16 @@
- # 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
-+ifdef NO_X
-+XLIBS=
-+else
-+XLIBS=Xt SM ICE Xext X11
-+endif
- 
- #XLIBDIRS=-L/usr/local/X/lib
--XLIBDIRS=-L/usr/X11/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.
-@@ -329,7 +333,7 @@
- # Choose the device(s) to include.  See devs.mak for details,
- # devs.mak and contrib.mak for the list of available devices.
- 
--DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
-+#DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
- 
- #DEVICE_DEVS1=
- #DEVICE_DEVS2=
-@@ -352,27 +356,27 @@
- #DEVICE_DEVS19=
- #DEVICE_DEVS20=
- 
--DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
--DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
--DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
--DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
--DEVICE_DEVS5=$(DD)uniprint.dev
--DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
--DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
--DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
--DEVICE_DEVS9=$(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
--DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
--DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev
--DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
--DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev
--DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
--DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
--
--DEVICE_DEVS16=
--DEVICE_DEVS17=
--DEVICE_DEVS18=
--DEVICE_DEVS19=
--DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
-+#DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
-+#DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
-+#DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
-+#DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
-+#DEVICE_DEVS5=$(DD)uniprint.dev
-+#DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
-+#DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
-+#DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
-+#DEVICE_DEVS9=$(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
-+#DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
-+#DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev
-+#DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
-+#DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev
-+#DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
-+#DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
-+
-+#DEVICE_DEVS16=
-+#DEVICE_DEVS17=
-+#DEVICE_DEVS18=
-+#DEVICE_DEVS19=
-+#DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
- 
- # ---------------------------- End of options --------------------------- #
- 
-@@ -386,13 +390,13 @@
- # detect whether we're running a version of gcc with the const optimization
- # bug.
- 
--AK=$(GLGENDIR)/cc.tr
-+#AK=$(GLGENDIR)/cc.tr
- 
- # Define the compilation rules and flags.
- 
- CCFLAGS=$(GENOPT) $(CFLAGS)
--CC_=$(CC) `cat $(AK)` $(CCFLAGS)
--CCAUX=$(CC) `cat $(AK)`
-+CC_=$(CC) $(CCFLAGS)
-+CCAUX=$(CC)
- CC_LEAF=$(CC_) -fomit-frame-pointer
- # gcc can't use -fomit-frame-pointer with -pg.
- CC_LEAF_PG=$(CC_)
-@@ -419,5 +423,5 @@
- include $(GLSRCDIR)/unixinst.mak
- 
- # This has to come last so it won't be taken as the default target.
--$(AK):
--	if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
-+#$(AK):
-+#	if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript8/files/patch-ac b/print/ghostscript8/files/patch-ac
deleted file mode 100644
index 148e0e556d33..000000000000
--- a/print/ghostscript8/files/patch-ac
+++ /dev/null
@@ -1,86 +0,0 @@
-begin patches/patch-ac:
-This patch removes the  code that tries to figure out  the cache size of
-the host. The  algorithm may very well fail under  some circumstances --
-it  makes too  many  assumptions  about the  cache  behaviour, but  most
-importantly,  the  figured out  values  ARE  NOT  USED anywhere  in  the
-ghostscript code anymore.
-
-	-mi
-
---- src/genarch.c	Thu Mar  9 03:40:41 2000
-+++ src/genarch.c	Wed Jul 19 09:37:30 2000
-@@ -43,11 +42,0 @@
--private clock_t
--time_clear(char *buf, int bsize, int nreps)
--{
--    clock_t t = clock();
--    int i;
--
--    for (i = 0; i < nreps; ++i)
--	memset(buf, 0, bsize);
--    return clock() - t;
--}
--
-@@ -181,63 +170,2 @@
- #undef PRINT_MAX
--
--    section(f, "Cache sizes");
--
--    /*
--     * Determine the primary and secondary cache sizes by looking for a
--     * non-linearity in the time required to fill blocks with memset.
--     */
--    {
--#define MAX_BLOCK (1 << 20)
--	static char buf[MAX_BLOCK];
--	int bsize = 1 << 10;
--	int nreps = 1;
--	clock_t t = 0;
--	clock_t t_eps;
--
--	/*
--	 * Increase the number of repetitions until the time is
--	 * long enough to exceed the likely uncertainty.
--	 */
--
--	while ((t = time_clear(buf, bsize, nreps)) == 0)
--	    nreps <<= 1;
--	t_eps = t;
--	while ((t = time_clear(buf, bsize, nreps)) < t_eps * 10)
--	    nreps <<= 1;
--
--	/*
--	 * Increase the block size until the time jumps non-linearly.
--	 */
--	for (; bsize <= MAX_BLOCK;) {
--	    clock_t dt = time_clear(buf, bsize, nreps);
--
--	    if (dt > t + (t >> 1)) {
--		t = dt;
--		break;
--	    }
--	    bsize <<= 1;
--	    nreps >>= 1;
--	    if (nreps == 0)
--		nreps = 1, t <<= 1;
--	}
--	define_int(f, "ARCH_CACHE1_SIZE", bsize >> 1);
--	/*
--	 * Do the same thing a second time for the secondary cache.
--	 */
--	if (nreps > 1)
--	    nreps >>= 1, t >>= 1;
--	for (; bsize <= MAX_BLOCK;) {
--	    clock_t dt = time_clear(buf, bsize, nreps);
--
--	    if (dt > t * 1.25) {
--		t = dt;
--		break;
--	    }
--	    bsize <<= 1;
--	    nreps >>= 1;
--	    if (nreps == 0)
--		nreps = 1, t <<= 1;
--	}
--	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
--    }
diff --git a/print/ghostscript8/files/patch-hpijs:makefile b/print/ghostscript8/files/patch-hpijs:makefile
new file mode 100644
index 000000000000..8f53a8202f59
--- /dev/null
+++ b/print/ghostscript8/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/ghostscript8/files/patch-lib,gs_init.ps b/print/ghostscript8/files/patch-lib,gs_init.ps
deleted file mode 100644
index a2f5d54ee5b7..000000000000
--- a/print/ghostscript8/files/patch-lib,gs_init.ps
+++ /dev/null
@@ -1,31 +0,0 @@
-  File:     @(#)$Id: README,v 2.6 2000/11/09 18:33:58 Martin Beta $
-  Contents: README file for the pcl3 distribution
-  Author:   Martin Lottermoser, Greifswaldstrasse 28, 38124 Braunschweig,
-            Germany. E-mail: Martin.Lottermoser@t-online.de.
-[...]
- 8. There is also a bug in ghostscript's default configuration for the
-    undercolour removal and black generation functions. It shows up when
-    printing PostScript documents using the RGB colour space ("setrgbcolor" or
-    "sethsbcolor") on a device where the CMYK space is the native colour space;
-    this is the case for pcl3 if you specify "-sColourModel=CMYK". The bug
-    results in black being printed as a mixture of cyan, magenta, and yellow.
-    On my printer, this is a slightly greenish grey with fuzzy edges. My
-    subjective impression is that correcting this bug leads to sharper-looking
-    images.
-[...]
-
-I generated a patch as suggested from Martin Lottermoser
-
-	-andreas
-
---- lib/gs_init.ps.orig	Mon Jan  8 20:47:39 2001
-+++ lib/gs_init.ps	Mon Jan  8 20:49:02 2001
-@@ -1229,7 +1229,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>
diff --git a/print/ghostscript8/files/patch-lib:gs_init.ps b/print/ghostscript8/files/patch-lib:gs_init.ps
new file mode 100644
index 000000000000..d3e7e8130021
--- /dev/null
+++ b/print/ghostscript8/files/patch-lib:gs_init.ps
@@ -0,0 +1,19 @@
+--- lib/gs_init.ps.orig	Mon Apr  9 15:20:03 2001
++++ lib/gs_init.ps	Wed Jun 20 04:05:12 2001
+@@ -1263,7 +1263,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>
+@@ -1815,3 +1815,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/ghostscript8/files/patch-pcl3:eprn:gdeveprn.c b/print/ghostscript8/files/patch-pcl3:eprn:gdeveprn.c
new file mode 100644
index 000000000000..605148be439c
--- /dev/null
+++ b/print/ghostscript8/files/patch-pcl3:eprn:gdeveprn.c
@@ -0,0 +1,12 @@
+--- pcl3/eprn/gdeveprn.c.orig	Sun Mar 25 13:59:11 2001
++++ pcl3/eprn/gdeveprn.c	Tue Apr 10 17:53:03 2001
+@@ -81,6 +81,9 @@
+ #include "gstypes.h"	/* needed by gsstate.h */
+ #include "gsstate.h"	/* needed by icstate.h */
+ #include "icstate.h"	/* for struct gs_context_state_s */
++#if !defined(GS_REVISION) || GS_REVISION >= 700
++#include "iapi.h"	/* needed by iminst.h */
++#endif
+ #include "iminst.h"	/* for struct gs_main_instance_s */
+ #include "imain.h"	/* for gs_main_instance_default() */
+ #include "gscoord.h"	/* for gs_setdefaultmatrix() */
diff --git a/print/ghostscript8/files/patch-src.gdevxini.c b/print/ghostscript8/files/patch-src.gdevxini.c
deleted file mode 100644
index 5c072ec041e4..000000000000
--- a/print/ghostscript8/files/patch-src.gdevxini.c
+++ /dev/null
@@ -1,47 +0,0 @@
-Message-ID: <3AB64C01.54380C00@we.lc.ehu.es>
-Date: Mon, 19 Mar 2001 19:12:17 +0100
-From: "Jose M. Alcaide" <jose@we.lc.ehu.es>
-Organization: Universidad del Pais Vasco - Dpto. de Electricidad y Electronica
-Subject: new patch for ghostscript 6.50
-
-Hello Andreas,
-
-About a month ago I sent you a patch for GhostScript 6.50. Without that
-patch, LyX 1.1.6 cannot show included EPS figures. Now that the LyX
-port has been updated this problem will begin to hit many LyX users,
-and the ports freeze is coming soon...
-
-The problem is described in:
-
-http://sourceforge.net/bugs/?func=detailbug&bug_id=124957&group_id=1897
-
-I am resending the patch attached to this message. I am using Ghostscript
-with this patch applied and everything (including LyX) seems to work OK.
-
-Cheers,
--- JMA
-****** Jose M. Alcaide  //  jose@we.lc.ehu.es  //  jmas@FreeBSD.org ******
-** "Beware of Programmers who carry screwdrivers" --  Leonard Brandwein **
---------------8E7698D95DE1CB06D5711335
-Content-Type: text/plain; charset=us-ascii;
- name="patch-src,gdevxini.c"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline;
- filename="patch-src,gdevxini.c"
-
---- src/gdevxini.c.orig	Tue Sep 19 21:00:23 2000
-+++ src/gdevxini.c	Tue Feb 20 18:07:09 2001
-@@ -654,8 +654,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/ghostscript8/files/patch-src:contrib.mak-5.94.add b/print/ghostscript8/files/patch-src:contrib.mak-5.94.add
new file mode 100644
index 000000000000..1d2c46b8ea2e
--- /dev/null
+++ b/print/ghostscript8/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/ghostscript8/files/patch-src:genarch.c b/print/ghostscript8/files/patch-src:genarch.c
new file mode 100644
index 000000000000..3b74ac7e6145
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:genarch.c
@@ -0,0 +1,34 @@
+--- src/genarch.c.orig	Wed Sep 20 04:00:23 2000
++++ src/genarch.c	Wed Jun 20 04:05:36 2001
+@@ -40,6 +40,7 @@
+     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
+ }
+ 
++#ifndef __FreeBSD__
+ private clock_t
+ time_clear(char *buf, int bsize, int nreps)
+ {
+@@ -50,6 +51,7 @@
+ 	memset(buf, 0, bsize);
+     return clock() - t;
+ }
++#endif /* __FreeBSD__ */
+ 
+ private void
+ define(FILE *f, const char *str)
+@@ -180,6 +182,7 @@
+     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
+ #undef PRINT_MAX
+ 
++#ifndef __FreeBSD__
+     section(f, "Cache sizes");
+ 
+     /*
+@@ -240,6 +243,7 @@
+ 	}
+ 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
+     }
++#endif /* __FreeBSD__ */
+ 
+     section(f, "Miscellaneous");
+ 
diff --git a/print/ghostscript8/files/patch-src:gp_unifs.c b/print/ghostscript8/files/patch-src:gp_unifs.c
new file mode 100644
index 000000000000..68c9bcaf175b
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:gp_unifs.c
@@ -0,0 +1,34 @@
+--- src/gp_unifs.c.orig	Tue Mar 13 15:51:39 2001
++++ src/gp_unifs.c	Wed Jun 20 04:06:02 2001
+@@ -28,6 +28,7 @@
+ #include "stat_.h"
+ #include "dirent_.h"
+ #include <sys/param.h>		/* for MAXPATHLEN */
++#include <unistd.h>
+ 
+ /* Some systems (Interactive for example) don't define MAXPATHLEN,
+  * so we define it here.  (This probably should be done via a Config-Script.)
+@@ -58,6 +59,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_gettmpdir(fname, &len) != 0)
+ 	strcpy(fname, "/tmp/");
+@@ -70,8 +73,12 @@
+     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
+ 	strcat(fname, "-");
+     strcat(fname, "XXXXXX");
+-    mktemp(fname);
+-    return gp_fopentemp(fname, mode);
++    fd = mkstemp(fname);
++    if (fd == -1)
++	return NULL;
++    if ((f = fdopen(fd, mode)) == NULL)
++	close(fd);
++    return f;
+ }
+ 
+ /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
new file mode 100644
index 000000000000..32c9f2b531d5
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:unix-gcc.mak
@@ -0,0 +1,130 @@
+--- src/unix-gcc.mak.orig	Mon Apr  9 14:52:57 2001
++++ src/unix-gcc.mak	Fri Jun 15 21:47:42 2001
+@@ -26,14 +26,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.
+ 
+@@ -52,11 +53,10 @@
+ # 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)
+@@ -128,7 +128,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).
+@@ -148,14 +148,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=10010
+ 
+ # 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.
+@@ -167,7 +167,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
+ 
+@@ -187,7 +187,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.
+@@ -222,7 +222,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.
+@@ -231,7 +231,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
+ 
+@@ -264,7 +264,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/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
+@@ -277,11 +277,16 @@
+ #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
+ # X11R6 (on any platform) may need
+ #XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
++XLIBS=Xt SM ICE Xext X11
++endif
+ 
+ #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:
diff --git a/print/ghostscript8/files/patch-src:zmedia2.c b/print/ghostscript8/files/patch-src:zmedia2.c
new file mode 100644
index 000000000000..7db33eaecc44
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:zmedia2.c
@@ -0,0 +1,25 @@
+--- src/zmedia2.c.orig	Wed Sep 20 04:00:54 2000
++++ src/zmedia2.c	Wed Jun 20 04:06:24 2001
+@@ -427,11 +427,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/ghostscript8/pkg-comment b/print/ghostscript8/pkg-comment
index 1e371cace06a..dd6a867e3c83 100644
--- a/print/ghostscript8/pkg-comment
+++ b/print/ghostscript8/pkg-comment
@@ -1 +1 @@
-Aladdin Postscript interpreter version 6
+AFPL Postscript interpreter version 7
diff --git a/print/ghostscript8/pkg-descr b/print/ghostscript8/pkg-descr
index 39e0177bea17..4489409d3260 100644
--- a/print/ghostscript8/pkg-descr
+++ b/print/ghostscript8/pkg-descr
@@ -1,24 +1,25 @@
-This is Aladdin Ghostscript, the non-GPL version that comes with a licence
-different from the GPL. Read the file PUBLIC in the work/gsX.Y directory or
-in ${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
-
 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.
 
+Versions entitled "AFPL Ghostscript" are distributed with a licence different
+from the GPL. Read the file PUBLIC in the work/gsX.Y directory or in
+${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
+
 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/
-	o Additional driver support
-	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
-	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
+	  - 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
 		
-Thomas Merz has written a Ghostscript manual in PDF format:
-	http://www.cs.wisc.edu/~ghost/merz.html
-
-The manual is also available in German language, see:
-	http://www.muc.de/~tm/free/free.html
-
 WWW: http://www.cs.wisc.edu/~ghost/index.html
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 228305ea212a..0089e7022f71 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -30,14 +30,14 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/LGPL.txt
+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/LGPL
 %%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/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
 share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
@@ -47,6 +47,7 @@ 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/Develop.htm
 share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
 share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
 share/ghostscript/%%GS_VERSION%%/doc/Helpers.htm
@@ -62,6 +63,7 @@ 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/Maintain.htm
 share/ghostscript/%%GS_VERSION%%/doc/Make.htm
 share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
 share/ghostscript/%%GS_VERSION%%/doc/News.htm
@@ -70,6 +72,7 @@ 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/Ps-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Public.htm
 share/ghostscript/%%GS_VERSION%%/doc/README
 share/ghostscript/%%GS_VERSION%%/doc/Readme.htm
@@ -86,6 +89,7 @@ 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
@@ -163,6 +167,7 @@ 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_icc.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
@@ -263,6 +268,9 @@ 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/stc300.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bm.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500p.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500ph.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc600ih.upp
@@ -481,16 +489,17 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
-@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
-@dirrm share/doc/ghostscript/%%GS_VERSION%%
-@dirrm share/doc/ghostscript
-@dirrm share/ghostscript/%%GS_VERSION%%/doc
-@dirrm share/ghostscript/%%GS_VERSION%%/examples
-@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
-@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/ghostscript/%%GS_VERSION%%/lib
 @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
+%%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/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index 4b86359db1d0..31c7d3d85b44 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -5,13 +5,8 @@
 # configure - gs driver preconfiguration, manual driver selection
 # by Andreas Klemm <andreas@FreeBSD.org>
 
-#
-# XXX - needs some rework for gs v 6.50,
-#       therefore currently disabled in Makefile
-#
-
 # driverselection
-/usr/bin/dialog --title "Ghostscript 6 driver configuration" --clear \
+/usr/bin/dialog --title "AFPL 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\
@@ -33,10 +28,11 @@ Have fun with this new configuration style !     -andreas \n\n\
   "m8510"    "C.Itoh M8510 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 \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
-  "ap3250"   "Epson AP3250" OFF \
+  "ap3250"   "Epson ActionPrinter 3250" OFF \
   "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
   "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
   "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" OFF \
@@ -45,6 +41,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
   "st800"    "Epson Stylus 800 printer" 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 \
@@ -55,8 +52,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
   "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
   "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
-  "cdj850"   "HP DeskJet 670/690/850/855/870/890/1100/1600" ON \
-  "cdj970"   "HP DeskJet 970, 3rd party" 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 \
@@ -76,20 +77,29 @@ Have fun with this new configuration style !     -andreas \n\n\
   "paintjet" "HP PaintJet color printer (alternate)" OFF \
   "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 \
+  "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 \
   "bmpmono"  "BMP Monochrome" ON \
   "bmpgray"  "BMP 8-bit gray" ON \
   "bmp16"    "BMP 4-bit EGA/VGA" ON \
@@ -148,36 +158,32 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
   "sunhmono" "Harlequin variant of 1-bit Sun raster file" 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 \
   "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 \
-  "x11rg16x" "X Windows with G5/B5/R6 pixel layout for testing" ON \
-  "x11rg32x" "X Windows with G11/B10/R11 pixel layout for testing" 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=$?
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index 95f0c51bb2e3..87bdc1eb7377 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -6,11 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-ifndef NO_X
-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
+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)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.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)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)cdj850.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+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)lj250.dev \$(DD)declj250.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)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)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)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.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