8 files changed, 53 insertions, 107 deletions

diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 9d58bf146a5c..72a255cccc0a 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,36 +7,36 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.04
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint/} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
-		${MASTER_SITE_PORTS_JP:S/$/:ports_jp/} \
+		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
+		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
 		http://www.humblesoft.com/pub/:epag \
-		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/:eplaser \
+		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_304/:eplaser \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
-MASTER_SITE_SUBDIR=	ghostscript/:DEFAULT,fonts,ports_jp \
-			gimp-print/:gprint
+MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
+			./:ports_jp
 PKGNAMESUFFIX=	-afpl
-DISTFILES=	${GS_SRCS}:DEFAULT \
-		${GS_FONTS_STD}:fonts \
-		${GS_FONTS_OTHER}:fonts \
+DISTFILES=	${GS_SRCS}:gs_srcs \
+		${GS_FONTS_STD}:gs_fonts \
+		${GS_FONTS_OTHER}:gs_fonts \
 		${HP8XX_SRCS}:hp8xx \
 		${HPDJ_SRCS}:hpdj_pcl3 \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
-		${GPRINT_SRCS}:gprint \
 		${MD2K_SRCS}:md2k \
-		${ALPS_SRCS}:ports_jp \
-		${BJ10V_SRCS}:ports_jp \
-		${LIPS_SRCS}:ports_jp \
-		${DMPRT_SRCS}:ports_jp \
+		${ALPS_SRCS}:ports_jp_gs \
+		${BJ10V_SRCS}:ports_jp_gs \
+		${LIPS_SRCS}:lips \
+		${DMPRT_SRCS}:ports_jp_gs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
@@ -54,8 +54,8 @@ NO_CDROM=	"Can only be distributed for free"
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 
-USE_REINPLACE=	yes
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
@@ -138,13 +138,6 @@ PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 DJ970=		gdevdj9
 DJ970_SRCS=	${DJ970}.c.gz
 
-# Gimp-Print - very high quality driver for Epson, HPs,...
-# http://gimp-print.sourceforge.net/
-GPRINT=		gimp-print
-GPRINT_VERS=	4.2.1
-GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
-GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -164,6 +157,7 @@ BJ10V_NAME=	gdev10v
 BJ10V_SRCS=	${BJ10V_NAME}.tar.gz
 
 # LIPS - additional driver for Canon LIPS II+/III/IVc/IV printers
+# http://www.ucatv.ne.jp/~taeko/software/gs/
 LIPS=		lips
 LIPS_VERS=	2.4.0
 LIPS_NAME=	gdevlips-${LIPS_VERS}
@@ -176,7 +170,7 @@ DMPRT_NAME=	${DMPRT}-${DMPRT_VERS}
 DMPRT_SRCS=	${DMPRT_NAME}.tar.gz
 
 # EPAG - additional driver for Epson ESC/Page printers
-# http://www.humblesoft.com/
+# http://www.humblesoft.com/gdevepag.html
 EPAG=		epag
 EPAG_VERS=	3.09
 EPAG_NAME=	${EPAG}-${EPAG_VERS}
@@ -185,7 +179,7 @@ EPAG_SRCS=	${EPAG_NAME}.tar.gz
 # EPLASER - additional driver for ESC/Page printers (Epson Kowa developed)
 # http://www.epkowa.co.jp/linux/lpd.html
 EPLASER=	eplaser
-EPLASER_VERS=	3.0.1
+EPLASER_VERS=	3.0.4
 EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
 EPLASER_SRCS=	${EPLASER_NAME}-651.tgz
 
@@ -203,7 +197,7 @@ NPDL_SRCS=	${NPDL_NAME}.tar.gz
 
 # GDI - additional driver for Samsung SmartGDI laser printers
 GDI=		gdi
-GDI_NAME=	samsung-gdi-driver-gs5.50
+GDI_NAME=	Samsung-SmartGDI-all-GS
 GDI_SRCS=	${GDI_NAME}.tar.gz
 
 # contributed uniprint profiles
@@ -245,9 +239,6 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS}
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -316,10 +307,6 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   adding ${GPRINT} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/stp.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
 # for MD2K driver
 	${ECHO_MSG} ">>>   adding ${MD2K} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \
@@ -360,7 +347,7 @@ pre-configure:
 		>> ${WRKSRC}/src/contrib.mak
 # for GDI driver
 	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/gdi.contrib.mak \
+	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
@@ -371,36 +358,12 @@ do-configure:
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
-post-configure:
-	${ECHO_MSG} ">>> in post-configure ..."
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   running configure script for ${GPRINT} library ..."
-	cd ${WRKSRC}/${GPRINT_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--without-translated-ppds --with-ghost \
-			--without-gimp --without-samples \
-			--without-user-guide --disable-escputil \
-			--disable-nls --disable-shared \
-			--prefix=${PREFIX}
-
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
 	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
 	${LN} -sf ${WRKSRC}/src/unix-gcc.mak ${WRKSRC}/Makefile
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   building ${GPRINT} library ..."
-	cd ${WRKSRC}/${GPRINT_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
-	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT} ..."
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/ghost/*.[ch] \
-		${WRKSRC}/src
-	${MKDIR} ${WRKSRC}/${GPRINT}
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \
-		${WRKSRC}/${GPRINT}/gimp-print
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
-		${WRKSRC}/${GPRINT}/libgimpprint.a
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -530,13 +493,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${DOCSDIR}/${PORTVERSION}/${PCL3}
 .endfor
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   installing ${GPRINT} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${GPRINT}
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
-		${DOCSDIR}/${PORTVERSION}/${GPRINT}
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
@@ -586,7 +542,7 @@ post-install:
 # for EPLASER driver
 	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPLASER}
-.for i in readme-eplaser-651.euc
+.for i in readme-eplaser-651.euc readme-eplaser-651-jp.euc
 	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
 		${DOCSDIR}/${PORTVERSION}/${EPLASER}
 .endfor
@@ -604,6 +560,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/${i} \
 		${DOCSDIR}/${PORTVERSION}/${NPDL}
 .endfor
+# for GDI driver
+	${ECHO_MSG} ">>>   installing ${GDI} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${GDI}
+.for i in README
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DOCSDIR}/${PORTVERSION}/${GDI}
+.endfor
 .endif
 	${ECHO_MSG} "> post-installation tasks completed."
 
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 96f35da1a645..17ecfbe0785a 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -5,14 +5,13 @@ MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
-MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
 MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
-MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254
+MD5 (ghostscript/eplaser-3.0.4-651.tgz) = 71ba8635e865731c51b6e8fab3c15d2d
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
-MD5 (ghostscript/samsung-gdi-driver-gs5.50.tar.gz) = d85da4a9e26f2d751a22b6f1e19fc6d1
+MD5 (ghostscript/Samsung-SmartGDI-all-GS.tar.gz) = e6963f6c9460a964fe57d38479bbdd41
diff --git a/print/ghostscript8/files/gdi.contrib.mak b/print/ghostscript8/files/gdi.contrib.mak
deleted file mode 100644
index 808b7fb71935..000000000000
--- a/print/ghostscript8/files/gdi.contrib.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-### ---------------- The Samsung SmartGDI laser printer devices --------- ###
-### Note : this driver is used by Samsung SmartGDI compatible printers.   ###
-###
-
-GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
-
-$(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gsparam_h)
-	$(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
-
-$(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
-	$(SETPDEV) $(DD)gdi $(GDIMONO)
-
diff --git a/print/ghostscript8/files/patch-src:gdevgdi.c b/print/ghostscript8/files/patch-src:gdevgdi.c
deleted file mode 100644
index 15f7c66b85ee..000000000000
--- a/print/ghostscript8/files/patch-src:gdevgdi.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gdevgdi.c.orig	Fri Feb  9 04:51:11 2001
-+++ src/gdevgdi.c	Tue Aug 21 11:17:56 2001
-@@ -24,6 +24,7 @@
- /* SAMSUNG GDI driver for Ghostscript */
- #include "gdevprn.h"
- #include "gdevpcl.h"
-+#include "gsparam.h"
- 
- 
- /*
-@@ -126,7 +127,7 @@
- private int
- gdi_open(gx_device *pdev)
- {	/* Change the margins if necessary. */
--	const float _ds *m = 0;
-+	const float *m = 0;
- 	bool move_origin = true;
- 
- 	static const float m_a4[4] = { GDI_MARGINS_A4 };
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
index 94085a8e0710..dca774800545 100644
--- a/print/ghostscript8/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript8/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
 --- src/unix-gcc.mak.orig	Fri Feb  1 15:27:58 2002
-+++ src/unix-gcc.mak	Sat Feb  9 04:34:53 2002
++++ src/unix-gcc.mak	Fri Jun  7 05:20:39 2002
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -101,7 +101,7 @@
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+XCFLAGS+=-I${.CURDIR}/gimp-print
++#XCFLAGS=
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
@@ -110,7 +110,7 @@
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
 -XLDFLAGS=
-+XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib
++XLDFLAGS=-L${LOCALBASE}/lib
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 2d1db2b75ebc..5656e6c852d8 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -44,7 +44,8 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gsepagif.sh
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/psprint
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-651.euc
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-651-jp.euc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gdi/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
@@ -529,7 +530,7 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gdi
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/epag
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/dmprt
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index 4a2a196840d2..e46e721a5b4b 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -50,7 +50,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "m8510"    "C.Itoh M8510 printer" OFF \
   "coslw2p"  "CoStar LabelWriter II II/Plus" OFF \
   "coslwxl"  "CoStar LabelWriter XL" OFF \
-  "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" ON \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
   "dmprt"    "Configurable dot matrix printer driver [DMPRT]" ON \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
@@ -63,23 +62,36 @@ Have fun with this new configuration style !     -andreas \n\n\
   "epag"     "Epson ESC/Page laser printer (generic) [EPAG]" ON \
   "escpage"  "Epson ESC/Page laser printer (generic) [LIPS]" ON \
   "lp2000"   "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" ON \
+  "alc8600"  "Epson AL-C8600 color laser printer [EPLASER]" ON \
+  "alc8500"  "Epson AL-C8500 color laser printer [EPLASER]" ON \
+  "alc2000"  "Epson AL-C2000 color laser printer [EPLASER]" ON \
+  "alc4000"  "Epson AL-C4000 color laser printer [EPLASER]" ON \
   "lp8800c"  "Epson LP-8800C color laser printer [EPLASER]" ON \
   "lp8300c"  "Epson LP-8300C color laser printer [EPLASER]" ON \
   "lp8500c"  "Epson LP-8500C color laser printer [EPLASER]" ON \
   "lp3000c"  "Epson LP-3000C color laser printer [EPLASER]" ON \
   "lp8200c"  "Epson LP-8200C color laser printer [EPLASER]" ON \
   "lp8000c"  "Epson LP-8000C color laser printer [EPLASER]" ON \
+  "epl5900"  "Epson EPL-5900 laser printer [EPLASER]" ON \
+  "epl5800"  "Epson EPL-5800 laser printer [EPLASER]" ON \
+  "epl2050"  "Epson EPL-N2050 laser printer [EPLASER]" ON \
+  "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" ON \
+  "epl2120"  "Epson EPL-N2120 laser printer [EPLASER]" ON \
+  "lp7500"   "Epson LP-7500(R) laser printer [EPLASER]" ON \
+  "lp2400"   "Epson LP-2400 laser printer [EPLASER]" ON \
   "lp2200"   "Epson LP-2200 laser printer [EPLASER]" ON \
   "lp9400"   "Epson LP-9400(R) laser printer [EPLASER]" ON \
+  "lp8900"   "Epson LP-8900(R) laser printer [EPLASER]" ON \
   "lp8700"   "Epson LP-8700(R) laser printer [EPLASER]" ON \
   "lp8100"   "Epson LP-8100(R) laser printer [EPLASER]" ON \
+  "lp7700"   "Epson LP-7700(R) laser printer [EPLASER]" ON \
   "lp8600f"  "Epson LP-8600FX(N) laser printer [EPLASER]" ON \
   "lp8400f"  "Epson LP-8400FX(N) laser printer [EPLASER]" ON \
   "lp8300f"  "Epson LP-8300F laser printer [EPLASER]" ON \
   "lp1900"   "Epson LP-1900(N) laser printer [EPLASER]" ON \
   "lp9600s"  "Epson LP-9600S laser printer [EPLASER]" ON \
-  "lp9600"   "Epson LP-9600 laser printer [EPLASER]" ON \
   "lp9300"   "Epson LP-9300 laser printer [EPLASER]" ON \
+  "lp9600"   "Epson LP-9600 laser printer [EPLASER]" ON \
   "lp8600"   "Epson LP-8600FX(N) laser printer [EPLASER]" ON \
   "lp1800"   "Epson LP-1800 laser printer [EPLASER]" ON \
   "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index 720d16a198ab..3a30da7d6d9b 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -10,7 +10,9 @@ ifndef WITHOUT_X11
 DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
 endif
 
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9600.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)alc8600.dev \$(DD)alc8500.dev \$(DD)alc2000.dev \$(DD)alc4000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)epl5900.dev \$(DD)epl5800.dev \$(DD)epl2050.dev \$(DD)epl2050p.dev \$(DD)epl2120.dev \$(DD)lp7500.dev \$(DD)lp2400.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8900.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp7700.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp9600.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev
+
+DEVICE_DEVS+= \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices