Update a printer driver eplaser for EPSON laser printers to version 2.0.2

5 files changed, 27 insertions, 8 deletions

diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 737bd9897384..bba94f49a1b8 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -24,7 +24,7 @@ MASTER_SITES=	${MASTER_SITE_GNU} \
 		http://www.necs.co.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
 		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.50/ \
-		http://www.epkowa.on.arena.ne.jp/pips/data/lp8500/
+		http://www.epkowa.on.arena.ne.jp/pips/data/lp1900/
 # first for ${MASTER_SITE_GNU}, second for ${MASTER_SITE_LOCAL},
 # third for ${MASTER_SITE_PORTS_JP}
 MASTER_SITE_SUBDIR=	ghostscript asami/LOCAL_PORTS .
@@ -59,7 +59,7 @@ GS_DRIVERS+=	epag-3.09.tar.gz
 GS_DRIVERS+=	gdevalps-0.21.tar.gz
 GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
 GS_DRIVERS+=	gdevrpdl-1.2.tar.gz
-GS_DRIVERS+=	eplaser-1.1.1-550.tgz
+GS_DRIVERS+=	eplaser-2.0.2-550.tgz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
@@ -87,7 +87,7 @@ post-extract:
 	  ${TAR} --unlink -xzf ${DISTDIR}/gdevalps-0.21.tar.gz ; \
 	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
 	  ${TAR} --unlink -xzf ${DISTDIR}/gdevrpdl-1.2.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/eplaser-1.1.1-550.tgz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/eplaser-2.0.2-550.tgz ; \
 	)
 
 pre-patch:
@@ -109,7 +109,7 @@ post-patch:
 	  ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-5.50 ${WRKSRC}; \
 	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-5.50 ${WRKSRC}; \
 	  ${CP} gdevrpdl-1.2/gdevrpdl.c gdevrpdl-1.2/gdevrpdl.mak ${WRKSRC}; \
-	  ${CP} eplaser/gdevescv.[ch] eplaser/gdevescv.mak ${WRKSRC}; \
+	  ${CP} eplaser/gdevescv.[ch] eplaser/gdevescv.mak eplaser/gdevesmv.c eplaser/gdevesmv.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
@@ -119,6 +119,7 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevescv.c.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevesmv.c.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/contrib.mak
@@ -129,6 +130,7 @@ post-patch:
 	@${CAT} ${WRKSRC}/gdevalps.mak-5.50 >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevescv.mak >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevesmv.mak >> ${WRKSRC}/contrib.mak
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index 435bd3c5009e..95ed0f5f0f32 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -9,7 +9,7 @@ MD5 (epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 MD5 (gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (gdevrpdl-1.2.tar.gz) = af11f7926674b5b59c2028efab281889
-MD5 (eplaser-1.1.1-550.tgz) = 91857f6775249f3cb98cd6d645020556
+MD5 (eplaser-2.0.2-550.tgz) = 0332c31a2aab211d64f6e728558e1cb3
 MD5 (gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
 MD5 (gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/japanese/vfghostscript55/files/gdevescv.c.patch b/japanese/vfghostscript55/files/gdevescv.c.patch
index e3a63fad8480..351299ca0cf0 100644
--- a/japanese/vfghostscript55/files/gdevescv.c.patch
+++ b/japanese/vfghostscript55/files/gdevescv.c.patch
@@ -1,5 +1,5 @@
---- jp-printers/eplaser/gdevescv.c.org	Thu Aug 24 18:23:06 2000
-+++ jp-printers/eplaser/gdevescv.c	Sat Sep  2 16:43:12 2000
+--- gdevescv.c.org	Thu Aug 24 18:23:06 2000
++++ gdevescv.c	Sat Sep  2 16:43:12 2000
 @@ -49,7 +49,7 @@
  #include "gscspace.h"
  #include "gsutil.h"
diff --git a/japanese/vfghostscript55/files/gdevesmv.c.patch b/japanese/vfghostscript55/files/gdevesmv.c.patch
new file mode 100644
index 000000000000..27606b3a24c8
--- /dev/null
+++ b/japanese/vfghostscript55/files/gdevesmv.c.patch
@@ -0,0 +1,11 @@
+--- gdevesmv.c.~1~	Thu Sep 28 12:13:38 2000
++++ gdevesmv.c	Fri Sep 29 15:26:14 2000
+@@ -46,7 +46,7 @@
+ #include "gscspace.h"
+ #include "gsutil.h"
+ #include "gdevvec.h"
+-#include "gdevpstr.h"
++//#include "gdevpstr.h"
+ #include "ghost.h"
+ #include "gzstate.h"
+ #include "imemory.h"
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index a5f5a1da8f60..1e0b63efd2dd 100644
--- a/japanese/vfghostscript55/scripts/configure
+++ b/japanese/vfghostscript55/scripts/configure
@@ -4,7 +4,7 @@
 
 if [ ! "X"${BATCH} = "X" ] ; then
 
-PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev lp3000c lp8000c lp8200c lp8500c'
+PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev lp3000c lp8000c lp8200c lp8300c lp8500c lp8600f lp8400f lp8300f lp1900 lp1800'
 
 sed -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev st800.dev uniprint.dev bmp16m.dev ${PRINTER_JAPAN};" \
     < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
@@ -96,7 +96,13 @@ Have fun with this new configuration style !     -andreas \n\n\
    "lp3000c"  "Epson LP-3000C color laser printer" ON \
    "lp8000c"  "Epson LP-8000C color laser printer" ON \
    "lp8200c"  "Epson LP-8200C color laser printer" ON \
+   "lp8300c"  "Epson LP-8300C color laser printer" ON \
    "lp8500c"  "Epson LP-8500C color laser printer" ON \
+   "lp8600f"  "Epson LP-8600FX(N) laser printer" ON \
+   "lp8400f"  "Epson LP-8400FX(N) laser printer" ON \
+   "lp8300f"  "Epson LP-8300F laser printer" ON \
+   "lp1900"   "Epson LP-1900 laser printer" ON \
+   "lp1800"   "Epson LP-1800 laser printer" ON \
    "ibmpro"   "IBM 9-pin Proprinter" OFF \
    "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
    "imagen"   "Imagen ImPress printers" OFF \