Add HPDJ driver

an enhanced PCL3 (PCL3+) driver
that was part of gs5 port and got lost in gs55 port.
Now it reappears in gs 6.01 ;-)

ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html

24 files changed, 168 insertions, 24 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index ff36ddd10705..f6cf0bec3910 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -11,9 +11,10 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
-		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/
+		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/ \
+		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP8XX_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV}
 
 MAINTAINER=	andreas@FreeBSD.org
 
@@ -24,7 +25,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
 
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
 USE_XLIB=	yes
-EXTRACT_ONLY=	${GS_SOURCES}
+EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -34,7 +35,8 @@ CFLAGS+=	-I${PREFIX}/include
 MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.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
+		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
+		gs-hpdj.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -49,6 +51,10 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 # http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
 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_DRV=	hpdj-2.6.tar.gz
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -72,9 +78,15 @@ pre-fetch:
 .endif
 
 post-extract:
-	@${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b \
+	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
 		${WRKSRC}/jpeg
 	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HP8XX_DRV}
+	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HPDJ_DRV}
+	# additional HPDJ driver
+	@${TAR} -xf ${WRKDIR}/hpdj-2.6/hpdj.tar -C ${WRKSRC}/src
+	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add >> ${WRKSRC}/src/contrib.mak
+	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
+		< ${WRKSRC}/src/zmedia2.c-5.50.diff
 
 do-configure:
 .if defined(BATCH)
@@ -98,6 +110,9 @@ post-install:
 	@strip ${PREFIX}/bin/gs
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/libexec/lpr
+	@${INSTALL_SCRIPT} ${WRKSRC}/src/if-hpdj ${PREFIX}/libexec/lpr
+	@${INSTALL_DATA} ${WRKSRC}/src/gs-hpdj.1 ${PREFIX}/man/man1
 .for i in ${CONTRIB_UPP}
 	@${INSTALL_DATA} ${FILESDIR}/$i \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
@@ -106,5 +121,13 @@ post-install:
 	@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endif
+.if !defined(NOPORTDOC)
+	@${MKDIR} ${PREFIX}/share/ghostscript/hpdj
+.for i in LGPL.txt NEWS README.hpdj example.mdf hpdj.html margins-A4.ps \
+	margins-A4Rotated.ps margins-Letter.ps margins-LetterRotated.ps
+	@ cd ${WRKSRC}/src; ${INSTALL_DATA} $i ${PREFIX}/share/ghostscript/hpdj
+
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index d0377fe1b306..f326d36606a7 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -2,4 +2,5 @@ MD5 (ghostscript-6.01.tar.gz) = abad620560b79ff40162f648506ae448
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
+MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript-afpl/pkg-descr b/print/ghostscript-afpl/pkg-descr
index 78ede9e41f87..39e0177bea17 100644
--- a/print/ghostscript-afpl/pkg-descr
+++ b/print/ghostscript-afpl/pkg-descr
@@ -11,6 +11,7 @@ This port includes add-on packages (not part of the official gs release)
 	  -  http://www.ozemail.com.au/~geoffk/pdfencrypt/
 	o Additional driver support
 	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
+	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 		
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index b2ce76cd3266..5221d8baf05d 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -428,9 +428,19 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+share/ghostscript/hpdj/LGPL.txt
+share/ghostscript/hpdj/NEWS
+share/ghostscript/hpdj/README.hpdj
+share/ghostscript/hpdj/example.mdf
+share/ghostscript/hpdj/hpdj.html
+share/ghostscript/hpdj/margins-A4.ps
+share/ghostscript/hpdj/margins-A4Rotated.ps
+share/ghostscript/hpdj/margins-Letter.ps
+share/ghostscript/hpdj/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
+@dirrm share/ghostscript/hpdj
 @dirrm share/ghostscript
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index cf3ab9cb4bf0..93997aebbc74 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -70,6 +70,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
   "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "hpdj"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript-afpl/scripts/configure.batch b/print/ghostscript-afpl/scripts/configure.batch
index 5531110c22e0..98c26638ad80 100644
--- a/print/ghostscript-afpl/scripts/configure.batch
+++ b/print/ghostscript-afpl/scripts/configure.batch
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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
+DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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)hpdj.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 ff36ddd10705..f6cf0bec3910 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -11,9 +11,10 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
-		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/
+		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/ \
+		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP8XX_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV}
 
 MAINTAINER=	andreas@FreeBSD.org
 
@@ -24,7 +25,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
 
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
 USE_XLIB=	yes
-EXTRACT_ONLY=	${GS_SOURCES}
+EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -34,7 +35,8 @@ CFLAGS+=	-I${PREFIX}/include
 MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.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
+		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
+		gs-hpdj.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -49,6 +51,10 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 # http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
 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_DRV=	hpdj-2.6.tar.gz
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -72,9 +78,15 @@ pre-fetch:
 .endif
 
 post-extract:
-	@${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b \
+	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
 		${WRKSRC}/jpeg
 	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HP8XX_DRV}
+	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HPDJ_DRV}
+	# additional HPDJ driver
+	@${TAR} -xf ${WRKDIR}/hpdj-2.6/hpdj.tar -C ${WRKSRC}/src
+	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add >> ${WRKSRC}/src/contrib.mak
+	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
+		< ${WRKSRC}/src/zmedia2.c-5.50.diff
 
 do-configure:
 .if defined(BATCH)
@@ -98,6 +110,9 @@ post-install:
 	@strip ${PREFIX}/bin/gs
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/libexec/lpr
+	@${INSTALL_SCRIPT} ${WRKSRC}/src/if-hpdj ${PREFIX}/libexec/lpr
+	@${INSTALL_DATA} ${WRKSRC}/src/gs-hpdj.1 ${PREFIX}/man/man1
 .for i in ${CONTRIB_UPP}
 	@${INSTALL_DATA} ${FILESDIR}/$i \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
@@ -106,5 +121,13 @@ post-install:
 	@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endif
+.if !defined(NOPORTDOC)
+	@${MKDIR} ${PREFIX}/share/ghostscript/hpdj
+.for i in LGPL.txt NEWS README.hpdj example.mdf hpdj.html margins-A4.ps \
+	margins-A4Rotated.ps margins-Letter.ps margins-LetterRotated.ps
+	@ cd ${WRKSRC}/src; ${INSTALL_DATA} $i ${PREFIX}/share/ghostscript/hpdj
+
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index d0377fe1b306..f326d36606a7 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -2,4 +2,5 @@ MD5 (ghostscript-6.01.tar.gz) = abad620560b79ff40162f648506ae448
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
+MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index 78ede9e41f87..39e0177bea17 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -11,6 +11,7 @@ This port includes add-on packages (not part of the official gs release)
 	  -  http://www.ozemail.com.au/~geoffk/pdfencrypt/
 	o Additional driver support
 	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
+	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 		
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index b2ce76cd3266..5221d8baf05d 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -428,9 +428,19 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+share/ghostscript/hpdj/LGPL.txt
+share/ghostscript/hpdj/NEWS
+share/ghostscript/hpdj/README.hpdj
+share/ghostscript/hpdj/example.mdf
+share/ghostscript/hpdj/hpdj.html
+share/ghostscript/hpdj/margins-A4.ps
+share/ghostscript/hpdj/margins-A4Rotated.ps
+share/ghostscript/hpdj/margins-Letter.ps
+share/ghostscript/hpdj/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
+@dirrm share/ghostscript/hpdj
 @dirrm share/ghostscript
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index cf3ab9cb4bf0..93997aebbc74 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -70,6 +70,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
   "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "hpdj"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index 5531110c22e0..98c26638ad80 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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
+DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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)hpdj.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index ff36ddd10705..f6cf0bec3910 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -11,9 +11,10 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
-		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/
+		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/ \
+		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP8XX_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV}
 
 MAINTAINER=	andreas@FreeBSD.org
 
@@ -24,7 +25,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
 
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
 USE_XLIB=	yes
-EXTRACT_ONLY=	${GS_SOURCES}
+EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -34,7 +35,8 @@ CFLAGS+=	-I${PREFIX}/include
 MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.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
+		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
+		gs-hpdj.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -49,6 +51,10 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 # http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
 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_DRV=	hpdj-2.6.tar.gz
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -72,9 +78,15 @@ pre-fetch:
 .endif
 
 post-extract:
-	@${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b \
+	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
 		${WRKSRC}/jpeg
 	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HP8XX_DRV}
+	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HPDJ_DRV}
+	# additional HPDJ driver
+	@${TAR} -xf ${WRKDIR}/hpdj-2.6/hpdj.tar -C ${WRKSRC}/src
+	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add >> ${WRKSRC}/src/contrib.mak
+	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
+		< ${WRKSRC}/src/zmedia2.c-5.50.diff
 
 do-configure:
 .if defined(BATCH)
@@ -98,6 +110,9 @@ post-install:
 	@strip ${PREFIX}/bin/gs
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/libexec/lpr
+	@${INSTALL_SCRIPT} ${WRKSRC}/src/if-hpdj ${PREFIX}/libexec/lpr
+	@${INSTALL_DATA} ${WRKSRC}/src/gs-hpdj.1 ${PREFIX}/man/man1
 .for i in ${CONTRIB_UPP}
 	@${INSTALL_DATA} ${FILESDIR}/$i \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
@@ -106,5 +121,13 @@ post-install:
 	@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endif
+.if !defined(NOPORTDOC)
+	@${MKDIR} ${PREFIX}/share/ghostscript/hpdj
+.for i in LGPL.txt NEWS README.hpdj example.mdf hpdj.html margins-A4.ps \
+	margins-A4Rotated.ps margins-Letter.ps margins-LetterRotated.ps
+	@ cd ${WRKSRC}/src; ${INSTALL_DATA} $i ${PREFIX}/share/ghostscript/hpdj
+
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript6/distinfo b/print/ghostscript6/distinfo
index d0377fe1b306..f326d36606a7 100644
--- a/print/ghostscript6/distinfo
+++ b/print/ghostscript6/distinfo
@@ -2,4 +2,5 @@ MD5 (ghostscript-6.01.tar.gz) = abad620560b79ff40162f648506ae448
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
+MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript6/pkg-descr b/print/ghostscript6/pkg-descr
index 78ede9e41f87..39e0177bea17 100644
--- a/print/ghostscript6/pkg-descr
+++ b/print/ghostscript6/pkg-descr
@@ -11,6 +11,7 @@ This port includes add-on packages (not part of the official gs release)
 	  -  http://www.ozemail.com.au/~geoffk/pdfencrypt/
 	o Additional driver support
 	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
+	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 		
diff --git a/print/ghostscript6/pkg-plist b/print/ghostscript6/pkg-plist
index b2ce76cd3266..5221d8baf05d 100644
--- a/print/ghostscript6/pkg-plist
+++ b/print/ghostscript6/pkg-plist
@@ -428,9 +428,19 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+share/ghostscript/hpdj/LGPL.txt
+share/ghostscript/hpdj/NEWS
+share/ghostscript/hpdj/README.hpdj
+share/ghostscript/hpdj/example.mdf
+share/ghostscript/hpdj/hpdj.html
+share/ghostscript/hpdj/margins-A4.ps
+share/ghostscript/hpdj/margins-A4Rotated.ps
+share/ghostscript/hpdj/margins-Letter.ps
+share/ghostscript/hpdj/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
+@dirrm share/ghostscript/hpdj
 @dirrm share/ghostscript
diff --git a/print/ghostscript6/scripts/configure b/print/ghostscript6/scripts/configure
index cf3ab9cb4bf0..93997aebbc74 100644
--- a/print/ghostscript6/scripts/configure
+++ b/print/ghostscript6/scripts/configure
@@ -70,6 +70,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
   "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "hpdj"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript6/scripts/configure.batch b/print/ghostscript6/scripts/configure.batch
index 5531110c22e0..98c26638ad80 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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
+DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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)hpdj.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index ff36ddd10705..f6cf0bec3910 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -11,9 +11,10 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
-		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/
+		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/ \
+		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP8XX_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV}
 
 MAINTAINER=	andreas@FreeBSD.org
 
@@ -24,7 +25,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
 
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
 USE_XLIB=	yes
-EXTRACT_ONLY=	${GS_SOURCES}
+EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -34,7 +35,8 @@ CFLAGS+=	-I${PREFIX}/include
 MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
 		gslj.1 gslp.1 gsnd.1 pdf2dsc.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
+		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
+		gs-hpdj.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -49,6 +51,10 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 # http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
 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_DRV=	hpdj-2.6.tar.gz
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -72,9 +78,15 @@ pre-fetch:
 .endif
 
 post-extract:
-	@${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b \
+	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
 		${WRKSRC}/jpeg
 	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HP8XX_DRV}
+	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HPDJ_DRV}
+	# additional HPDJ driver
+	@${TAR} -xf ${WRKDIR}/hpdj-2.6/hpdj.tar -C ${WRKSRC}/src
+	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add >> ${WRKSRC}/src/contrib.mak
+	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
+		< ${WRKSRC}/src/zmedia2.c-5.50.diff
 
 do-configure:
 .if defined(BATCH)
@@ -98,6 +110,9 @@ post-install:
 	@strip ${PREFIX}/bin/gs
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/libexec/lpr
+	@${INSTALL_SCRIPT} ${WRKSRC}/src/if-hpdj ${PREFIX}/libexec/lpr
+	@${INSTALL_DATA} ${WRKSRC}/src/gs-hpdj.1 ${PREFIX}/man/man1
 .for i in ${CONTRIB_UPP}
 	@${INSTALL_DATA} ${FILESDIR}/$i \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
@@ -106,5 +121,13 @@ post-install:
 	@${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endif
+.if !defined(NOPORTDOC)
+	@${MKDIR} ${PREFIX}/share/ghostscript/hpdj
+.for i in LGPL.txt NEWS README.hpdj example.mdf hpdj.html margins-A4.ps \
+	margins-A4Rotated.ps margins-Letter.ps margins-LetterRotated.ps
+	@ cd ${WRKSRC}/src; ${INSTALL_DATA} $i ${PREFIX}/share/ghostscript/hpdj
+
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index d0377fe1b306..f326d36606a7 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -2,4 +2,5 @@ MD5 (ghostscript-6.01.tar.gz) = abad620560b79ff40162f648506ae448
 MD5 (ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (gdevcd8.tar.gz) = 6ff0db0cb9f1190a1587ad6c335581cf
+MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript8/pkg-descr b/print/ghostscript8/pkg-descr
index 78ede9e41f87..39e0177bea17 100644
--- a/print/ghostscript8/pkg-descr
+++ b/print/ghostscript8/pkg-descr
@@ -11,6 +11,7 @@ This port includes add-on packages (not part of the official gs release)
 	  -  http://www.ozemail.com.au/~geoffk/pdfencrypt/
 	o Additional driver support
 	  - http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
+	  - ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html (HPDJ drv)
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 		
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index b2ce76cd3266..5221d8baf05d 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -428,9 +428,19 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+share/ghostscript/hpdj/LGPL.txt
+share/ghostscript/hpdj/NEWS
+share/ghostscript/hpdj/README.hpdj
+share/ghostscript/hpdj/example.mdf
+share/ghostscript/hpdj/hpdj.html
+share/ghostscript/hpdj/margins-A4.ps
+share/ghostscript/hpdj/margins-A4Rotated.ps
+share/ghostscript/hpdj/margins-Letter.ps
+share/ghostscript/hpdj/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
+@dirrm share/ghostscript/hpdj
 @dirrm share/ghostscript
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index cf3ab9cb4bf0..93997aebbc74 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -70,6 +70,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
   "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "hpdj"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index 5531110c22e0..98c26638ad80 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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
+DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)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)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)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(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)hpdj.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices