6 files changed, 28 insertions, 47 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 25e3dc0657d4..8648fb198dd4 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \
 		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/AFPL/fonts/:fonts \
@@ -58,7 +58,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" WITHOUT_X11="${WITHOUT_X11}"
-PLIST_SUB=	GS_VERSION=${GS_VERSION}
+PLIST_SUB=	GS_VERSION=${GS_VERSION} EPLASER_GSVERS=${EPLASER_GSVERS}
 
 SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}"
 
@@ -174,9 +174,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
@@ -491,7 +492,7 @@ post-install:
 # for EPLASER driver
 	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${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}/${GS_VERSION}/${EPLASER}
 .endfor
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index b981013e374b..9cf385b82519 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -7,12 +7,11 @@ MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621d
-MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
 MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
+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-afpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
index 84685e9df007..be2792ffee44 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
@@ -1,16 +1,15 @@
---- eplaser/gdevescv.c.orig	Wed Jul  3 13:17:26 2002
-+++ eplaser/gdevescv.c	Fri Nov 29 21:59:00 2002
-@@ -37,8 +37,7 @@
+--- eplaser/gdevescv.c.orig	Fri Jan 24 13:35:28 2003
++++ eplaser/gdevescv.c	Tue Mar 25 18:03:39 2003
+@@ -37,8 +37,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include <string.h>
+ #include <string.h>
  
  #include "math_.h"
- #include "gx.h"
-@@ -305,30 +304,30 @@
+@@ -321,30 +319,30 @@
  };
  
  /* Vector device implementation */
@@ -59,16 +58,7 @@
  private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
  private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -585,6 +584,8 @@
-     {421, 595, 15, "A5"},		/* A5 */
-     {709, 1002, 24, "B4"},		/* B4 */
-     {501, 709, 25, "B5"},		/* B5 */
-+    {729, 1032, 24, "B5"},		/* JIS B4 */
-+    {516, 729, 25, "B5"},		/* JIS B5 */
-     {612, 792, 30, "LT"},		/* Letter */
-     {396, 612, 31, "HLT"},		/* Half Letter */
-     {612, 1008, 32, "LGL"},		/* Legal */
-@@ -1849,13 +1850,13 @@
+@@ -1879,13 +1877,13 @@
  
  /* Process the next piece of an image. */
  private int
@@ -84,7 +74,7 @@
      gx_device *dev = info->dev;
  #endif
      gx_device_vector *const	vdev = (gx_device_vector *) dev;
-@@ -1873,7 +1874,7 @@
+@@ -1903,7 +1901,7 @@
  
      {
  
@@ -93,7 +83,7 @@
  	if (height == 260)
  	    height = 1;
  #endif
-@@ -2011,13 +2012,13 @@
+@@ -2041,13 +2039,13 @@
  
  
  private int
diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
index ec97843811b5..bc6f85a0b807 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
@@ -1,16 +1,15 @@
---- eplaser/gdevesmv.c.orig	Wed Jul  3 13:20:55 2002
-+++ eplaser/gdevesmv.c	Fri Nov 29 22:00:34 2002
-@@ -34,8 +34,7 @@
+--- eplaser/gdevesmv.c.orig	Fri Jan 24 13:34:55 2003
++++ eplaser/gdevesmv.c	Tue Mar 25 18:13:37 2003
+@@ -34,8 +34,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include <string.h>
+ #include <string.h>
  
  #include "math_.h"
- #include "gx.h"
-@@ -385,30 +384,30 @@
+@@ -393,30 +391,30 @@
  
  
  /* Vector device implementation */
@@ -59,16 +58,7 @@
  private int esmv_setlinewidth(gx_device_vector * vdev, floatp width);
  private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -665,6 +664,8 @@
-     {421, 595, 15, "A5"},		/* A5 */
-     {709, 1002, 24, "B4"},		/* B4 */
-     {501, 709, 25, "B5"},		/* B5 */
-+    {729, 1032, 24, "B4"},		/* JIS B4 */
-+    {516, 729, 25, "B5"},		/* JIS B5 */
-     {612, 792, 30, "LT"},		/* Letter */
-     {396, 612, 31, "HLT"},		/* Half Letter */
-     {612, 1008, 32, "LGL"},		/* Legal */
-@@ -1933,13 +1934,13 @@
+@@ -1958,13 +1956,13 @@
  
  /* Process the next piece of an image. */
  private int
@@ -84,7 +74,7 @@
      gx_device *dev = info->dev;
  #endif
      gx_device_vector *const	vdev = (gx_device_vector *) dev;
-@@ -1957,7 +1958,7 @@
+@@ -1982,7 +1980,7 @@
  
      {
  
@@ -93,7 +83,7 @@
  	if (height == 260)
  	    height = 1;
  #endif
-@@ -2114,13 +2115,13 @@
+@@ -2139,13 +2137,13 @@
  
  
  private int
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index cc9d46f0194b..69aa5bd5e54f 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -43,8 +43,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%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 932bf56fde92..eb40ba77557b 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -31,7 +31,7 @@ else
 		epag \
 		escpage lp2000 \
 		alc8600 alc8500 alc2000 alc4000 \
-		lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \
+		lp9500c lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \
 		epl5900 epl5800 epl2050 epl2050p epl2120 \
 		lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 lp8100 lp7700 \
 		lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 lp9600 lp8600 \
@@ -148,6 +148,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "alc8500"  "Epson AL-C8500 color laser printer [EPLASER]" "$status_alc8500" \
   "alc2000"  "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \
   "alc4000"  "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \
+  "lp9500c"  "Epson LP-9500C color laser printer [EPLASER]" "$status_lp9500c" \
   "lp8800c"  "Epson LP-8800C color laser printer [EPLASER]" "$status_lp8800c" \
   "lp8300c"  "Epson LP-8300C color laser printer [EPLASER]" "$status_lp8300c" \
   "lp8500c"  "Epson LP-8500C color laser printer [EPLASER]" "$status_lp8500c" \