- Update to version 8.13

PR:		61077
Submitted by:	Ports Fury

14 files changed, 226 insertions, 107 deletions

diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 7bb0b35ecd61..2b68cb205367 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,13 +7,10 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print
-MASTER_SITES=	\
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:gs_fonts \
-		${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
-		http://hp.sourceforge.net/:hp2200 \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
+		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://www.harsch.net/Download/:dj970 \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
 		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
@@ -24,6 +21,7 @@ MASTER_SITES=	\
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/:gs_fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
 			bjc250gs/:bjc250 \
@@ -32,7 +30,7 @@ PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
 		${GS_FONTS_STD}:gs_fonts \
 		${GS_FONTS_OTHER}:gs_fonts \
-		${HP2200_SRCS}:hp2200 \
+		${HP8XX_SRCS}:hp8xx \
 		${DJ970_SRCS}:dj970 \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp_gs \
@@ -81,7 +79,7 @@ MLINKS=		gslp.1 gsbj.1 \
 		ps2pdf.1 ps2pdf13.1 \
 		ps2ps.1 eps2eps.1
 
-XCFLAGS=	-DUPD_SIGNAL=0
+XCFLAGS=	-DUPD_SIGNAL=0 -DSTDINT_TYPES_DEFINED=1
 
 .if defined(A4)
 XCFLAGS+=	-DA4
@@ -97,6 +95,11 @@ USE_XLIB=	yes
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 .endif
 
+.if defined(WITH_FT_BRIDGE)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2
+MAKE_ENV+=	FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a"
+.endif
+
 .if defined(WITH_SHLIB)
 .undef WITHOUT_X11
 USE_GNOME=	gtk12
@@ -120,10 +123,10 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
-# HP2200 - additional driver for HP DeskJet 8xx and Business Inkjet 2200
-# http://hp.sourceforge.net/gs-hp2200.php
-HP2200=		hp2200
-HP2200_SRCS=	gs-hp2200.tar.gz
+# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
+# http://www.gelhaus.net/hp880c/
+HP8XX=		cdj880
+HP8XX_SRCS=	gdevcd8.tar.gz
 
 # DJ970 - additional driver for HP DeskJet 970, supports duplex printing
 # http://www.harsch.net/Ghostscript/ghostscript.html
@@ -177,9 +180,9 @@ EPAG_NAME=	${EPAG}-${EPAG_VERS}
 EPAG_SRCS=	${EPAG_NAME}.tar.gz
 
 # EPLASER - additional driver for ESC/Page printers (Epson Kowa developed)
-# http://www.epkowa.co.jp/linux/lpd.html
+# http://www.epkowa.co.jp/english/linux_e/index.html
 EPLASER=	eplaser
-EPLASER_VERS=	3.1.1
+EPLASER_VERS=	3.1.3
 EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
 EPLASER_SRCS=	${EPLASER_NAME}-705.tgz
 
@@ -231,10 +234,9 @@ post-extract:
 # configure.batch, which update unix-gcc.mak to build gs with these
 # new devices !
 #
-# for HP2200 driver
-	${ECHO_MSG} ">>>   extracting ${HP2200_SRCS} ..."
-	${MKDIR} ${WRKSRC}/${HP2200}
-	${TAR} -C ${WRKSRC}/${HP2200} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP2200_SRCS}
+# for HP8XX driver
+	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
 # for DJ970 driver
 	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
@@ -302,9 +304,9 @@ post-patch:
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
 	${ECHO_MSG} ">>> in pre-configure ..."
-# for HP2200 driver
-	${ECHO_MSG} ">>>   adding ${HP2200} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/chp2200.contrib.mak \
+# for HP8XX driver
+	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for DJ970 driver
 	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
@@ -370,11 +372,6 @@ pre-build:
 	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
-# for HP2200 driver
-	${ECHO_MSG} ">>>   creating symlinks for ${HP2200} ..."
-.for i in gdevcd8.c
-	${LN} -sf ${WRKSRC}/${HP2200}/${i} ${WRKSRC}/src
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -424,12 +421,20 @@ pre-build:
 	${ECHO_MSG} ">>>   creating symlinks for ${LXM3200} ..."
 .for i in gdevlx32.c
 	${LN} -sf ${WRKSRC}/${LXM3200_NAME}/${i} ${WRKSRC}/src
-.endfor 
+.endfor
 # for LEX7000 driver
 	${ECHO_MSG} ">>>   creating symlinks for ${LEX7000} ..."
 .for i in gdevlx7.c
 	${LN} -sf ${WRKSRC}/${LEX7000}/src/${i} ${WRKSRC}/src
 .endfor
+.if defined(WITH_FT_BRIDGE)
+	${MKDIR} ${WRKSRC}/freetype/include
+	${LN} -sf ${LOCALBASE}/include/freetype2/freetype \
+		${WRKSRC}/freetype/include/freetype
+	${MKDIR} ${WRKSRC}/freetype/objs
+	${LN} -sf ${LOCALBASE}/lib/libfreetype.a \
+		${WRKSRC}/freetype/objs/freetype214MT_D.a
+.endif
 
 pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index 021c63b6208b..c0b46adb923b 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-GS_VERSION=	8.11
+GS_VERSION=	8.13
 
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 866f16fba2f1..730d3aaf160b 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -1,7 +1,7 @@
-MD5 (ghostscript/ghostscript-8.11.tar.bz2) = 5d0e813e483e89135abd95f2e4661a89
-MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 6865682b095f8c4500c54b285ff05ef6
+MD5 (ghostscript/ghostscript-8.13.tar.bz2) = f942e72ed73758f49f17b3ad52962c2a
+MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = d7cdf58a95f7dd66d089d77e7ca8654c
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
+MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
@@ -10,7 +10,7 @@ MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621
 MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
 MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
-MD5 (ghostscript/eplaser-3.1.1-705.tgz) = 3b984ec8c3d2f161b569783f4884fdea
+MD5 (ghostscript/eplaser-3.1.3-705.tgz) = 036ce4658aee899f8412396736ad9fc9
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b
 MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b
diff --git a/print/ghostscript8/files/chp2200.contrib.mak b/print/ghostscript8/files/cdj850.contrib.mak
index c71ea8ac3512..8faefec5fe4e 100644
--- a/print/ghostscript8/files/chp2200.contrib.mak
+++ b/print/ghostscript8/files/cdj850.contrib.mak
@@ -1,5 +1,4 @@
-### --------------- The H-P Buisiness Inkjet 2200 devices --------------- ###
-
+###- cdj850 - HP 850 Driver under development -------- ###
 cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
 $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
@@ -17,9 +16,6 @@ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
 $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
 	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
 
-$(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
-
 $(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
  $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
diff --git a/print/ghostscript8/files/patch-eplaser:gdevescv.c b/print/ghostscript8/files/patch-eplaser:gdevescv.c
index 3578352b1b7e..e52c4569c06a 100644
--- a/print/ghostscript8/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript8/files/patch-eplaser:gdevescv.c
@@ -1,15 +1,28 @@
---- eplaser/gdevescv.c.orig	Fri Jul 25 20:59:58 2003
-+++ eplaser/gdevescv.c	Tue Sep  9 22:03:50 2003
-@@ -37,8 +37,6 @@
+--- eplaser/gdevescv.c.orig	Thu Oct 30 21:41:16 2003
++++ eplaser/gdevescv.c	Wed Dec 17 00:51:21 2003
+@@ -37,10 +37,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
- #include <string.h>
- 
+-#include <string.h>
+-
  #include "math_.h"
-@@ -321,6 +319,16 @@
+ #include "gx.h"
+ #include "gserrors.h"
+@@ -62,6 +58,10 @@
+ #include "gspath.h"
+ #include "gzpath.h"
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
+ /* ---------------- Device definition ---------------- */
+ 
+ /* Device procedures */
+@@ -335,6 +335,16 @@
  };
  
  /* Vector device implementation */
@@ -26,7 +39,7 @@
  private int escv_beginpage(P1(gx_device_vector * vdev));
  private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
  private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -329,10 +337,25 @@
+@@ -343,10 +353,25 @@
  private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
  private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
  			       gs_logical_operation_t diff));
@@ -52,7 +65,7 @@
  private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
  private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
  			   floatp x, floatp y, gx_path_type_t type));
-@@ -345,6 +368,7 @@
+@@ -359,6 +384,7 @@
  				floatp x_start, floatp y_start, gx_path_type_t type));
  
  private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
@@ -60,3 +73,21 @@
  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);
+@@ -1570,7 +1596,7 @@
+             pdev->MaskState = 1;
+         }
+ 	color_set_pure(&color, one);
+-	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
++	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
+ 
+ 	/* ここを通過したら以下の色設定は無意味？ */
+     }
+@@ -1669,7 +1695,7 @@
+     if (w <= 0 || h <= 0) return 0;
+     
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0
+ 	) 
diff --git a/print/ghostscript8/files/patch-eplaser:gdevesmv.c b/print/ghostscript8/files/patch-eplaser:gdevesmv.c
index b18c7503f5f5..2bcb1b8e273d 100644
--- a/print/ghostscript8/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript8/files/patch-eplaser:gdevesmv.c
@@ -1,15 +1,28 @@
---- eplaser/gdevesmv.c.orig	Tue Aug 26 19:45:23 2003
-+++ eplaser/gdevesmv.c	Tue Sep  9 22:08:25 2003
-@@ -34,8 +34,6 @@
+--- eplaser/gdevesmv.c.orig	Tue Oct 28 19:40:09 2003
++++ eplaser/gdevesmv.c	Wed Dec 17 00:50:58 2003
+@@ -34,10 +34,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
- #include <string.h>
- 
+-#include <string.h>
+-
  #include "math_.h"
-@@ -407,6 +405,16 @@
+ #include "gx.h"
+ #include "gserrors.h"
+@@ -59,6 +55,10 @@
+ #include "gspath.h"
+ #include "gzpath.h"
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
+ /* ---------------- Device definition ---------------- */
+ 
+ /* Device procedures */
+@@ -428,6 +428,16 @@
  
  
  /* Vector device implementation */
@@ -26,7 +39,7 @@
  private int esmv_beginpage(P1(gx_device_vector * vdev));
  private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
  private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -415,10 +423,25 @@
+@@ -436,10 +446,25 @@
  private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
  private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
  			       gs_logical_operation_t diff));
@@ -52,7 +65,7 @@
  private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
  private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
  			   floatp x, floatp y, gx_path_type_t type));
-@@ -431,6 +454,7 @@
+@@ -452,6 +477,7 @@
  				floatp x_start, floatp y_start, gx_path_type_t type));
  
  private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
@@ -60,3 +73,21 @@
  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);
+@@ -1688,7 +1714,7 @@
+             pdev->MaskState = 1;
+         }
+ 	color_set_pure(&color, one);
+-	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
++	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
+ 
+ 	/* ここを通過したら以下の色設定は無意味？ */
+     }
+@@ -1779,7 +1805,7 @@
+     if (w <= 0 || h <= 0) return 0;
+     
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0
+ 	) 
diff --git a/print/ghostscript8/files/patch-lib:pdf_font.ps b/print/ghostscript8/files/patch-lib:pdf_font.ps
new file mode 100644
index 000000000000..28e098c7acd9
--- /dev/null
+++ b/print/ghostscript8/files/patch-lib:pdf_font.ps
@@ -0,0 +1,15 @@
+--- lib/pdf_font.ps.orig	Fri Oct 24 02:45:33 2003
++++ lib/pdf_font.ps	Thu Dec 18 23:11:07 2003
+@@ -1113,10 +1113,12 @@
+ 
+ /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
+   dup /BaseFont get exch 1 index findCIDFont
++  addCIDmetrics /CIDFont defineresource
+ } bdef
+ 
+ /buildCIDType2 {	% <CIDFontType2-font-resource> buildCIDType2 <font>
+   dup /BaseFont get exch 1 index findCIDFont
++  addCIDmetrics /CIDFont defineresource
+ } bdef
+ 
+ /processCIDToGIDMap { % <fontres> <cidfont> processCIDToGIDMap <fontres> <cidfont>
diff --git a/print/ghostscript8/files/patch-lips:gdevl4v.c b/print/ghostscript8/files/patch-lips:gdevl4v.c
index 91da63b0b63e..15f8af27eda0 100644
--- a/print/ghostscript8/files/patch-lips:gdevl4v.c
+++ b/print/ghostscript8/files/patch-lips:gdevl4v.c
@@ -1,5 +1,5 @@
 --- lips/gdevl4v.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevl4v.c	Fri Sep 12 10:11:25 2003
++++ lips/gdevl4v.c	Wed Dec 10 19:42:42 2003
 @@ -230,41 +230,66 @@
  };
  
@@ -33,7 +33,7 @@
 +private int
 +lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 +	       floatp y, gx_path_type_t type);
-+private int
+ private int
 +lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 +	       floatp y, gx_path_type_t type);
 +private int
@@ -42,7 +42,8 @@
 +		gx_path_type_t type);
 +lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
 +		  floatp y_start, gx_path_type_t type);
-+
+ 
+-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
 +private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
 +#else
 +private int lips4v_beginpage(P1(gx_device_vector * vdev));
@@ -56,9 +57,8 @@
 +private int
 +lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
 +		 gs_logical_operation_t diff);
- private int
- 
--lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++private int
++
 +lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
  private int
 -lips4v_moveto(P6
@@ -120,3 +120,21 @@
  	lputs(s, paper);
      }
      pdev->prev_paper_size = paper_size;
+@@ -1881,7 +1906,7 @@
+ 	}
+ 	color_set_pure(&color, one);
+ 	code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
+-					     &color);
++					     NULL, &color);
+     }
+     if (code < 0)
+ 	return 0;
+@@ -2026,7 +2051,7 @@
+     if (w <= 0 || h <= 0)
+ 	return 0;
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0)
+ 	return gx_default_fill_mask(dev, data, data_x, raster, id,
diff --git a/print/ghostscript8/files/patch-src:cpca_gdevl4v.c b/print/ghostscript8/files/patch-src:cpca_gdevl4v.c
index 005f7cdf39dc..8e7c323a351d 100644
--- a/print/ghostscript8/files/patch-src:cpca_gdevl4v.c
+++ b/print/ghostscript8/files/patch-src:cpca_gdevl4v.c
@@ -1,5 +1,5 @@
 --- src/cpca_gdevl4v.c.orig	Tue May  7 00:30:00 2002
-+++ src/cpca_gdevl4v.c	Fri Dec  6 04:59:34 2002
++++ src/cpca_gdevl4v.c	Wed Dec 10 19:54:46 2003
 @@ -316,41 +316,35 @@
  };
  
@@ -31,14 +31,13 @@
  
 -lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
 +lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
  private int
 -lips4v_moveto(P6
 -	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 -	       floatp y, gx_path_type_t type));
--private int
++lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
 -lips4v_lineto(P6
 -	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 -	       floatp y, gx_path_type_t type));
@@ -63,3 +62,21 @@
  private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
  private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -2296,7 +2290,7 @@
+ 	}
+ 	color_set_pure(&color, one);
+ 	code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
+-					     &color);
++					     NULL, &color);
+     }
+     if (code < 0)
+ 	return 0;
+@@ -2438,7 +2432,7 @@
+     if (w <= 0 || h <= 0)
+ 	return 0;
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0)
+ 	return gx_default_fill_mask(dev, data, data_x, raster, id,
diff --git a/print/ghostscript8/files/patch-hp2200:gdevcd8.c b/print/ghostscript8/files/patch-src:gdevcd8.c
index 497acc7d3b65..f92af5b292f4 100644
--- a/print/ghostscript8/files/patch-hp2200:gdevcd8.c
+++ b/print/ghostscript8/files/patch-src:gdevcd8.c
@@ -1,6 +1,6 @@
---- hp2200/gdevcd8.c.orig	Wed Jun 21 20:39:33 2000
-+++ hp2200/gdevcd8.c	Sat Nov 23 03:03:58 2002
-@@ -409,19 +409,19 @@
+--- src/gdevcd8.c.orig	Mon Feb 28 16:01:59 2000
++++ src/gdevcd8.c	Wed Dec 10 21:32:53 2003
+@@ -406,19 +406,19 @@
  };
  
  private int
@@ -29,7 +29,7 @@
      {
  	rescale_byte_wise1x1, rescale_byte_wise1x2
      },
-@@ -574,16 +574,16 @@
+@@ -571,16 +571,16 @@
  };
  
      /* function pointer typedefs for device driver struct */
@@ -51,7 +51,7 @@
  
  typedef struct gx_device_cdj850_s {
      gx_device_common;
-@@ -729,60 +729,60 @@
+@@ -699,52 +699,52 @@
   *  functions.
   */
  private void
@@ -117,21 +117,10 @@
 -     cdj1600_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
 +     cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
  
- /*  Functions for the HP2200C */
- private void
--     chp2200_start_raster_mode(P3(gx_device_printer * pdev,
--				 int papersize, FILE * prn_stream));
-+     chp2200_start_raster_mode(gx_device_printer * pdev,
-+				 int papersize, FILE * prn_stream);
- 
- private void
--     chp2200_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+     chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
  
  
- private const gx_device_procs cdj670_procs =
-@@ -855,12 +855,12 @@
- 	       chp2200_terminate_page);
+@@ -804,12 +804,12 @@
+ 		cdj1600_terminate_page);
  
  /* Forward references */
 -private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
@@ -149,7 +138,7 @@
  
  
  /*  hp_colour_open()
-@@ -1102,73 +1102,73 @@
+@@ -1028,73 +1028,73 @@
  
  /* internal functions */
  private void
@@ -247,7 +236,7 @@
  
  
  private void
-@@ -3393,13 +3393,14 @@
+@@ -2744,13 +2744,14 @@
      (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
  
  private gx_color_index
@@ -266,7 +255,7 @@
  
      switch (pdev->color_info.depth) {
  	case 1:
-@@ -3432,9 +3433,11 @@
+@@ -2783,9 +2784,11 @@
  /* Mapping of RGB colors to gray values. */
  
  private gx_color_index
@@ -280,7 +269,7 @@
      if (gx_color_value_to_byte(r & g & b) == 0xff) {
  	return (gx_color_index) 0;	/* White */
      } else {
-@@ -3522,9 +3525,11 @@
+@@ -2873,9 +2876,11 @@
  }
  
  private gx_color_index
diff --git a/print/ghostscript8/files/patch-src:unix-dll.mak b/print/ghostscript8/files/patch-src:unix-dll.mak
index 2ee0a5c3a0d1..dbecfe241c4d 100644
--- a/print/ghostscript8/files/patch-src:unix-dll.mak
+++ b/print/ghostscript8/files/patch-src:unix-dll.mak
@@ -1,6 +1,6 @@
---- src/unix-dll.mak.orig	Wed Oct 17 19:11:23 2001
-+++ src/unix-dll.mak	Sat Feb  9 04:53:18 2002
-@@ -48,11 +48,9 @@
+--- src/unix-dll.mak.orig	Wed Sep 24 22:41:20 2003
++++ src/unix-dll.mak	Wed Dec 10 19:25:49 2003
+@@ -46,11 +46,9 @@
  
  # shared library
  GS_SONAME=lib$(GS).so
@@ -14,7 +14,7 @@
  
  # Shared object is built by redefining GS_XE in a recursive make.
  
-@@ -60,24 +58,20 @@
+@@ -58,24 +56,20 @@
  
  $(GS_SO): $(GS_SO_MAJOR)
  	$(RM_) $(GS_SO)
@@ -29,7 +29,7 @@
  
  $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
 -	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
-+	$(GLCC) `$(GTK_CONFIG) --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `$(GTK_CONFIG) --libs`
++	$(GLCC) `pkg-config --cflags gtk+` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config --libs gtk+`
  
  $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
 -	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
@@ -37,14 +37,15 @@
  
  # ------------------------- Recursive make targets ------------------------- #
  
- SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
+-SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname=$(GS_SONAME_MAJOR)'\
 - GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
++SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
 + GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\
   STDIO_IMPLEMENTATION=c\
   DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
   BINDIR=$(BINDIR)/$(SOBINRELDIR)\
-@@ -106,11 +100,9 @@
- 	-mkdir $(libdir)
+@@ -104,11 +98,9 @@
+ 	-mkdir -p $(libdir)
  	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
  	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
 -	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
index 0ef8d446ab00..ab8ae52b389b 100644
--- a/print/ghostscript8/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript8/files/patch-src:unix-gcc.mak
@@ -93,7 +93,7 @@
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+XCFLAGS+=-I${LOCALBASE}/include
++XCFLAGS+=-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index ecde02aa5f4b..31537c660710 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -76,8 +76,13 @@ share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-V
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-0
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-1
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-2
+share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETHK-B5-H
+share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETHK-B5-V
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETen-B5-H
+share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETen-B5-UCS2
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETen-B5-V
+share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETenms-B5-H
+share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETenms-B5-V
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/EUC-H
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/EUC-V
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-H
@@ -112,6 +117,10 @@ share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/V
 share/ghostscript/%%GS_VERSION%%/Resource/CMap/WP-Symbol
+share/ghostscript/%%GS_VERSION%%/Resource/ColorSpace/DefaultCMYK
+share/ghostscript/%%GS_VERSION%%/Resource/ColorSpace/DefaultGray
+share/ghostscript/%%GS_VERSION%%/Resource/ColorSpace/DefaultRGB
+share/ghostscript/%%GS_VERSION%%/Resource/Decoding/Latin1
 share/ghostscript/%%GS_VERSION%%/Resource/Decoding/StandardEncoding
 share/ghostscript/%%GS_VERSION%%/Resource/Decoding/Unicode
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
@@ -562,6 +571,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%/Resource/Decoding
+@dirrm share/ghostscript/%%GS_VERSION%%/Resource/ColorSpace
 @dirrm share/ghostscript/%%GS_VERSION%%/Resource/CMap
 @dirrm share/ghostscript/%%GS_VERSION%%/Resource
 @unexec rmdir %D/share/ghostscript/%%GS_VERSION%% 2>/dev/null || true
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index 646808bd41c8..8b617b62d598 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -34,17 +34,19 @@ else
 		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
 		epag \
 		escpage lp2000 \
-		alc8600 alc8500 alc2000 alc4000 alc1900 \
-		lp9500c lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \
-		epl6100 epl5900 epl5800 epl2050 epl2050p epl2120 epl2750 \
-		lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 \
-		lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 \
-		lp9600 lp8600 lp1800 \
+		alc8600 alc8500 alc2000 alc4000 alc1900 alc4100 \
+		lp9000c lp9500c lp8800c lp8300c lp8500c lp3000c \
+		lp8200c lp8000c \
+		epl6100 epl5900 epl5800 \
+		epl2050 epl2050p epl2120 epl2500 epl2750 \
+		lp9000b lp2500 lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 \
+		lp8900 lp8700 lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 \
+		lp9600s lp9300 lp9600 lp8600 lp1800 \
 		lq850 epsonc \
 		mjc180 mjc360 mjc720 mj500c \
 		st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \
 		djet500c cdjcolor cdjmono cdj500 cdj550 \
-		cdj670 cdj850 cdj880 cdj890 cdj1600 chp2200 cdj970 \
+		cdj670 cdj850 cdj880 cdj890 cdj1600 cdj970 \
 		laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \
 		cljet5 cljet5c cljet5pr lj5mono lj5gray \
 		pj pjetxl pjxl paintjet \
@@ -157,6 +159,8 @@ Have fun with this new configuration style !     -andreas \n\n\
   "alc2000"  "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \
   "alc4000"  "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \
   "alc1900"  "Epson AL-C1900 color laser printer [EPLASER]" "$status_alc1900" \
+  "alc4100"  "Epson AL-C4100 color laser printer [EPLASER]" "$status_alc4100" \
+  "lp9000c"  "Epson LP-9000C color laser printer [EPLASER]" "$status_lp9000c" \
   "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" \
@@ -170,7 +174,10 @@ Have fun with this new configuration style !     -andreas \n\n\
   "epl2050"  "Epson EPL-N2050 laser printer [EPLASER]" "$status_epl2050" \
   "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \
   "epl2120"  "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \
+  "epl2500"  "Epson EPL-N2500 laser printer [EPLASER]" "$status_epl2500" \
   "epl2750"  "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \
+  "lp9000b"  "Epson LP-9000B laser printer [EPLASER]" "$status_lp9000b" \
+  "lp2500"   "Epson LP-2500 laser printer [EPLASER]" "$status_lp2500" \
   "lp9100"   "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \
   "lp7900"   "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \
   "lp7500"   "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \
@@ -209,12 +216,11 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" "$status_cdjmono" \
   "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" "$status_cdj500" \
   "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" "$status_cdj550" \
-  "cdj670"   "HP DeskJet 670/690 [HP2200]" "$status_cdj670" \
-  "cdj850"   "HP DeskJet 850/855/870/1100 [HP2200]" "$status_cdj850" \
-  "cdj880"   "HP DeskJet 880 [HP2200]" "$status_cdj880" \
-  "cdj890"   "HP DeskJet 890 [HP2200]" "$status_cdj890" \
-  "cdj1600"  "HP DeskJet 1600 [HP2200]" "$status_cdj1600" \
-  "chp2200"  "HP Buisiness Inkjet 2200 [HP2200]" "$status_chp2200" \
+  "cdj670"   "HP DeskJet 670/690 [HP8XX]" "$status_cdj670" \
+  "cdj850"   "HP DeskJet 850/855/870/1100 [HP8XX]" "$status_cdj850" \
+  "cdj880"   "HP DeskJet 880 [HP8XX]" "$status_cdj880" \
+  "cdj890"   "HP DeskJet 890 [HP8XX]" "$status_cdj890" \
+  "cdj1600"  "HP DeskJet 1600 [HP8XX]" "$status_cdj1600" \
   "cdj970"   "HP DeskJet 970CXi [DJ970]" "$status_cdj970" \
   "laserjet" "HP LaserJet" "$status_laserjet" \
   "ljetplus" "HP LaserJet Plus" "$status_ljetplus" \