- added stable version 4.0.4 of gimp-print (stp) driver

  high quality drivers for Epsons, HPs, ...
- bumped port revision
- modified all target and added a makefile component to build
  tool from stp driver (escputil) to do maintenance on epsons
  install manpage as well
- variable name changes, new scheme sounds better
- use variables as often as possible in all make targets
  to reduce port maintenance as much as possible
- fix two copy and paste mistakes in echo messages
- updated pkg_plist, tested port and package building
  as well as removal
- modified configure.batch to build stp driver

20 files changed, 344 insertions, 144 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 33a5566f338e..a70a929fd539 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -14,6 +15,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
 	http://www.harsch.net/Download/ \
 	http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
 	http://download.sourceforge.net/ghostscript/ \
 	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
@@ -27,7 +29,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 # note: russian mirror isn't up to date
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV} ${PCL3_SRC} \
-		${HP970_DRV}
+		${HP970_DRV} ${GPRINT_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	andreas@FreeBSD.org
@@ -36,7 +38,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
-ALL_TARGET=	all pcl3opts
+ALL_TARGET=	all pcl3opts escputil
 USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -47,7 +49,7 @@ MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
 		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
 		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1
+		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -66,24 +68,33 @@ HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
 # ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
-HPDJ_NAME=	hpdj
+HPDJ=		hpdj
 HPDJ_VERS=	2.6
-HPDJ_DIR=	${HPDJ_NAME}-${HPDJ_VERS}
-HPDJ_SRC=	${HPDJ_NAME}-${HPDJ_VERS}.tar.gz
+HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
+HPDJ_SRC=	${HPDJ_NAME}.tar.gz
 HPDJ_MAN1=	gs-hpdj.1
 
 # PCL3 (hpdj successor in BETA state)
 # additional driver for HP PCL3 Printers, by Martin Lottermoser
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
-PCL3_NAME=	pcl3
+PCL3=		pcl3
 PCL3_VERS=	3.0.2
-PCL3_DIR=	${PCL3_NAME}-${PCL3_VERS}
-PCL3_SRC=	${PCL3_NAME}-${PCL3_VERS}.tar.gz
+PCL3_NAME=	${PCL3}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
 # additional driver for HP DeskJet 970, supports duplex printing
 HP970_DRV=	gdevdj9.c.gz
 
+# gimp-print - very high quality driver for Epson, HPs,...
+# http://sourceforge.net/projects/gimp-print/
+GPRINT=		print
+GPRINT_DESC=	gimp-${GPRINT}
+GPRINT_VERS=	4.0.4
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_MAN1=	escputil.1
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -116,43 +127,56 @@ post-extract:
 	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKDIR} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKDIR}/${HPDJ_DIR}/${HPDJ_NAME}.tar
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
+	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	@${ECHO} ">>>   extracting ${PCL3_SRC} ..."
 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_DIR} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_DIR} -xf \
-		${WRKSRC}/${PCL3_DIR}/${PCL3_NAME}.tar
+	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
+	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   extracting ${HP970_DRV} ..."
 	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
 	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for gimp-print
+	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
 
 # here we apply unofficial patches from 3rd party drivers
 post-patch:
 # from PCL3 driver
 	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from PCL3 ..."
+	@${ECHO} ">>>   applying patches from ${PCL3} ..."
 	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_DIR}/src/zmedia2.c-6.01.diff
+		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
 	@${ECHO} ">>> in pre-configure ..."
 # for HPDJ driver
-	@${ECHO} ">>>   adding HPDJ driver to contrib.mak ..."
+	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
 	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding PCL3 driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_DIR}/src/contrib.mak-6.01.add \
+	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
 	@${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for gimp-print
+	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+		${WRKSRC}/src
+	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
+	@${CAT} ${FILESDIR}/escputil.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
 	@${ECHO} ">>> in do-configure ..."
@@ -172,9 +196,9 @@ pre-build:
 
 pre-install:
 	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating destdir ..."
+	@${ECHO} ">>>   creating ghostscript destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting gs fonts..."
+	@${ECHO} ">>>   extracting ghostscript fonts..."
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
@@ -186,35 +210,52 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
 # for HPDJ driver
-	@${ECHO} ">>>   installing HPDJ manpages ..."
+	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating HPDJ destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
 .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
 	margins-Letter.ps margins-LetterRotated.ps
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing PCL3 manpages ..."
+	@${ECHO} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_DIR}/doc/${i} ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating PCL3 destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in PCL3 destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
 .for i in BETA 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_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
+# for gimp-print driver
+	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
+	@strip ${PREFIX}/bin/escputil
+	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+.for i in ${GPRINT_MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/man/man1
+.endfor
+	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
+	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+.for i in README
+	@${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+.endfor
 # contributed UPP driver
 	@${ECHO} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
@@ -232,20 +273,20 @@ post-install:
 	@${ECHO} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
 .for i in LGPL.txt NEWS hpdj.html
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # install pcl3 docu, not necessary for runtime
 # note: new pcl3 driver has a subdir of its own
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
 .for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
 .endfor
 .endif
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index b1f8c91af19f..e9c2804b05d6 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -3,6 +3,6 @@ MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
-MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pcl3-3.0.2.tar.gz) = 66b3391815a6df6e43e636b398bd88ba
 MD5 (gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
+MD5 (print-4.0.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
diff --git a/print/ghostscript-afpl/files/escputil.contrib.mak b/print/ghostscript-afpl/files/escputil.contrib.mak
new file mode 100644
index 000000000000..b0cea6064968
--- /dev/null
+++ b/print/ghostscript-afpl/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index dba27df31e42..8b424426caff 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -1,6 +1,7 @@
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
+bin/escputil
 bin/fixmswrd.pl
 bin/font2c
 bin/gs
@@ -78,6 +79,7 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
 share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
 share/ghostscript/%%GS_VERSION%%/doc/Use.htm
 share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
 share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
 share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
@@ -485,6 +487,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/doc/ghostscript
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
 @dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
diff --git a/print/ghostscript-afpl/scripts/configure.batch b/print/ghostscript-afpl/scripts/configure.batch
index 9e96762608f5..0aed2a22e47b 100644
--- a/print/ghostscript-afpl/scripts/configure.batch
+++ b/print/ghostscript-afpl/scripts/configure.batch
@@ -6,7 +6,7 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev
+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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 33a5566f338e..a70a929fd539 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -14,6 +15,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
 	http://www.harsch.net/Download/ \
 	http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
 	http://download.sourceforge.net/ghostscript/ \
 	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
@@ -27,7 +29,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 # note: russian mirror isn't up to date
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV} ${PCL3_SRC} \
-		${HP970_DRV}
+		${HP970_DRV} ${GPRINT_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	andreas@FreeBSD.org
@@ -36,7 +38,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
-ALL_TARGET=	all pcl3opts
+ALL_TARGET=	all pcl3opts escputil
 USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -47,7 +49,7 @@ MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
 		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
 		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1
+		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -66,24 +68,33 @@ HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
 # ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
-HPDJ_NAME=	hpdj
+HPDJ=		hpdj
 HPDJ_VERS=	2.6
-HPDJ_DIR=	${HPDJ_NAME}-${HPDJ_VERS}
-HPDJ_SRC=	${HPDJ_NAME}-${HPDJ_VERS}.tar.gz
+HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
+HPDJ_SRC=	${HPDJ_NAME}.tar.gz
 HPDJ_MAN1=	gs-hpdj.1
 
 # PCL3 (hpdj successor in BETA state)
 # additional driver for HP PCL3 Printers, by Martin Lottermoser
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
-PCL3_NAME=	pcl3
+PCL3=		pcl3
 PCL3_VERS=	3.0.2
-PCL3_DIR=	${PCL3_NAME}-${PCL3_VERS}
-PCL3_SRC=	${PCL3_NAME}-${PCL3_VERS}.tar.gz
+PCL3_NAME=	${PCL3}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
 # additional driver for HP DeskJet 970, supports duplex printing
 HP970_DRV=	gdevdj9.c.gz
 
+# gimp-print - very high quality driver for Epson, HPs,...
+# http://sourceforge.net/projects/gimp-print/
+GPRINT=		print
+GPRINT_DESC=	gimp-${GPRINT}
+GPRINT_VERS=	4.0.4
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_MAN1=	escputil.1
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -116,43 +127,56 @@ post-extract:
 	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKDIR} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKDIR}/${HPDJ_DIR}/${HPDJ_NAME}.tar
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
+	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	@${ECHO} ">>>   extracting ${PCL3_SRC} ..."
 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_DIR} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_DIR} -xf \
-		${WRKSRC}/${PCL3_DIR}/${PCL3_NAME}.tar
+	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
+	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   extracting ${HP970_DRV} ..."
 	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
 	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for gimp-print
+	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
 
 # here we apply unofficial patches from 3rd party drivers
 post-patch:
 # from PCL3 driver
 	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from PCL3 ..."
+	@${ECHO} ">>>   applying patches from ${PCL3} ..."
 	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_DIR}/src/zmedia2.c-6.01.diff
+		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
 	@${ECHO} ">>> in pre-configure ..."
 # for HPDJ driver
-	@${ECHO} ">>>   adding HPDJ driver to contrib.mak ..."
+	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
 	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding PCL3 driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_DIR}/src/contrib.mak-6.01.add \
+	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
 	@${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for gimp-print
+	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+		${WRKSRC}/src
+	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
+	@${CAT} ${FILESDIR}/escputil.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
 	@${ECHO} ">>> in do-configure ..."
@@ -172,9 +196,9 @@ pre-build:
 
 pre-install:
 	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating destdir ..."
+	@${ECHO} ">>>   creating ghostscript destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting gs fonts..."
+	@${ECHO} ">>>   extracting ghostscript fonts..."
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
@@ -186,35 +210,52 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
 # for HPDJ driver
-	@${ECHO} ">>>   installing HPDJ manpages ..."
+	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating HPDJ destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
 .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
 	margins-Letter.ps margins-LetterRotated.ps
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing PCL3 manpages ..."
+	@${ECHO} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_DIR}/doc/${i} ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating PCL3 destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in PCL3 destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
 .for i in BETA 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_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
+# for gimp-print driver
+	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
+	@strip ${PREFIX}/bin/escputil
+	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+.for i in ${GPRINT_MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/man/man1
+.endfor
+	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
+	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+.for i in README
+	@${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+.endfor
 # contributed UPP driver
 	@${ECHO} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
@@ -232,20 +273,20 @@ post-install:
 	@${ECHO} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
 .for i in LGPL.txt NEWS hpdj.html
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # install pcl3 docu, not necessary for runtime
 # note: new pcl3 driver has a subdir of its own
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
 .for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
 .endfor
 .endif
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index b1f8c91af19f..e9c2804b05d6 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -3,6 +3,6 @@ MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
-MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pcl3-3.0.2.tar.gz) = 66b3391815a6df6e43e636b398bd88ba
 MD5 (gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
+MD5 (print-4.0.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
diff --git a/print/ghostscript-gpl/files/escputil.contrib.mak b/print/ghostscript-gpl/files/escputil.contrib.mak
new file mode 100644
index 000000000000..b0cea6064968
--- /dev/null
+++ b/print/ghostscript-gpl/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index dba27df31e42..8b424426caff 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -1,6 +1,7 @@
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
+bin/escputil
 bin/fixmswrd.pl
 bin/font2c
 bin/gs
@@ -78,6 +79,7 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
 share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
 share/ghostscript/%%GS_VERSION%%/doc/Use.htm
 share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
 share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
 share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
@@ -485,6 +487,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/doc/ghostscript
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
 @dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index 9e96762608f5..0aed2a22e47b 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -6,7 +6,7 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev
+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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 33a5566f338e..a70a929fd539 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -14,6 +15,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
 	http://www.harsch.net/Download/ \
 	http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
 	http://download.sourceforge.net/ghostscript/ \
 	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
@@ -27,7 +29,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 # note: russian mirror isn't up to date
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV} ${PCL3_SRC} \
-		${HP970_DRV}
+		${HP970_DRV} ${GPRINT_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	andreas@FreeBSD.org
@@ -36,7 +38,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
-ALL_TARGET=	all pcl3opts
+ALL_TARGET=	all pcl3opts escputil
 USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -47,7 +49,7 @@ MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
 		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
 		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1
+		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -66,24 +68,33 @@ HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
 # ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
-HPDJ_NAME=	hpdj
+HPDJ=		hpdj
 HPDJ_VERS=	2.6
-HPDJ_DIR=	${HPDJ_NAME}-${HPDJ_VERS}
-HPDJ_SRC=	${HPDJ_NAME}-${HPDJ_VERS}.tar.gz
+HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
+HPDJ_SRC=	${HPDJ_NAME}.tar.gz
 HPDJ_MAN1=	gs-hpdj.1
 
 # PCL3 (hpdj successor in BETA state)
 # additional driver for HP PCL3 Printers, by Martin Lottermoser
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
-PCL3_NAME=	pcl3
+PCL3=		pcl3
 PCL3_VERS=	3.0.2
-PCL3_DIR=	${PCL3_NAME}-${PCL3_VERS}
-PCL3_SRC=	${PCL3_NAME}-${PCL3_VERS}.tar.gz
+PCL3_NAME=	${PCL3}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
 # additional driver for HP DeskJet 970, supports duplex printing
 HP970_DRV=	gdevdj9.c.gz
 
+# gimp-print - very high quality driver for Epson, HPs,...
+# http://sourceforge.net/projects/gimp-print/
+GPRINT=		print
+GPRINT_DESC=	gimp-${GPRINT}
+GPRINT_VERS=	4.0.4
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_MAN1=	escputil.1
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -116,43 +127,56 @@ post-extract:
 	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKDIR} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKDIR}/${HPDJ_DIR}/${HPDJ_NAME}.tar
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
+	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	@${ECHO} ">>>   extracting ${PCL3_SRC} ..."
 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_DIR} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_DIR} -xf \
-		${WRKSRC}/${PCL3_DIR}/${PCL3_NAME}.tar
+	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
+	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   extracting ${HP970_DRV} ..."
 	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
 	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for gimp-print
+	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
 
 # here we apply unofficial patches from 3rd party drivers
 post-patch:
 # from PCL3 driver
 	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from PCL3 ..."
+	@${ECHO} ">>>   applying patches from ${PCL3} ..."
 	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_DIR}/src/zmedia2.c-6.01.diff
+		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
 	@${ECHO} ">>> in pre-configure ..."
 # for HPDJ driver
-	@${ECHO} ">>>   adding HPDJ driver to contrib.mak ..."
+	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
 	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding PCL3 driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_DIR}/src/contrib.mak-6.01.add \
+	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
 	@${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for gimp-print
+	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+		${WRKSRC}/src
+	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
+	@${CAT} ${FILESDIR}/escputil.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
 	@${ECHO} ">>> in do-configure ..."
@@ -172,9 +196,9 @@ pre-build:
 
 pre-install:
 	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating destdir ..."
+	@${ECHO} ">>>   creating ghostscript destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting gs fonts..."
+	@${ECHO} ">>>   extracting ghostscript fonts..."
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
@@ -186,35 +210,52 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
 # for HPDJ driver
-	@${ECHO} ">>>   installing HPDJ manpages ..."
+	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating HPDJ destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
 .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
 	margins-Letter.ps margins-LetterRotated.ps
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing PCL3 manpages ..."
+	@${ECHO} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_DIR}/doc/${i} ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating PCL3 destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in PCL3 destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
 .for i in BETA 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_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
+# for gimp-print driver
+	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
+	@strip ${PREFIX}/bin/escputil
+	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+.for i in ${GPRINT_MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/man/man1
+.endfor
+	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
+	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+.for i in README
+	@${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+.endfor
 # contributed UPP driver
 	@${ECHO} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
@@ -232,20 +273,20 @@ post-install:
 	@${ECHO} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
 .for i in LGPL.txt NEWS hpdj.html
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # install pcl3 docu, not necessary for runtime
 # note: new pcl3 driver has a subdir of its own
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
 .for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
 .endfor
 .endif
diff --git a/print/ghostscript6/distinfo b/print/ghostscript6/distinfo
index b1f8c91af19f..e9c2804b05d6 100644
--- a/print/ghostscript6/distinfo
+++ b/print/ghostscript6/distinfo
@@ -3,6 +3,6 @@ MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
-MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pcl3-3.0.2.tar.gz) = 66b3391815a6df6e43e636b398bd88ba
 MD5 (gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
+MD5 (print-4.0.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
diff --git a/print/ghostscript6/files/escputil.contrib.mak b/print/ghostscript6/files/escputil.contrib.mak
new file mode 100644
index 000000000000..b0cea6064968
--- /dev/null
+++ b/print/ghostscript6/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript6/pkg-plist b/print/ghostscript6/pkg-plist
index dba27df31e42..8b424426caff 100644
--- a/print/ghostscript6/pkg-plist
+++ b/print/ghostscript6/pkg-plist
@@ -1,6 +1,7 @@
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
+bin/escputil
 bin/fixmswrd.pl
 bin/font2c
 bin/gs
@@ -78,6 +79,7 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
 share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
 share/ghostscript/%%GS_VERSION%%/doc/Use.htm
 share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
 share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
 share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
@@ -485,6 +487,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/doc/ghostscript
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
 @dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
diff --git a/print/ghostscript6/scripts/configure.batch b/print/ghostscript6/scripts/configure.batch
index 9e96762608f5..0aed2a22e47b 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -6,7 +6,7 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev
+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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 33a5566f338e..a70a929fd539 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -14,6 +15,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
 	http://www.harsch.net/Download/ \
 	http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
 	http://download.sourceforge.net/ghostscript/ \
 	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
@@ -27,7 +29,7 @@ MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 # note: russian mirror isn't up to date
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV} ${PCL3_SRC} \
-		${HP970_DRV}
+		${HP970_DRV} ${GPRINT_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	andreas@FreeBSD.org
@@ -36,7 +38,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
-ALL_TARGET=	all pcl3opts
+ALL_TARGET=	all pcl3opts escputil
 USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -47,7 +49,7 @@ MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
 		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
 		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1
+		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -66,24 +68,33 @@ HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
 # ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
-HPDJ_NAME=	hpdj
+HPDJ=		hpdj
 HPDJ_VERS=	2.6
-HPDJ_DIR=	${HPDJ_NAME}-${HPDJ_VERS}
-HPDJ_SRC=	${HPDJ_NAME}-${HPDJ_VERS}.tar.gz
+HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
+HPDJ_SRC=	${HPDJ_NAME}.tar.gz
 HPDJ_MAN1=	gs-hpdj.1
 
 # PCL3 (hpdj successor in BETA state)
 # additional driver for HP PCL3 Printers, by Martin Lottermoser
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
-PCL3_NAME=	pcl3
+PCL3=		pcl3
 PCL3_VERS=	3.0.2
-PCL3_DIR=	${PCL3_NAME}-${PCL3_VERS}
-PCL3_SRC=	${PCL3_NAME}-${PCL3_VERS}.tar.gz
+PCL3_NAME=	${PCL3}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
 # additional driver for HP DeskJet 970, supports duplex printing
 HP970_DRV=	gdevdj9.c.gz
 
+# gimp-print - very high quality driver for Epson, HPs,...
+# http://sourceforge.net/projects/gimp-print/
+GPRINT=		print
+GPRINT_DESC=	gimp-${GPRINT}
+GPRINT_VERS=	4.0.4
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_MAN1=	escputil.1
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -116,43 +127,56 @@ post-extract:
 	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKDIR} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKDIR}/${HPDJ_DIR}/${HPDJ_NAME}.tar
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
+	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	@${ECHO} ">>>   extracting ${PCL3_SRC} ..."
 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_DIR} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_DIR} -xf \
-		${WRKSRC}/${PCL3_DIR}/${PCL3_NAME}.tar
+	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
+	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   extracting ${HP970_DRV} ..."
 	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
 	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for gimp-print
+	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
 
 # here we apply unofficial patches from 3rd party drivers
 post-patch:
 # from PCL3 driver
 	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from PCL3 ..."
+	@${ECHO} ">>>   applying patches from ${PCL3} ..."
 	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_DIR}/src/zmedia2.c-6.01.diff
+		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
 	@${ECHO} ">>> in pre-configure ..."
 # for HPDJ driver
-	@${ECHO} ">>>   adding HPDJ driver to contrib.mak ..."
+	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
 	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding PCL3 driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_DIR}/src/contrib.mak-6.01.add \
+	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
 	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
 	@${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for gimp-print
+	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+		${WRKSRC}/src
+	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
+	@${CAT} ${FILESDIR}/escputil.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
 	@${ECHO} ">>> in do-configure ..."
@@ -172,9 +196,9 @@ pre-build:
 
 pre-install:
 	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating destdir ..."
+	@${ECHO} ">>>   creating ghostscript destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting gs fonts..."
+	@${ECHO} ">>>   extracting ghostscript fonts..."
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
@@ -186,35 +210,52 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
 # for HPDJ driver
-	@${ECHO} ">>>   installing HPDJ manpages ..."
+	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating HPDJ destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
 .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
 	margins-Letter.ps margins-LetterRotated.ps
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing PCL3 manpages ..."
+	@${ECHO} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_DIR}/doc/${i} ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating PCL3 destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in PCL3 destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
 .for i in BETA 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_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
+# for gimp-print driver
+	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
+	@strip ${PREFIX}/bin/escputil
+	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+.for i in ${GPRINT_MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/man/man1
+.endfor
+	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
+	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+.for i in README
+	@${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+.endfor
 # contributed UPP driver
 	@${ECHO} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
@@ -232,20 +273,20 @@ post-install:
 	@${ECHO} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
 .for i in LGPL.txt NEWS hpdj.html
 	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # install pcl3 docu, not necessary for runtime
 # note: new pcl3 driver has a subdir of its own
-	@${ECHO} ">>>   creating HPDJ docu destdir ..."
+	@${ECHO} ">>>   creating ${PCL3} docu destdir ..."
 	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
 .for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_DIR}/${i} \
+	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
 .endfor
 .endif
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index b1f8c91af19f..e9c2804b05d6 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -3,6 +3,6 @@ MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
-MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pcl3-3.0.2.tar.gz) = 66b3391815a6df6e43e636b398bd88ba
 MD5 (gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
+MD5 (print-4.0.4.tar.gz) = e6b955ab3e842a7f0cf8214ffef5842c
diff --git a/print/ghostscript8/files/escputil.contrib.mak b/print/ghostscript8/files/escputil.contrib.mak
new file mode 100644
index 000000000000..b0cea6064968
--- /dev/null
+++ b/print/ghostscript8/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index dba27df31e42..8b424426caff 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -1,6 +1,7 @@
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
+bin/escputil
 bin/fixmswrd.pl
 bin/font2c
 bin/gs
@@ -78,6 +79,7 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
 share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
 share/ghostscript/%%GS_VERSION%%/doc/Use.htm
 share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
 share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
 share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
@@ -485,6 +487,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/doc/ghostscript
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
 @dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index 9e96762608f5..0aed2a22e47b 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -6,7 +6,7 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev
+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 \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices