10 files changed, 279 insertions, 102 deletions

diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 12fe4c37b896..33a5566f338e 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -6,18 +6,29 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	6.01
-PORTREVISION=	1
+PORTVERSION=	6.50
 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://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
-		http://www.harsch.net/Download/
+MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
+	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
+	http://www.gelhaus.net/hp880c/1.4beta/ \
+	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
+	http://www.harsch.net/Download/ \
+	http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+	http://download.sourceforge.net/ghostscript/ \
+	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
+	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
+	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
+	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/gs650/ \
+	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/fonts/ \
+	ftp://munnari.oz.au/ghost/aladdin/gs650/ \
+	ftp://munnari.oz.au/ghost/aladdin/fonts/ \
+	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/gs650/ \
+	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/fonts/
+# note: russian mirror isn't up to date
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${HP970_DRV}
-EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_SRC}
+		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_DRV} ${PCL3_SRC} \
+		${HP970_DRV}
+EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	andreas@FreeBSD.org
 
@@ -25,6 +36,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
+ALL_TARGET=	all pcl3opts
 USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
@@ -32,10 +44,10 @@ PLIST_SUB=	GS_VERSION=${PORTVERSION}
 # Note: the order that the manpages are listed here matters because
 # some of them are symbolic links
 MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
-		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdf2ps.1 pf2afm.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-hpdj.1 gs-pcl3.1 pcl3opts.1
 
 GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
 #  Note: the following two are real files that have symlinks with
@@ -47,15 +59,27 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
-# http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
+# Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
+# http://www.gelhaus.net/hp880c/
+# driver names:	cdj880
 HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
-# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
+# ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
 HPDJ_NAME=	hpdj
 HPDJ_VERS=	2.6
 HPDJ_DIR=	${HPDJ_NAME}-${HPDJ_VERS}
 HPDJ_SRC=	${HPDJ_NAME}-${HPDJ_VERS}.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_VERS=	3.0.2
+PCL3_DIR=	${PCL3_NAME}-${PCL3_VERS}
+PCL3_SRC=	${PCL3_NAME}-${PCL3_VERS}.tar.gz
+PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
 # additional driver for HP DeskJet 970, supports duplex printing
 HP970_DRV=	gdevdj9.c.gz
@@ -79,55 +103,152 @@ pre-fetch:
 .endif
 
 post-extract:
+	@${ECHO} ">>> in post-extract ..."
 	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
 		${WRKSRC}/jpeg
+# ** 3rd party driver **
+# Note: don't forget to add those devices in scripts/configure and
+# configure.batch, which update unix-gcc.mak to build gs with these
+# new devices !
+#
+# for HP8XX driver
+	@${ECHO} ">>>   extracting ${HP8XX_DRV} ..."
 	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
-	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HPDJ_SRC}
-# additional HPDJ driver
+# 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
-	@${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
+# 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
+# for HP DeskJet 970 driver
+	@${ECHO} ">>>   extracting ${HP970_DRV} ..."
 	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
 	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
-	@${CAT} ${FILESDIR}/dj970.contrib.mak >> ${WRKSRC}/src/contrib.mak
+
+# here we apply unofficial patches from 3rd party drivers
+post-patch:
+# from PCL3 driver
+	@${ECHO} ">>> in post-patch ..."
+	@${ECHO} ">>>   applying patches from PCL3 ..."
+	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
+		< ${WRKSRC}/${PCL3_DIR}/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 ..."
+	@${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 \
+		>> ${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
 
 do-configure:
+	@${ECHO} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
+	# XXX diable dialog based configure, needs some rework later...
+	#@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .endif
 
 pre-build:
+	@${ECHO} ">>> in pre-build ..."
+	@${ECHO} ">>>   creating directories for compilation ..."
 	@${MKDIR} ${WRKSRC}/obj
 	@${MKDIR} ${WRKSRC}/bin
 
 pre-install:
+	@${ECHO} ">>> in pre-install ..."
+	@${ECHO} ">>>   creating destdir ..."
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	@${ECHO} ">>>   extracting gs fonts..."
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
+	@${ECHO} ">>> in post-install ..."
+	@${ECHO} ">>>   stripping gs ..."
 	@strip ${PREFIX}/bin/gs
-	${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_MAN} ${WRKSRC}/src/gs-hpdj.1 ${PREFIX}/man/man1
+	@${ECHO} ">>>   installing additional scripts ..."
+	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+# for HPDJ driver
+	@${ECHO} ">>>   installing HPDJ manpages ..."
+.for i in ${HPDJ_MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+.endfor
+	@${ECHO} ">>>   creating HPDJ destdir ..."
+	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
+	@${ECHO} ">>>   installing files in HPDJ destdir ..."
+.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 ..."
+.for i in ${PCL3_MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${PCL3_DIR}/doc/${i} ${PREFIX}/man/man1
+.endfor
+# other pcl3 stuff, which might be interesting for runtime
+	@${ECHO} ">>>   creating PCL3 destdir ..."
+	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+	@${ECHO} ">>>   installing files in PCL3 destdir ..."
+.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} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+.endfor
+# contributed UPP driver
+	@${ECHO} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
-	${INSTALL_DATA} ${FILESDIR}/${i} \
+	@${INSTALL_DATA} ${FILESDIR}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endfor
-	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps \
+# for reading encrypted PDFs
+	@${ECHO} ">>> installing support for encrypted PDF files ..."
+	@${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+#
+# now NOPORTDOCS dependend stuff
+#
 .if !defined(NOPORTDOCS)
-	@${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
-	${INSTALL_DATA} ${WRKSRC}/src/${i} ${PREFIX}/share/ghostscript/hpdj
-
+	@${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 ..."
+	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
+	@${ECHO} ">>>   installing files in HPDJ docu destdir ..."
+.for i in LGPL.txt NEWS hpdj.html
+	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${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 ..."
+	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
+	@${ECHO} ">>>   installing files in HPDJ 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} \
+		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
 .endfor
 .endif
+	@${ECHO} "> post-installation tasks completed."
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript6/distinfo b/print/ghostscript6/distinfo
index 4a877c2e2ed9..b1f8c91af19f 100644
--- a/print/ghostscript6/distinfo
+++ b/print/ghostscript6/distinfo
@@ -1,7 +1,8 @@
-MD5 (ghostscript-6.01.tar.gz) = abad620560b79ff40162f648506ae448
+MD5 (ghostscript-6.50.tar.gz) = 8f52f724f692cf06c94ad7da45eb7ec1
 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
diff --git a/print/ghostscript6/files/patch-aa b/print/ghostscript6/files/patch-aa
index 9330d7f9c504..18f6f663cabf 100644
--- a/print/ghostscript6/files/patch-aa
+++ b/print/ghostscript6/files/patch-aa
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak	Fri Mar 17 23:13:40 2000
-+++ src/unix-gcc.mak	Wed Jul 19 10:23:42 2000
+--- src/unix-gcc.mak.orig	Mon Sep 25 17:06:28 2000
++++ src/unix-gcc.mak	Tue Jan  9 17:30:58 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -48,13 +48,13 @@
  JVERSION=6
  
  # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
-@@ -146,14 +147,14 @@
+@@ -148,14 +148,14 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
 -PSRCDIR=libpng
 +PSRCDIR=${LOCALBASE}/include
- PVERSION=10005
+ PVERSION=10008
  
  # Choose whether to use a shared version of the PNG library, and if so,
  # what its name is.
@@ -65,7 +65,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -165,7 +165,7 @@
+@@ -167,7 +167,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -74,7 +74,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -180,7 +180,7 @@
+@@ -182,7 +182,7 @@
  
  # Define the name of the C compiler.
  
@@ -83,7 +83,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -213,7 +213,7 @@
+@@ -215,7 +215,7 @@
  #   gcc to accept ANSI-style function prototypes and function definitions.
  XCFLAGS=
  
@@ -92,7 +92,7 @@
  
  # Define platform flags for ld.
  # SunOS 4.n may need -Bstatic.
-@@ -222,7 +222,7 @@
+@@ -224,7 +224,7 @@
  #	-R /usr/local/xxx/lib:/usr/local/lib
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
@@ -101,7 +101,7 @@
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -242,7 +242,7 @@
+@@ -244,7 +244,7 @@
  # All reasonable platforms require -lm, but Rhapsody and perhaps one or
  # two others fold libm into libc and don't require any additional library.
  
@@ -110,7 +110,7 @@
  
  # Define the include switch(es) for the X11 header files.
  # This can be null if handled in some other way (e.g., the files are
-@@ -252,7 +252,7 @@
+@@ -254,7 +254,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -119,7 +119,7 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -264,12 +264,12 @@
+@@ -266,12 +266,12 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
@@ -135,7 +135,7 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -327,7 +327,7 @@
+@@ -329,7 +329,7 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
@@ -144,9 +144,9 @@
  
  #DEVICE_DEVS1=
  #DEVICE_DEVS2=
-@@ -345,27 +345,27 @@
- #DEVICE_DEVS14=
- #DEVICE_DEVS15=
+@@ -352,27 +352,27 @@
+ #DEVICE_DEVS19=
+ #DEVICE_DEVS20=
  
 -DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
 -DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev
@@ -193,7 +193,7 @@
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -379,13 +379,13 @@
+@@ -386,13 +386,13 @@
  # detect whether we're running a version of gcc with the const optimization
  # bug.
  
@@ -210,7 +210,7 @@
  CC_LEAF=$(CC_) -fomit-frame-pointer
  # gcc can't use -fomit-frame-pointer with -pg.
  CC_LEAF_PG=$(CC_)
-@@ -412,5 +412,5 @@
+@@ -419,5 +419,5 @@
  include $(GLSRCDIR)/unixinst.mak
  
  # This has to come last so it won't be taken as the default target.
diff --git a/print/ghostscript6/files/patch-ab b/print/ghostscript6/files/patch-ab
deleted file mode 100644
index bb2d26d40db7..000000000000
--- a/print/ghostscript6/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/contrib.mak.orig	Sat Mar 25 21:15:07 2000
-+++ src/contrib.mak	Sat Mar 25 21:15:58 2000
-@@ -343,7 +343,7 @@
- 	$(SETPDEV) $(DD)coslw2p $(coslw_)
- 
- $(DD)coslwxl.dev : $(coslw_) $(DD)page.dev
--	$(SETPDEV) ($DD)coslwxl $(coslw_)
-+	$(SETPDEV) $(DD)coslwxl $(coslw_)
- 
- $(GLOBJ)gdevcslw.$(OBJ) : $(GLSRC)gdevcslw.c $(PDEVH)
- 	$(GLCC) $(GLO_)gdevcslw.$(OBJ) $(C_) $(GLSRC)gdevcslw.c
diff --git a/print/ghostscript6/files/patch-ac b/print/ghostscript6/files/patch-ac
index 319922485be0..148e0e556d33 100644
--- a/print/ghostscript6/files/patch-ac
+++ b/print/ghostscript6/files/patch-ac
@@ -84,4 +84,3 @@ ghostscript code anymore.
 -	}
 -	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
 -    }
- 
diff --git a/print/ghostscript6/files/patch-ad b/print/ghostscript6/files/patch-ad
deleted file mode 100644
index 943abecaa755..000000000000
--- a/print/ghostscript6/files/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch replaces the use of the dangerous mktemp/fopen combo
-with the safe mkstemp/fdopen.
-
-	-mi
-
---- src/gp_unifs.c	Thu Mar  9 03:40:41 2000
-+++ src/gp_unifs.c	Wed Jul 19 09:56:42 2000
-@@ -71,4 +71,5 @@
-     strcat(fname, "XXXXXX");
--    mktemp(fname);
--    return fopen(fname, mode);
-+    len = mkstemp(fname); /* reuse the no longer needed variable */
-+    if (len == -1) return NULL;
-+    return fdopen(len, mode);
- }
diff --git a/print/ghostscript6/files/patch-lib,gs_init.ps b/print/ghostscript6/files/patch-lib,gs_init.ps
new file mode 100644
index 000000000000..a2f5d54ee5b7
--- /dev/null
+++ b/print/ghostscript6/files/patch-lib,gs_init.ps
@@ -0,0 +1,31 @@
+  File:     @(#)$Id: README,v 2.6 2000/11/09 18:33:58 Martin Beta $
+  Contents: README file for the pcl3 distribution
+  Author:   Martin Lottermoser, Greifswaldstrasse 28, 38124 Braunschweig,
+            Germany. E-mail: Martin.Lottermoser@t-online.de.
+[...]
+ 8. There is also a bug in ghostscript's default configuration for the
+    undercolour removal and black generation functions. It shows up when
+    printing PostScript documents using the RGB colour space ("setrgbcolor" or
+    "sethsbcolor") on a device where the CMYK space is the native colour space;
+    this is the case for pcl3 if you specify "-sColourModel=CMYK". The bug
+    results in black being printed as a mixture of cyan, magenta, and yellow.
+    On my printer, this is a slightly greenish grey with fuzzy edges. My
+    subjective impression is that correcting this bug leads to sharper-looking
+    images.
+[...]
+
+I generated a patch as suggested from Martin Lottermoser
+
+	-andreas
+
+--- lib/gs_init.ps.orig	Mon Jan  8 20:47:39 2001
++++ lib/gs_init.ps	Mon Jan  8 20:49:02 2001
+@@ -1229,7 +1229,7 @@
+ % Set the default screen and BG/UCR.
+ /.setdefaultbgucr {
+   systemdict /setblackgeneration known {
+-    { pop 0 } dup setblackgeneration setundercolorremoval
++    {} dup setblackgeneration setundercolorremoval
+   } if
+ } bind def
+ /.useloresscreen {	% - .useloresscreen <bool>
diff --git a/print/ghostscript6/pkg-plist b/print/ghostscript6/pkg-plist
index 7adda9488619..dba27df31e42 100644
--- a/print/ghostscript6/pkg-plist
+++ b/print/ghostscript6/pkg-plist
@@ -13,6 +13,7 @@ bin/gsnd
 bin/lprsetup.sh
 bin/pdf2dsc
 bin/pdf2ps
+bin/pdfopt
 bin/pf2afm
 bin/pfbtopfa
 bin/pj-gs.sh
@@ -28,9 +29,18 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
-libexec/lpr/if-hpdj
+share/doc/ghostscript/%%GS_VERSION%%/hpdj/LGPL.txt
+share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
+share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
+share/doc/ghostscript/%%GS_VERSION%%/pcl3/LGPL
+share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS
+share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
+share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
+share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
+share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
 share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
+share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
 share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
 share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
 share/ghostscript/%%GS_VERSION%%/doc/Current.htm
@@ -55,6 +65,8 @@ share/ghostscript/%%GS_VERSION%%/doc/Make.htm
 share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
 share/ghostscript/%%GS_VERSION%%/doc/News.htm
 share/ghostscript/%%GS_VERSION%%/doc/PUBLIC
+share/ghostscript/%%GS_VERSION%%/doc/Projects.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps2epsi.htm
 share/ghostscript/%%GS_VERSION%%/doc/Ps2pdf.htm
 share/ghostscript/%%GS_VERSION%%/doc/Psfiles.htm
 share/ghostscript/%%GS_VERSION%%/doc/Public.htm
@@ -66,7 +78,12 @@ 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%%/doc/ps2epsi.txt
+share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
+share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
 share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
 share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
 share/ghostscript/%%GS_VERSION%%/examples/chess.ps
@@ -86,6 +103,13 @@ share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
 share/ghostscript/%%GS_VERSION%%/lib/addxchar.ps
 share/ghostscript/%%GS_VERSION%%/lib/align.ps
 share/ghostscript/%%GS_VERSION%%/lib/bdftops.ps
+share/ghostscript/%%GS_VERSION%%/lib/bj8.rpd
+share/ghostscript/%%GS_VERSION%%/lib/bj8gc12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8hg12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8oh06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8pa06n.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8pp12f.upp
+share/ghostscript/%%GS_VERSION%%/lib/bj8ts06n.upp
 share/ghostscript/%%GS_VERSION%%/lib/bjc610a0.upp
 share/ghostscript/%%GS_VERSION%%/lib/bjc610a1.upp
 share/ghostscript/%%GS_VERSION%%/lib/bjc610a2.upp
@@ -116,22 +140,27 @@ share/ghostscript/%%GS_VERSION%%/lib/docie.ps
 share/ghostscript/%%GS_VERSION%%/lib/errpage.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2c.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2pcl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_agl.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_btokn.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ccfnt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ce_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cff.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmdl.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_css_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dbt_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_diskf.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dpnxt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dps.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dps1.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_dps2.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_il1_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_il2_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
@@ -200,7 +229,8 @@ share/ghostscript/%%GS_VERSION%%/lib/pdf_font.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_main.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_ops.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_sec.ps
-share/ghostscript/%%GS_VERSION%%/lib/pdfeof.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdfopt.ps
+share/ghostscript/%%GS_VERSION%%/lib/pdfwrite.ps
 share/ghostscript/%%GS_VERSION%%/lib/pf2afm.ps
 share/ghostscript/%%GS_VERSION%%/lib/pfbtopfa.ps
 share/ghostscript/%%GS_VERSION%%/lib/ppath.ps
@@ -219,6 +249,12 @@ share/ghostscript/%%GS_VERSION%%/lib/ras8m.upp
 share/ghostscript/%%GS_VERSION%%/lib/rollconv.ps
 share/ghostscript/%%GS_VERSION%%/lib/showchar.ps
 share/ghostscript/%%GS_VERSION%%/lib/showpage.ps
+share/ghostscript/%%GS_VERSION%%/lib/st640ih.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640ihg.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640p.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640pg.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640pl.upp
+share/ghostscript/%%GS_VERSION%%/lib/st640plg.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc1520h.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc2.upp
@@ -261,6 +297,20 @@ share/ghostscript/%%GS_VERSION%%/lib/wftopfa.ps
 share/ghostscript/%%GS_VERSION%%/lib/winmaps.ps
 share/ghostscript/%%GS_VERSION%%/lib/wrfont.ps
 share/ghostscript/%%GS_VERSION%%/lib/zeroline.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/BETA
+share/ghostscript/%%GS_VERSION%%/pcl3/BUGS
+share/ghostscript/%%GS_VERSION%%/pcl3/README
+share/ghostscript/%%GS_VERSION%%/pcl3/calign.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/dumppdd.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/example.mcf
+share/ghostscript/%%GS_VERSION%%/pcl3/if-pcl3
+share/ghostscript/%%GS_VERSION%%/pcl3/levels-test.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -429,20 +479,15 @@ 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/doc/ghostscript/%%GS_VERSION%%/hpdj
+@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
+@dirrm share/doc/ghostscript/%%GS_VERSION%%
+@dirrm share/doc/ghostscript
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
+@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
+@dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript/fonts
-@dirrm share/ghostscript/hpdj
 @dirrm share/ghostscript
-@unexec rmdir %D/libexec/lpr 2>/dev/null || true
diff --git a/print/ghostscript6/scripts/configure b/print/ghostscript6/scripts/configure
index 70c6d30b5149..0c5d62596544 100644
--- a/print/ghostscript6/scripts/configure
+++ b/print/ghostscript6/scripts/configure
@@ -1,5 +1,13 @@
 #! /bin/sh
 
+# configure - gs driver preconfiguration, manual driver selection
+# by Andreas Klemm <andreas@FreeBSD.org>
+
+#
+# XXX - needs some rework for gs v 6.50,
+#       therefore currently disabled in Makefile
+#
+
 # driverselection
 /usr/bin/dialog --title "Ghostscript 6 driver configuration" --clear \
 	--checklist "\n\
@@ -45,12 +53,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
   "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
   "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
-  "cdj670"   "HP DeskJet 670/690" OFF \
-  "cdj850"   "HP DeskJet 850/855/870/1100" OFF \
-  "cdj880"   "HP DeskJet 812/815/832/880/882/895/932/970 C (experimental)" OFF \
-  "cdj890"   "HP DeskJet 890" OFF \
   "cdj970"   "HP DeskJet 970, 3rd party" ON \
-  "cdj1600"  "HP DeskJet 1600" OFF \
   "laserjet" "HP LaserJet" ON \
   "ljetplus" "HP LaserJet Plus" ON \
   "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
@@ -71,7 +74,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 \
+  "pcl3"     "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 cf7d289fbf76..cd01400f68aa 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -1,7 +1,10 @@
 #! /bin/sh
 
+# configure.batch - gs driver preconfiguration, batch mode
+# by Andreas Klemm <andreas@FreeBSD.org>
+
 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 \$(DD)hpdj.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
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices