36 files changed, 1872 insertions, 845 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 30c320f05e9d..f8a48cea5ca2 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -6,39 +6,35 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	7.04
-PORTREVISION=	7
+PORTVERSION=	${GS_VERSION}
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,gprint,bjc250/} \
-		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
-		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
+		http://hp.sourceforge.net/:hp2200 \
 		http://www.harsch.net/Download/:dj970 \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
 		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
+		ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \
 		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
 		http://www.humblesoft.com/pub/:epag \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_304/:eplaser \
 		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
-			gimp-print/:gprint \
 			bjc250gs/:bjc250 \
 			./:ports_jp
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
 		${GS_FONTS_STD}:gs_fonts \
 		${GS_FONTS_OTHER}:gs_fonts \
-		${HP8XX_SRCS}:hp8xx \
-		${HPDJ_SRCS}:hpdj_pcl3 \
-		${PCL3_SRCS}:hpdj_pcl3 \
+		${HP2200_SRCS}:hp2200 \
 		${DJ970_SRCS}:dj970 \
-		${GPRINT_SRCS}:gprint \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp_gs \
 		${BJ10V_SRCS}:ports_jp_gs \
 		${BJC250_SRCS}:bjc250 \
+		${CPCA_SRCS}:cpca \
 		${LIPS_SRCS}:lips \
 		${DMPRT_SRCS}:ports_jp_gs \
 		${EPAG_SRCS}:epag \
@@ -51,24 +47,23 @@ EXTRACT_ONLY=	${GS_SRCS}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png
 
 NO_CDROM=	"Can only be distributed for free"
 
-WRKSRC=		${WRKDIR}/gs${PORTVERSION}
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
-		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
+		XCFLAGS="${XCFLAGS}" WITHOUT_X11="${WITHOUT_X11}"
+PLIST_SUB=	GS_VERSION=${GS_VERSION}
+
+SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}"
 
-MAN1=		ansi2knr.1 dvipdf.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
+MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.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 \
@@ -83,11 +78,10 @@ XCFLAGS=	-DUPD_SIGNAL=0
 XCFLAGS+=	-DA4
 .endif
 
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-.else
+.if defined(WITHOUT_X11)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
-MAKE_ENV+=	WITHOUT_X11="${WITHOUT_X11}"
+.else
+USE_XLIB=	yes
 .endif
 
 .if defined(WITH_SHLIB)
@@ -95,13 +89,12 @@ MAKE_ENV+=	WITHOUT_X11="${WITHOUT_X11}"
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 MAKE_ENV+=	GS_SHLIB_VER="${SHLIB_VER}"
-ALL_TARGET=	so pcl3opts
+ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	1
 PLIST_SUB+=	SHLIB="" SHLIB_VER="${SHLIB_VER}"
 .else
-ALL_TARGET=	all pcl3opts
 PLIST_SUB+=	SHLIB="@comment "
 .endif
 
@@ -115,48 +108,16 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
-# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
-# http://www.gelhaus.net/hp880c/
-HP8XX=		cdj880
-HP8XX_SRCS=	gdevcd8.tar.gz
-
-# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser
-# still present, just for the case pcl3 is missing some hpdj feature
-# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
-HPDJ=		hpdj
-HPDJ_VERS=	2.6
-HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
-HPDJ_SRCS=	${HPDJ_NAME}.tar.gz
-HPDJ_MAN1=	gs-hpdj.1
-
-# PCL3 (hpdj successor now in RELEASE quality)
-# additional driver for HP PCL3 printers, by Martin Lottermoser
-# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
-PCL3=		pcl3
-PCL3_VERS=	3.3
-PCL3_NAME=	${PCL3}-${PCL3_VERS}
-PCL3_SRCS=	${PCL3_NAME}.tar.gz
-PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
+# HP2200 - additional driver for HP DeskJet 8xx and Business Inkjet 2200
+# http://hp.sourceforge.net/gs-hp2200.php
+HP2200=		hp2200
+HP2200_SRCS=	gs-hp2200.tar.gz
 
 # DJ970 - additional driver for HP DeskJet 970, supports duplex printing
 # http://www.harsch.net/Ghostscript/ghostscript.html
 DJ970=		gdevdj9
 DJ970_SRCS=	${DJ970}.c.gz
 
-# Gimp-Print - very high quality driver for Epson, HPs,...
-# http://gimp-print.sourceforge.net/
-#
-# NOTE:
-# Support of stp driver interface has already been discontinued, and using
-# ijs driver with ijsgimpprint (part of print/gimp-print port) is highly
-# recommended.
-#
-# For that reason, integlation of stp driver is disabled by default.
-GPRINT=		gimp-print
-GPRINT_VERS=	4.2.1
-GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
-GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -182,6 +143,13 @@ BJC250_VERS=	0.756
 BJC250_NAME=	${BJC250}-v${BJC250_VERS}
 BJC250_SRCS=	gs7.05-${BJC250_NAME}.diff.gz
 
+# CPCA - additional driver for Canon CPCA printers
+# http://cweb.canon.jp/open-mie/technical/index-j.html
+CPCA=		cpca
+CPCA_VERS=	1.0.0
+CPCA_NAME=	canon-lips4-${CPCA_VERS}
+CPCA_SRCS=	${CPCA_NAME}-651.tgz
+
 # LIPS - additional driver for Canon LIPS II+/III/IVc/IV printers
 # http://www.ucatv.ne.jp/~taeko/software/gs/
 LIPS=		lips
@@ -241,33 +209,19 @@ pre-everything::
 
 post-extract:
 	${ECHO_MSG} ">>> in post-extract ..."
-	${LN} -sf `cd ${PORTSDIR}/graphics/jpeg && ${MAKE} -V WRKSRC` \
-		${WRKSRC}/jpeg
 # ** 3rd party driver **
 # Note: don't forget to add those devices in scripts/configure and
 # configure.batch, which update unix-gcc.mak to build gs with these
 # new devices !
 #
-# for HP8XX driver
-	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
-# for HPDJ driver
-	${ECHO_MSG} ">>>   extracting ${HPDJ_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS}
-	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
-# for PCL3 driver
-	${ECHO_MSG} ">>>   extracting ${PCL3_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
-	${LN} -sf ${PCL3_NAME} ${WRKSRC}/${PCL3}
-	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
-		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
+# for HP2200 driver
+	${ECHO_MSG} ">>>   extracting ${HP2200_SRCS} ..."
+	${MKDIR} ${WRKSRC}/${HP2200}
+	${TAR} -C ${WRKSRC}/${HP2200} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP2200_SRCS}
 # for DJ970 driver
 	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS}
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -285,6 +239,10 @@ post-extract:
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${BJC250_SRCS} | \
 		${PATCH} -d ${WRKSRC}/${BJC250_NAME} -f -s -N -E -p1 \
 		2>/dev/null || ${TRUE}
+	${LN} -sf ${BJC250_NAME} ${WRKSRC}/${BJC250}
+# for CPCA driver
+	${ECHO_MSG} ">>>   extracting ${CPCA_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${CPCA_SRCS}
 # for LIPS driver
 	${ECHO_MSG} ">>>   extracting ${LIPS_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
@@ -319,33 +277,21 @@ post-patch:
 		${WRKSRC}/lib/gs_res.ps
 # for DMPRT driver
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
-		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
+		 s|%%GS_VERSION%%|${GS_VERSION}|g' \
 			${WRKSRC}/src/dmp_site.ps
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
 	${ECHO_MSG} ">>> in pre-configure ..."
-# for HP8XX driver
-	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/cdj850.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for HPDJ driver
-	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
-		>> ${WRKSRC}/src/contrib.mak
-# for PCL3 driver
-	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
+# for HP2200 driver
+	${ECHO_MSG} ">>>   adding ${HP2200} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/chp2200.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for DJ970 driver
 	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   adding ${GPRINT} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/stp.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
 # for MD2K driver
 	${ECHO_MSG} ">>>   adding ${MD2K} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \
@@ -362,6 +308,10 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${BJC250} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/bjc250.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for CPCA driver
+	${ECHO_MSG} ">>>   adding ${CPCA} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/cpca_gdev.mak \
+		>> ${WRKSRC}/src/contrib.mak
 # for LIPS driver
 	${ECHO_MSG} ">>>   adding ${LIPS} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
@@ -393,49 +343,16 @@ pre-configure:
 	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 
-do-configure:
-	${ECHO_MSG} ">>> in do-configure ..."
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
-.else
-.if defined(WITHOUT_X11)
-	${GREP} -v '^  "x11' ${SCRIPTDIR}/configure > ${WRKDIR}/configure
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${WRKDIR}/configure
-.else
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-.endif
-.endif
-
-post-configure:
-	${ECHO_MSG} ">>> in post-configure ..."
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   running configure script for ${GPRINT} library ..."
-	cd ${WRKSRC}/${GPRINT_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--without-translated-ppds --with-ghost \
-			--without-gimp --without-samples \
-			--without-user-guide --disable-escputil \
-			--disable-nls --disable-shared \
-			--prefix=${PREFIX}
-
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
 	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
-	${LN} -sf ${WRKSRC}/src/unix-gcc.mak ${WRKSRC}/Makefile
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   building ${GPRINT} library ..."
-	cd ${WRKSRC}/${GPRINT_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
-	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT} ..."
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/ghost/*.[ch] \
-		${WRKSRC}/src
-	${MKDIR} ${WRKSRC}/${GPRINT}
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \
-		${WRKSRC}/${GPRINT}/gimp-print
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
-		${WRKSRC}/${GPRINT}/libgimpprint.a
+# for HP2200 driver
+	${ECHO_MSG} ">>>   creating symlinks for ${HP2200} ..."
+.for i in gdevcd8.c
+	${LN} -sf ${WRKSRC}/${HP2200}/${i} ${WRKSRC}/src
+.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -503,43 +420,11 @@ post-install:
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
-# for HPDJ driver
-	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
-.for i in ${HPDJ_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/src/${i} ${MANPREFIX}/man/man1
-.endfor
-	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
-	${MKDIR} ${DATADIR}/${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} \
-		${DATADIR}/${PORTVERSION}/${HPDJ}
-.endfor
-# for PCL3 driver
-	${ECHO_MSG} ">>>   installing ${PCL3} utility in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
-	${ECHO_MSG} ">>>   installing ${PCL3} manpages ..."
-.for i in ${PCL3_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${MANPREFIX}/man/man1
-.endfor
-# other pcl3 stuff, which might be interesting for runtime
-	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
-	${MKDIR} ${DATADIR}/${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} \
-		${DATADIR}/${PORTVERSION}/${PCL3}
-.endfor
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
 .for i in dmp_init.ps dmp_site.ps escp_24.src
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DATADIR}/${PORTVERSION}/lib
+		${DATADIR}/${GS_VERSION}/lib
 .endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
@@ -548,103 +433,90 @@ post-install:
 	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
 	${INSTALL_DATA} ${FILESDIR}/${i} \
-		${DATADIR}/${PORTVERSION}/lib
+		${DATADIR}/${GS_VERSION}/lib
 .endfor
 #
 # now NOPORTDOCS dependend stuff
 #
 .if !defined(NOPORTDOCS)
 	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}
-# for HPDJ driver
-	${ECHO_MSG} ">>>   installing ${HPDJ} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPDJ}
-.for i in NEWS hpdj.html
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${PORTVERSION}/${HPDJ}
-.endfor
-# for PCL3 driver
-	${ECHO_MSG} ">>>   installing ${PCL3} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${PCL3}
-.for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${PCL3}
-.endfor
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MD2K}
 .for i in README.jis
 	${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${MD2K}
+		${DOCSDIR}/${GS_VERSION}/${MD2K}
 .endfor
 # for ALPS driver
 	${ECHO_MSG} ">>>   installing ${ALPS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${ALPS}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${ALPS}
 .for i in README.gdevalps
 	${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${ALPS}
+		${DOCSDIR}/${GS_VERSION}/${ALPS}
 .endfor
 # for BJ10V driver
 	${ECHO_MSG} ">>>   installing ${BJ10V} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${BJ10V}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${BJ10V}
 .for i in gdev10v.jis
 	${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${BJ10V}
+		${DOCSDIR}/${GS_VERSION}/${BJ10V}
 .endfor
 # for LIPS driver
 	${ECHO_MSG} ">>>   installing ${LIPS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${LIPS}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LIPS}
 .for i in Gdevlips.htm
 	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${LIPS}
+		${DOCSDIR}/${GS_VERSION}/${LIPS}
 .endfor
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${DMPRT}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${DMPRT}
 .for i in gdevdmpr.sj
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${PORTVERSION}/${DMPRT}
+		${DOCSDIR}/${GS_VERSION}/${DMPRT}
 .endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPAG}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG}
 .for i in ert.txt gdevepag.txt ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${EPAG}
+		${DOCSDIR}/${GS_VERSION}/${EPAG}
 .endfor
 .for i in psprint gsepagif.sh
 	${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${EPAG}
+		${DOCSDIR}/${GS_VERSION}/${EPAG}
 .endfor
 # for EPLASER driver
 	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPLASER}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPLASER}
 .for i in readme-eplaser-651.euc readme-eplaser-651-jp.euc
 	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${EPLASER}
+		${DOCSDIR}/${GS_VERSION}/${EPLASER}
 .endfor
 # for MJC driver
 	${ECHO_MSG} ">>>   installing ${MJC} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MJC}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MJC}
 .for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc
 	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${MJC}
+		${DOCSDIR}/${GS_VERSION}/${MJC}
 .endfor
 # for NPDL driver
 	${ECHO_MSG} ">>>   installing ${NPDL} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${NPDL}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${NPDL}
 .for i in gdevnpdl.jis
 	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${NPDL}
+		${DOCSDIR}/${GS_VERSION}/${NPDL}
 .endfor
 # for GDI driver
 	${ECHO_MSG} ">>>   installing ${GDI} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${GDI}
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${PORTVERSION}/${GDI}
+		${DOCSDIR}/${GS_VERSION}/${GDI}
 .endfor
 .endif
 	${ECHO_MSG} "> post-installation tasks completed."
 
+.include "Makefile.inc"
 .include <bsd.port.mk>
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
new file mode 100644
index 000000000000..cf63422dcf01
--- /dev/null
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+GS_VERSION=	8.00
+
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index b94a25119a6b..b981013e374b 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,16 +1,14 @@
-MD5 (ghostscript/ghostscript-7.04.tar.bz2) = 4fffc7520a510dac7b1cfb98fca8e724
+MD5 (ghostscript/ghostscript-8.00.tar.bz2) = f87b74758f8e73f899f0b3654e5887b1
 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
-MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
-MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
+MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
-MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621d
 MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
+MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
 MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 MD5 (ghostscript/eplaser-3.0.4-651.tgz) = 71ba8635e865731c51b6e8fab3c15d2d
diff --git a/print/ghostscript-gpl/files/cdj850.contrib.mak b/print/ghostscript-gpl/files/chp2200.contrib.mak
index 8faefec5fe4e..c71ea8ac3512 100644
--- a/print/ghostscript-gpl/files/cdj850.contrib.mak
+++ b/print/ghostscript-gpl/files/chp2200.contrib.mak
@@ -1,4 +1,5 @@
-###- cdj850 - HP 850 Driver under development -------- ###
+### --------------- The H-P Buisiness Inkjet 2200 devices --------------- ###
+
 cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
 $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
@@ -16,6 +17,9 @@ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
 $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
 	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
 
+$(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
+	$(SETPDEV2) $(DD)chp2200 $(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/patch-bjc250:src:gdevbjc_.c b/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.c
new file mode 100644
index 000000000000..8eaf44e181c0
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.c
@@ -0,0 +1,14 @@
+--- bjc250/src/gdevbjc_.c.orig	Fri Nov  8 06:15:15 2002
++++ bjc250/src/gdevbjc_.c	Fri Nov  8 07:43:31 2002
+@@ -54,9 +54,9 @@
+ private dev_proc_put_params(gdev_bjc_put_params);
+ private dev_proc_get_params(gdev_bjc_get_params);
+ const stringParamDescription *
+- paramValueToParam(P2(const stringParamDescription *, int));
++ paramValueToParam(const stringParamDescription *, int);
+ const stringParamDescription *
+- paramStringToParam(P3(const stringParamDescription *, const char *, uint));
++ paramStringToParam(const stringParamDescription *, const char *, uint);
+ 
+ BJL_command BJL_command_set[] = {
+     { "@Cleaning=1",            BJC_BJL_CLEANING,      11},
diff --git a/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.h b/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.h
new file mode 100644
index 000000000000..26af2028cebc
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.h
@@ -0,0 +1,93 @@
+--- bjc250/src/gdevbjc_.h.orig	Fri Nov  8 06:15:15 2002
++++ bjc250/src/gdevbjc_.h	Fri Nov  8 07:44:18 2002
+@@ -183,48 +183,48 @@
+ 
+ /* Put a BJL command to stream */
+ 
+-void bjc_put_bjl_command(P2(FILE * file, int bjl_command));
++void bjc_put_bjl_command(FILE * file, int bjl_command);
+ 
+-void bjc_put_LF(P1(FILE *file));
+-void bjc_put_FF(P1(FILE *file));
+-void bjc_put_CR(P1(FILE *file));
+-void bjc_put_initialize(P1(FILE *file));
+-void bjc_put_set_initial(P1(FILE *file));
+-void bjc_put_set_compression(P2(FILE *file, char compression));
+-void bjc_put_print_method_short(P2(FILE *file, char color));
+-void bjc_put_print_method(P5(FILE *file, char color, char media, char quality, char density));
+-void bjc_put_raster_resolution(P3(FILE *file, int x_resolution, int y_resolution));
+-void bjc_put_raster_skip(P2(FILE *file, int skip));
+-void bjc_put_page_margins(P5(FILE *file, int length, int lm, int rm, int top));
+-void bjc_put_media_supply(P3(FILE *file, char supply, char type));
+-void bjc_put_cmyk_image(P4(FILE *file, char component, const char *data, int count));
+-void bjc_put_move_lines(P2(FILE *file, int lines));
+-void bjc_put_move_lines_unit(P2(FILE *file, int unit));
+-void bjc_put_extended_margins(P5(FILE *file, int length, int lm, int rm, int top));
+-void bjc_put_image_format(P4(FILE *file, char depth, char format, char ink));
+-void bjc_put_page_id(P2(FILE *file, int id));
+-void bjc_put_continue_image(P3(FILE *file, const char *data, int count));
+-void bjc_put_indexed_image(P4(FILE *file, int dot_rows, int dot_cols, int layers));
+-
+-bool bjc_invert_bytes(P4(byte *row, uint raster, bool inverse, byte lastmask));
+-bool bjc_invert_cmyk_bytes(P8(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster,
+-                              bool inverse, byte lastmask, skip_t *skip));
+-uint bjc_compress(P3(const byte *row, uint raster, byte *compressed));
+-
+-int  FloydSteinbergInitG(P1(gx_device_printer * pdev));
+-void FloydSteinbergDitheringG(P5(byte *row, byte *dithered, uint width, uint raster, bool limit_extr));
+-void FloydSteinbergCloseG(P1(gx_device_printer *pdev));
+-
+-int  FloydSteinbergForwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask));
+-int  FloydSteinbergBckwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask));
+-int  FloydSteinbergInitC(P1(gx_device_printer * pdev));
+-void FloydSteinbergDitheringC(P6(byte *row, byte *dithered, uint width, uint raster,
+-                                 bool limit_extr, bool composeK));
+-void FloydSteinbergCloseC(P1(gx_device_printer *pdev));
+-
+-void bjc_build_gamma_table(P2(float gamma, char color));
+-void bjc_rgb_to_cmy (P6(byte r, byte g, byte b, int *c, int *m, int *y));
+-void bjc_rgb_to_gray(P4(byte r, byte g, byte b, int *k));
++void bjc_put_LF(FILE *file);
++void bjc_put_FF(FILE *file);
++void bjc_put_CR(FILE *file);
++void bjc_put_initialize(FILE *file);
++void bjc_put_set_initial(FILE *file);
++void bjc_put_set_compression(FILE *file, char compression);
++void bjc_put_print_method_short(FILE *file, char color);
++void bjc_put_print_method(FILE *file, char color, char media, char quality, char density);
++void bjc_put_raster_resolution(FILE *file, int x_resolution, int y_resolution);
++void bjc_put_raster_skip(FILE *file, int skip);
++void bjc_put_page_margins(FILE *file, int length, int lm, int rm, int top);
++void bjc_put_media_supply(FILE *file, char supply, char type);
++void bjc_put_cmyk_image(FILE *file, char component, const char *data, int count);
++void bjc_put_move_lines(FILE *file, int lines);
++void bjc_put_move_lines_unit(FILE *file, int unit);
++void bjc_put_extended_margins(FILE *file, int length, int lm, int rm, int top);
++void bjc_put_image_format(FILE *file, char depth, char format, char ink);
++void bjc_put_page_id(FILE *file, int id);
++void bjc_put_continue_image(FILE *file, const char *data, int count);
++void bjc_put_indexed_image(FILE *file, int dot_rows, int dot_cols, int layers);
++
++bool bjc_invert_bytes(byte *row, uint raster, bool inverse, byte lastmask);
++bool bjc_invert_cmyk_bytes(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster,
++                              bool inverse, byte lastmask, skip_t *skip);
++uint bjc_compress(const byte *row, uint raster, byte *compressed);
++
++int  FloydSteinbergInitG(gx_device_printer * pdev);
++void FloydSteinbergDitheringG(byte *row, byte *dithered, uint width, uint raster, bool limit_extr);
++void FloydSteinbergCloseG(gx_device_printer *pdev);
++
++int  FloydSteinbergForwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask);
++int  FloydSteinbergBckwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask);
++int  FloydSteinbergInitC(gx_device_printer * pdev);
++void FloydSteinbergDitheringC(byte *row, byte *dithered, uint width, uint raster,
++                                 bool limit_extr, bool composeK);
++void FloydSteinbergCloseC(gx_device_printer *pdev);
++
++void bjc_build_gamma_table(float gamma, char color);
++void bjc_rgb_to_cmy (byte r, byte g, byte b, int *c, int *m, int *y);
++void bjc_rgb_to_gray(byte r, byte g, byte b, int *k);
+ uint bjc_rand(void);
+-void bjc_init_tresh(P1(int rnd));
++void bjc_init_tresh(int rnd);
+ #endif				/* gdevbjc_INCLUDED */
diff --git a/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjca.c b/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjca.c
new file mode 100644
index 000000000000..37f525bfeb42
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-bjc250:src:gdevbjca.c
@@ -0,0 +1,17 @@
+--- bjc250/src/gdevbjca.c.orig	Fri Nov  8 06:15:15 2002
++++ bjc250/src/gdevbjca.c	Fri Nov  8 07:47:41 2002
+@@ -46,10 +46,10 @@
+ #include <math.h>
+ #include <time.h>
+ 
+-private void bjc_put_bytes(P3(FILE *file, const char *data, int count));
+-private void bjc_put_hi_lo(P2(FILE *file, int value));
+-private void bjc_put_lo_hi(P2(FILE *file, int value));
+-private void bjc_put_command(P3(FILE *file, char command, int count));
++private void bjc_put_bytes(FILE *file, const char *data, int count);
++private void bjc_put_hi_lo(FILE *file, int value);
++private void bjc_put_lo_hi(FILE *file, int value);
++private void bjc_put_command(FILE *file, char command, int count);
+ 
+ /* ---------------- Utilities ---------------- */
+ 
diff --git a/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
index dbc3f4a109a9..84685e9df007 100644
--- a/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
@@ -1,5 +1,5 @@
---- eplaser/gdevescv.c.orig	Fri Dec 21 15:50:22 2001
-+++ eplaser/gdevescv.c	Sat Apr 27 13:45:53 2002
+--- eplaser/gdevescv.c.orig	Wed Jul  3 13:17:26 2002
++++ eplaser/gdevescv.c	Fri Nov 29 21:59:00 2002
 @@ -37,8 +37,7 @@
  
   */
@@ -10,7 +10,65 @@
  
  #include "math_.h"
  #include "gx.h"
-@@ -1760,13 +1759,13 @@
+@@ -305,30 +304,30 @@
+ };
+ 
+ /* Vector device implementation */
+-private int escv_beginpage(P1(gx_device_vector * vdev));
+-private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+-private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+-private int escv_setdash(P4(gx_device_vector * vdev, const float *pattern, 
+-			      uint count, floatp offset));
+-private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
+-private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
+-			       gs_logical_operation_t diff));
++private int escv_beginpage(gx_device_vector * vdev);
++private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
++private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
++private int escv_setdash(gx_device_vector * vdev, const float *pattern, 
++			      uint count, floatp offset);
++private int escv_setflat(gx_device_vector * vdev, floatp flatness);
++private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, 
++			       gs_logical_operation_t diff);
+ private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+ 			       fixed y1, gx_path_type_t type);
+ private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
+ 			       gx_path_type_t type);
+-private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+-private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+-			   floatp x, floatp y, gx_path_type_t type));
+-private int escv_lineto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+-			   floatp x, floatp y, gx_path_type_t type));
+-private int escv_curveto(P10(gx_device_vector * vdev, floatp x0, floatp y0,
++private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
++private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
++			   floatp x, floatp y, gx_path_type_t type);
++private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
++			   floatp x, floatp y, gx_path_type_t type);
++private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
+ 			       floatp x1, floatp y1, floatp x2, floatp y2,
+-			       floatp x3, floatp y3, gx_path_type_t type));
+-private int escv_closepath(P6(gx_device_vector * vdev, floatp x, floatp y,
+-				floatp x_start, floatp y_start, gx_path_type_t type));
++			       floatp x3, floatp y3, gx_path_type_t type);
++private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y,
++				floatp x_start, floatp y_start, gx_path_type_t type);
+ 
+-private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type);
+ private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
+ private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+ private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -585,6 +584,8 @@
+     {421, 595, 15, "A5"},		/* A5 */
+     {709, 1002, 24, "B4"},		/* B4 */
+     {501, 709, 25, "B5"},		/* B5 */
++    {729, 1032, 24, "B5"},		/* JIS B4 */
++    {516, 729, 25, "B5"},		/* JIS B5 */
+     {612, 792, 30, "LT"},		/* Letter */
+     {396, 612, 31, "HLT"},		/* Half Letter */
+     {612, 1008, 32, "LGL"},		/* Legal */
+@@ -1849,13 +1850,13 @@
  
  /* Process the next piece of an image. */
  private int
@@ -26,7 +84,7 @@
      gx_device *dev = info->dev;
  #endif
      gx_device_vector *const	vdev = (gx_device_vector *) dev;
-@@ -1784,7 +1783,7 @@
+@@ -1873,7 +1874,7 @@
  
      {
  
@@ -35,7 +93,7 @@
  	if (height == 260)
  	    height = 1;
  #endif
-@@ -1922,13 +1921,13 @@
+@@ -2011,13 +2012,13 @@
  
  
  private int
diff --git a/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
index bce92ff8358c..ec97843811b5 100644
--- a/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
@@ -1,5 +1,5 @@
---- eplaser/gdevesmv.c.orig	Fri Dec 14 10:50:14 2001
-+++ eplaser/gdevesmv.c	Sat Apr 27 13:46:31 2002
+--- eplaser/gdevesmv.c.orig	Wed Jul  3 13:20:55 2002
++++ eplaser/gdevesmv.c	Fri Nov 29 22:00:34 2002
 @@ -34,8 +34,7 @@
  
   */
@@ -10,7 +10,65 @@
  
  #include "math_.h"
  #include "gx.h"
-@@ -1799,13 +1798,13 @@
+@@ -385,30 +384,30 @@
+ 
+ 
+ /* Vector device implementation */
+-private int esmv_beginpage(P1(gx_device_vector * vdev));
+-private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+-private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+-private int esmv_setdash(P4(gx_device_vector * vdev, const float *pattern, 
+-			      uint count, floatp offset));
+-private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
+-private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
+-			       gs_logical_operation_t diff));
++private int esmv_beginpage(gx_device_vector * vdev);
++private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
++private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
++private int esmv_setdash(gx_device_vector * vdev, const float *pattern, 
++			      uint count, floatp offset);
++private int esmv_setflat(gx_device_vector * vdev, floatp flatness);
++private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, 
++			       gs_logical_operation_t diff);
+ private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+ 			       fixed y1, gx_path_type_t type);
+ private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
+ 			       gx_path_type_t type);
+-private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+-private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+-			   floatp x, floatp y, gx_path_type_t type));
+-private int esmv_lineto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+-			   floatp x, floatp y, gx_path_type_t type));
+-private int esmv_curveto(P10(gx_device_vector * vdev, floatp x0, floatp y0,
++private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
++private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
++			   floatp x, floatp y, gx_path_type_t type);
++private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
++			   floatp x, floatp y, gx_path_type_t type);
++private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
+ 			       floatp x1, floatp y1, floatp x2, floatp y2,
+-			       floatp x3, floatp y3, gx_path_type_t type));
+-private int esmv_closepath(P6(gx_device_vector * vdev, floatp x, floatp y,
+-				floatp x_start, floatp y_start, gx_path_type_t type));
++			       floatp x3, floatp y3, gx_path_type_t type);
++private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y,
++				floatp x_start, floatp y_start, gx_path_type_t type);
+ 
+-private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type);
+ private int esmv_setlinewidth(gx_device_vector * vdev, floatp width);
+ private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+ private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -665,6 +664,8 @@
+     {421, 595, 15, "A5"},		/* A5 */
+     {709, 1002, 24, "B4"},		/* B4 */
+     {501, 709, 25, "B5"},		/* B5 */
++    {729, 1032, 24, "B4"},		/* JIS B4 */
++    {516, 729, 25, "B5"},		/* JIS B5 */
+     {612, 792, 30, "LT"},		/* Letter */
+     {396, 612, 31, "HLT"},		/* Half Letter */
+     {612, 1008, 32, "LGL"},		/* Legal */
+@@ -1933,13 +1934,13 @@
  
  /* Process the next piece of an image. */
  private int
@@ -26,7 +84,7 @@
      gx_device *dev = info->dev;
  #endif
      gx_device_vector *const	vdev = (gx_device_vector *) dev;
-@@ -1823,7 +1822,7 @@
+@@ -1957,7 +1958,7 @@
  
      {
  
@@ -35,7 +93,7 @@
  	if (height == 260)
  	    height = 1;
  #endif
-@@ -1980,13 +1979,13 @@
+@@ -2114,13 +2115,13 @@
  
  
  private int
diff --git a/print/ghostscript-gpl/files/patch-hp2200:gdevcd8.c b/print/ghostscript-gpl/files/patch-hp2200:gdevcd8.c
new file mode 100644
index 000000000000..497acc7d3b65
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-hp2200:gdevcd8.c
@@ -0,0 +1,296 @@
+--- hp2200/gdevcd8.c.orig	Wed Jun 21 20:39:33 2000
++++ hp2200/gdevcd8.c	Sat Nov 23 03:03:58 2002
+@@ -409,19 +409,19 @@
+ };
+ 
+ private int
+-    rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise1x1(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ private int
+-    rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise2x1(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ private int
+-    rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise1x2(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ private int
+-    rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise2x2(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ 
+-private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
++private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
+     {
+ 	rescale_byte_wise1x1, rescale_byte_wise1x2
+     },
+@@ -574,16 +574,16 @@
+ };
+ 
+     /* function pointer typedefs for device driver struct */
+-typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size,
+-				    FILE * prn_stream));
+-typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev,
++typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size,
++				    FILE * prn_stream);
++typedef void (*PrintNonBlankLines) (gx_device_printer * pdev,
+ 				       struct ptr_arrays *data_ptrs,
+ 				       struct misc_struct *misc_vars,
+ 				       struct error_val_field *error_values,
+ 				       const Gamma *gamma,
+-				       FILE * prn_stream));
++				       FILE * prn_stream);
+ 
+-typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream));
++typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream);
+ 
+ typedef struct gx_device_cdj850_s {
+     gx_device_common;
+@@ -729,60 +729,60 @@
+  *  functions.
+  */
+ private void
+-     cdj850_start_raster_mode(P3(gx_device_printer * pdev,
+-				 int papersize, FILE * prn_stream));
++     cdj850_start_raster_mode(gx_device_printer * pdev,
++				 int papersize, FILE * prn_stream);
+ 
+ private void
+-     cdj850_print_non_blank_lines(P6(gx_device_printer * pdev,
++     cdj850_print_non_blank_lines(gx_device_printer * pdev,
+ 				     struct ptr_arrays *data_ptrs,
+ 				     struct misc_struct *misc_vars,
+ 				     struct error_val_field *error_values,
+ 				     const Gamma *gamma,
+-				     FILE * prn_stream));
++				     FILE * prn_stream);
+ 
+ private void
+-     cdj850_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
++     cdj850_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
+ 
+ /*  The 880C and siblings need a separate set of functions because they seem
+  *  to require a somewhat different version of PCL3+.
+  */
+ private void
+-     cdj880_start_raster_mode(P3(gx_device_printer * pdev,
+-				 int papersize, FILE * prn_stream));
++     cdj880_start_raster_mode(gx_device_printer * pdev,
++				 int papersize, FILE * prn_stream);
+ 
+ private void
+-     cdj880_print_non_blank_lines(P6(gx_device_printer * pdev,
++     cdj880_print_non_blank_lines(gx_device_printer * pdev,
+ 				     struct ptr_arrays *data_ptrs,
+ 				     struct misc_struct *misc_vars,
+ 				     struct error_val_field *error_values,
+ 				     const Gamma *gamma,
+-				     FILE * prn_stream));
++				     FILE * prn_stream);
+ 
+ private void
+-     cdj880_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
++     cdj880_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
+ 
+ /*  Functions for the 1600C.
+  */
+ private void
+-     cdj1600_start_raster_mode(P3(gx_device_printer * pdev,
+-				  int papersize, FILE * prn_stream));
++     cdj1600_start_raster_mode(gx_device_printer * pdev,
++				  int papersize, FILE * prn_stream);
+ private void
+-     cdj1600_print_non_blank_lines(P6(gx_device_printer * pdev,
++     cdj1600_print_non_blank_lines(gx_device_printer * pdev,
+ 				      struct ptr_arrays *data_ptrs,
+ 				      struct misc_struct *misc_vars,
+ 				      struct error_val_field *error_values,
+ 				      const Gamma *gamma,
+-				      FILE * prn_stream));
++				      FILE * prn_stream);
+ private void
+-     cdj1600_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
++     cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
+ 
+ /*  Functions for the HP2200C */
+ private void
+-     chp2200_start_raster_mode(P3(gx_device_printer * pdev,
+-				 int papersize, FILE * prn_stream));
++     chp2200_start_raster_mode(gx_device_printer * pdev,
++				 int papersize, FILE * prn_stream);
+ 
+ private void
+-     chp2200_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
++     chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
+ 
+ 
+ private const gx_device_procs cdj670_procs =
+@@ -855,12 +855,12 @@
+ 	       chp2200_terminate_page);
+ 
+ /* Forward references */
+-private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
+-				 int *, int, int, int));
+-private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float
+-				   *, float, float, int));
+-private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int));
+-private int cdj_set_bpp(P3(gx_device *, int, int));
++private int cdj_put_param_int(gs_param_list *, gs_param_name,
++				 int *, int, int, int);
++private int cdj_put_param_float(gs_param_list *, gs_param_name, float
++				   *, float, float, int);
++private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
++private int cdj_set_bpp(gx_device *, int, int);
+ 
+ 
+ /*  hp_colour_open()
+@@ -1102,73 +1102,73 @@
+ 
+ /* internal functions */
+ private void
+-     FSDlinebw(P7(int scan, int plane_size,
++     FSDlinebw(int scan, int plane_size,
+ 		  struct error_val_field *error_values,
+ 		  byte * kP,
+-		  int n, int *ep, byte * dp));
++		  int n, int *ep, byte * dp);
+ private void
+-     FSDlinec2(P9(int scan, int plane_size,
++     FSDlinec2(int scan, int plane_size,
+ 		  struct error_val_field *error_values,
+ 		  byte * cPa, byte * mPa, byte * yPa, int n,
+-		  byte * dp, int *ep));
++		  byte * dp, int *ep);
+ private void
+-     FSDlinec3(P12(int scan, int plane_size,
++     FSDlinec3(int scan, int plane_size,
+ 		   struct error_val_field *error_values,
+ 		   byte * cPa, byte * mPa, byte * yPa,
+ 		   byte * cPb, byte * mPb, byte * yPb,
+-		   int n, byte * dp, int *ep));
++		   int n, byte * dp, int *ep);
+ private void
+-     FSDlinec4(P12(int scan, int plane_size,
++     FSDlinec4(int scan, int plane_size,
+ 		   struct error_val_field *error_values,
+ 		   byte * cPa, byte * mPa, byte * yPa,
+ 		   byte * cPb, byte * mPb, byte * yPb,
+-		   int n, byte * dp, int *ep));
++		   int n, byte * dp, int *ep);
+ private void
+      init_error_buffer(struct misc_struct *misc_vars,
+ 		       struct ptr_arrays *data_ptrs);
+ private void
+-     do_floyd_steinberg(P8(int scan, int cscan, int plane_size,
++     do_floyd_steinberg(int scan, int cscan, int plane_size,
+ 			   int plane_size_c, int n,
+ 			   struct ptr_arrays *data_ptrs,
+ 			   gx_device_printer * pdev,
+-			   struct error_val_field *error_values));
++			   struct error_val_field *error_values);
+ private int
+-    do_gcr(P8(int bytecount, byte * inbyte, const byte * kvalues,
++    do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
+ 	      const byte * cvalues, const byte * mvalues,
+ 	      const byte * yvalues, const int *kcorrect,
+-	      word * inword));
++	      word * inword);
+ 
+ /* UNUSED
+  *private int
+- *test_scan (P4(int size, 
++ *test_scan (int size, 
+  *            byte * current,
+  *            byte * last, 
+- *            byte * control));
++ *            byte * control);
+  *private void
+- *save_color_data(P3(int size,
++ *save_color_data(int size,
+  *                 byte * current,
+- *                 byte * saved));
++ *                 byte * saved);
+  *
+  */
+ private void
+-     send_scan_lines(P6(gx_device_printer * pdev,
++     send_scan_lines(gx_device_printer * pdev,
+ 			struct ptr_arrays *data_ptrs,
+ 			struct misc_struct *misc_vars,
+ 			struct error_val_field *error_values,
+ 			const Gamma *gamma,
+-			FILE * prn_stream));
++			FILE * prn_stream);
+ private void
+-     do_gamma(P3(float mastergamma, float gammaval, byte * values));
++     do_gamma(float mastergamma, float gammaval, byte * values);
+ private void
+-     do_black_correction(P2(float kvalue, int *kcorrect));
++     do_black_correction(float kvalue, int *kcorrect);
+ 
+ private void
+-     init_data_structure(P3(gx_device_printer * pdev,
++     init_data_structure(gx_device_printer * pdev,
+ 			    struct ptr_arrays *data_ptrs,
+-			    struct misc_struct *misc_vars));
++			    struct misc_struct *misc_vars);
+ private void
+-     calculate_memory_size(P2(gx_device_printer * pdev,
+-			      struct misc_struct *misc_vars));
++     calculate_memory_size(gx_device_printer * pdev,
++			      struct misc_struct *misc_vars);
+ 
+ 
+ private void
+@@ -3393,13 +3393,14 @@
+     (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
+ 
+ private gx_color_index
+-gdev_cmyk_map_cmyk_color(gx_device * pdev,
+-			 gx_color_value cyan, gx_color_value magenta,
+-			 gx_color_value yellow,
+-			 gx_color_value black)
++gdev_cmyk_map_cmyk_color(gx_device * pdev, const gx_color_value cv[])
+ {
+ 
+     gx_color_index color;
++    gx_color_value cyan = cv[0];
++    gx_color_value magenta = cv[1];
++    gx_color_value yellow = cv[2];
++    gx_color_value black = cv[3];
+ 
+     switch (pdev->color_info.depth) {
+ 	case 1:
+@@ -3432,9 +3433,11 @@
+ /* Mapping of RGB colors to gray values. */
+ 
+ private gx_color_index
+-gdev_cmyk_map_rgb_color(gx_device * pdev, gx_color_value r, gx_color_value
+-			g, gx_color_value b)
++gdev_cmyk_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
+ {
++    gx_color_value r = cv[0];
++    gx_color_value g = cv[1];
++    gx_color_value b = cv[2];
+     if (gx_color_value_to_byte(r & g & b) == 0xff) {
+ 	return (gx_color_index) 0;	/* White */
+     } else {
+@@ -3522,9 +3525,11 @@
+ }
+ 
+ private gx_color_index
+-gdev_pcl_map_rgb_color(gx_device * pdev, gx_color_value r,
+-		       gx_color_value g, gx_color_value b)
++gdev_pcl_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
+ {
++    gx_color_value r = cv[0];
++    gx_color_value g = cv[1];
++    gx_color_value b = cv[2];
+     if (gx_color_value_to_byte(r & g & b) == 0xff)
+ 	return (gx_color_index) 0;	/* white */
+     else {
diff --git a/print/ghostscript-gpl/files/patch-lib:gs_statd.ps b/print/ghostscript-gpl/files/patch-lib:gs_statd.ps
new file mode 100644
index 000000000000..d78c6e16bfc0
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lib:gs_statd.ps
@@ -0,0 +1,23 @@
+--- lib/gs_statd.ps.orig	Fri Oct 11 02:29:39 2002
++++ lib/gs_statd.ps	Fri Dec  6 04:53:01 2002
+@@ -105,6 +105,12 @@
+  /flsa {612 936 //.setpagesize exec} bind def  % U.S. foolscap
+  /flse {612 936 //.setpagesize exec} bind def  % European foolscap
+  /halfletter {396 612 //.setpagesize exec} bind def
++ /postcard {284 419 //.setpagesize exec} bind def
++ /dbl_postcard {419 568 //.setpagesize exec} bind def
++ /Executive {522 756 //.setpagesize exec} bind def
++ /jenv_you4 {298 666 //.setpagesize exec} bind def
++ /jenv_you2 {324 460 //.setpagesize exec} bind def
++ /jenv_kaku2 {682 942 //.setpagesize exec} bind def
+ % /tabloid {792 1224 //.setpagesize exec} bind def  % 11x17 portrait
+ % /csheet {1224 1584 //.setpagesize exec} bind def % ANSI C 17x22
+ % /dsheet {1584 2448 //.setpagesize exec} bind def % ANSI D 22x34
+@@ -121,6 +127,7 @@
+  [ /letter /note	%do not change this line, needed by 'setpagetype'
+    /legal /lettersmall
+    /11x17 /ledger
++   /postcard /dbl_postcard /Executive /jenv_you4 /jenv_you2 /jenv_kaku2
+    /a4small /a3 /a4
+ STRICT { (%END SIZES) .skipeof } if
+    /a0 /a1 /a2 /a5 /a6 /a7 /a8 /a9 /a10
diff --git a/print/ghostscript-gpl/files/patch-lib:ps2epsi b/print/ghostscript-gpl/files/patch-lib:ps2epsi
deleted file mode 100644
index 06389642bb93..000000000000
--- a/print/ghostscript-gpl/files/patch-lib:ps2epsi
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/ps2epsi.orig	Sat Jun 23 01:09:22 2001
-+++ lib/ps2epsi	Tue Apr 23 05:18:24 2002
-@@ -1,5 +1,5 @@
- #!/bin/sh
--# $Id: ps2epsi,v 1.7 2001/06/22 16:09:22 lpd Exp $
-+# $Id: ps2epsi,v 1.7.2.1 2002/04/22 20:18:24 giles Exp $
- 
- tmpfile=/tmp/ps2epsi$$
- 
-@@ -58,7 +58,8 @@
- cat << BEGINEPS
- save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
- %%EndProlog
--%%Page 1 1
-+%%Page: 1 1
-+%%BeginDocument: ${infile}
- BEGINEPS
- 
- cat "${infile}" |
-@@ -66,6 +67,7 @@
- 	-e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
- 
- cat << ENDEPS
-+%%EndDocument
- %%Trailer
- cleartomark countdictstack exch sub { end } repeat restore
- %%EOF
diff --git a/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps b/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps
deleted file mode 100644
index 19ccc7d0b022..000000000000
--- a/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps
+++ /dev/null
@@ -1,203 +0,0 @@
---- lib/ps2epsi.ps.orig	Wed Apr  4 13:45:42 2001
-+++ lib/ps2epsi.ps	Tue Apr 23 05:30:39 2002
-@@ -1,27 +1,31 @@
--%    Copyright (C) 1990, 2000 Aladdin Enterprises.  All rights reserved.
-+%    Copyright (C) 1990-2002 artofcode LLC. All rights reserved.
- % 
--% This file is part of AFPL Ghostscript.
-+% This software is provided AS-IS with no warranty, either express or
-+% implied.
- % 
--% AFPL Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author or
--% distributor accepts any responsibility for the consequences of using it, or
--% for whether it serves any particular purpose or works at all, unless he or
--% she says so in writing.  Refer to the Aladdin Free Public License (the
--% "License") for full details.
-+% This software is distributed under license and may not be copied,
-+% modified or distributed except as expressly authorized under the terms
-+% of the license contained in the file LICENSE in this distribution.
- % 
--% Every copy of AFPL Ghostscript must include a copy of the License, normally
--% in a plain ASCII text file named PUBLIC.  The License grants you the right
--% to copy, modify and redistribute AFPL Ghostscript, but only under certain
--% conditions described in the License.  Among other things, the License
--% requires that the copyright notice and this notice be preserved on all
--% copies.
-+% For more information about licensing, please refer to
-+% http://www.ghostscript.com/licensing/. For information on
-+% commercial licensing, go to http://www.artifex.com/licensing/ or
-+% contact Artifex Software, Inc., 101 Lucas Valley Road #110,
-+% San Rafael, CA  94903, U.S.A., +1(415)492-9861.
- 
--% $Id: ps2epsi.ps,v 1.5 2001/04/04 04:45:42 alexcher Exp $
-+% $Id: ps2epsi.ps,v 1.5.2.3 2002/04/22 20:30:39 giles Exp $
- % Convert an arbitrary PostScript file to an EPSI file.
- %
- % Please do not contact these users if you have questions.  They no longer
- % have the time, interest, or current expertise to keep this code working.
- % If you find bugs, please send proposed fixes to bug-gs@aladdin.com.
- %
-+% Bug fix 2002-04-20 by rayjj: Bounding box was incorrect since it depended
-+%   on the dither pattern and gray shade at the boundary. Changed to use
-+%   8-bit grayscale preview image to allow correct bounding box (at the
-+%   expense of a 8x larger preview image). Also moved .setsafe until after
-+%   the device and file operations are complete (but still before the input
-+%   file is processed.
- % Bug fix 2000-04-11 by lpd: if a font didn't have a FontName (which is the
- %   case for bitmap fonts produced by recent versions of dvips), setfont
- %   caused an error.
-@@ -51,7 +55,6 @@
-   /ps2epsi
-    {				% Open the file
-      outfile (w) file /epsifile exch def
--     //systemdict /.setsafe known { .setsafe } if
- 					% Get the device parameters
-      currentdevice getdeviceprops .dicttomark 
-      /HWSize get aload pop
-@@ -59,17 +62,23 @@
-        /devwidth exch def
-      matrix defaultmatrix
-        /devmatrix exch def
--				% Make a corresponding memory device
--     devmatrix devwidth devheight <ff 00>
-+				% Make a corresponding 8-bit deep memory device
-+     devmatrix devwidth devheight
-+     256 string 0 1 255 { 1 index exch dup 255 exch sub put } for
-      makeimagedevice
-      /arraydevice exch def
--     arraydevice setdevice	% (does an erasepage)
--     /rowwidth devwidth 7 add 8 idiv def
-+     arraydevice
-+     % Turn on anti-aliasing
-+     mark /TextAlphaBits 4 /GraphicsAlphaBits 4 6 -1 roll
-+     putdeviceprops
-+     setdevice	% (does an erasepage)
-+     /rowwidth devwidth def
-      /row rowwidth string def
-      /zerorow rowwidth string def	% all zero
- 				% Replace the definition of showpage
-      userdict /showpage { ps2edict begin epsipage end } bind put
-      userdict /setfont { ps2edict begin epsisetfont end } bind put
-+     //systemdict /.setsafe known { .setsafe } if
-    } bind def
- 
-  /epsifontdict 100 dict def
-@@ -125,8 +134,8 @@
-      
-      % Initialise limit variables
-      /loopcount rowwidth 1 sub def
--     /lm loopcount def /lmb 0 def
--     /rm 0 def /rmb 0 def
-+     /lm loopcount def 
-+     /rm 0 def 
- 
-      % Find left and right boundaries of image
-      tm 1 bm
-@@ -135,47 +144,29 @@
- 	% Scan from left to find first non-zero element
- 	% We save first the element, then the index
- 	-1 0 1 loopcount
--	{ dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
-+	{ dup row exch get 0 ne { exch pop exit }{ pop } ifelse
- 	} for
- 	% If we found -1, row is blank ..
- 	dup -1 ne 
- 	{ % Find the leftmost index
-           dup lm lt
-           % If the new index is less, we save index and element
--          { /lm exch def /lmb exch def }
--          % If the index is equal, we or the bits together
--          { lm eq { lmb or /lmb exch def }{ pop } ifelse
--          } ifelse
-+          { /lm exch def } { pop } ifelse
- 	  % Now find the rightmost index
- 	  loopcount -1 0
--          { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
-+          { dup row exch get 0 ne { exit }{ pop } ifelse
-           } for
- 	  dup rm gt
-           % If the new index is greater, we save index and element
--          { /rm exch def /rmb exch def }
--          % If the index is equal, or the bits
--          { rm eq { rmb or /rmb exch def } { pop } ifelse
--          } ifelse
-+          { /rm exch def } { pop } ifelse
- 	} if
--	pop
-       } for
- 
--     % Now we find the real left & right bit positions
--     256 0 1 7
--     { exch 2 div dup lmb le { pop exit }{ exch pop } ifelse
--     } for
--     /lmb exch def
--
--     1 7 -1 0
--     { exch dup dup rmb and eq { pop exit }{ 2 mul exch pop } ifelse
--     } for
--     /rmb exch def
--
-      % Calculate the bounding box values.
-      % Note that these must be corrected to produce closed-open intervals.
--     /llx lm 8 mul lmb add def
-+     /llx lm def
-      /lly devheight bm sub 1 sub def
--     /urx rm 8 mul rmb add 1 add def
-+     /urx rm 1 add def
-      /ury devheight tm sub def
- 
-     % Write out the magic string and bounding box information
-@@ -206,38 +197,31 @@
-      epsifile lly write==only epsifile ( ) writestring
-      epsifile urx write==only epsifile ( ) writestring
-      epsifile ury write==
--     epsifile (%%BeginPreview: ) writestring
--     epsifile urx llx sub write==only epsifile ( ) writestring
--     epsifile bm tm sub 1 add write==only epsifile ( 1 ) writestring
--     epsifile bm tm sub 1 add write==
--     epsifile flushfile
- 
-     % Define character and bit widths for the output line buffer:
-      /cwidth rm lm sub 1 add def
--     /bwidth cwidth 8 mul def
--     /owidth urx llx sub 7 add 8 idiv def
-      /out cwidth string def
- 
--     % Create a 1-bit-high device for bitblt to align with the bbox
--     gsave
--     matrix cwidth 8 mul 1 <00 ff> makeimagedevice setdevice
-+     epsifile (%%BeginPreview: ) writestring
-+     epsifile cwidth write==only epsifile ( ) writestring
-+     epsifile bm tm sub 1 add write==only epsifile ( 8 ) writestring
-+     epsifile bm tm sub 1 add
-+     cwidth 39 add 40 idiv mul write==
-+     epsifile flushfile
- 
--     % 'image' a zero string to clear the line device
--     bwidth 1 1 matrix cwidth string image
-+     gsave
- 
-      tm 1 bm
-       { % Get a scan line interval from the array device
- 	arraydevice exch row copyscanlines lm cwidth getinterval
--	lmb 0 gt
--	{ % 'image' it into the line device with the lmb offset
--	  bwidth 1 1 [1 0 0 1 lmb 0] 5 -1 roll image
--	  % Now we get the modified scan line
--	  currentdevice 0 out copyscanlines 0 owidth getinterval
--	} if
--	% Write out the hex data
--	epsifile (% ) writestring 
--	epsifile exch writehexstring
--	epsifile (\n) writestring
-+	% Write out the hex data as 40 bytes per line (82 chars)
-+	0 40 cwidth
-+	 { epsifile (% ) writestring 
-+	   epsifile exch 2 index exch
-+	   dup cwidth exch sub 40 .min getinterval writehexstring
-+	   epsifile (\n) writestring
-+	 } for
-+        pop
-       } for
- 
-      epsifile (%%EndImage\n) writestring
diff --git a/print/ghostscript-gpl/files/patch-lips:gdevl4r.c b/print/ghostscript-gpl/files/patch-lips:gdevl4r.c
new file mode 100644
index 000000000000..018f0f93c495
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lips:gdevl4r.c
@@ -0,0 +1,13 @@
+--- lips/gdevl4r.c.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevl4r.c	Sun Nov 10 21:12:14 2002
+@@ -178,8 +178,8 @@
+ private int lips4c_output_page(gx_device_printer * pdev, FILE * prn_stream);
+ private int lips_delta_encode(byte * inBuff, byte * prevBuff, byte * outBuff, byte * diffBuff, int Length);
+ private int lips_byte_cat(byte * TotalBuff, byte * Buff, int TotalLen, int Len);
+-private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies));
+-private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies));
++private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies);
++private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies);
+ private int lips4type_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, int num_copies, int ptype);
+ 
+ private int
diff --git a/print/ghostscript-gpl/files/patch-lips:gdevl4v.c b/print/ghostscript-gpl/files/patch-lips:gdevl4v.c
new file mode 100644
index 000000000000..c4b3bfb38e76
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lips:gdevl4v.c
@@ -0,0 +1,65 @@
+--- lips/gdevl4v.c.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevl4v.c	Sun Nov 10 21:17:34 2002
+@@ -230,41 +230,35 @@
+ };
+ 
+ /* Vector device implementation */
+-private int lips4v_beginpage(P1(gx_device_vector * vdev));
+-private int lips4v_setfillcolor(P2(gx_device_vector * vdev,
+-				   const gx_drawing_color * pdc));
+-private int lips4v_setstrokecolor(P2(gx_device_vector * vdev,
+-				     const gx_drawing_color * pdc));
+-private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
+-			      uint count, floatp offset));
+-private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
++private int lips4v_beginpage(gx_device_vector * vdev);
++private int lips4v_setfillcolor(gx_device_vector * vdev,
++				   const gx_drawing_color * pdc);
++private int lips4v_setstrokecolor(gx_device_vector * vdev,
++				     const gx_drawing_color * pdc);
++private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
++			      uint count, floatp offset);
++private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
+ private int
+-lips4v_setlogop(P3
+-
+-		(gx_device_vector * vdev, gs_logical_operation_t lop,
+-		 gs_logical_operation_t diff));
++lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
++		 gs_logical_operation_t diff);
+ private int
+ 
+-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
++private int
++lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
+-lips4v_moveto(P6
+-	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+-	       floatp y, gx_path_type_t type));
+-private int
+-lips4v_lineto(P6
+-	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+-	       floatp y, gx_path_type_t type));
++lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
+-lips4v_curveto(P10
+-	       (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
++lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
+ 		floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
+-		gx_path_type_t type));
++		gx_path_type_t type);
+ private int
+-lips4v_closepath(P6
+-		 (gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
+-		  floatp y_start, gx_path_type_t type));
++lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
++		  floatp y_start, gx_path_type_t type);
+ 
+-private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
+ private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
+ private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+ private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
diff --git a/print/ghostscript-gpl/files/patch-lips:gdevlprn.h b/print/ghostscript-gpl/files/patch-lips:gdevlprn.h
new file mode 100644
index 000000000000..f8169e113db7
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lips:gdevlprn.h
@@ -0,0 +1,11 @@
+--- lips/gdevlprn.h.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevlprn.h	Sun Nov 10 21:11:22 2002
+@@ -29,7 +29,7 @@
+ #include "gdevprn.h"
+ 
+ #define lprn_dev_proc_image_out(proc)\
+-  void proc(P6(gx_device_printer *, FILE *, int, int, int, int))
++  void proc(gx_device_printer *, FILE *, int, int, int, int)
+ 
+ #define dev_proc_image_out(proc) lprn_dev_proc_image_out(proc)
+ 
diff --git a/print/ghostscript-gpl/files/patch-md2k:gdevmd2k.c b/print/ghostscript-gpl/files/patch-md2k:gdevmd2k.c
new file mode 100644
index 000000000000..4b1049db015c
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-md2k:gdevmd2k.c
@@ -0,0 +1,50 @@
+--- md2k/gdevmd2k.c.orig	Sun May  2 14:07:57 1999
++++ md2k/gdevmd2k.c	Fri Nov  8 07:29:13 2002
+@@ -638,11 +638,13 @@
+     (k) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
+ 
+ private gx_color_index
+-alps_map_cmyk_color(gx_device* pdev,
+-		    gx_color_value c, gx_color_value m,
+-		    gx_color_value y, gx_color_value k)
++alps_map_cmyk_color(gx_device* pdev, const gx_color_value cv[])
+ {
+     gx_color_index color;
++    gx_color_value c = cv[0];
++    gx_color_value m = cv[1];
++    gx_color_value y = cv[2];
++    gx_color_value k = cv[3];
+ 
+     switch (pdev->color_info.depth) {
+     case 1:
+@@ -675,10 +677,12 @@
+ }
+ 
+ private gx_color_index
+-alps_map_cmy_color(gx_device* pdev,
+-		   gx_color_value c, gx_color_value m,
+-		   gx_color_value y, gx_color_value k)
++alps_map_cmy_color(gx_device* pdev, const gx_color_value cv[])
+ {
++    gx_color_value c = cv[0];
++    gx_color_value m = cv[1];
++    gx_color_value y = cv[2];
++    gx_color_value k = cv[3];
+     int nbits = pdev->color_info.depth;
+     ulong weight = ((gx_max_color_value - k) << 10) / gx_max_color_value;
+     c = ((c * weight) >> 10) + k;
+@@ -694,10 +698,12 @@
+ /* Mapping of RGB colors to gray values. */
+ 
+ private gx_color_index
+-alps_map_rgb_color(gx_device *pdev,
+-		   gx_color_value r, gx_color_value g, gx_color_value b)
++alps_map_rgb_color(gx_device *pdev, const gx_color_value cv[])
+ {
+ 
++  gx_color_value r = cv[0];
++  gx_color_value g = cv[1];
++  gx_color_value b = cv[2];
+   if (gx_color_value_to_byte(r & g & b) == 0xff) {
+       return (gx_color_index) 0;	/* White */
+   } else {
diff --git a/print/ghostscript-gpl/files/patch-mjc:gdevmjc.c b/print/ghostscript-gpl/files/patch-mjc:gdevmjc.c
index 99ff0bcb245f..ffdae781ffa1 100644
--- a/print/ghostscript-gpl/files/patch-mjc:gdevmjc.c
+++ b/print/ghostscript-gpl/files/patch-mjc:gdevmjc.c
@@ -1,5 +1,5 @@
---- mjc/gdevmjc.c.orig	Tue May 23 19:16:52 2000
-+++ mjc/gdevmjc.c	Tue May 23 19:17:44 2000
+--- mjc/gdevmjc.c.orig	Sat Nov  2 17:58:50 1996
++++ mjc/gdevmjc.c	Sun Nov 10 21:37:22 2002
 @@ -43,7 +43,8 @@
  #include <limits.h>
  #include "gdevprn.h"
@@ -20,25 +20,32 @@
  #define PAPER_SIZE_B4 30
  #define PAPER_SIZE_B5 31
  
-@@ -190,14 +193,12 @@
+@@ -190,18 +193,16 @@
  private dev_proc_print_page(mjc720_print_page);
  private dev_proc_print_page(mj500c_print_page);
  
 -private dev_proc_get_props(mj_get_props);
 -private dev_proc_put_props(mj_put_props);
+-
+-private void expand_line(P4(word*, int, int, int));
+-private int put_prop_float(P5(gs_prop_item *, float *, float, float, int));
+-private int put_prop_int(P5(gs_prop_item *, int *, int, int, int));
 +private dev_proc_get_params(mj_get_params);
 +private dev_proc_put_params(mj_put_params);
  
- private void expand_line(P4(word*, int, int, int));
--private int put_prop_float(P5(gs_prop_item *, float *, float, float, int));
--private int put_prop_int(P5(gs_prop_item *, int *, int, int, int));
--
 -private void set_bpp(P2(gx_device *, int));
-+private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int));
-+private void mj_set_bpp(P2(gx_device *, int));
++private void expand_line(word*, int, int, int);
++private int mj_put_param_int(gs_param_list *, gs_param_name, int *, int, int, int);
++private void mj_set_bpp(gx_device *, int);
+ 
+-private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int ));
++private uint gdev_prn_rasterwidth(const gx_device_printer *, int );
  
- private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int ));
+-private gx_color_index mjc_correct_color(P2(gx_device_printer *, gx_color_index));
++private gx_color_index mjc_correct_color(gx_device_printer *, gx_color_index);
  
+ /* The device descriptors */
+ struct gx_device_mj_s {
 @@ -224,7 +225,7 @@
  #define mj    ((gx_device_mj *) pdev)
  
@@ -70,8 +77,10 @@
 +	proc_put_params\
  }
  
- private int mjc_open(P1(gx_device *));
- private int mj_colour_open(P1(gx_device *));
+-private int mjc_open(P1(gx_device *));
+-private int mj_colour_open(P1(gx_device *));
++private int mjc_open(gx_device *);
++private int mj_colour_open(gx_device *);
  
  private gx_device_procs mj_procs =
 -mj_colour_procs(mjc_open, mj_get_props, mj_put_props);
@@ -108,7 +117,7 @@
  
    switch (mj->colorcomp) {
    case 1:
-@@ -360,80 +358,74 @@
+@@ -360,84 +358,78 @@
   * and control over the bits-per-pixel used in output rendering */
  /* Added properties for DeskJet 5xxC */
  
@@ -245,6 +254,11 @@
  }
  
  /* ------ Internal routines ------ */
+-private int mj_colour_print_page(P3(gx_device_printer *, FILE *, int));
++private int mj_colour_print_page(gx_device_printer *, FILE *, int);
+ 
+ 
+ private int
 @@ -1163,7 +1155,8 @@
  
    /* Send each scan line in turn */
@@ -255,7 +269,35 @@
      int cErr, mErr, yErr, kErr;
      int this_pass, i;
      long int lnum;
-@@ -1685,39 +1678,25 @@
+@@ -1412,10 +1405,10 @@
+ 
+ void 
+ mj_color_correct(gx_color_value *Rptr ,gx_color_value *Gptr , gx_color_value *Bptr )
+-								/* R,G,B : 0�`255 */
++								/* R,G,B : 0)B�`255 */
+ {
+-	short	R,G,B;				/* R,G,B : 0�`255  */
+-	short	C,M,Y;				/* C,M,Y : 0�`1023 */
++	short	R,G,B;				/* R,G,B : 0)B�`255  */
++	short	C,M,Y;				/* C,M,Y : 0)B�`1023 */
+ 	short	H,D,Wa;				/* ese-HSV         */
+ 	long	S;					/*     HSV         */
+ 
+@@ -1517,9 +1510,11 @@
+  * c, m, y, inks by reducing the cyan component to give a truer black.
+  */
+ private gx_color_index
+-gdev_mjc_map_rgb_color(gx_device *pdev, gx_color_value r,
+-				 gx_color_value g, gx_color_value b)
++gdev_mjc_map_rgb_color(gx_device *pdev, const gx_color_value cv[])
+ {
++  gx_color_value r = cv[0];
++  gx_color_value g = cv[1];
++  gx_color_value b = cv[2];
+   if (gx_color_value_to_byte(r & g & b) == 0xff)
+     return (gx_color_index)0;         /* white */
+   else {
+@@ -1685,39 +1680,25 @@
  }
  
  private int
@@ -311,7 +353,7 @@
  { gx_device_color_info *ci = &pdev->color_info;
    /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */
    int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : 
-@@ -1725,9 +1704,9 @@
+@@ -1725,9 +1706,9 @@
    ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3);
    ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp);
    ci->max_gray = (bpp >= 8 ? 255 : 1);
@@ -324,7 +366,7 @@
  }
  
  /* This returns either the number of pixels in a scan line, or the number
-@@ -1736,7 +1715,7 @@
+@@ -1736,7 +1717,7 @@
  gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount)
  {
    word raster_width =
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
deleted file mode 100644
index 1d2c46b8ea2e..000000000000
--- a/print/ghostscript-gpl/files/patch-src:contrib.mak-5.94.add
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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:cpca_gdevl4v.c b/print/ghostscript-gpl/files/patch-src:cpca_gdevl4v.c
new file mode 100644
index 000000000000..005f7cdf39dc
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:cpca_gdevl4v.c
@@ -0,0 +1,65 @@
+--- src/cpca_gdevl4v.c.orig	Tue May  7 00:30:00 2002
++++ src/cpca_gdevl4v.c	Fri Dec  6 04:59:34 2002
+@@ -316,41 +316,35 @@
+ };
+ 
+ /* Vector device implementation */
+-private int lips4v_beginpage(P1(gx_device_vector * vdev));
+-private int lips4v_setfillcolor(P2(gx_device_vector * vdev,
+-				   const gx_drawing_color * pdc));
+-private int lips4v_setstrokecolor(P2(gx_device_vector * vdev,
+-				     const gx_drawing_color * pdc));
+-private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
+-			      uint count, floatp offset));
+-private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
++private int lips4v_beginpage(gx_device_vector * vdev);
++private int lips4v_setfillcolor(gx_device_vector * vdev,
++				   const gx_drawing_color * pdc);
++private int lips4v_setstrokecolor(gx_device_vector * vdev,
++				     const gx_drawing_color * pdc);
++private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
++			      uint count, floatp offset);
++private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
+ private int
+-lips4v_setlogop(P3
+-
+-		(gx_device_vector * vdev, gs_logical_operation_t lop,
+-		 gs_logical_operation_t diff));
++lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
++		 gs_logical_operation_t diff);
+ private int
+ 
+-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
++private int
++lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
+-lips4v_moveto(P6
+-	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+-	       floatp y, gx_path_type_t type));
+-private int
+-lips4v_lineto(P6
+-	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+-	       floatp y, gx_path_type_t type));
++lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
+-lips4v_curveto(P10
+-	       (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
++lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
+ 		floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
+-		gx_path_type_t type));
++		gx_path_type_t type);
+ private int
+-lips4v_closepath(P6
+-		 (gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
+-		  floatp y_start, gx_path_type_t type));
++lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
++		  floatp y_start, gx_path_type_t type);
+ 
+-private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
+ private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
+ private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+ private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
diff --git a/print/ghostscript-gpl/files/patch-src:dviprlib.c b/print/ghostscript-gpl/files/patch-src:dviprlib.c
index 67662665f273..c61ca748cbc2 100644
--- a/print/ghostscript-gpl/files/patch-src:dviprlib.c
+++ b/print/ghostscript-gpl/files/patch-src:dviprlib.c
@@ -1,5 +1,47 @@
 --- src/dviprlib.c.orig	Tue May 13 16:14:09 1997
-+++ src/dviprlib.c	Mon Apr 22 23:02:58 2002
++++ src/dviprlib.c	Sun Nov 10 23:26:06 2002
+@@ -39,8 +39,8 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_read_S_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-private int dviprt_read_QR_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
++private int dviprt_read_S_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
++private int dviprt_read_QR_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
+      
+ /*--- library functions ---*/
+ int 
+@@ -429,21 +429,21 @@
+ 
+ /*--- forward declarations ---*/
+ private int dviprt_set_select
+-  (P4(dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_integer
+-  (P4(dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_strings
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_rpexpr
+-  (P6(dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int));
++  (dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int);
+ private int dviprt_set_code
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ 
+-private long dviprt_oct2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_dec2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_hex2long(P3(uchar *,uchar *,uchar **));
++private long dviprt_oct2long(uchar *,uchar *,uchar **);
++private long dviprt_dec2long(uchar *,uchar *,uchar **);
++private long dviprt_hex2long(uchar *,uchar *,uchar **);
+      
+-private int dviprt_printtokenerror(P4(dviprt_cfg_i *,char *,int ,int));
++private int dviprt_printtokenerror(dviprt_cfg_i *,char *,int ,int);
+      
+ /*--- macros ---*/
+ #define strlcmp(tmplt,str,len) \
 @@ -1433,7 +1433,9 @@
  char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
  char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
@@ -11,3 +53,82 @@
  
  /*--- library functions ---*/
  int
+@@ -1568,16 +1570,16 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_getmaximalwidth(P1(dviprt_print *));
+-private int dviprt_flush_buffer(P2(dviprt_print *,uchar far *));
+-private int dviprt_output_transpose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose_reverse(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_reverse_bits(P2(uchar far *,uint));
+-private int dviprt_transpose8x8(P4(uchar far *,uint, uchar far *,uint));
+-private int dviprt_output_expr(P4(dviprt_print *,int,uint,uint));
+-private int dviprt_default_outputproc(P3(uchar far *,long ,void *));
+-private long dviprt_getbuffersize(P1(dviprt_print *));
++private int dviprt_getmaximalwidth(dviprt_print *);
++private int dviprt_flush_buffer(dviprt_print *,uchar far *);
++private int dviprt_output_transpose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose_reverse(dviprt_print *,uchar far *,uint );
++private int dviprt_reverse_bits(uchar far *,uint);
++private int dviprt_transpose8x8(uchar far *,uint, uchar far *,uint);
++private int dviprt_output_expr(dviprt_print *,int,uint,uint);
++private int dviprt_default_outputproc(uchar far *,long ,void *);
++private long dviprt_getbuffersize(dviprt_print *);
+      
+ /*--- library functions ---*/
+ long
+@@ -1618,7 +1620,7 @@
+ int
+   dviprt_setstream
+ #ifdef __PROTOTYPES__
+-  (dviprt_print *pprint,int (*func)(P3(uchar far *,long ,void*)),void *pstream)
++  (dviprt_print *pprint,int (*func)(uchar far *,long ,void*),void *pstream)
+ #else
+ (pprint,func,pstream)
+ dviprt_print *pprint;
+@@ -2264,19 +2266,19 @@
+ #define DVIPRT_SUPPORT_PCL 1
+ 
+ /*--- forward declarations ---*/
+-private long dviprt_null_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_null_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_hex_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_hex_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_null_getworksize(dviprt_print *,long );
++private long dviprt_null_encode(dviprt_print *,long ,int );
++private long dviprt_hex_getworksize(dviprt_print *,long );
++private long dviprt_hex_encode(dviprt_print *,long ,int );
+ #if DVIPRT_SUPPORT_FAX
+-private long dviprt_fax_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_fax_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_fax_getworksize(dviprt_print *,long );
++private long dviprt_fax_encode(dviprt_print *,long ,int );
+ #endif
+ #if DVIPRT_SUPPORT_PCL
+-private long dviprt_pcl1_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl1_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_pcl2_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl2_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_pcl1_getworksize(dviprt_print *,long );
++private long dviprt_pcl1_encode(dviprt_print *,long ,int );
++private long dviprt_pcl2_getworksize(dviprt_print *,long );
++private long dviprt_pcl2_encode(dviprt_print *,long ,int );
+ #endif
+      
+ private dviprt_encoder dviprt_encoder_list[] = {
+@@ -2468,9 +2470,9 @@
+   int o_count;
+   int o_bufcount;
+ } FaxEncodeInfo;
+-private int dviprt_fax_set_white(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_black(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_bitcount(P2(FaxEncode_t *,FaxEncodeInfo *));
++private int dviprt_fax_set_white(int,FaxEncodeInfo *);
++private int dviprt_fax_set_black(int,FaxEncodeInfo *);
++private int dviprt_fax_set_bitcount(FaxEncode_t *,FaxEncodeInfo *);
+      
+ private long 
+ dviprt_fax_encode(dviprt_print *pprint,long s,int f)
diff --git a/print/ghostscript-gpl/files/patch-src:dviprlib.h b/print/ghostscript-gpl/files/patch-src:dviprlib.h
new file mode 100644
index 000000000000..2a671205b46d
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:dviprlib.h
@@ -0,0 +1,38 @@
+--- src/dviprlib.h.orig	Tue May 13 16:10:34 1997
++++ src/dviprlib.h	Sun Nov 10 23:32:53 2002
+@@ -337,23 +337,23 @@
+ #ifdef dviprlib_implementation
+ typedef struct {
+   int no;
+-  long (*getworksize)(P2(dviprt_print *,long ));
+-  long (*encode)(P3(dviprt_print *,long,int));
++  long (*getworksize)(dviprt_print *,long );
++  long (*encode)(dviprt_print *,long,int);
+ } dviprt_encoder;
+ 
+ #define liblocal private
+ 
+-liblocal dviprt_encoder *dviprt_getencoder_(P1(int ));
+-liblocal int dviprt_setcfgbuffer_(P3(dviprt_cfg_i *,int ,int ));
+-liblocal int dviprt_resetcfgbuffer_(P1(dviprt_cfg_i *));
+-liblocal int dviprt_initcfg_(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-liblocal int dviprt_printmessage(P2(char *,int ));
+-liblocal int dviprt_printerror(P2(char *,int ));
+-liblocal int dviprt_printwarning(P2(char *,int ));
+-liblocal int dviprt_printcfgerror(P3(dviprt_cfg_i *,char *,int ));
+-liblocal int dviprt_printcfgwarning(P3(dviprt_cfg_i *,char *,int ));
++liblocal dviprt_encoder *dviprt_getencoder_(int );
++liblocal int dviprt_setcfgbuffer_(dviprt_cfg_i *,int ,int );
++liblocal int dviprt_resetcfgbuffer_(dviprt_cfg_i *);
++liblocal int dviprt_initcfg_(dviprt_cfg_t *,dviprt_cfg_i *);
++liblocal int dviprt_printmessage(char *,int );
++liblocal int dviprt_printerror(char *,int );
++liblocal int dviprt_printwarning(char *,int );
++liblocal int dviprt_printcfgerror(dviprt_cfg_i *,char *,int );
++liblocal int dviprt_printcfgwarning(dviprt_cfg_i *,char *,int );
+ 
+-extern int dviprt_print_headercomment_(P4(char *,char *,char *,FILE *));
++extern int dviprt_print_headercomment_(char *,char *,char *,FILE *);
+ extern char dviprt_message_buffer[];
+ #endif dviprlib_implementation
+  
diff --git a/print/ghostscript-gpl/files/patch-src:gdevccr.c b/print/ghostscript-gpl/files/patch-src:gdevccr.c
new file mode 100644
index 000000000000..56bb760b8ac8
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevccr.c
@@ -0,0 +1,15 @@
+--- src/gdevccr.c.orig	Fri Feb 22 07:24:51 2002
++++ src/gdevccr.c	Sun Nov 10 22:38:51 2002
+@@ -112,8 +112,11 @@
+ /* ------ Color mapping routines ------ */
+ /* map an rgb color to a ccr cmy bitmap */
+ private gx_color_index
+-ccr_map_rgb_color(gx_device *pdev, ushort r, ushort g, ushort b)
++ccr_map_rgb_color(gx_device *pdev, const ushort cv[])
+ {
++  ushort r = cv[0];
++  ushort g = cv[1];
++  ushort b = cv[2];
+   register int shift = gx_color_value_bits - 1;
+   r>>=shift;
+   g>>=shift;
diff --git a/print/ghostscript-gpl/files/patch-src:gdevcp50.c b/print/ghostscript-gpl/files/patch-src:gdevcp50.c
new file mode 100644
index 000000000000..ffc8308ec35d
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevcp50.c
@@ -0,0 +1,18 @@
+--- src/gdevcp50.c.orig	Fri Feb 22 07:24:51 2002
++++ src/gdevcp50.c	Sun Nov 10 22:35:13 2002
+@@ -204,9 +204,12 @@
+  
+ /* Map a r-g-b color to a color index. */
+ private gx_color_index
+-cp50_rgb_color(gx_device *dev, gx_color_value r, gx_color_value g,
+-  gx_color_value b)
+-{   return ((ulong)gx_color_value_to_byte(r) << 16)+
++cp50_rgb_color(gx_device *dev, const gx_color_value cv[])
++{
++    gx_color_value r = cv[0];
++    gx_color_value g = cv[1];
++    gx_color_value b = cv[2];
++    return ((ulong)gx_color_value_to_byte(r) << 16)+
+            ((uint)gx_color_value_to_byte(g) << 8) +
+            gx_color_value_to_byte(b);
+ }
diff --git a/print/ghostscript-gpl/files/patch-src:gdevdj9.c b/print/ghostscript-gpl/files/patch-src:gdevdj9.c
new file mode 100644
index 000000000000..f58a6c7de792
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevdj9.c
@@ -0,0 +1,255 @@
+--- src/gdevdj9.c.orig	Fri Nov  8 06:15:08 2002
++++ src/gdevdj9.c	Sun Nov 10 22:00:45 2002
+@@ -243,19 +243,19 @@
+ };
+ 
+ private int
+-    rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise1x1(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ private int
+-    rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise2x1(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ private int
+-    rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise1x2(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ private int
+-    rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea,
+-			    const byte * inbyteb, byte * outbyte));
++    rescale_byte_wise2x2(int bytecount, const byte * inbytea,
++			    const byte * inbyteb, byte * outbyte);
+ 
+-private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
++private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
+     {
+ 	rescale_byte_wise1x1, rescale_byte_wise1x2
+     },
+@@ -264,7 +264,7 @@
+     }
+ };
+ /*
+-private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
++private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
+     {
+ 	rescale_byte_wise1x1, rescale_byte_wise1x1
+     },
+@@ -273,8 +273,8 @@
+     }
+ };
+ */
+-private int cdj970_write_header(P2(gx_device *, FILE *));
+-private int cdj970_write_trailer(P2(gx_device *, FILE *));
++private int cdj970_write_header(gx_device *, FILE *);
++private int cdj970_write_trailer(gx_device *, FILE *);
+ 
+ /*
+  * Drivers stuff.
+@@ -422,16 +422,16 @@
+ };
+ 
+     /* function pointer typedefs for device driver struct */
+-typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size,
+-				    FILE * prn_stream));
+-typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev,
++typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size,
++				    FILE * prn_stream);
++typedef void (*PrintNonBlankLines) (gx_device_printer * pdev,
+ 				       struct ptr_arrays *data_ptrs,
+ 				       struct misc_struct *misc_vars,
+ 				       struct error_val_field *error_values,
+ 				       const Gamma *gamma,
+-				       FILE * prn_stream));
++				       FILE * prn_stream);
+ 
+-typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream));
++typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream);
+ 
+ typedef struct gx_device_cdj970_s {
+     gx_device_common;
+@@ -529,18 +529,18 @@
+ }
+ 
+ private void
+-     cdj970_start_raster_mode(P3(gx_device_printer * pdev,
+-				 int papersize, FILE * prn_stream));
++     cdj970_start_raster_mode(gx_device_printer * pdev,
++				 int papersize, FILE * prn_stream);
+ 
+ private void
+-     cdj970_print_non_blank_lines(P6(gx_device_printer * pdev,
++     cdj970_print_non_blank_lines(gx_device_printer * pdev,
+ 				     struct ptr_arrays *data_ptrs,
+ 				     struct misc_struct *misc_vars,
+ 				     struct error_val_field *error_values,
+ 				     const Gamma *gamma,
+-				     FILE * prn_stream));
++				     FILE * prn_stream);
+ private void
+-     cdj970_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
++     cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
+ 
+ 
+ private const gx_device_procs cdj970_procs =
+@@ -555,12 +555,12 @@
+ 				cdj970_terminate_page);
+ 
+ /* Forward references */
+-private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
+-				 int *, int, int, int));
+-private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float
+-				   *, float, float, int));
+-private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int));
+-private int cdj_set_bpp(P3(gx_device *, int, int));
++private int cdj_put_param_int(gs_param_list *, gs_param_name,
++				 int *, int, int, int);
++private int cdj_put_param_float(gs_param_list *, gs_param_name, float
++				   *, float, float, int);
++private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
++private int cdj_set_bpp(gx_device *, int, int);
+ 
+ static int PageCtr = 0;
+ 
+@@ -692,70 +692,70 @@
+ 
+ /* internal functions */
+ private void
+-     FSDlinebw(P7(int scan, int plane_size,
++     FSDlinebw(int scan, int plane_size,
+ 		  struct error_val_field *error_values,
+ 		  byte * kP,
+-		  int n, int *ep, byte * dp));
++		  int n, int *ep, byte * dp);
+ 		  
+ private void
+-     FSDlinec2(P9(int scan, int plane_size,
++     FSDlinec2(int scan, int plane_size,
+ 		  struct error_val_field *error_values,
+ 		  byte * cPa, byte * mPa, byte * yPa, int n,
+-		  byte * dp, int *ep));
++		  byte * dp, int *ep);
+ 		  
+ private void
+-     FSDlinec3(P12(int scan, int plane_size,
++     FSDlinec3(int scan, int plane_size,
+ 		   struct error_val_field *error_values,
+ 		   byte * cPa, byte * mPa, byte * yPa,
+ 		   byte * cPb, byte * mPb, byte * yPb,
+-		   int n, byte * dp, int *ep));
++		   int n, byte * dp, int *ep);
+ 		   
+ private void
+-     FSDlinec4(P12(int scan, int plane_size,
++     FSDlinec4(int scan, int plane_size,
+ 		   struct error_val_field *error_values,
+ 		   byte * cPa, byte * mPa, byte * yPa,
+ 		   byte * cPb, byte * mPb, byte * yPb,
+-		   int n, byte * dp, int *ep));
++		   int n, byte * dp, int *ep);
+ 
+ private void
+      init_error_buffer(struct misc_struct *misc_vars,
+ 		       struct ptr_arrays *data_ptrs);
+ 		       
+ private void
+-     do_floyd_steinberg(P8(int scan, int cscan, int plane_size,
++     do_floyd_steinberg(int scan, int cscan, int plane_size,
+ 			   int plane_size_c, int n,
+ 			   struct ptr_arrays *data_ptrs,
+ 			   gx_device_printer * pdev,
+-			   struct error_val_field *error_values));
++			   struct error_val_field *error_values);
+ 
+ 			   	   
+ private int
+-    do_gcr(P7(int bytecount, byte * inbyte, const byte * kvalues,
++    do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
+ 	      const byte * cvalues, const byte * mvalues,
+-	      const byte * yvalues, const int *kcorrect));
++	      const byte * yvalues, const int *kcorrect);
+ 	      
+ private void
+-     send_scan_lines(P6(gx_device_printer * pdev,
++     send_scan_lines(gx_device_printer * pdev,
+ 			struct ptr_arrays *data_ptrs,
+ 			struct misc_struct *misc_vars,
+ 			struct error_val_field *error_values,
+ 			const Gamma *gamma,
+-			FILE * prn_stream));
++			FILE * prn_stream);
+ 			
+ private void
+-     do_gamma(P3(float mastergamma, float gammaval, byte * values));
++     do_gamma(float mastergamma, float gammaval, byte * values);
+      
+ private void
+-     do_black_correction(P2(float kvalue, int *kcorrect));
++     do_black_correction(float kvalue, int *kcorrect);
+ 
+ private void
+-     init_data_structure(P3(gx_device_printer * pdev,
++     init_data_structure(gx_device_printer * pdev,
+ 			    struct ptr_arrays *data_ptrs,
+-			    struct misc_struct *misc_vars));
++			    struct misc_struct *misc_vars);
+ 			    
+ private void
+-     calculate_memory_size(P2(gx_device_printer * pdev,
+-			      struct misc_struct *misc_vars));
++     calculate_memory_size(gx_device_printer * pdev,
++			      struct misc_struct *misc_vars);
+ 
+ 
+ /* assign_dpi:  
+@@ -2292,12 +2292,13 @@
+ /* gdev_cmyk_map_cmyk_color: 
+ ----------------------------------------------------------------------------------*/
+ private gx_color_index gdev_cmyk_map_cmyk_color(gx_device 			*pdev,
+-																								gx_color_value 	cyan, 
+-																								gx_color_value 	magenta,
+-																								gx_color_value 	yellow,
+-																								gx_color_value 	black)
++																								const gx_color_value 	cv[])
+ {
+ 	gx_color_index color;
++	gx_color_value cyan = cv[0];
++	gx_color_value magenta = cv[1];
++	gx_color_value yellow = cv[2];
++	gx_color_value black = cv[3];
+ 
+ 	switch (pdev->color_info.depth) {
+ 		case 1:
+@@ -2331,10 +2332,11 @@
+ /* gdev_cmyk_map_rgb_color: Mapping of RGB colors to gray values. 
+ ----------------------------------------------------------------------------------*/
+ private gx_color_index gdev_cmyk_map_rgb_color(	gx_device 			*pdev, 
+-																								gx_color_value 	r, 
+-																								gx_color_value 	g, 
+-																								gx_color_value 	b)
++																								const gx_color_value 	cv[])
+ {
++	gx_color_value r = cv[0];
++	gx_color_value g = cv[1];
++	gx_color_value b = cv[2];
+ 	if (gx_color_value_to_byte(r & g & b) == 0xff) {
+ 		return (gx_color_index) 0;	/* White */
+ 	} else {
+@@ -2427,10 +2429,11 @@
+ /* gdev_pcl_map_rgb_color: 
+ ----------------------------------------------------------------------------------*/
+ private gx_color_index gdev_pcl_map_rgb_color(	gx_device 			*pdev, 
+-																								gx_color_value 	r,
+-																								gx_color_value 	g, 
+-																								gx_color_value 	b)
++																								const gx_color_value 	cv[])
+ {
++	gx_color_value r = cv[0];
++	gx_color_value g = cv[1];
++	gx_color_value b = cv[2];
+ 	if (gx_color_value_to_byte(r & g & b) == 0xff)
+ 		return (gx_color_index) 0;	/* white */
+ 	else {
diff --git a/print/ghostscript-gpl/files/patch-src:gdevdmpr.c b/print/ghostscript-gpl/files/patch-src:gdevdmpr.c
index 05e3bb12dc13..47e980154ccd 100644
--- a/print/ghostscript-gpl/files/patch-src:gdevdmpr.c
+++ b/print/ghostscript-gpl/files/patch-src:gdevdmpr.c
@@ -1,5 +1,32 @@
 --- src/gdevdmpr.c.orig	Tue May 13 20:43:37 1997
-+++ src/gdevdmpr.c	Tue Apr  2 01:16:25 2002
++++ src/gdevdmpr.c	Sun Nov 10 21:19:41 2002
+@@ -41,7 +41,7 @@
+ /* include library header. */
+ #include "dviprlib.h"
+ 
+-extern FILE *lib_fopen(P1(const char *));
++extern FILE *lib_fopen(const char *);
+ 
+ #define LOCAL_DEBUG 0
+ 
+@@ -87,12 +87,12 @@
+ private dev_proc_close_device(gdev_dmprt_close);
+ 
+ /* declarations of sub functions to get printer properties. */
+-private void gdev_dmprt_init_printer_props(P1(gx_device_dmprt *));
+-private int gdev_dmprt_get_printer_props(P2(gx_device_dmprt *,char *));
+-private int gdev_dmprt_check_code_props(P2(byte * ,int ));
+-private FILE *gdev_dmprt_dviprt_lib_fopen(P2(const char *,char *));
++private void gdev_dmprt_init_printer_props(gx_device_dmprt *);
++private int gdev_dmprt_get_printer_props(gx_device_dmprt *,char *);
++private int gdev_dmprt_check_code_props(byte * ,int );
++private FILE *gdev_dmprt_dviprt_lib_fopen(const char *,char *);
+ 
+-private int gdev_dmprt_error_no_dviprt_to_gs(P1(int ));
++private int gdev_dmprt_error_no_dviprt_to_gs(int );
+ 
+ /* The device descriptor */
+ gx_device_procs prn_dmprt_procs = {
 @@ -846,7 +846,7 @@
      if (env) {
        strcpy(fname,env);
diff --git a/print/ghostscript-gpl/files/patch-src:gdevgdi.c b/print/ghostscript-gpl/files/patch-src:gdevgdi.c
new file mode 100644
index 000000000000..f59111ee2591
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevgdi.c
@@ -0,0 +1,15 @@
+--- src/gdevgdi.c.orig	Wed Jun 19 19:32:49 2002
++++ src/gdevgdi.c	Sun Nov 10 22:37:00 2002
+@@ -86,9 +86,9 @@
+ 
+ int GDI_BAND_WIDTH[] = {4768, 4928};
+ 
+-private int gdi_print_page(P2(gx_device_printer *pdev, FILE *prn_stream));
+-private int gdi_open(P1(gx_device *pdev));
+-private int gdi_close(P1(gx_device *pdev));
++private int gdi_print_page(gx_device_printer *pdev, FILE *prn_stream);
++private int gdi_open(gx_device *pdev);
++private int gdi_close(gx_device *pdev);
+ 
+ /* The device descriptors */
+ private dev_proc_open_device(gdi_open);
diff --git a/print/ghostscript-gpl/files/patch-src:gdevifno.c b/print/ghostscript-gpl/files/patch-src:gdevifno.c
new file mode 100644
index 000000000000..b3bc447dd27a
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevifno.c
@@ -0,0 +1,15 @@
+--- src/gdevifno.c.orig	Sun Jun 16 14:48:55 2002
++++ src/gdevifno.c	Sun Nov 10 22:49:32 2002
+@@ -99,8 +99,10 @@
+  * rgb and color map entries
+  */
+ private gx_color_index 
+-inferno_rgb2cmap(gx_device *dev, gx_color_value red,
+-  gx_color_value green, gx_color_value blue) {
++inferno_rgb2cmap(gx_device *dev, const gx_color_value cv[]) {
++	gx_color_value red = cv[0];
++	gx_color_value green = cv[1];
++	gx_color_value blue = cv[2];
+ 	int shift;
+ 	inferno_device *bdev = (inferno_device*) dev;
+ 	int nbits = bdev->nbits;
diff --git a/print/ghostscript-gpl/files/patch-src:gdevmgr.c b/print/ghostscript-gpl/files/patch-src:gdevmgr.c
new file mode 100644
index 000000000000..8f2dc4028c34
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevmgr.c
@@ -0,0 +1,17 @@
+--- src/gdevmgr.c.orig	Sun Jun 16 14:48:55 2002
++++ src/gdevmgr.c	Sun Nov 10 22:52:19 2002
+@@ -364,9 +364,11 @@
+ /* (1/6, 1/2, and 5/6), instead of the obvious 8x8x4. */
+ 
+ gx_color_index
+-mgr_8bit_map_rgb_color(gx_device *dev, gx_color_value r, gx_color_value g,
+-  gx_color_value b)
+-{	uint rv = r / (gx_max_color_value / 7 + 1);
++mgr_8bit_map_rgb_color(gx_device *dev, const gx_color_value cv[])
++{	gx_color_value r = cv[0];
++	gx_color_value g = cv[1];
++	gx_color_value b = cv[2];
++	uint rv = r / (gx_max_color_value / 7 + 1);
+ 	uint gv = g / (gx_max_color_value / 7 + 1);
+ 	uint bv = b / (gx_max_color_value / 7 + 1);
+ 	return (gx_color_index)
diff --git a/print/ghostscript-gpl/files/patch-src:gdevsgi.c b/print/ghostscript-gpl/files/patch-src:gdevsgi.c
new file mode 100644
index 000000000000..96d3891fc9e5
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevsgi.c
@@ -0,0 +1,16 @@
+--- src/gdevsgi.c.orig	Fri Feb 22 07:24:52 2002
++++ src/gdevsgi.c	Sun Nov 10 22:55:30 2002
+@@ -32,8 +32,11 @@
+   sgi_prn_device(sgi_procs, "sgirgb", 3, 24, 255, 255, sgi_print_page);
+ 
+ private gx_color_index
+-sgi_map_rgb_color(gx_device *dev, ushort r, ushort g, ushort b)
+-{      ushort bitspercolor = dev->color_info.depth / 3;
++sgi_map_rgb_color(gx_device *dev, const ushort cv[])
++{      ushort r = cv[0];
++       ushort g = cv[1];
++       ushort b = cv[2];
++       ushort bitspercolor = dev->color_info.depth / 3;
+        ulong max_value = (1 << bitspercolor) - 1;
+        return ((r*max_value / gx_max_color_value) << (bitspercolor * 2)) +
+ 	      ((g*max_value / gx_max_color_value) << bitspercolor) +
diff --git a/print/ghostscript-gpl/files/patch-src:gxobj.h b/print/ghostscript-gpl/files/patch-src:gxobj.h
new file mode 100644
index 000000000000..e3dca6b573f6
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gxobj.h
@@ -0,0 +1,17 @@
+--- src/gxobj.h.orig	Fri Feb 22 07:24:53 2002
++++ src/gxobj.h	Fri Dec 20 22:56:03 2002
+@@ -103,10 +103,14 @@
+  * required by the hardware, regardless of the value of obj_align_mod.
+  * See gsmemraw.h for more information about this.
+  */
++#if !defined(__ia64__)
+ #define obj_align_mod\
+   (((arch_align_memory_mod - 1) |\
+     (align_bitmap_mod - 1) |\
+     (obj_back_scale - 1)) + 1)
++#else
++#define obj_align_mod 16
++#endif
+ /* The only possible values for obj_align_mod are 4, 8, or 16.... */
+ #if obj_align_mod == 4
+ #  define log2_obj_align_mod 2
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
index c27a7c5e6610..0ef8d446ab00 100644
--- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -1,6 +1,6 @@
---- src/unix-gcc.mak.orig	Fri Feb  1 15:27:58 2002
-+++ src/unix-gcc.mak	Fri Jun  7 05:20:39 2002
-@@ -26,14 +26,15 @@
+--- src/unix-gcc.mak.orig	Thu Oct 24 21:57:57 2002
++++ src/unix-gcc.mak	Sun Nov 17 22:01:58 2002
+@@ -24,14 +24,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
  
@@ -24,39 +24,31 @@
  
  # Do not edit the next group of lines.
  
-@@ -52,11 +53,10 @@
+@@ -50,11 +51,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)
++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
  
 -prefix = /usr/local
-+prefix = $(PREFIX)
++prefix = ${PREFIX}
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -137,7 +137,7 @@
- # You may need to change this if the IJG library version changes.
- # See jpeg.mak for more information.
+@@ -143,7 +143,7 @@
+ # some older JPEG streams that violate the standard. If the JPEG
+ # library built from local sources, the patch will be applied.
  
--JSRCDIR=jpeg
-+JSRCDIR=${.CURDIR}/jpeg
- JVERSION=6
+-SHARE_JPEG=0
++SHARE_JPEG=1
+ JPEG_NAME=jpeg
  
- # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
-@@ -157,14 +157,14 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${LOCALBASE}/include
- PVERSION=10201
- 
- # Choose whether to use a shared version of the PNG library, and if so,
+ # Define the directory where the PNG library sources are stored,
+@@ -158,7 +158,7 @@
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -65,7 +57,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -176,7 +176,7 @@
+@@ -170,7 +170,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -74,7 +66,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -203,7 +203,7 @@
+@@ -197,7 +197,7 @@
  
  # Define the name of the C compiler.
  
@@ -83,12 +75,12 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -220,9 +220,9 @@
+@@ -214,9 +214,9 @@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
 -CFLAGS_STANDARD=-O2
--CFLAGS_DEBUG=-g -O
+-CFLAGS_DEBUG=-g -O0
 -CFLAGS_PROFILE=-pg -O2
 +CFLAGS_STANDARD?=-O2
 +CFLAGS_DEBUG=-g
@@ -96,25 +88,25 @@
  CFLAGS_SO=-fPIC
  
  # Define the other compilation flags.  Add at most one of the following:
-@@ -236,7 +236,7 @@
+@@ -230,7 +230,7 @@
  # We don't include -ansi, because this gets in the way of the platform-
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+XCFLAGS+=-I${.CURDIR}/gimp-print
++XCFLAGS+=-I${LOCALBASE}/include
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -247,7 +247,7 @@
+@@ -241,7 +241,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${.CURDIR}/gimp-print -L${LOCALBASE}/lib
++XLDFLAGS=-L${LOCALBASE}/lib
  
- LDFLAGS=$(XLDFLAGS) -fno-common
+ LDFLAGS=$(XLDFLAGS)
  
-@@ -280,7 +280,7 @@
+@@ -274,7 +274,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -123,7 +115,7 @@
  
  # 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
-@@ -292,12 +292,12 @@
+@@ -286,12 +286,12 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
diff --git a/print/ghostscript-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index 8c9cd4496d84..122e09a3a7b7 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -7,18 +7,10 @@ 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://members.ozemail.com.au/~geoffk/pdfencrypt/
-	o HP8XX driver for HP DeskJet 880C/882C/895C
-	  - http://www.gelhaus.net/hp880c/
+	o HP2200 driver for HP DeskJet 8xx and Business Inkjet 2200
+	  - http://hp.sourceforge.net/gs-hp2200.php
 	o DJ970 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 Spacial drivers for verious printer models mainly sold in Japan
 	  - Alps, Canon, Epson, NEC, Ricoh,...
 	o Additional contributed uniprint driver profiles for
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 5656e6c852d8..cc9d46f0194b 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -14,7 +14,6 @@ bin/gslp
 bin/gsnd
 %%SHLIB%%bin/gsx
 bin/lprsetup.sh
-bin/pcl3opts
 bin/pdf2dsc
 bin/pdf2ps
 bin/pdfopt
@@ -27,6 +26,7 @@ bin/ps2epsi
 bin/ps2pdf
 bin/ps2pdf12
 bin/ps2pdf13
+bin/ps2pdf14
 bin/ps2pdfwr
 bin/ps2ps
 bin/pv.sh
@@ -46,8 +46,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-651.euc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-651-jp.euc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gdi/README
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
@@ -56,10 +54,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
-%%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
@@ -67,7 +61,6 @@ share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
 share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
 share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
-share/ghostscript/%%GS_VERSION%%/doc/Current.htm
 share/ghostscript/%%GS_VERSION%%/doc/DLL.htm
 share/ghostscript/%%GS_VERSION%%/doc/Develop.htm
 share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
@@ -81,11 +74,9 @@ share/ghostscript/%%GS_VERSION%%/doc/History3.htm
 share/ghostscript/%%GS_VERSION%%/doc/History4.htm
 share/ghostscript/%%GS_VERSION%%/doc/History5.htm
 share/ghostscript/%%GS_VERSION%%/doc/History6.htm
-share/ghostscript/%%GS_VERSION%%/doc/History7.htm
 share/ghostscript/%%GS_VERSION%%/doc/Htmstyle.htm
 share/ghostscript/%%GS_VERSION%%/doc/Humor.htm
 share/ghostscript/%%GS_VERSION%%/doc/Install.htm
-share/ghostscript/%%GS_VERSION%%/doc/Issues.htm
 share/ghostscript/%%GS_VERSION%%/doc/Language.htm
 share/ghostscript/%%GS_VERSION%%/doc/Lib.htm
 share/ghostscript/%%GS_VERSION%%/doc/Maintain.htm
@@ -114,19 +105,16 @@ share/ghostscript/%%GS_VERSION%%/examples/chess.ps
 share/ghostscript/%%GS_VERSION%%/examples/colorcir.ps
 share/ghostscript/%%GS_VERSION%%/examples/doretree.ps
 share/ghostscript/%%GS_VERSION%%/examples/escher.ps
-share/ghostscript/%%GS_VERSION%%/examples/golfer.ps
+share/ghostscript/%%GS_VERSION%%/examples/golfer.eps
 share/ghostscript/%%GS_VERSION%%/examples/grayalph.ps
 share/ghostscript/%%GS_VERSION%%/examples/ridt91.eps
 share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
-share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
+share/ghostscript/%%GS_VERSION%%/examples/tiger.eps
 share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
 share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
-share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
+share/ghostscript/%%GS_VERSION%%/lib/FAPIcidfmap
+share/ghostscript/%%GS_VERSION%%/lib/FAPIconfig
+share/ghostscript/%%GS_VERSION%%/lib/FAPIfontmap
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
 share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
@@ -162,6 +150,7 @@ share/ghostscript/%%GS_VERSION%%/lib/cbjc800.ppd
 share/ghostscript/%%GS_VERSION%%/lib/cdj550.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690ec.upp
+share/ghostscript/%%GS_VERSION%%/lib/cidfmap
 share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/decrypt.ps
 share/ghostscript/%%GS_VERSION%%/lib/dmp_init.ps
@@ -179,24 +168,36 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_ccfnt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ce_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cff.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ciddc.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cidfm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs2.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs3.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmdl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cspace.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_css_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dbt_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_devcs.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_devn.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_devpxl.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_diskf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_diskn.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dpnxt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dps.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dps1.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dps2.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_fapi.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_img.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_indxd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_kanji.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ksb_e.ps
@@ -214,14 +215,17 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_m_m.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_mex_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_mgl_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_mro_e.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_patrn.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_pdf_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_pdfwr.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_pfile.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_rdlin.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_res.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_resmp.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xpm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s_m.xbm
+share/ghostscript/%%GS_VERSION%%/lib/gs_sepr.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_setpd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_statd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_std_e.ps
@@ -333,21 +337,8 @@ share/ghostscript/%%GS_VERSION%%/lib/viewps2a.ps
 share/ghostscript/%%GS_VERSION%%/lib/wftopfa.ps
 share/ghostscript/%%GS_VERSION%%/lib/winmaps.ps
 share/ghostscript/%%GS_VERSION%%/lib/wrfont.ps
+share/ghostscript/%%GS_VERSION%%/lib/xlatmap
 share/ghostscript/%%GS_VERSION%%/lib/zeroline.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/BUGS
-share/ghostscript/%%GS_VERSION%%/pcl3/NEWS
-share/ghostscript/%%GS_VERSION%%/pcl3/README
-share/ghostscript/%%GS_VERSION%%/pcl3/calign.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/dumppdd.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/example.mcf
-share/ghostscript/%%GS_VERSION%%/pcl3/if-pcl3
-share/ghostscript/%%GS_VERSION%%/pcl3/levels-test.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
-share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -517,19 +508,15 @@ share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/fonts
-@dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
-@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gdi
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/epag
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index dad3e9790fe1..932bf56fde92 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -5,274 +5,358 @@
 # configure - gs driver preconfiguration, manual driver selection
 # by Andreas Klemm <andreas@FreeBSD.org>
 
-# driverselection
-/usr/bin/dialog --title "AFPL Ghostscript driver configuration" --clear \
-	--checklist "\n\
+tempfile=`mktemp -t checklist`
+
+if [ -z "${WITHOUT_X11}" ]; then
+x11devs="x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 \
+	x11gray2 x11gray4 x11mono x11rg16x x11rg32x"
+fi
+
+if [ ! -z "${GS_OPTIONS}" ]; then
+	set ${GS_OPTIONS}
+else
+	set \
+		$x11devs \
+		md2k md5k \
+		md50Mono md50Eco md1xMono \
+		appledmp iwhi iwlo iwlq hl7x0 bj10e \
+		bj10v bj10vh bj200 bjc600 bjc800 \
+		bjccmyk bjccolor bjcgray bjcmono \
+		lbp8 \
+		lbp1310 lbp1510 lbp1610 lbp1710 lbp1810 lbp1910 \
+		lips2p lips3 lips4 bjc880j lips4v \
+		m8510 coslw2p coslwxl uniprint \
+		dmprt \
+		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
+		epag \
+		escpage lp2000 \
+		alc8600 alc8500 alc2000 alc4000 \
+		lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \
+		epl5900 epl5800 epl2050 epl2050p epl2120 \
+		lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 lp8100 lp7700 \
+		lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 lp9600 lp8600 \
+		lp1800 \
+		lq850 epsonc \
+		mjc180 mjc360 mjc720 mj500c \
+		st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \
+		djet500c cdjcolor cdjmono cdj500 cdj550 \
+		cdj670 cdj850 cdj880 cdj890 cdj1600 chp2200 cdj970 \
+		laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \
+		cljet5 cljet5c cljet5pr lj5mono lj5gray \
+		pj pjetxl pjxl paintjet \
+		pjxl300 pxlmono pxlcolor \
+		ijs ibmpro jetp3852 imagen fs600 lxm5700m cp50 necp6 \
+		npdl \
+		oce9050 oki182 okiibm atx23 atx24 atx38 r4081 \
+		rpdl \
+		gdi \
+		sj48 t4693d2 t4693d4 t4693d8 tek4696 \
+		bmpmono bmpgray bmp16 bmp256 bmp16m bmp32b bmpsep1 bmpsep8 \
+		ccr \
+		cif \
+		dfaxhigh dfaxlow \
+		xcf xcfcmyk \
+		faxg3 faxg32d faxg4 \
+		miff24 inferno jpeg jpeggray \
+		mgrmono mgrgray2 mgrgray4 mgrgray8 mgr4 mgr8 \
+		pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pdfwrite \
+		psdrgb psdcmyk \
+		bit bitrgb bitcmyk plan9bm pam pbm pbmraw \
+		pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw \
+		pkm pkmraw pksm pksmraw \
+		pngmono pnggray png16 png256 png16m pnga psmono psgray psrgb \
+		pswrite epswrite sgirgb sunhmono \
+		tiffcrle tiffg3 tiffg32d tiffg4 \
+		tiff12nc tiff24nc tifflzw tiffpack \
+		bbox \
+		devicen perm spotrgb spotcmyk
+fi
+
+for i; do
+	eval status_$i=ON
+done
+
+if [ -z "${BATCH}" ]; then
+	/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\
 other programs in the ports collection might need some of the default gs \n\
 file format drivers. The gs5 default drivers are preselected. \n\
 Have fun with this new configuration style !     -andreas \n\n\
-  Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
-  "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 \
-  "md2k"     "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" ON \
-  "md5k"     "ALPS MD-5000 Eco Mode [MD2K]" ON \
-  "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" ON \
-  "md50Eco"  "ALPS MD-5000 Eco Mode [ALPS]" ON \
-  "md1xMono" "ALPS MD-1x00 Monochrome [ALPS]" ON \
-  "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
-  "iwhi"     "Apple Imagewriter, high-resolution mode" OFF \
-  "iwlo"     "Apple Imagewriter, low-resolution mode" OFF \
-  "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
-  "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" OFF \
-  "bj10e"    "Canon BubbleJet BJ-10e" ON \
-  "bj10v"    "Canon BubbleJet BJ-10v [BJ10V]" ON \
-  "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" ON \
-  "bj200"    "Canon BubbleJet BJ-200 and BJC-240(b&w)" ON \
-  "bjc600"   "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" ON \
-  "bjc800"   "Canon Color BubbleJet BJC-240/800" ON \
-  "bjccmyk"  "Canon Color BubbleJet BJC-210/240/250/265/1000 [BJC250]" ON \
-  "bjccolor" "Canon Color BubbleJet BJC-210 ... 1000 truecolor [BJC250]" ON \
-  "bjcgray"  "Canon Color BubbleJet BJC-210 ... 1000 grayscale [BJC250]" ON \
-  "bjcmono"  "Canon Color BubbleJet BJC-210 ... 1000 monochrome [BJC250]" ON \
-  "lbp8"     "Canon LBP-8II laser printer" OFF \
-  "lips2p"   "Canon LIPS II+ [LIPS]" ON \
-  "lips3"    "Canon LIPS III [LIPS]" ON \
-  "lips4"    "Canon LIPS IV [LIPS]" ON \
-  "bjc880j"  "Canon LIPS IVc (BJC-680J/880J) [LIPS]" ON \
-  "lips4v"   "Canon LIPS IV, vector output mode [LIPS]" ON \
-  "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]" OFF \
-  "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
-  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" ON \
-  "lj250"    "DEC LJ250 Companion color printer" OFF \
-  "declj250" "DEC LJ250 driver (alternate)" 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 \
-  "lp8000"   "Epson LP-8000 line printer" OFF \
-  "epag"     "Epson ESC/Page laser printer (generic) [EPAG]" ON \
-  "escpage"  "Epson ESC/Page laser printer (generic) [LIPS]" ON \
-  "lp2000"   "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" ON \
-  "alc8600"  "Epson AL-C8600 color laser printer [EPLASER]" ON \
-  "alc8500"  "Epson AL-C8500 color laser printer [EPLASER]" ON \
-  "alc2000"  "Epson AL-C2000 color laser printer [EPLASER]" ON \
-  "alc4000"  "Epson AL-C4000 color laser printer [EPLASER]" ON \
-  "lp8800c"  "Epson LP-8800C color laser printer [EPLASER]" ON \
-  "lp8300c"  "Epson LP-8300C color laser printer [EPLASER]" ON \
-  "lp8500c"  "Epson LP-8500C color laser printer [EPLASER]" ON \
-  "lp3000c"  "Epson LP-3000C color laser printer [EPLASER]" ON \
-  "lp8200c"  "Epson LP-8200C color laser printer [EPLASER]" ON \
-  "lp8000c"  "Epson LP-8000C color laser printer [EPLASER]" ON \
-  "epl5900"  "Epson EPL-5900 laser printer [EPLASER]" ON \
-  "epl5800"  "Epson EPL-5800 laser printer [EPLASER]" ON \
-  "epl2050"  "Epson EPL-N2050 laser printer [EPLASER]" ON \
-  "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" ON \
-  "epl2120"  "Epson EPL-N2120 laser printer [EPLASER]" ON \
-  "lp7500"   "Epson LP-7500(R) laser printer [EPLASER]" ON \
-  "lp2400"   "Epson LP-2400 laser printer [EPLASER]" ON \
-  "lp2200"   "Epson LP-2200 laser printer [EPLASER]" ON \
-  "lp9400"   "Epson LP-9400(R) laser printer [EPLASER]" ON \
-  "lp8900"   "Epson LP-8900(R) laser printer [EPLASER]" ON \
-  "lp8700"   "Epson LP-8700(R) laser printer [EPLASER]" ON \
-  "lp8100"   "Epson LP-8100(R) laser printer [EPLASER]" ON \
-  "lp7700"   "Epson LP-7700(R) laser printer [EPLASER]" ON \
-  "lp8600f"  "Epson LP-8600FX(N) laser printer [EPLASER]" ON \
-  "lp8400f"  "Epson LP-8400FX(N) laser printer [EPLASER]" ON \
-  "lp8300f"  "Epson LP-8300F laser printer [EPLASER]" ON \
-  "lp1900"   "Epson LP-1900(N) laser printer [EPLASER]" ON \
-  "lp9600s"  "Epson LP-9600S laser printer [EPLASER]" ON \
-  "lp9300"   "Epson LP-9300 laser printer [EPLASER]" ON \
-  "lp9600"   "Epson LP-9600 laser printer [EPLASER]" ON \
-  "lp8600"   "Epson LP-8600FX(N) laser printer [EPLASER]" ON \
-  "lp1800"   "Epson LP-1800 laser printer [EPLASER]" ON \
-  "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \
-  "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
-  "mjc180"   "Epson MachJet series 180dpi, CMYK [MJC]" ON \
-  "mjc360"   "Epson MachJet series 360dpi, CMYK [MJC]" ON \
-  "mjc720"   "Epson MachJet series 720dpi, CMYK [MJC]" ON \
-  "mj500c"   "Epson MachJet MJ-500C 360dpi, CMY or mono [MJC]" ON \
-  "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 \
-  "djet500"  "HP DeskJet 500 (for DeskJet 600 use -r600)" ON \
-  "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
-  "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
-  "cdjcolor" "HP DeskJet 500C/540C, 24bit/pxl+FS dith, Citizen Projet IIc" ON \
-  "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 \
-  "cdj670"   "HP DeskJet 670/690 [HP8XX]" ON \
-  "cdj850"   "HP DeskJet 850/855/870/1100 [HP8XX]" ON \
-  "cdj880"   "HP DeskJet 880 [HP8XX]" ON \
-  "cdj890"   "HP DeskJet 890 [HP8XX]" ON \
-  "cdj1600"  "HP DeskJet 1600 [HP8XX]" ON \
-  "cdj970"   "HP DeskJet 970CXi [DJ970]" ON \
-  "laserjet" "HP LaserJet" ON \
-  "ljetplus" "HP LaserJet Plus" ON \
-  "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
-  "ljet3"    "HP LaserJet III* with Delta Row compression" ON \
-  "ljet3d"   "HP LaserJet IIID with duplex capability" ON \
-  "ljet4"    "HP LaserJet 4 and 5L/5P (not real LJ5), defaults to 600 dpi" ON \
-  "ljet4d"   "HP LaserJet 4 (defaults to 600 dpi) with duplex" ON \
-  "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
-  "cljet5"   "HP LaserJet 5/5M Color (new driver, old=cljet5pr)" ON \
-  "cljet5c"  "HP LaserJet 5/5M Color Simple" ON \
-  "cljet5pr" "HP LaserJet 5/5M Color (old drv. with rotation hacks/flaws)" ON \
-  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
-  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
-  "pj"       "HP PaintJet XL driver " ON \
-  "pjetxl"   "HP PaintJet XL driver (alternate)" OFF \
-  "pjxl"     "HP PaintJet XL color printer" ON \
-  "paintjet" "HP PaintJet color printer (alternate)" OFF \
-  "pjxl300"  "HP PaintJet XL300, 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 (Color LaserJet 4500/5000)" ON \
-  "pcl3"     "HP PCL 3+ (generic) [PCL3]" ON \
-  "hpdj"     "HP PCL 3+ (old drv.) [HPDJ]" ON \
-  "ijs"      "HP Inkjet and other raster devices" 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 PinWriter P6/P6+/P60, 360x360 DPI resol" OFF \
-  "npdl"     "NEC Printer Description Language [NPDL]" ON \
-  "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 \
-  "rpdl"     "Ricoh Printer Description Language [LIPS]" ON \
-  "gdi"      "Samsung SmartGDI laser printer [GDI]" ON \
-  "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 \
-  "bmp256"   "BMP 8-bit 256-color" ON \
-  "bmp16m"   "BMP 24-bit" ON \
-  "bmp32b"   "BMP 32-bit pseudo-.BMP" ON \
-  "bmpsep1"  "BMP Separated 1-bit CMYK" ON \
-  "bmpsep8"  "BMP Separated 8-bit CMYK" ON \
-  "ccr"      "CalComp Raster format" OFF \
-  "cgmmono"  "CGM Monochrome -- LOW LEVEL OUTPUT ONLY" OFF \
-  "cgm8"     "CGM 8-bit 256-color -- DITTO" OFF \
-  "cgm24"    "CGM 24-bit color -- DITTO" OFF \
-  "cif"      "CIF file format for VLSI" OFF \
-  "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
-  "dfaxlow"  "DigiFAX low (normal) resol" OFF \
-  "faxg3"    "Group 3 fax, with EOLs but no header or EOD" ON \
-  "faxg32d"  "Group 3 2-D fax, with EOLs but no header or EOD" ON \
-  "faxg4"    "Group 4 fax, with EOLs but no header or EOD" ON \
-  "miff24"   "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
-  "inferno"  "Inferno bitmaps" OFF \
-  "jpeg"     "JPEG format, RGB output" ON \
-  "jpeggray" "JPEG format, gray output" ON \
-  "mgrmono"  "MGR devices 1-bit monochrome" OFF \
-  "mgrgray2" "MGR devices 2-bit gray scale" OFF \
-  "mgrgray4" "MGR devices 4-bit gray scale" OFF \
-  "mgrgray8" "MGR devices 8-bit gray scale" OFF \
-  "mgr4"     "MGR devices 4-bit (VGA) color" OFF \
-  "mgr8"     "MGR devices 8-bit color" OFF \
-  "pcxmono"  "PCX file format, monochrome 1-bit b/w" ON \
-  "pcxgray"  "PCX file format, 8-bit gray scale" ON \
-  "pcx16"    "PCX file format, 4-bit planar EGA/VGA color" ON \
-  "pcx256"   "PCX file format, 8-bit chunky color" ON \
-  "pcx24b"   "PCX file format, 24-bit color 3x8-bit planes" ON \
-  "pcxcmyk"  "PCX file format, 4-bit chunky CMYK color" ON \
-  "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
-  "bit"      "Plain bits, monochrome" ON \
-  "bitrgb"   "Plain bits, RGB" ON \
-  "bitcmyk"  "Plain bits, CMYK" ON \
-  "plan9bm"  "Plan 9 bitmap format" OFF \
-  "pbm"      "Portable Bitmap,  plain format" ON \
-  "pbmraw"   "Portable Bitmap,  raw format" ON \
-  "pgm"      "Portable Graymap, plain format" ON \
-  "pgmraw"   "Portable Graymap, raw format" ON \
-  "pgnm"     "Portable Graymap, plain format, optim. to PBM" ON \
-  "pgnmraw"  "Portable Graymap, raw format, optim. to PBM" ON \
-  "pnm"      "Portable Pixmap,  plain format RGB, optim. to PGM/PBM" ON \
-  "pnmraw"   "Portable Pixmap,  raw format RGB, optim. to PGM/PBM" ON \
-  "ppm"      "Portable Pixmap,  plain format RGB" ON \
-  "ppmraw"   "Portable Pixmap,  raw format RGB" ON \
-  "pkm"      "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
-  "pkmraw"   "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
-  "pksm"     "Portable Separated map (plain) (4-bit CMYK => 4 pages)" ON \
-  "pksmraw"  "Portable Separated map (raw) (4-bit CMYK => 4 pages)" ON \
-  "pngmono"  "PNG Monochrome Portable Network Graphics" ON \
-  "pnggray"  "PNG 8-bit gray Portable Network Graphics" ON \
-  "png16"    "PNG 4-bit color Portable Network Graphics" ON \
-  "png256"   "PNG 8-bit color Portable Network Graphics" ON \
-  "png16m"   "PNG 24-bit color Portable Network Graphics" ON \
-  "psmono"   "PostScript (Level 1) monochrome image" ON \
-  "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 \
-  "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 \
-  "tifflzw"  "TIFF LZW,      tag = 5,     mono" ON \
-  "tiffpack" "TIFF PackBits, tag = 32773, mono" ON \
-2> /tmp/checklist.tmp.$$
+  Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9 \
+  "x11"      "X Window System version 11, release >=4" "$status_x11" \
+  "x11alpha" "X Window System masquer. as device with alpha capability" "$status_x11alpha" \
+  "x11cmyk"  "X Window System masquer. as 1-bit-per-plane CMYK device" "$status_x11cmyk" \
+  "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" "$status_x11cmyk2" \
+  "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" "$status_x11cmyk4" \
+  "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" "$status_x11cmyk8" \
+  "x11gray2" "X Window System as a 2-bit gray-scale device" "$status_x11gray2" \
+  "x11gray4" "X Window System as a 4-bit gray-scale device" "$status_x11gray4" \
+  "x11mono"  "X Window System masquer. as black-and-white device" "$status_x11mono" \
+  "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" "$status_x11rg16x" \
+  "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" "$status_x11rg32x" \
+  "md2k"     "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" "$status_md2k" \
+  "md5k"     "ALPS MD-5000 Eco Mode [MD2K]" "$status_md5k" \
+  "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" "$status_md50Mono" \
+  "md50Eco"  "ALPS MD-5000 Eco Mode [ALPS]" "$status_md50Eco" \
+  "md1xMono" "ALPS MD-1x00 Monochrome [ALPS]" "$status_md1xMono" \
+  "appledmp" "Apple Dot Matrix Printer / Imagewriter" "$status_appledmp" \
+  "iwhi"     "Apple Imagewriter, high-resolution mode" "$status_iwhi" \
+  "iwlo"     "Apple Imagewriter, low-resolution mode" "$status_iwlo" \
+  "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \
+  "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \
+  "bj10e"    "Canon BubbleJet BJ-10e" "$status_bj10e" \
+  "bj10v"    "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \
+  "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \
+  "bj200"    "Canon BubbleJet BJ-200 and BJC-240(b&w)" "$status_bj200" \
+  "bjc600"   "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" "$status_bjc600" \
+  "bjc800"   "Canon Color BubbleJet BJC-240/800" "$status_bjc800" \
+  "bjccmyk"  "Canon Color BubbleJet BJC-210/240/250/265/1000 [BJC250]" "$status_bjccmyk" \
+  "bjccolor" "Canon Color BubbleJet BJC-210 ... 1000 truecolor [BJC250]" "$status_bjccolor" \
+  "bjcgray"  "Canon Color BubbleJet BJC-210 ... 1000 grayscale [BJC250]" "$status_bjcgray" \
+  "bjcmono"  "Canon Color BubbleJet BJC-210 ... 1000 monochrome [BJC250]" "$status_bjcmono" \
+  "lbp8"     "Canon LBP-8II laser printer" "$status_lbp8" \
+  "lbp1310"  "Canon LBP-1310 laser printer [CPCA]" "$status_lbp1310" \
+  "lbp1510"  "Canon LBP-1510 laser printer [CPCA]" "$status_lbp1510" \
+  "lbp1610"  "Canon LBP-1610 laser printer [CPCA]" "$status_lbp1610" \
+  "lbp1710"  "Canon LBP-1710 laser printer [CPCA]" "$status_lbp1710" \
+  "lbp1810"  "Canon LBP-1810 laser printer [CPCA]" "$status_lbp1810" \
+  "lbp1910"  "Canon LBP-1910 laser printer [CPCA]" "$status_lbp1910" \
+  "lips2p"   "Canon LIPS II+ [LIPS]" "$status_lips2p" \
+  "lips3"    "Canon LIPS III [LIPS]" "$status_lips3" \
+  "lips4"    "Canon LIPS IV [LIPS]" "$status_lips4" \
+  "bjc880j"  "Canon LIPS IVc (BJC-680J/880J) [LIPS]" "$status_bjc880j" \
+  "lips4v"   "Canon LIPS IV, vector output mode [LIPS]" "$status_lips4v" \
+  "m8510"    "C.Itoh M8510 printer" "$status_m8510" \
+  "coslw2p"  "CoStar LabelWriter II II/Plus" "$status_coslw2p" \
+  "coslwxl"  "CoStar LabelWriter XL" "$status_coslwxl" \
+  "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" "$status_stp" \
+  "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" "$status_uniprint" \
+  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" "$status_dmprt" \
+  "lj250"    "DEC LJ250 Companion color printer" "$status_lj250" \
+  "declj250" "DEC LJ250 driver (alternate)" "$status_declj250" \
+  "ap3250"   "Epson ActionPrinter 3250" "$status_ap3250" \
+  "epson"    "Epson-compatible dot matrix, 9/24-pin" "$status_epson" \
+  "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" "$status_eps9mid" \
+  "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" "$status_eps9high" \
+  "lp8000"   "Epson LP-8000 line printer" "$status_lp8000" \
+  "epag"     "Epson ESC/Page laser printer (generic) [EPAG]" "$status_epag" \
+  "escpage"  "Epson ESC/Page laser printer (generic) [LIPS]" "$status_escpage" \
+  "lp2000"   "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" "$status_lp2000" \
+  "alc8600"  "Epson AL-C8600 color laser printer [EPLASER]" "$status_alc8600" \
+  "alc8500"  "Epson AL-C8500 color laser printer [EPLASER]" "$status_alc8500" \
+  "alc2000"  "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \
+  "alc4000"  "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \
+  "lp8800c"  "Epson LP-8800C color laser printer [EPLASER]" "$status_lp8800c" \
+  "lp8300c"  "Epson LP-8300C color laser printer [EPLASER]" "$status_lp8300c" \
+  "lp8500c"  "Epson LP-8500C color laser printer [EPLASER]" "$status_lp8500c" \
+  "lp3000c"  "Epson LP-3000C color laser printer [EPLASER]" "$status_lp3000c" \
+  "lp8200c"  "Epson LP-8200C color laser printer [EPLASER]" "$status_lp8200c" \
+  "lp8000c"  "Epson LP-8000C color laser printer [EPLASER]" "$status_lp8000c" \
+  "epl5900"  "Epson EPL-5900 laser printer [EPLASER]" "$status_epl5900" \
+  "epl5800"  "Epson EPL-5800 laser printer [EPLASER]" "$status_epl5800" \
+  "epl2050"  "Epson EPL-N2050 laser printer [EPLASER]" "$status_epl2050" \
+  "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \
+  "epl2120"  "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \
+  "lp7500"   "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \
+  "lp2400"   "Epson LP-2400 laser printer [EPLASER]" "$status_lp2400" \
+  "lp2200"   "Epson LP-2200 laser printer [EPLASER]" "$status_lp2200" \
+  "lp9400"   "Epson LP-9400(R) laser printer [EPLASER]" "$status_lp9400" \
+  "lp8900"   "Epson LP-8900(R) laser printer [EPLASER]" "$status_lp8900" \
+  "lp8700"   "Epson LP-8700(R) laser printer [EPLASER]" "$status_lp8700" \
+  "lp8100"   "Epson LP-8100(R) laser printer [EPLASER]" "$status_lp8100" \
+  "lp8600f"  "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600f" \
+  "lp8400f"  "Epson LP-8400FX(N) laser printer [EPLASER]" "$status_lp8400f" \
+  "lp8300f"  "Epson LP-8300F laser printer [EPLASER]" "$status_lp8300f" \
+  "lp1900"   "Epson LP-1900(N) laser printer [EPLASER]" "$status_lp1900" \
+  "lp9600s"  "Epson LP-9600S laser printer [EPLASER]" "$status_lp9600s" \
+  "lp9300"   "Epson LP-9300 laser printer [EPLASER]" "$status_lp9300" \
+  "lp9600"   "Epson LP-9600 laser printer [EPLASER]" "$status_lp9600" \
+  "lp8600"   "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600" \
+  "lp1800"   "Epson LP-1800 laser printer [EPLASER]" "$status_lp1800" \
+  "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" "$status_lq850" \
+  "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" "$status_epsonc" \
+  "mjc180"   "Epson MachJet series 180dpi, CMYK [MJC]" "$status_mjc180" \
+  "mjc360"   "Epson MachJet series 360dpi, CMYK [MJC]" "$status_mjc360" \
+  "mjc720"   "Epson MachJet series 720dpi, CMYK [MJC]" "$status_mjc720" \
+  "mj500c"   "Epson MachJet MJ-500C 360dpi, CMY or mono [MJC]" "$status_mj500c" \
+  "st800"    "Epson Stylus 800 printer" "$status_st800" \
+  "stcolor"  "Epson Stylus Color and II/IIs/1500 (see driver docu)" "$status_stcolor" \
+  "photoex"  "Epson Stylus Color Photo, Photo EX, Photo 700" "$status_photoex" \
+  "lp2563"   "HP 2563B line printer" "$status_lp2563" \
+  "dnj650c"  "HP DesignJet 650C" "$status_dnj650c" \
+  "deskjet"  "HP DeskJet and DeskJet Plus" "$status_deskjet" \
+  "djet500"  "HP DeskJet 500 (for DeskJet 600 use -r600)" "$status_djet500" \
+  "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" "$status_cdeskjet" \
+  "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" "$status_djet500c" \
+  "cdjcolor" "HP DeskJet 500C/540C, 24bit/pxl+FS dith, Citizen Projet IIc" "$status_cdjcolor" \
+  "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" "$status_cdjmono" \
+  "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" "$status_cdj500" \
+  "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" "$status_cdj550" \
+  "cdj670"   "HP DeskJet 670/690 [HP2200]" "$status_cdj670" \
+  "cdj850"   "HP DeskJet 850/855/870/1100 [HP2200]" "$status_cdj850" \
+  "cdj880"   "HP DeskJet 880 [HP2200]" "$status_cdj880" \
+  "cdj890"   "HP DeskJet 890 [HP2200]" "$status_cdj890" \
+  "cdj1600"  "HP DeskJet 1600 [HP2200]" "$status_cdj1600" \
+  "chp2200"  "HP Buisiness Inkjet 2200 [HP2200]" "$status_chp2200" \
+  "cdj970"   "HP DeskJet 970CXi [DJ970]" "$status_cdj970" \
+  "laserjet" "HP LaserJet" "$status_laserjet" \
+  "ljetplus" "HP LaserJet Plus" "$status_ljetplus" \
+  "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" "$status_ljet2p" \
+  "ljet3"    "HP LaserJet III* with Delta Row compression" "$status_ljet3" \
+  "ljet3d"   "HP LaserJet IIID with duplex capability" "$status_ljet3d" \
+  "ljet4"    "HP LaserJet 4 and 5L/5P (not real LJ5), defaults to 600 dpi" "$status_ljet4" \
+  "ljet4d"   "HP LaserJet 4 (defaults to 600 dpi) with duplex" "$status_ljet4d" \
+  "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" "$status_lj4dith" \
+  "cljet5"   "HP LaserJet 5/5M Color (new driver, old=cljet5pr)" "$status_cljet5" \
+  "cljet5c"  "HP LaserJet 5/5M Color Simple" "$status_cljet5c" \
+  "cljet5pr" "HP LaserJet 5/5M Color (old drv. with rotation hacks/flaws)" "$status_cljet5pr" \
+  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" "$status_lj5mono" \
+  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" "$status_lj5gray" \
+  "pj"       "HP PaintJet XL driver " "$status_pj" \
+  "pjetxl"   "HP PaintJet XL driver (alternate)" "$status_pjetxl" \
+  "pjxl"     "HP PaintJet XL color printer" "$status_pjxl" \
+  "paintjet" "HP PaintJet color printer (alternate)" "$status_paintjet" \
+  "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" "$status_pjxl300" \
+  "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" "$status_pxlmono" \
+  "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" "$status_pxlcolor" \
+  "pcl3"     "HP PCL 3+ (generic) [PCL3]" "$status_pcl3" \
+  "hpdj"     "HP PCL 3+ (old drv.) [HPDJ]" "$status_hpdj" \
+  "ijs"      "HP Inkjet and other raster devices" "$status_ijs" \
+  "ibmpro"   "IBM 9-pin Proprinter" "$status_ibmpro" \
+  "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" "$status_jetp3852" \
+  "imagen"   "Imagen ImPress printers" "$status_imagen" \
+  "fs600"    "Kyocera FS-600 (600 dpi)" "$status_fs600" \
+  "lxm5700m" "Lexmark 5700 monotone" "$status_lxm5700m" \
+  "cp50"     "Mitsubishi CP50 color" "$status_cp50" \
+  "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" "$status_necp6" \
+  "npdl"     "NEC Printer Description Language [NPDL]" "$status_npdl" \
+  "oce9050"  "OCE 9050 printer" "$status_oce9050" \
+  "oki182"   "Okidata MicroLine 182" "$status_oki182" \
+  "okiibm"   "Okidata MicroLine IBM-compatible printers" "$status_okiibm" \
+  "atx23"    "Practical Automation ATX-23 label printer" "$status_atx23" \
+  "atx24"    "Practical Automation ATX-24 label printer" "$status_atx24" \
+  "atx38"    "Practical Automation ATX-38 label printer" "$status_atx38" \
+  "r4081"    "Ricoh 4081 laser printer" "$status_r4081" \
+  "rpdl"     "Ricoh Printer Description Language [LIPS]" "$status_rpdl" \
+  "gdi"      "Samsung SmartGDI laser printer [GDI]" "$status_gdi" \
+  "sj48"     "StarJet 48 inkjet printer" "$status_sj48" \
+  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" "$status_t4693d2" \
+  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" "$status_t4693d4" \
+  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" "$status_t4693d8" \
+  "tek4696"  "Tektronix 4695/4696 inkjet plotter" "$status_tek4696" \
+  "bmpmono"  "BMP Monochrome" "$status_bmpmono" \
+  "bmpgray"  "BMP 8-bit gray" "$status_bmpgray" \
+  "bmp16"    "BMP 4-bit EGA/VGA" "$status_bmp16" \
+  "bmp256"   "BMP 8-bit 256-color" "$status_bmp256" \
+  "bmp16m"   "BMP 24-bit" "$status_bmp16m" \
+  "bmp32b"   "BMP 32-bit pseudo-.BMP" "$status_bmp32b" \
+  "bmpsep1"  "BMP Separated 1-bit CMYK" "$status_bmpsep1" \
+  "bmpsep8"  "BMP Separated 8-bit CMYK" "$status_bmpsep8" \
+  "ccr"      "CalComp Raster format" "$status_ccr" \
+  "cgmmono"  "CGM Monochrome -- LOW LEVEL OUTPUT "$status_"LY" "$status_cgmmono" \
+  "cgm8"     "CGM 8-bit 256-color -- DITTO" "$status_cgm8" \
+  "cgm24"    "CGM 24-bit color -- DITTO" "$status_cgm24" \
+  "cif"      "CIF file format for VLSI" "$status_cif" \
+  "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" "$status_dfaxhigh" \
+  "dfaxlow"  "DigiFAX low (normal) resol" "$status_dfaxlow" \
+  "xcf"      "Gimp XCF, RGB" "$status_xcf" \
+  "xcfcmyk"  "Gimp XCF, CMYK" "$status_xcfcmyk" \
+  "faxg3"    "Group 3 fax, with EOLs but no header or EOD" "$status_faxg3" \
+  "faxg32d"  "Group 3 2-D fax, with EOLs but no header or EOD" "$status_faxg32d" \
+  "faxg4"    "Group 4 fax, with EOLs but no header or EOD" "$status_faxg4" \
+  "miff24"   "ImageMagick MIFF, 24-bit direct color, RLE compressed" "$status_miff24" \
+  "inferno"  "Inferno bitmaps" "$status_inferno" \
+  "jpeg"     "JPEG format, RGB output" "$status_jpeg" \
+  "jpeggray" "JPEG format, gray output" "$status_jpeggray" \
+  "mgrmono"  "MGR devices 1-bit monochrome" "$status_mgrmono" \
+  "mgrgray2" "MGR devices 2-bit gray scale" "$status_mgrgray2" \
+  "mgrgray4" "MGR devices 4-bit gray scale" "$status_mgrgray4" \
+  "mgrgray8" "MGR devices 8-bit gray scale" "$status_mgrgray8" \
+  "mgr4"     "MGR devices 4-bit (VGA) color" "$status_mgr4" \
+  "mgr8"     "MGR devices 8-bit color" "$status_mgr8" \
+  "pcxmono"  "PCX file format, monochrome 1-bit b/w" "$status_pcxmono" \
+  "pcxgray"  "PCX file format, 8-bit gray scale" "$status_pcxgray" \
+  "pcx16"    "PCX file format, 4-bit planar EGA/VGA color" "$status_pcx16" \
+  "pcx256"   "PCX file format, 8-bit chunky color" "$status_pcx256" \
+  "pcx24b"   "PCX file format, 24-bit color 3x8-bit planes" "$status_pcx24b" \
+  "pcxcmyk"  "PCX file format, 4-bit chunky CMYK color" "$status_pcxcmyk" \
+  "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" "$status_pdfwrite" \
+  "psdrgb"   "PhotoShop PSD, RGB" "$status_psdrgb" \
+  "psdcmyk"  "PhotoShop PSD, CMYK" "$status_psdcmyk" \
+  "bit"      "Plain bits, monochrome" "$status_bit" \
+  "bitrgb"   "Plain bits, RGB" "$status_bitrgb" \
+  "bitcmyk"  "Plain bits, CMYK" "$status_bitcmyk" \
+  "plan9bm"  "Plan 9 bitmap format" "$status_plan9bm" \
+  "pam"      "Portable Arbitrary Map file format" "$status_pam" \
+  "pbm"      "Portable Bitmap,  plain format" "$status_pbm" \
+  "pbmraw"   "Portable Bitmap,  raw format" "$status_pbmraw" \
+  "pgm"      "Portable Graymap, plain format" "$status_pgm" \
+  "pgmraw"   "Portable Graymap, raw format" "$status_pgmraw" \
+  "pgnm"     "Portable Graymap, plain format, optim. to PBM" "$status_pgnm" \
+  "pgnmraw"  "Portable Graymap, raw format, optim. to PBM" "$status_pgmraw" \
+  "pnm"      "Portable Pixmap,  plain format RGB, optim. to PGM/PBM" "$status_pnm" \
+  "pnmraw"   "Portable Pixmap,  raw format RGB, optim. to PGM/PBM" "$status_pnmraw" \
+  "ppm"      "Portable Pixmap,  plain format RGB" "$status_ppm" \
+  "ppmraw"   "Portable Pixmap,  raw format RGB" "$status_ppmraw" \
+  "pkm"      "Portable inKmap (plain format) (4-bit CMYK => RGB)" "$status_pkm" \
+  "pkmraw"   "Portable inKmap (raw format) (4-bit CMYK => RGB)" "$status_pkmraw" \
+  "pksm"     "Portable Separated map (plain) (4-bit CMYK => 4 pages)" "$status_pksm" \
+  "pksmraw"  "Portable Separated map (raw) (4-bit CMYK => 4 pages)" "$status_pksmraw" \
+  "pngmono"  "PNG Monochrome Portable Network Graphics" "$status_pngmono" \
+  "pnggray"  "PNG 8-bit gray Portable Network Graphics" "$status_pnggray" \
+  "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
+  "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
+  "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
+  "pnga"     "PNG with transparency" "$status_pnga" \
+  "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
+  "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
+  "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \
+  "pswrite"  "PostScript output (like PostScript Distillery)" "$status_pswrite" \
+  "epswrite" "EPS output (like PostScript Distillery)" "$status_epswrite" \
+  "sgirgb"   "SGI RGB pixmap format" "$status_sgirgb" \
+  "sunhmono" "Harlequin variant of 1-bit Sun raster file" "$status_sunhmono" \
+  "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" "$status_tiffcrle" \
+  "tiffg3"   "TIFF Group 3 fax with EOLs" "$status_tiffg3" \
+  "tiffg32d" "TIFF Group 3 2-D fax" "$status_tiffg32d" \
+  "tiffg4"   "TIFF Group 4 fax" "$status_tiffg4" \
+  "tiff12nc" "TIFF 12-bit RGB, no compression" "$status_tiff12nc" \
+  "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" "$status_tiff24nc" \
+  "tifflzw"  "TIFF LZW,      tag = 5,     mono" "$status_tifflzw" \
+  "tiffpack" "TIFF PackBits, tag = 32773, mono" "$status_tiffpack" \
+  "bbox"     "Bounding box output" "$status_bbox" \
+  "devicen"  "DeviceN process color model device" "$status_devicen" \
+  "perm"     "DeviceN which permutes color components" "$status_perm" \
+  "spotrgb"  "DeviceN with RGB and spot color support" "$status_spotrgb" \
+  "spotcmyk" "DeviceN with CMYK and spot color support" "$status_spotcmyk" \
+2> $tempfile
+
+	retval=$?
+
+	if [ -s $tempfile ]; then
+		set `sed 's/"//g' $tempfile`
+	fi
+	rm -f $tempfile
 
-retval=$?
+	case $retval in
+		0)	if [ -z "$*" ]; then
+				echo "Nothing selected"
+			fi
+			;;
+		1)	echo "Cancel pressed."
+			exit 1
+			;;
+	esac
+fi
 
-choice=`cat /tmp/checklist.tmp.$$`
-rm -f /tmp/checklist.tmp.$$
+exec > ${WRKSRC}/Makefile
 
-case $retval in
-	0)	if [ -z "$choice" ]; then
-			echo "Nothing selected"
-			exit 1;
-		fi
-		;;
-	1)	echo "Cancel pressed."
-		exit 1
-		;;
-esac
+echo "DEVICE_DEVS=	\\"
 
-# bring it into the right format with '.dev' appended to each driver name
-#old:
-#echo "DEVICE_DEVS=$choice" \
-#	| sed -e "s/\"//g" \
-#	| sed -e "s/ /.dev /g" \
-#	| sed -e "s/$/.dev/g" \
-#	> ${WRKSRC}/src/unix-gcc.mak.new
-# XXX new:
-echo "DEVICE_DEVS=$choice" \
-	| perl -pe 's|"([A-Za-z0-9]+)"|\$(DD)\1.dev|g' \
-	> ${WRKSRC}/src/unix-gcc.mak.new
+for i; do
+	echo "	\$(DD)$i.dev	\\"
+done
 
-# create one new Makefile, where DEVICE_DEVS contains all wanted devices
-sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
-	>> ${WRKSRC}/src/unix-gcc.mak.new
-mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak
+echo ""
+cat "${WRKSRC}/src/unix-gcc.mak"
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
deleted file mode 100644
index d60e681b0bdb..000000000000
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD$
-
-# configure.batch - gs driver preconfiguration, batch mode
-# by Andreas Klemm <andreas@FreeBSD.org>
-
-cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-ifndef WITHOUT_X11
-DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
-endif
-
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)bjccmyk.dev \$(DD)bjccolor.dev \$(DD)bjcgray.dev \$(DD)bjcmono.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)alc8600.dev \$(DD)alc8500.dev \$(DD)alc2000.dev \$(DD)alc4000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)epl5900.dev \$(DD)epl5800.dev \$(DD)epl2050.dev \$(DD)epl2050p.dev \$(DD)epl2120.dev \$(DD)lp7500.dev \$(DD)lp2400.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8900.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp7700.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp9600.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.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)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev
-
-DEVICE_DEVS+= \$(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)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
-sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
-	>> ${WRKSRC}/src/unix-gcc.mak.new
-mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak