14 files changed, 30 insertions, 32 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 80eb36e01265..4b7693d82eba 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gs_fonts/} \
 		${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_304/:eplaser \
+		http://www.epkowa.on.arena.ne.jp/pips/data/V306/:eplaser \
 		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
@@ -61,7 +61,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
+PLIST_SUB=	GS_VERSION=${PORTVERSION} EPLASER_GSVERS=${EPLASER_GSVERS}
 
 MAN1=		ansi2knr.1 dvipdf.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
 		gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \
@@ -203,9 +203,10 @@ 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.4
+EPLASER_VERS=	3.0.6
+EPLASER_GSVERS=	652
 EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
-EPLASER_SRCS=	${EPLASER_NAME}-651.tgz
+EPLASER_SRCS=	${EPLASER_NAME}-${EPLASER_GSVERS}.tgz
 
 # MJC - additional driver for Epson MachJet series
 MJC=		mjc
@@ -608,7 +609,7 @@ post-install:
 # for EPLASER driver
 	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPLASER}
-.for i in readme-eplaser-651.euc readme-eplaser-651-jp.euc
+.for i in readme-eplaser-${EPLASER_GSVERS}.euc readme-eplaser-${EPLASER_GSVERS}-jp.euc
 	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
 		${DOCSDIR}/${PORTVERSION}/${EPLASER}
 .endfor
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index a5b7d4d0bf14..494e722873c1 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -13,8 +13,7 @@ MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621
 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.4-651.tgz) = 71ba8635e865731c51b6e8fab3c15d2d
-MD5 (ghostscript/eplaser-3.0.4-651.tgz) = 758b6adbe96a75510105d3d4f204bc5c
+MD5 (ghostscript/eplaser-3.0.6-652.tgz) = a575b9f3424d0a9ab6fbb5619429a8fd
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
 MD5 (ghostscript/Samsung-SmartGDI-all-GS.tar.gz) = e6963f6c9460a964fe57d38479bbdd41
diff --git a/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c b/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c
index dbc3f4a109a9..6168d5b7da61 100644
--- a/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c
@@ -1,15 +1,14 @@
 --- eplaser/gdevescv.c.orig	Fri Dec 21 15:50:22 2001
 +++ eplaser/gdevescv.c	Sat Apr 27 13:45:53 2002
-@@ -37,8 +37,7 @@
+@@ -37,8 +37,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include <string.h>
+ #include <string.h>
  
  #include "math_.h"
- #include "gx.h"
 @@ -1760,13 +1759,13 @@
  
  /* Process the next piece of an image. */
diff --git a/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c b/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c
index bce92ff8358c..0d5ba3b0db97 100644
--- a/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c
@@ -1,15 +1,14 @@
 --- eplaser/gdevesmv.c.orig	Fri Dec 14 10:50:14 2001
 +++ eplaser/gdevesmv.c	Sat Apr 27 13:46:31 2002
-@@ -34,8 +34,7 @@
+@@ -34,8 +34,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include <string.h>
+ #include <string.h>
  
  #include "math_.h"
- #include "gx.h"
 @@ -1799,13 +1798,13 @@
  
  /* Process the next piece of an image. */
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index 36857e18a44b..94d09cbeb40f 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -45,8 +45,8 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt
 %%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%%/eplaser/readme-eplaser-651-jp.euc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-%%EPLASER_GSVERS%%.euc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-%%EPLASER_GSVERS%%-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
diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure
index 583b96011dec..a26a5fd19813 100644
--- a/print/ghostscript-gnu/scripts/configure
+++ b/print/ghostscript-gnu/scripts/configure
@@ -66,6 +66,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
+  "lp9500c"  "Epson LP-9500C 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 \
diff --git a/print/ghostscript-gnu/scripts/configure.batch b/print/ghostscript-gnu/scripts/configure.batch
index fd01eff0f4b2..ae4e22973c38 100644
--- a/print/ghostscript-gnu/scripts/configure.batch
+++ b/print/ghostscript-gnu/scripts/configure.batch
@@ -5,7 +5,7 @@ ifndef WITHOUT_X11
 DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
 endif
 
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)bjccmyk.dev \$(DD)bjccolor.dev \$(DD)bjcgray.dev \$(DD)bjcmono.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)alc8600.dev \$(DD)alc8500.dev \$(DD)alc2000.dev \$(DD)alc4000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)epl5900.dev \$(DD)epl5800.dev \$(DD)epl2050.dev \$(DD)epl2050p.dev \$(DD)epl2120.dev \$(DD)lp7500.dev \$(DD)lp2400.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8900.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp7700.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp9600.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)bjccmyk.dev \$(DD)bjccolor.dev \$(DD)bjcgray.dev \$(DD)bjcmono.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)alc8600.dev \$(DD)alc8500.dev \$(DD)alc2000.dev \$(DD)alc4000.dev \$(DD)lp9500c.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
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 80eb36e01265..4b7693d82eba 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gs_fonts/} \
 		${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_304/:eplaser \
+		http://www.epkowa.on.arena.ne.jp/pips/data/V306/:eplaser \
 		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
@@ -61,7 +61,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
+PLIST_SUB=	GS_VERSION=${PORTVERSION} EPLASER_GSVERS=${EPLASER_GSVERS}
 
 MAN1=		ansi2knr.1 dvipdf.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
 		gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \
@@ -203,9 +203,10 @@ 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.4
+EPLASER_VERS=	3.0.6
+EPLASER_GSVERS=	652
 EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
-EPLASER_SRCS=	${EPLASER_NAME}-651.tgz
+EPLASER_SRCS=	${EPLASER_NAME}-${EPLASER_GSVERS}.tgz
 
 # MJC - additional driver for Epson MachJet series
 MJC=		mjc
@@ -608,7 +609,7 @@ post-install:
 # for EPLASER driver
 	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPLASER}
-.for i in readme-eplaser-651.euc readme-eplaser-651-jp.euc
+.for i in readme-eplaser-${EPLASER_GSVERS}.euc readme-eplaser-${EPLASER_GSVERS}-jp.euc
 	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
 		${DOCSDIR}/${PORTVERSION}/${EPLASER}
 .endfor
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index a5b7d4d0bf14..494e722873c1 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -13,8 +13,7 @@ MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621
 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.4-651.tgz) = 71ba8635e865731c51b6e8fab3c15d2d
-MD5 (ghostscript/eplaser-3.0.4-651.tgz) = 758b6adbe96a75510105d3d4f204bc5c
+MD5 (ghostscript/eplaser-3.0.6-652.tgz) = a575b9f3424d0a9ab6fbb5619429a8fd
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
 MD5 (ghostscript/Samsung-SmartGDI-all-GS.tar.gz) = e6963f6c9460a964fe57d38479bbdd41
diff --git a/print/ghostscript7/files/patch-eplaser:gdevescv.c b/print/ghostscript7/files/patch-eplaser:gdevescv.c
index dbc3f4a109a9..6168d5b7da61 100644
--- a/print/ghostscript7/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript7/files/patch-eplaser:gdevescv.c
@@ -1,15 +1,14 @@
 --- eplaser/gdevescv.c.orig	Fri Dec 21 15:50:22 2001
 +++ eplaser/gdevescv.c	Sat Apr 27 13:45:53 2002
-@@ -37,8 +37,7 @@
+@@ -37,8 +37,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include <string.h>
+ #include <string.h>
  
  #include "math_.h"
- #include "gx.h"
 @@ -1760,13 +1759,13 @@
  
  /* Process the next piece of an image. */
diff --git a/print/ghostscript7/files/patch-eplaser:gdevesmv.c b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
index bce92ff8358c..0d5ba3b0db97 100644
--- a/print/ghostscript7/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
@@ -1,15 +1,14 @@
 --- eplaser/gdevesmv.c.orig	Fri Dec 14 10:50:14 2001
 +++ eplaser/gdevesmv.c	Sat Apr 27 13:46:31 2002
-@@ -34,8 +34,7 @@
+@@ -34,8 +34,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include <string.h>
+ #include <string.h>
  
  #include "math_.h"
- #include "gx.h"
 @@ -1799,13 +1798,13 @@
  
  /* Process the next piece of an image. */
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index 36857e18a44b..94d09cbeb40f 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -45,8 +45,8 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt
 %%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%%/eplaser/readme-eplaser-651-jp.euc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-%%EPLASER_GSVERS%%.euc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-%%EPLASER_GSVERS%%-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
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index 583b96011dec..a26a5fd19813 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -66,6 +66,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
+  "lp9500c"  "Epson LP-9500C 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 \
diff --git a/print/ghostscript7/scripts/configure.batch b/print/ghostscript7/scripts/configure.batch
index fd01eff0f4b2..ae4e22973c38 100644
--- a/print/ghostscript7/scripts/configure.batch
+++ b/print/ghostscript7/scripts/configure.batch
@@ -5,7 +5,7 @@ ifndef WITHOUT_X11
 DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
 endif
 
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)bjccmyk.dev \$(DD)bjccolor.dev \$(DD)bjcgray.dev \$(DD)bjcmono.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)alc8600.dev \$(DD)alc8500.dev \$(DD)alc2000.dev \$(DD)alc4000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)epl5900.dev \$(DD)epl5800.dev \$(DD)epl2050.dev \$(DD)epl2050p.dev \$(DD)epl2120.dev \$(DD)lp7500.dev \$(DD)lp2400.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8900.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp7700.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp9600.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)bjccmyk.dev \$(DD)bjccolor.dev \$(DD)bjcgray.dev \$(DD)bjcmono.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)alc8600.dev \$(DD)alc8500.dev \$(DD)alc2000.dev \$(DD)alc4000.dev \$(DD)lp9500c.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