Downgrade to 8.0 and fix accidental screwups.

Submitted by:	Ports Fury

36 files changed, 960 insertions, 219 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 14d528db12cd..89c748cef13c 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
-PORTREVISION=	3
+PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		http://hp.sourceforge.net/:hp2200 \
@@ -39,6 +39,7 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${BJC250_SRCS}:bjc250 \
 		${CPCA_SRCS}:cpca \
 		${LIPS_SRCS}:lips \
+		${DMPRT_SRCS}:ports_jp_gs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
@@ -67,7 +68,8 @@ MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
 PLIST_SUB=	GS_VERSION="${GS_VERSION}"
 
-SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}" \
+SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
+		WITHOUT_X11="${WITHOUT_X11}" \
 		WITH_SVGALIB="${WITH_SVGALIB}"
 
 MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 pdf2ps.1 \
@@ -169,6 +171,12 @@ LIPS_VERS=	2.4.0
 LIPS_NAME=	gdevlips-${LIPS_VERS}
 LIPS_SRCS=	${LIPS_NAME}.tar.gz
 
+# DMPRT - additional driver for generic dot matrix printers
+DMPRT=		dmprt
+DMPRT_VERS=	2.01
+DMPRT_NAME=	${DMPRT}-${DMPRT_VERS}
+DMPRT_SRCS=	${DMPRT_NAME}.tar.gz
+
 # EPAG - additional driver for Epson ESC/Page printers
 # http://www.humblesoft.com/gdevepag.html
 EPAG=		epag
@@ -270,6 +278,9 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${LIPS_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
 	${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS}
+# for DMPRT driver
+	${ECHO_MSG} ">>>   extracting ${DMPRT_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${DMPRT_SRCS}
 # for EPAG driver
 	${ECHO_MSG} ">>>   extracting ${EPAG_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
@@ -306,6 +317,12 @@ post-patch:
 		${WRKSRC}/src/unix-gcc.mak
 	${REINPLACE_CMD} -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
+		${WRKSRC}/lib/gs_res.ps
+# for DMPRT driver
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
+		 s|%%GS_VERSION%%|${GS_VERSION}|g' \
+			${WRKSRC}/src/dmp_site.ps
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
@@ -343,6 +360,10 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${LIPS} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for DMPRT driver
+	${ECHO_MSG} ">>>   adding ${DMPRT} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/gdevdmpr.mak \
+		>> ${WRKSRC}/src/contrib.mak
 # for EPAG driver
 	${ECHO_MSG} ">>>   adding ${EPAG} driver to contrib.mak ..."
 	${SED} -e 's:npdl:epag:g' ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \
@@ -466,6 +487,12 @@ post-install:
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
+.for i in dmp_init.ps dmp_site.ps escp_24.src
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DATADIR}/${GS_VERSION}/lib
+.endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
@@ -509,6 +536,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
 		${DOCSDIR}/${GS_VERSION}/${LIPS}
 .endfor
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} docs ..."
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${DMPRT}
+.for i in gdevdmpr.sj
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DOCSDIR}/${GS_VERSION}/${DMPRT}
+.endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG}
diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc
index d980e2905804..cf63422dcf01 100644
--- a/print/ghostscript-afpl/Makefile.inc
+++ b/print/ghostscript-afpl/Makefile.inc
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-GS_VERSION=	8.10
+GS_VERSION=	8.00
 
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 46973a1229d7..79caa18be266 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript/ghostscript-8.10.tar.bz2) = fe2817648951839741cbfa48f7bf76de
+MD5 (ghostscript/ghostscript-8.00.tar.bz2) = f87b74758f8e73f899f0b3654e5887b1
 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
diff --git a/print/ghostscript-afpl/files/patch-lib:gs_res.ps b/print/ghostscript-afpl/files/patch-lib:gs_res.ps
new file mode 100644
index 000000000000..2e5169720649
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lib:gs_res.ps
@@ -0,0 +1,13 @@
+--- lib/gs_res.ps.orig	Mon Jul 16 01:09:41 2001
++++ lib/gs_res.ps	Fri Feb  8 07:12:09 2002
+@@ -248,8 +248,8 @@
+   /pssystemparams 10 dict readonly def
+ } if
+ pssystemparams begin
+-  /FontResourceDir (/Resource/Font/) readonly .forcedef	% pssys'params is r-o
+-  /GenericResourceDir (/Resource/) readonly .forcedef	% pssys'params is r-o
++  /FontResourceDir (%%DATADIR%%/Resource/Font/) readonly .forcedef	% pssys'params is r-o
++  /GenericResourceDir (%%DATADIR%%/Resource/) readonly .forcedef	% pssys'params is r-o
+   /GenericResourcePathSep (/) readonly .forcedef	% pssys'params is r-o
+ end
+ end
diff --git a/print/ghostscript-afpl/files/patch-src:dmp_site.ps b/print/ghostscript-afpl/files/patch-src:dmp_site.ps
new file mode 100644
index 000000000000..ee1a5717d641
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:dmp_site.ps
@@ -0,0 +1,10 @@
+--- src/dmp_site.ps.orig	Tue May 27 09:57:00 1997
++++ src/dmp_site.ps	Tue Apr  2 23:05:45 2002
+@@ -1,6 +1,6 @@
+ BeginConfig
+ %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
+-/printer      (epsimage.src)
++/printer      (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
+ %               horizontal / vertical
+ % /resolution   [ 160.0 180.0 ]
+ %               horizontal / vertical
diff --git a/print/ghostscript-afpl/files/patch-src:dviprlib.c b/print/ghostscript-afpl/files/patch-src:dviprlib.c
new file mode 100644
index 000000000000..c61ca748cbc2
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:dviprlib.c
@@ -0,0 +1,134 @@
+--- src/dviprlib.c.orig	Tue May 13 16:14:09 1997
++++ src/dviprlib.c	Sun Nov 10 23:26:06 2002
+@@ -39,8 +39,8 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_read_S_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-private int dviprt_read_QR_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
++private int dviprt_read_S_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
++private int dviprt_read_QR_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
+      
+ /*--- library functions ---*/
+ int 
+@@ -429,21 +429,21 @@
+ 
+ /*--- forward declarations ---*/
+ private int dviprt_set_select
+-  (P4(dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_integer
+-  (P4(dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_strings
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_rpexpr
+-  (P6(dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int));
++  (dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int);
+ private int dviprt_set_code
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ 
+-private long dviprt_oct2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_dec2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_hex2long(P3(uchar *,uchar *,uchar **));
++private long dviprt_oct2long(uchar *,uchar *,uchar **);
++private long dviprt_dec2long(uchar *,uchar *,uchar **);
++private long dviprt_hex2long(uchar *,uchar *,uchar **);
+      
+-private int dviprt_printtokenerror(P4(dviprt_cfg_i *,char *,int ,int));
++private int dviprt_printtokenerror(dviprt_cfg_i *,char *,int ,int);
+      
+ /*--- macros ---*/
+ #define strlcmp(tmplt,str,len) \
+@@ -1433,7 +1433,9 @@
+ char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
+ char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
+ 
+-private FILE *dviprt_messagestream = stderr;
++private FILE *dviprt_messagestream;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
+ 
+ /*--- library functions ---*/
+ int
+@@ -1568,16 +1570,16 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_getmaximalwidth(P1(dviprt_print *));
+-private int dviprt_flush_buffer(P2(dviprt_print *,uchar far *));
+-private int dviprt_output_transpose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose_reverse(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_reverse_bits(P2(uchar far *,uint));
+-private int dviprt_transpose8x8(P4(uchar far *,uint, uchar far *,uint));
+-private int dviprt_output_expr(P4(dviprt_print *,int,uint,uint));
+-private int dviprt_default_outputproc(P3(uchar far *,long ,void *));
+-private long dviprt_getbuffersize(P1(dviprt_print *));
++private int dviprt_getmaximalwidth(dviprt_print *);
++private int dviprt_flush_buffer(dviprt_print *,uchar far *);
++private int dviprt_output_transpose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose_reverse(dviprt_print *,uchar far *,uint );
++private int dviprt_reverse_bits(uchar far *,uint);
++private int dviprt_transpose8x8(uchar far *,uint, uchar far *,uint);
++private int dviprt_output_expr(dviprt_print *,int,uint,uint);
++private int dviprt_default_outputproc(uchar far *,long ,void *);
++private long dviprt_getbuffersize(dviprt_print *);
+      
+ /*--- library functions ---*/
+ long
+@@ -1618,7 +1620,7 @@
+ int
+   dviprt_setstream
+ #ifdef __PROTOTYPES__
+-  (dviprt_print *pprint,int (*func)(P3(uchar far *,long ,void*)),void *pstream)
++  (dviprt_print *pprint,int (*func)(uchar far *,long ,void*),void *pstream)
+ #else
+ (pprint,func,pstream)
+ dviprt_print *pprint;
+@@ -2264,19 +2266,19 @@
+ #define DVIPRT_SUPPORT_PCL 1
+ 
+ /*--- forward declarations ---*/
+-private long dviprt_null_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_null_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_hex_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_hex_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_null_getworksize(dviprt_print *,long );
++private long dviprt_null_encode(dviprt_print *,long ,int );
++private long dviprt_hex_getworksize(dviprt_print *,long );
++private long dviprt_hex_encode(dviprt_print *,long ,int );
+ #if DVIPRT_SUPPORT_FAX
+-private long dviprt_fax_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_fax_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_fax_getworksize(dviprt_print *,long );
++private long dviprt_fax_encode(dviprt_print *,long ,int );
+ #endif
+ #if DVIPRT_SUPPORT_PCL
+-private long dviprt_pcl1_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl1_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_pcl2_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl2_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_pcl1_getworksize(dviprt_print *,long );
++private long dviprt_pcl1_encode(dviprt_print *,long ,int );
++private long dviprt_pcl2_getworksize(dviprt_print *,long );
++private long dviprt_pcl2_encode(dviprt_print *,long ,int );
+ #endif
+      
+ private dviprt_encoder dviprt_encoder_list[] = {
+@@ -2468,9 +2470,9 @@
+   int o_count;
+   int o_bufcount;
+ } FaxEncodeInfo;
+-private int dviprt_fax_set_white(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_black(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_bitcount(P2(FaxEncode_t *,FaxEncodeInfo *));
++private int dviprt_fax_set_white(int,FaxEncodeInfo *);
++private int dviprt_fax_set_black(int,FaxEncodeInfo *);
++private int dviprt_fax_set_bitcount(FaxEncode_t *,FaxEncodeInfo *);
+      
+ private long 
+ dviprt_fax_encode(dviprt_print *pprint,long s,int f)
diff --git a/print/ghostscript-afpl/files/patch-src:dviprlib.h b/print/ghostscript-afpl/files/patch-src:dviprlib.h
new file mode 100644
index 000000000000..2a671205b46d
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:dviprlib.h
@@ -0,0 +1,38 @@
+--- src/dviprlib.h.orig	Tue May 13 16:10:34 1997
++++ src/dviprlib.h	Sun Nov 10 23:32:53 2002
+@@ -337,23 +337,23 @@
+ #ifdef dviprlib_implementation
+ typedef struct {
+   int no;
+-  long (*getworksize)(P2(dviprt_print *,long ));
+-  long (*encode)(P3(dviprt_print *,long,int));
++  long (*getworksize)(dviprt_print *,long );
++  long (*encode)(dviprt_print *,long,int);
+ } dviprt_encoder;
+ 
+ #define liblocal private
+ 
+-liblocal dviprt_encoder *dviprt_getencoder_(P1(int ));
+-liblocal int dviprt_setcfgbuffer_(P3(dviprt_cfg_i *,int ,int ));
+-liblocal int dviprt_resetcfgbuffer_(P1(dviprt_cfg_i *));
+-liblocal int dviprt_initcfg_(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-liblocal int dviprt_printmessage(P2(char *,int ));
+-liblocal int dviprt_printerror(P2(char *,int ));
+-liblocal int dviprt_printwarning(P2(char *,int ));
+-liblocal int dviprt_printcfgerror(P3(dviprt_cfg_i *,char *,int ));
+-liblocal int dviprt_printcfgwarning(P3(dviprt_cfg_i *,char *,int ));
++liblocal dviprt_encoder *dviprt_getencoder_(int );
++liblocal int dviprt_setcfgbuffer_(dviprt_cfg_i *,int ,int );
++liblocal int dviprt_resetcfgbuffer_(dviprt_cfg_i *);
++liblocal int dviprt_initcfg_(dviprt_cfg_t *,dviprt_cfg_i *);
++liblocal int dviprt_printmessage(char *,int );
++liblocal int dviprt_printerror(char *,int );
++liblocal int dviprt_printwarning(char *,int );
++liblocal int dviprt_printcfgerror(dviprt_cfg_i *,char *,int );
++liblocal int dviprt_printcfgwarning(dviprt_cfg_i *,char *,int );
+ 
+-extern int dviprt_print_headercomment_(P4(char *,char *,char *,FILE *));
++extern int dviprt_print_headercomment_(char *,char *,char *,FILE *);
+ extern char dviprt_message_buffer[];
+ #endif dviprlib_implementation
+  
diff --git a/print/ghostscript-afpl/files/patch-src:gdevdmpr.c b/print/ghostscript-afpl/files/patch-src:gdevdmpr.c
new file mode 100644
index 000000000000..47e980154ccd
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:gdevdmpr.c
@@ -0,0 +1,38 @@
+--- src/gdevdmpr.c.orig	Tue May 13 20:43:37 1997
++++ src/gdevdmpr.c	Sun Nov 10 21:19:41 2002
+@@ -41,7 +41,7 @@
+ /* include library header. */
+ #include "dviprlib.h"
+ 
+-extern FILE *lib_fopen(P1(const char *));
++extern FILE *lib_fopen(const char *);
+ 
+ #define LOCAL_DEBUG 0
+ 
+@@ -87,12 +87,12 @@
+ private dev_proc_close_device(gdev_dmprt_close);
+ 
+ /* declarations of sub functions to get printer properties. */
+-private void gdev_dmprt_init_printer_props(P1(gx_device_dmprt *));
+-private int gdev_dmprt_get_printer_props(P2(gx_device_dmprt *,char *));
+-private int gdev_dmprt_check_code_props(P2(byte * ,int ));
+-private FILE *gdev_dmprt_dviprt_lib_fopen(P2(const char *,char *));
++private void gdev_dmprt_init_printer_props(gx_device_dmprt *);
++private int gdev_dmprt_get_printer_props(gx_device_dmprt *,char *);
++private int gdev_dmprt_check_code_props(byte * ,int );
++private FILE *gdev_dmprt_dviprt_lib_fopen(const char *,char *);
+ 
+-private int gdev_dmprt_error_no_dviprt_to_gs(P1(int ));
++private int gdev_dmprt_error_no_dviprt_to_gs(int );
+ 
+ /* The device descriptor */
+ gx_device_procs prn_dmprt_procs = {
+@@ -846,7 +846,7 @@
+     if (env) {
+       strcpy(fname,env);
+       strcat(fname,
+-        gp_file_name_concat_string(env,strlen(env),fname,strlen(fnamebase)));
++        gp_file_name_concat_string(env,strlen(env)));
+       strcat(fname,fnamebase);
+       fp = fopen(fname,gp_fmode_rb);
+     }
diff --git a/print/ghostscript-afpl/files/patch-src:gdevdmpr.mak b/print/ghostscript-afpl/files/patch-src:gdevdmpr.mak
new file mode 100644
index 000000000000..9136172873fa
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:gdevdmpr.mak
@@ -0,0 +1,21 @@
+--- src/gdevdmpr.mak.orig	Mon May  1 20:24:43 2000
++++ src/gdevdmpr.mak	Mon May  1 20:26:23 2000
+@@ -1,8 +1,12 @@
+ ### ---------------- Dot matrix printer device ---------------- ###
+-dmprt_=gdevdmpr.$(OBJ) dviprlib.$(OBJ) gdevprn.$(OBJ)
++dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+ 
+-dmprt.dev: $(dmprt_)
+-	$(SETDEV) dmprt $(dmprt_)
+-	$(ADDMOD) dmprt -ps dmp_init
+-gdevdmpr.$(OBJ): gdevdmpr.c dviprlib.h $(PDEVH)
+-dviprlib.$(OBJ): dviprlib.c dviprlib.h
++$(DD)dmprt.dev: $(dmprt_)
++	$(SETDEV) $(DD)dmprt $(dmprt_)
++	$(ADDMOD) $(DD)dmprt -ps dmp_init
++
++$(GLOBJ)gdevdmpr.$(OBJ): $(GLSRC)gdevdmpr.c $(GLSRC)dviprlib.h $(PDEVH)
++	$(GLCC) $(GLO_)gdevdmpr.$(OBJ) $(C_) $(GLSRC)gdevdmpr.c
++
++$(GLOBJ)dviprlib.$(OBJ): $(GLSRC)dviprlib.c $(GLSRC)dviprlib.h
++	$(GLCC) $(GLO_)dviprlib.$(OBJ) $(C_) $(GLSRC)dviprlib.c
diff --git a/print/ghostscript-afpl/files/patch-src:gdevsgi.c b/print/ghostscript-afpl/files/patch-src:gdevsgi.c
new file mode 100644
index 000000000000..96d3891fc9e5
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:gdevsgi.c
@@ -0,0 +1,16 @@
+--- src/gdevsgi.c.orig	Fri Feb 22 07:24:52 2002
++++ src/gdevsgi.c	Sun Nov 10 22:55:30 2002
+@@ -32,8 +32,11 @@
+   sgi_prn_device(sgi_procs, "sgirgb", 3, 24, 255, 255, sgi_print_page);
+ 
+ private gx_color_index
+-sgi_map_rgb_color(gx_device *dev, ushort r, ushort g, ushort b)
+-{      ushort bitspercolor = dev->color_info.depth / 3;
++sgi_map_rgb_color(gx_device *dev, const ushort cv[])
++{      ushort r = cv[0];
++       ushort g = cv[1];
++       ushort b = cv[2];
++       ushort bitspercolor = dev->color_info.depth / 3;
+        ulong max_value = (1 << bitspercolor) - 1;
+        return ((r*max_value / gx_max_color_value) << (bitspercolor * 2)) +
+ 	      ((g*max_value / gx_max_color_value) << bitspercolor) +
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index f29333db37bf..25314d5dfc08 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -38,6 +38,7 @@ bin/wftopfa
 %%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/alps/README.gdevalps
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/bj10v/gdev10v.jis
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/dmprt/gdevdmpr.sj
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/ChangeLog
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/ert.txt
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt
@@ -57,64 +58,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-EUC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-EUC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V
-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/ETen-B5-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETen-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
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Hankaku
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Hiragana
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Identity-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Identity-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Katakana
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/NWP-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/NWP-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Roman
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V
-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/Decoding/StandardEncoding
-share/ghostscript/%%GS_VERSION%%/Resource/Decoding/Unicode
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
@@ -211,12 +154,15 @@ share/ghostscript/%%GS_VERSION%%/lib/cbjc800.ppd
 share/ghostscript/%%GS_VERSION%%/lib/cdj550.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690ec.upp
-share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/cidfmap
+share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/decrypt.ps
+share/ghostscript/%%GS_VERSION%%/lib/dmp_init.ps
+share/ghostscript/%%GS_VERSION%%/lib/dmp_site.ps
 share/ghostscript/%%GS_VERSION%%/lib/dnj750c.upp
 share/ghostscript/%%GS_VERSION%%/lib/dnj750m.upp
 share/ghostscript/%%GS_VERSION%%/lib/docie.ps
+share/ghostscript/%%GS_VERSION%%/lib/escp_24.src
 share/ghostscript/%%GS_VERSION%%/lib/errpage.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2c.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2pcl.ps
@@ -229,7 +175,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciddc.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_cidtt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs2.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs3.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
@@ -250,7 +195,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fapi.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_fntem.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_icc.ps
@@ -282,7 +226,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_pfile.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_rdlin.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_res.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_resmp.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_resst.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xpm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s_m.xbm
@@ -290,7 +233,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_sepr.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_setpd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_statd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_std_e.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_stres.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_sym_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_t.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_t.xpm
@@ -328,7 +270,6 @@ share/ghostscript/%%GS_VERSION%%/lib/pdf_draw.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_font.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_main.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_ops.ps
-share/ghostscript/%%GS_VERSION%%/lib/pdf_rbld.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_sec.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdfopt.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdfwrite.ps
@@ -574,9 +515,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @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/CMap
-@dirrm share/ghostscript/%%GS_VERSION%%/Resource
+@dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
@@ -586,6 +525,7 @@ share/ghostscript/fonts/z003034l.pfm
 %%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
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/bj10v
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/alps
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index bd07968d029e..834327911bc7 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -31,6 +31,7 @@ else
 		lbp1310 lbp1510 lbp1610 lbp1710 lbp1810 lbp1910 \
 		lips2p lips3 lips4 bjc880j lips4v \
 		m8510 coslw2p coslwxl uniprint \
+		dmprt \
 		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
 		epag \
 		escpage lp2000 \
@@ -76,7 +77,7 @@ else
 		tiffcrle tiffg3 tiffg32d tiffg4 \
 		tiff12nc tiff24nc tifflzw tiffpack \
 		bbox \
-		devicen perm spotcmyk
+		devicen perm spotrgb spotcmyk
 fi
 
 for i; do
@@ -142,6 +143,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "coslwxl"  "CoStar LabelWriter XL" "$status_coslwxl" \
   "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" "$status_stp" \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" "$status_uniprint" \
+  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" "$status_dmprt" \
   "lj250"    "DEC LJ250 Companion color printer" "$status_lj250" \
   "declj250" "DEC LJ250 driver (alternate)" "$status_declj250" \
   "ap3250"   "Epson ActionPrinter 3250" "$status_ap3250" \
@@ -327,7 +329,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
   "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
   "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
-  "pngalpha" "PNG 32-bit RGBA Portable Network Graphics" "$status_pngalpha" \
+  "pnga"     "PNG with transparency" "$status_pnga" \
   "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
   "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
   "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \
@@ -346,6 +348,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "bbox"     "Bounding box output" "$status_bbox" \
   "devicen"  "DeviceN process color model device" "$status_devicen" \
   "perm"     "DeviceN which permutes color components" "$status_perm" \
+  "spotrgb"  "DeviceN with RGB and spot color support" "$status_spotrgb" \
   "spotcmyk" "DeviceN with CMYK and spot color support" "$status_spotcmyk" \
 2> $tempfile
 
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 14d528db12cd..89c748cef13c 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
-PORTREVISION=	3
+PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		http://hp.sourceforge.net/:hp2200 \
@@ -39,6 +39,7 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${BJC250_SRCS}:bjc250 \
 		${CPCA_SRCS}:cpca \
 		${LIPS_SRCS}:lips \
+		${DMPRT_SRCS}:ports_jp_gs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
@@ -67,7 +68,8 @@ MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
 PLIST_SUB=	GS_VERSION="${GS_VERSION}"
 
-SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}" \
+SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
+		WITHOUT_X11="${WITHOUT_X11}" \
 		WITH_SVGALIB="${WITH_SVGALIB}"
 
 MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 pdf2ps.1 \
@@ -169,6 +171,12 @@ LIPS_VERS=	2.4.0
 LIPS_NAME=	gdevlips-${LIPS_VERS}
 LIPS_SRCS=	${LIPS_NAME}.tar.gz
 
+# DMPRT - additional driver for generic dot matrix printers
+DMPRT=		dmprt
+DMPRT_VERS=	2.01
+DMPRT_NAME=	${DMPRT}-${DMPRT_VERS}
+DMPRT_SRCS=	${DMPRT_NAME}.tar.gz
+
 # EPAG - additional driver for Epson ESC/Page printers
 # http://www.humblesoft.com/gdevepag.html
 EPAG=		epag
@@ -270,6 +278,9 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${LIPS_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
 	${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS}
+# for DMPRT driver
+	${ECHO_MSG} ">>>   extracting ${DMPRT_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${DMPRT_SRCS}
 # for EPAG driver
 	${ECHO_MSG} ">>>   extracting ${EPAG_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
@@ -306,6 +317,12 @@ post-patch:
 		${WRKSRC}/src/unix-gcc.mak
 	${REINPLACE_CMD} -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
+		${WRKSRC}/lib/gs_res.ps
+# for DMPRT driver
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
+		 s|%%GS_VERSION%%|${GS_VERSION}|g' \
+			${WRKSRC}/src/dmp_site.ps
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
@@ -343,6 +360,10 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${LIPS} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for DMPRT driver
+	${ECHO_MSG} ">>>   adding ${DMPRT} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/gdevdmpr.mak \
+		>> ${WRKSRC}/src/contrib.mak
 # for EPAG driver
 	${ECHO_MSG} ">>>   adding ${EPAG} driver to contrib.mak ..."
 	${SED} -e 's:npdl:epag:g' ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \
@@ -466,6 +487,12 @@ post-install:
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
+.for i in dmp_init.ps dmp_site.ps escp_24.src
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DATADIR}/${GS_VERSION}/lib
+.endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
@@ -509,6 +536,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
 		${DOCSDIR}/${GS_VERSION}/${LIPS}
 .endfor
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} docs ..."
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${DMPRT}
+.for i in gdevdmpr.sj
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DOCSDIR}/${GS_VERSION}/${DMPRT}
+.endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG}
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index d980e2905804..cf63422dcf01 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-GS_VERSION=	8.10
+GS_VERSION=	8.00
 
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 46973a1229d7..79caa18be266 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript/ghostscript-8.10.tar.bz2) = fe2817648951839741cbfa48f7bf76de
+MD5 (ghostscript/ghostscript-8.00.tar.bz2) = f87b74758f8e73f899f0b3654e5887b1
 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
diff --git a/print/ghostscript-gpl/files/patch-lib:gs_res.ps b/print/ghostscript-gpl/files/patch-lib:gs_res.ps
new file mode 100644
index 000000000000..2e5169720649
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lib:gs_res.ps
@@ -0,0 +1,13 @@
+--- lib/gs_res.ps.orig	Mon Jul 16 01:09:41 2001
++++ lib/gs_res.ps	Fri Feb  8 07:12:09 2002
+@@ -248,8 +248,8 @@
+   /pssystemparams 10 dict readonly def
+ } if
+ pssystemparams begin
+-  /FontResourceDir (/Resource/Font/) readonly .forcedef	% pssys'params is r-o
+-  /GenericResourceDir (/Resource/) readonly .forcedef	% pssys'params is r-o
++  /FontResourceDir (%%DATADIR%%/Resource/Font/) readonly .forcedef	% pssys'params is r-o
++  /GenericResourceDir (%%DATADIR%%/Resource/) readonly .forcedef	% pssys'params is r-o
+   /GenericResourcePathSep (/) readonly .forcedef	% pssys'params is r-o
+ end
+ end
diff --git a/print/ghostscript-gpl/files/patch-src:dmp_site.ps b/print/ghostscript-gpl/files/patch-src:dmp_site.ps
new file mode 100644
index 000000000000..ee1a5717d641
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:dmp_site.ps
@@ -0,0 +1,10 @@
+--- src/dmp_site.ps.orig	Tue May 27 09:57:00 1997
++++ src/dmp_site.ps	Tue Apr  2 23:05:45 2002
+@@ -1,6 +1,6 @@
+ BeginConfig
+ %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
+-/printer      (epsimage.src)
++/printer      (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
+ %               horizontal / vertical
+ % /resolution   [ 160.0 180.0 ]
+ %               horizontal / vertical
diff --git a/print/ghostscript-gpl/files/patch-src:dviprlib.c b/print/ghostscript-gpl/files/patch-src:dviprlib.c
new file mode 100644
index 000000000000..c61ca748cbc2
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:dviprlib.c
@@ -0,0 +1,134 @@
+--- src/dviprlib.c.orig	Tue May 13 16:14:09 1997
++++ src/dviprlib.c	Sun Nov 10 23:26:06 2002
+@@ -39,8 +39,8 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_read_S_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-private int dviprt_read_QR_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
++private int dviprt_read_S_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
++private int dviprt_read_QR_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
+      
+ /*--- library functions ---*/
+ int 
+@@ -429,21 +429,21 @@
+ 
+ /*--- forward declarations ---*/
+ private int dviprt_set_select
+-  (P4(dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_integer
+-  (P4(dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_strings
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_rpexpr
+-  (P6(dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int));
++  (dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int);
+ private int dviprt_set_code
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ 
+-private long dviprt_oct2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_dec2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_hex2long(P3(uchar *,uchar *,uchar **));
++private long dviprt_oct2long(uchar *,uchar *,uchar **);
++private long dviprt_dec2long(uchar *,uchar *,uchar **);
++private long dviprt_hex2long(uchar *,uchar *,uchar **);
+      
+-private int dviprt_printtokenerror(P4(dviprt_cfg_i *,char *,int ,int));
++private int dviprt_printtokenerror(dviprt_cfg_i *,char *,int ,int);
+      
+ /*--- macros ---*/
+ #define strlcmp(tmplt,str,len) \
+@@ -1433,7 +1433,9 @@
+ char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
+ char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
+ 
+-private FILE *dviprt_messagestream = stderr;
++private FILE *dviprt_messagestream;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
+ 
+ /*--- library functions ---*/
+ int
+@@ -1568,16 +1570,16 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_getmaximalwidth(P1(dviprt_print *));
+-private int dviprt_flush_buffer(P2(dviprt_print *,uchar far *));
+-private int dviprt_output_transpose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose_reverse(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_reverse_bits(P2(uchar far *,uint));
+-private int dviprt_transpose8x8(P4(uchar far *,uint, uchar far *,uint));
+-private int dviprt_output_expr(P4(dviprt_print *,int,uint,uint));
+-private int dviprt_default_outputproc(P3(uchar far *,long ,void *));
+-private long dviprt_getbuffersize(P1(dviprt_print *));
++private int dviprt_getmaximalwidth(dviprt_print *);
++private int dviprt_flush_buffer(dviprt_print *,uchar far *);
++private int dviprt_output_transpose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose_reverse(dviprt_print *,uchar far *,uint );
++private int dviprt_reverse_bits(uchar far *,uint);
++private int dviprt_transpose8x8(uchar far *,uint, uchar far *,uint);
++private int dviprt_output_expr(dviprt_print *,int,uint,uint);
++private int dviprt_default_outputproc(uchar far *,long ,void *);
++private long dviprt_getbuffersize(dviprt_print *);
+      
+ /*--- library functions ---*/
+ long
+@@ -1618,7 +1620,7 @@
+ int
+   dviprt_setstream
+ #ifdef __PROTOTYPES__
+-  (dviprt_print *pprint,int (*func)(P3(uchar far *,long ,void*)),void *pstream)
++  (dviprt_print *pprint,int (*func)(uchar far *,long ,void*),void *pstream)
+ #else
+ (pprint,func,pstream)
+ dviprt_print *pprint;
+@@ -2264,19 +2266,19 @@
+ #define DVIPRT_SUPPORT_PCL 1
+ 
+ /*--- forward declarations ---*/
+-private long dviprt_null_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_null_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_hex_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_hex_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_null_getworksize(dviprt_print *,long );
++private long dviprt_null_encode(dviprt_print *,long ,int );
++private long dviprt_hex_getworksize(dviprt_print *,long );
++private long dviprt_hex_encode(dviprt_print *,long ,int );
+ #if DVIPRT_SUPPORT_FAX
+-private long dviprt_fax_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_fax_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_fax_getworksize(dviprt_print *,long );
++private long dviprt_fax_encode(dviprt_print *,long ,int );
+ #endif
+ #if DVIPRT_SUPPORT_PCL
+-private long dviprt_pcl1_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl1_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_pcl2_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl2_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_pcl1_getworksize(dviprt_print *,long );
++private long dviprt_pcl1_encode(dviprt_print *,long ,int );
++private long dviprt_pcl2_getworksize(dviprt_print *,long );
++private long dviprt_pcl2_encode(dviprt_print *,long ,int );
+ #endif
+      
+ private dviprt_encoder dviprt_encoder_list[] = {
+@@ -2468,9 +2470,9 @@
+   int o_count;
+   int o_bufcount;
+ } FaxEncodeInfo;
+-private int dviprt_fax_set_white(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_black(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_bitcount(P2(FaxEncode_t *,FaxEncodeInfo *));
++private int dviprt_fax_set_white(int,FaxEncodeInfo *);
++private int dviprt_fax_set_black(int,FaxEncodeInfo *);
++private int dviprt_fax_set_bitcount(FaxEncode_t *,FaxEncodeInfo *);
+      
+ private long 
+ dviprt_fax_encode(dviprt_print *pprint,long s,int f)
diff --git a/print/ghostscript-gpl/files/patch-src:dviprlib.h b/print/ghostscript-gpl/files/patch-src:dviprlib.h
new file mode 100644
index 000000000000..2a671205b46d
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:dviprlib.h
@@ -0,0 +1,38 @@
+--- src/dviprlib.h.orig	Tue May 13 16:10:34 1997
++++ src/dviprlib.h	Sun Nov 10 23:32:53 2002
+@@ -337,23 +337,23 @@
+ #ifdef dviprlib_implementation
+ typedef struct {
+   int no;
+-  long (*getworksize)(P2(dviprt_print *,long ));
+-  long (*encode)(P3(dviprt_print *,long,int));
++  long (*getworksize)(dviprt_print *,long );
++  long (*encode)(dviprt_print *,long,int);
+ } dviprt_encoder;
+ 
+ #define liblocal private
+ 
+-liblocal dviprt_encoder *dviprt_getencoder_(P1(int ));
+-liblocal int dviprt_setcfgbuffer_(P3(dviprt_cfg_i *,int ,int ));
+-liblocal int dviprt_resetcfgbuffer_(P1(dviprt_cfg_i *));
+-liblocal int dviprt_initcfg_(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-liblocal int dviprt_printmessage(P2(char *,int ));
+-liblocal int dviprt_printerror(P2(char *,int ));
+-liblocal int dviprt_printwarning(P2(char *,int ));
+-liblocal int dviprt_printcfgerror(P3(dviprt_cfg_i *,char *,int ));
+-liblocal int dviprt_printcfgwarning(P3(dviprt_cfg_i *,char *,int ));
++liblocal dviprt_encoder *dviprt_getencoder_(int );
++liblocal int dviprt_setcfgbuffer_(dviprt_cfg_i *,int ,int );
++liblocal int dviprt_resetcfgbuffer_(dviprt_cfg_i *);
++liblocal int dviprt_initcfg_(dviprt_cfg_t *,dviprt_cfg_i *);
++liblocal int dviprt_printmessage(char *,int );
++liblocal int dviprt_printerror(char *,int );
++liblocal int dviprt_printwarning(char *,int );
++liblocal int dviprt_printcfgerror(dviprt_cfg_i *,char *,int );
++liblocal int dviprt_printcfgwarning(dviprt_cfg_i *,char *,int );
+ 
+-extern int dviprt_print_headercomment_(P4(char *,char *,char *,FILE *));
++extern int dviprt_print_headercomment_(char *,char *,char *,FILE *);
+ extern char dviprt_message_buffer[];
+ #endif dviprlib_implementation
+  
diff --git a/print/ghostscript-gpl/files/patch-src:gdevdmpr.c b/print/ghostscript-gpl/files/patch-src:gdevdmpr.c
new file mode 100644
index 000000000000..47e980154ccd
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevdmpr.c
@@ -0,0 +1,38 @@
+--- src/gdevdmpr.c.orig	Tue May 13 20:43:37 1997
++++ src/gdevdmpr.c	Sun Nov 10 21:19:41 2002
+@@ -41,7 +41,7 @@
+ /* include library header. */
+ #include "dviprlib.h"
+ 
+-extern FILE *lib_fopen(P1(const char *));
++extern FILE *lib_fopen(const char *);
+ 
+ #define LOCAL_DEBUG 0
+ 
+@@ -87,12 +87,12 @@
+ private dev_proc_close_device(gdev_dmprt_close);
+ 
+ /* declarations of sub functions to get printer properties. */
+-private void gdev_dmprt_init_printer_props(P1(gx_device_dmprt *));
+-private int gdev_dmprt_get_printer_props(P2(gx_device_dmprt *,char *));
+-private int gdev_dmprt_check_code_props(P2(byte * ,int ));
+-private FILE *gdev_dmprt_dviprt_lib_fopen(P2(const char *,char *));
++private void gdev_dmprt_init_printer_props(gx_device_dmprt *);
++private int gdev_dmprt_get_printer_props(gx_device_dmprt *,char *);
++private int gdev_dmprt_check_code_props(byte * ,int );
++private FILE *gdev_dmprt_dviprt_lib_fopen(const char *,char *);
+ 
+-private int gdev_dmprt_error_no_dviprt_to_gs(P1(int ));
++private int gdev_dmprt_error_no_dviprt_to_gs(int );
+ 
+ /* The device descriptor */
+ gx_device_procs prn_dmprt_procs = {
+@@ -846,7 +846,7 @@
+     if (env) {
+       strcpy(fname,env);
+       strcat(fname,
+-        gp_file_name_concat_string(env,strlen(env),fname,strlen(fnamebase)));
++        gp_file_name_concat_string(env,strlen(env)));
+       strcat(fname,fnamebase);
+       fp = fopen(fname,gp_fmode_rb);
+     }
diff --git a/print/ghostscript-gpl/files/patch-src:gdevdmpr.mak b/print/ghostscript-gpl/files/patch-src:gdevdmpr.mak
new file mode 100644
index 000000000000..9136172873fa
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevdmpr.mak
@@ -0,0 +1,21 @@
+--- src/gdevdmpr.mak.orig	Mon May  1 20:24:43 2000
++++ src/gdevdmpr.mak	Mon May  1 20:26:23 2000
+@@ -1,8 +1,12 @@
+ ### ---------------- Dot matrix printer device ---------------- ###
+-dmprt_=gdevdmpr.$(OBJ) dviprlib.$(OBJ) gdevprn.$(OBJ)
++dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+ 
+-dmprt.dev: $(dmprt_)
+-	$(SETDEV) dmprt $(dmprt_)
+-	$(ADDMOD) dmprt -ps dmp_init
+-gdevdmpr.$(OBJ): gdevdmpr.c dviprlib.h $(PDEVH)
+-dviprlib.$(OBJ): dviprlib.c dviprlib.h
++$(DD)dmprt.dev: $(dmprt_)
++	$(SETDEV) $(DD)dmprt $(dmprt_)
++	$(ADDMOD) $(DD)dmprt -ps dmp_init
++
++$(GLOBJ)gdevdmpr.$(OBJ): $(GLSRC)gdevdmpr.c $(GLSRC)dviprlib.h $(PDEVH)
++	$(GLCC) $(GLO_)gdevdmpr.$(OBJ) $(C_) $(GLSRC)gdevdmpr.c
++
++$(GLOBJ)dviprlib.$(OBJ): $(GLSRC)dviprlib.c $(GLSRC)dviprlib.h
++	$(GLCC) $(GLO_)dviprlib.$(OBJ) $(C_) $(GLSRC)dviprlib.c
diff --git a/print/ghostscript-gpl/files/patch-src:gdevsgi.c b/print/ghostscript-gpl/files/patch-src:gdevsgi.c
new file mode 100644
index 000000000000..96d3891fc9e5
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevsgi.c
@@ -0,0 +1,16 @@
+--- src/gdevsgi.c.orig	Fri Feb 22 07:24:52 2002
++++ src/gdevsgi.c	Sun Nov 10 22:55:30 2002
+@@ -32,8 +32,11 @@
+   sgi_prn_device(sgi_procs, "sgirgb", 3, 24, 255, 255, sgi_print_page);
+ 
+ private gx_color_index
+-sgi_map_rgb_color(gx_device *dev, ushort r, ushort g, ushort b)
+-{      ushort bitspercolor = dev->color_info.depth / 3;
++sgi_map_rgb_color(gx_device *dev, const ushort cv[])
++{      ushort r = cv[0];
++       ushort g = cv[1];
++       ushort b = cv[2];
++       ushort bitspercolor = dev->color_info.depth / 3;
+        ulong max_value = (1 << bitspercolor) - 1;
+        return ((r*max_value / gx_max_color_value) << (bitspercolor * 2)) +
+ 	      ((g*max_value / gx_max_color_value) << bitspercolor) +
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index f29333db37bf..25314d5dfc08 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -38,6 +38,7 @@ bin/wftopfa
 %%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/alps/README.gdevalps
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/bj10v/gdev10v.jis
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/dmprt/gdevdmpr.sj
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/ChangeLog
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/ert.txt
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt
@@ -57,64 +58,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-EUC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-EUC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V
-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/ETen-B5-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETen-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
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Hankaku
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Hiragana
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Identity-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Identity-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Katakana
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/NWP-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/NWP-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Roman
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V
-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/Decoding/StandardEncoding
-share/ghostscript/%%GS_VERSION%%/Resource/Decoding/Unicode
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
@@ -211,12 +154,15 @@ share/ghostscript/%%GS_VERSION%%/lib/cbjc800.ppd
 share/ghostscript/%%GS_VERSION%%/lib/cdj550.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690ec.upp
-share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/cidfmap
+share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/decrypt.ps
+share/ghostscript/%%GS_VERSION%%/lib/dmp_init.ps
+share/ghostscript/%%GS_VERSION%%/lib/dmp_site.ps
 share/ghostscript/%%GS_VERSION%%/lib/dnj750c.upp
 share/ghostscript/%%GS_VERSION%%/lib/dnj750m.upp
 share/ghostscript/%%GS_VERSION%%/lib/docie.ps
+share/ghostscript/%%GS_VERSION%%/lib/escp_24.src
 share/ghostscript/%%GS_VERSION%%/lib/errpage.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2c.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2pcl.ps
@@ -229,7 +175,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciddc.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_cidtt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs2.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs3.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
@@ -250,7 +195,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fapi.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_fntem.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_icc.ps
@@ -282,7 +226,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_pfile.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_rdlin.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_res.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_resmp.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_resst.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xpm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s_m.xbm
@@ -290,7 +233,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_sepr.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_setpd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_statd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_std_e.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_stres.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_sym_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_t.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_t.xpm
@@ -328,7 +270,6 @@ share/ghostscript/%%GS_VERSION%%/lib/pdf_draw.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_font.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_main.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_ops.ps
-share/ghostscript/%%GS_VERSION%%/lib/pdf_rbld.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_sec.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdfopt.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdfwrite.ps
@@ -574,9 +515,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @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/CMap
-@dirrm share/ghostscript/%%GS_VERSION%%/Resource
+@dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
@@ -586,6 +525,7 @@ share/ghostscript/fonts/z003034l.pfm
 %%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
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/bj10v
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/alps
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index bd07968d029e..834327911bc7 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -31,6 +31,7 @@ else
 		lbp1310 lbp1510 lbp1610 lbp1710 lbp1810 lbp1910 \
 		lips2p lips3 lips4 bjc880j lips4v \
 		m8510 coslw2p coslwxl uniprint \
+		dmprt \
 		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
 		epag \
 		escpage lp2000 \
@@ -76,7 +77,7 @@ else
 		tiffcrle tiffg3 tiffg32d tiffg4 \
 		tiff12nc tiff24nc tifflzw tiffpack \
 		bbox \
-		devicen perm spotcmyk
+		devicen perm spotrgb spotcmyk
 fi
 
 for i; do
@@ -142,6 +143,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "coslwxl"  "CoStar LabelWriter XL" "$status_coslwxl" \
   "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" "$status_stp" \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" "$status_uniprint" \
+  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" "$status_dmprt" \
   "lj250"    "DEC LJ250 Companion color printer" "$status_lj250" \
   "declj250" "DEC LJ250 driver (alternate)" "$status_declj250" \
   "ap3250"   "Epson ActionPrinter 3250" "$status_ap3250" \
@@ -327,7 +329,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
   "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
   "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
-  "pngalpha" "PNG 32-bit RGBA Portable Network Graphics" "$status_pngalpha" \
+  "pnga"     "PNG with transparency" "$status_pnga" \
   "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
   "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
   "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \
@@ -346,6 +348,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "bbox"     "Bounding box output" "$status_bbox" \
   "devicen"  "DeviceN process color model device" "$status_devicen" \
   "perm"     "DeviceN which permutes color components" "$status_perm" \
+  "spotrgb"  "DeviceN with RGB and spot color support" "$status_spotrgb" \
   "spotcmyk" "DeviceN with CMYK and spot color support" "$status_spotcmyk" \
 2> $tempfile
 
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 14d528db12cd..89c748cef13c 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
-PORTREVISION=	3
+PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		http://hp.sourceforge.net/:hp2200 \
@@ -39,6 +39,7 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${BJC250_SRCS}:bjc250 \
 		${CPCA_SRCS}:cpca \
 		${LIPS_SRCS}:lips \
+		${DMPRT_SRCS}:ports_jp_gs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
@@ -67,7 +68,8 @@ MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
 PLIST_SUB=	GS_VERSION="${GS_VERSION}"
 
-SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}" \
+SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
+		WITHOUT_X11="${WITHOUT_X11}" \
 		WITH_SVGALIB="${WITH_SVGALIB}"
 
 MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 pdf2ps.1 \
@@ -169,6 +171,12 @@ LIPS_VERS=	2.4.0
 LIPS_NAME=	gdevlips-${LIPS_VERS}
 LIPS_SRCS=	${LIPS_NAME}.tar.gz
 
+# DMPRT - additional driver for generic dot matrix printers
+DMPRT=		dmprt
+DMPRT_VERS=	2.01
+DMPRT_NAME=	${DMPRT}-${DMPRT_VERS}
+DMPRT_SRCS=	${DMPRT_NAME}.tar.gz
+
 # EPAG - additional driver for Epson ESC/Page printers
 # http://www.humblesoft.com/gdevepag.html
 EPAG=		epag
@@ -270,6 +278,9 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${LIPS_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
 	${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS}
+# for DMPRT driver
+	${ECHO_MSG} ">>>   extracting ${DMPRT_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${DMPRT_SRCS}
 # for EPAG driver
 	${ECHO_MSG} ">>>   extracting ${EPAG_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
@@ -306,6 +317,12 @@ post-patch:
 		${WRKSRC}/src/unix-gcc.mak
 	${REINPLACE_CMD} -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
+		${WRKSRC}/lib/gs_res.ps
+# for DMPRT driver
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
+		 s|%%GS_VERSION%%|${GS_VERSION}|g' \
+			${WRKSRC}/src/dmp_site.ps
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
@@ -343,6 +360,10 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${LIPS} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for DMPRT driver
+	${ECHO_MSG} ">>>   adding ${DMPRT} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/gdevdmpr.mak \
+		>> ${WRKSRC}/src/contrib.mak
 # for EPAG driver
 	${ECHO_MSG} ">>>   adding ${EPAG} driver to contrib.mak ..."
 	${SED} -e 's:npdl:epag:g' ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \
@@ -466,6 +487,12 @@ post-install:
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
+.for i in dmp_init.ps dmp_site.ps escp_24.src
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DATADIR}/${GS_VERSION}/lib
+.endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
@@ -509,6 +536,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
 		${DOCSDIR}/${GS_VERSION}/${LIPS}
 .endfor
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} docs ..."
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${DMPRT}
+.for i in gdevdmpr.sj
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DOCSDIR}/${GS_VERSION}/${DMPRT}
+.endfor
 # for EPAG driver
 	${ECHO_MSG} ">>>   installing ${EPAG} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG}
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index d980e2905804..cf63422dcf01 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-GS_VERSION=	8.10
+GS_VERSION=	8.00
 
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 46973a1229d7..79caa18be266 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript/ghostscript-8.10.tar.bz2) = fe2817648951839741cbfa48f7bf76de
+MD5 (ghostscript/ghostscript-8.00.tar.bz2) = f87b74758f8e73f899f0b3654e5887b1
 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
diff --git a/print/ghostscript8/files/patch-lib:gs_res.ps b/print/ghostscript8/files/patch-lib:gs_res.ps
new file mode 100644
index 000000000000..2e5169720649
--- /dev/null
+++ b/print/ghostscript8/files/patch-lib:gs_res.ps
@@ -0,0 +1,13 @@
+--- lib/gs_res.ps.orig	Mon Jul 16 01:09:41 2001
++++ lib/gs_res.ps	Fri Feb  8 07:12:09 2002
+@@ -248,8 +248,8 @@
+   /pssystemparams 10 dict readonly def
+ } if
+ pssystemparams begin
+-  /FontResourceDir (/Resource/Font/) readonly .forcedef	% pssys'params is r-o
+-  /GenericResourceDir (/Resource/) readonly .forcedef	% pssys'params is r-o
++  /FontResourceDir (%%DATADIR%%/Resource/Font/) readonly .forcedef	% pssys'params is r-o
++  /GenericResourceDir (%%DATADIR%%/Resource/) readonly .forcedef	% pssys'params is r-o
+   /GenericResourcePathSep (/) readonly .forcedef	% pssys'params is r-o
+ end
+ end
diff --git a/print/ghostscript8/files/patch-src:dmp_site.ps b/print/ghostscript8/files/patch-src:dmp_site.ps
new file mode 100644
index 000000000000..ee1a5717d641
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:dmp_site.ps
@@ -0,0 +1,10 @@
+--- src/dmp_site.ps.orig	Tue May 27 09:57:00 1997
++++ src/dmp_site.ps	Tue Apr  2 23:05:45 2002
+@@ -1,6 +1,6 @@
+ BeginConfig
+ %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
+-/printer      (epsimage.src)
++/printer      (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
+ %               horizontal / vertical
+ % /resolution   [ 160.0 180.0 ]
+ %               horizontal / vertical
diff --git a/print/ghostscript8/files/patch-src:dviprlib.c b/print/ghostscript8/files/patch-src:dviprlib.c
new file mode 100644
index 000000000000..c61ca748cbc2
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:dviprlib.c
@@ -0,0 +1,134 @@
+--- src/dviprlib.c.orig	Tue May 13 16:14:09 1997
++++ src/dviprlib.c	Sun Nov 10 23:26:06 2002
+@@ -39,8 +39,8 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_read_S_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-private int dviprt_read_QR_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
++private int dviprt_read_S_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
++private int dviprt_read_QR_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
+      
+ /*--- library functions ---*/
+ int 
+@@ -429,21 +429,21 @@
+ 
+ /*--- forward declarations ---*/
+ private int dviprt_set_select
+-  (P4(dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_integer
+-  (P4(dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_strings
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ private int dviprt_set_rpexpr
+-  (P6(dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int));
++  (dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int);
+ private int dviprt_set_code
+-  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
++  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
+ 
+-private long dviprt_oct2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_dec2long(P3(uchar *,uchar *,uchar **));
+-private long dviprt_hex2long(P3(uchar *,uchar *,uchar **));
++private long dviprt_oct2long(uchar *,uchar *,uchar **);
++private long dviprt_dec2long(uchar *,uchar *,uchar **);
++private long dviprt_hex2long(uchar *,uchar *,uchar **);
+      
+-private int dviprt_printtokenerror(P4(dviprt_cfg_i *,char *,int ,int));
++private int dviprt_printtokenerror(dviprt_cfg_i *,char *,int ,int);
+      
+ /*--- macros ---*/
+ #define strlcmp(tmplt,str,len) \
+@@ -1433,7 +1433,9 @@
+ char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
+ char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
+ 
+-private FILE *dviprt_messagestream = stderr;
++private FILE *dviprt_messagestream;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
+ 
+ /*--- library functions ---*/
+ int
+@@ -1568,16 +1570,16 @@
+ 
+ 
+ /*--- forward declarations ---*/
+-private int dviprt_getmaximalwidth(P1(dviprt_print *));
+-private int dviprt_flush_buffer(P2(dviprt_print *,uchar far *));
+-private int dviprt_output_transpose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_output_nontranspose_reverse(P3(dviprt_print *,uchar far *,uint ));
+-private int dviprt_reverse_bits(P2(uchar far *,uint));
+-private int dviprt_transpose8x8(P4(uchar far *,uint, uchar far *,uint));
+-private int dviprt_output_expr(P4(dviprt_print *,int,uint,uint));
+-private int dviprt_default_outputproc(P3(uchar far *,long ,void *));
+-private long dviprt_getbuffersize(P1(dviprt_print *));
++private int dviprt_getmaximalwidth(dviprt_print *);
++private int dviprt_flush_buffer(dviprt_print *,uchar far *);
++private int dviprt_output_transpose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose(dviprt_print *,uchar far *,uint );
++private int dviprt_output_nontranspose_reverse(dviprt_print *,uchar far *,uint );
++private int dviprt_reverse_bits(uchar far *,uint);
++private int dviprt_transpose8x8(uchar far *,uint, uchar far *,uint);
++private int dviprt_output_expr(dviprt_print *,int,uint,uint);
++private int dviprt_default_outputproc(uchar far *,long ,void *);
++private long dviprt_getbuffersize(dviprt_print *);
+      
+ /*--- library functions ---*/
+ long
+@@ -1618,7 +1620,7 @@
+ int
+   dviprt_setstream
+ #ifdef __PROTOTYPES__
+-  (dviprt_print *pprint,int (*func)(P3(uchar far *,long ,void*)),void *pstream)
++  (dviprt_print *pprint,int (*func)(uchar far *,long ,void*),void *pstream)
+ #else
+ (pprint,func,pstream)
+ dviprt_print *pprint;
+@@ -2264,19 +2266,19 @@
+ #define DVIPRT_SUPPORT_PCL 1
+ 
+ /*--- forward declarations ---*/
+-private long dviprt_null_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_null_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_hex_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_hex_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_null_getworksize(dviprt_print *,long );
++private long dviprt_null_encode(dviprt_print *,long ,int );
++private long dviprt_hex_getworksize(dviprt_print *,long );
++private long dviprt_hex_encode(dviprt_print *,long ,int );
+ #if DVIPRT_SUPPORT_FAX
+-private long dviprt_fax_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_fax_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_fax_getworksize(dviprt_print *,long );
++private long dviprt_fax_encode(dviprt_print *,long ,int );
+ #endif
+ #if DVIPRT_SUPPORT_PCL
+-private long dviprt_pcl1_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl1_encode(P3(dviprt_print *,long ,int ));
+-private long dviprt_pcl2_getworksize(P2(dviprt_print *,long ));
+-private long dviprt_pcl2_encode(P3(dviprt_print *,long ,int ));
++private long dviprt_pcl1_getworksize(dviprt_print *,long );
++private long dviprt_pcl1_encode(dviprt_print *,long ,int );
++private long dviprt_pcl2_getworksize(dviprt_print *,long );
++private long dviprt_pcl2_encode(dviprt_print *,long ,int );
+ #endif
+      
+ private dviprt_encoder dviprt_encoder_list[] = {
+@@ -2468,9 +2470,9 @@
+   int o_count;
+   int o_bufcount;
+ } FaxEncodeInfo;
+-private int dviprt_fax_set_white(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_black(P2(int,FaxEncodeInfo *));
+-private int dviprt_fax_set_bitcount(P2(FaxEncode_t *,FaxEncodeInfo *));
++private int dviprt_fax_set_white(int,FaxEncodeInfo *);
++private int dviprt_fax_set_black(int,FaxEncodeInfo *);
++private int dviprt_fax_set_bitcount(FaxEncode_t *,FaxEncodeInfo *);
+      
+ private long 
+ dviprt_fax_encode(dviprt_print *pprint,long s,int f)
diff --git a/print/ghostscript8/files/patch-src:dviprlib.h b/print/ghostscript8/files/patch-src:dviprlib.h
new file mode 100644
index 000000000000..2a671205b46d
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:dviprlib.h
@@ -0,0 +1,38 @@
+--- src/dviprlib.h.orig	Tue May 13 16:10:34 1997
++++ src/dviprlib.h	Sun Nov 10 23:32:53 2002
+@@ -337,23 +337,23 @@
+ #ifdef dviprlib_implementation
+ typedef struct {
+   int no;
+-  long (*getworksize)(P2(dviprt_print *,long ));
+-  long (*encode)(P3(dviprt_print *,long,int));
++  long (*getworksize)(dviprt_print *,long );
++  long (*encode)(dviprt_print *,long,int);
+ } dviprt_encoder;
+ 
+ #define liblocal private
+ 
+-liblocal dviprt_encoder *dviprt_getencoder_(P1(int ));
+-liblocal int dviprt_setcfgbuffer_(P3(dviprt_cfg_i *,int ,int ));
+-liblocal int dviprt_resetcfgbuffer_(P1(dviprt_cfg_i *));
+-liblocal int dviprt_initcfg_(P2(dviprt_cfg_t *,dviprt_cfg_i *));
+-liblocal int dviprt_printmessage(P2(char *,int ));
+-liblocal int dviprt_printerror(P2(char *,int ));
+-liblocal int dviprt_printwarning(P2(char *,int ));
+-liblocal int dviprt_printcfgerror(P3(dviprt_cfg_i *,char *,int ));
+-liblocal int dviprt_printcfgwarning(P3(dviprt_cfg_i *,char *,int ));
++liblocal dviprt_encoder *dviprt_getencoder_(int );
++liblocal int dviprt_setcfgbuffer_(dviprt_cfg_i *,int ,int );
++liblocal int dviprt_resetcfgbuffer_(dviprt_cfg_i *);
++liblocal int dviprt_initcfg_(dviprt_cfg_t *,dviprt_cfg_i *);
++liblocal int dviprt_printmessage(char *,int );
++liblocal int dviprt_printerror(char *,int );
++liblocal int dviprt_printwarning(char *,int );
++liblocal int dviprt_printcfgerror(dviprt_cfg_i *,char *,int );
++liblocal int dviprt_printcfgwarning(dviprt_cfg_i *,char *,int );
+ 
+-extern int dviprt_print_headercomment_(P4(char *,char *,char *,FILE *));
++extern int dviprt_print_headercomment_(char *,char *,char *,FILE *);
+ extern char dviprt_message_buffer[];
+ #endif dviprlib_implementation
+  
diff --git a/print/ghostscript8/files/patch-src:gdevdmpr.c b/print/ghostscript8/files/patch-src:gdevdmpr.c
new file mode 100644
index 000000000000..47e980154ccd
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:gdevdmpr.c
@@ -0,0 +1,38 @@
+--- src/gdevdmpr.c.orig	Tue May 13 20:43:37 1997
++++ src/gdevdmpr.c	Sun Nov 10 21:19:41 2002
+@@ -41,7 +41,7 @@
+ /* include library header. */
+ #include "dviprlib.h"
+ 
+-extern FILE *lib_fopen(P1(const char *));
++extern FILE *lib_fopen(const char *);
+ 
+ #define LOCAL_DEBUG 0
+ 
+@@ -87,12 +87,12 @@
+ private dev_proc_close_device(gdev_dmprt_close);
+ 
+ /* declarations of sub functions to get printer properties. */
+-private void gdev_dmprt_init_printer_props(P1(gx_device_dmprt *));
+-private int gdev_dmprt_get_printer_props(P2(gx_device_dmprt *,char *));
+-private int gdev_dmprt_check_code_props(P2(byte * ,int ));
+-private FILE *gdev_dmprt_dviprt_lib_fopen(P2(const char *,char *));
++private void gdev_dmprt_init_printer_props(gx_device_dmprt *);
++private int gdev_dmprt_get_printer_props(gx_device_dmprt *,char *);
++private int gdev_dmprt_check_code_props(byte * ,int );
++private FILE *gdev_dmprt_dviprt_lib_fopen(const char *,char *);
+ 
+-private int gdev_dmprt_error_no_dviprt_to_gs(P1(int ));
++private int gdev_dmprt_error_no_dviprt_to_gs(int );
+ 
+ /* The device descriptor */
+ gx_device_procs prn_dmprt_procs = {
+@@ -846,7 +846,7 @@
+     if (env) {
+       strcpy(fname,env);
+       strcat(fname,
+-        gp_file_name_concat_string(env,strlen(env),fname,strlen(fnamebase)));
++        gp_file_name_concat_string(env,strlen(env)));
+       strcat(fname,fnamebase);
+       fp = fopen(fname,gp_fmode_rb);
+     }
diff --git a/print/ghostscript8/files/patch-src:gdevdmpr.mak b/print/ghostscript8/files/patch-src:gdevdmpr.mak
new file mode 100644
index 000000000000..9136172873fa
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:gdevdmpr.mak
@@ -0,0 +1,21 @@
+--- src/gdevdmpr.mak.orig	Mon May  1 20:24:43 2000
++++ src/gdevdmpr.mak	Mon May  1 20:26:23 2000
+@@ -1,8 +1,12 @@
+ ### ---------------- Dot matrix printer device ---------------- ###
+-dmprt_=gdevdmpr.$(OBJ) dviprlib.$(OBJ) gdevprn.$(OBJ)
++dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+ 
+-dmprt.dev: $(dmprt_)
+-	$(SETDEV) dmprt $(dmprt_)
+-	$(ADDMOD) dmprt -ps dmp_init
+-gdevdmpr.$(OBJ): gdevdmpr.c dviprlib.h $(PDEVH)
+-dviprlib.$(OBJ): dviprlib.c dviprlib.h
++$(DD)dmprt.dev: $(dmprt_)
++	$(SETDEV) $(DD)dmprt $(dmprt_)
++	$(ADDMOD) $(DD)dmprt -ps dmp_init
++
++$(GLOBJ)gdevdmpr.$(OBJ): $(GLSRC)gdevdmpr.c $(GLSRC)dviprlib.h $(PDEVH)
++	$(GLCC) $(GLO_)gdevdmpr.$(OBJ) $(C_) $(GLSRC)gdevdmpr.c
++
++$(GLOBJ)dviprlib.$(OBJ): $(GLSRC)dviprlib.c $(GLSRC)dviprlib.h
++	$(GLCC) $(GLO_)dviprlib.$(OBJ) $(C_) $(GLSRC)dviprlib.c
diff --git a/print/ghostscript8/files/patch-src:gdevsgi.c b/print/ghostscript8/files/patch-src:gdevsgi.c
new file mode 100644
index 000000000000..96d3891fc9e5
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:gdevsgi.c
@@ -0,0 +1,16 @@
+--- src/gdevsgi.c.orig	Fri Feb 22 07:24:52 2002
++++ src/gdevsgi.c	Sun Nov 10 22:55:30 2002
+@@ -32,8 +32,11 @@
+   sgi_prn_device(sgi_procs, "sgirgb", 3, 24, 255, 255, sgi_print_page);
+ 
+ private gx_color_index
+-sgi_map_rgb_color(gx_device *dev, ushort r, ushort g, ushort b)
+-{      ushort bitspercolor = dev->color_info.depth / 3;
++sgi_map_rgb_color(gx_device *dev, const ushort cv[])
++{      ushort r = cv[0];
++       ushort g = cv[1];
++       ushort b = cv[2];
++       ushort bitspercolor = dev->color_info.depth / 3;
+        ulong max_value = (1 << bitspercolor) - 1;
+        return ((r*max_value / gx_max_color_value) << (bitspercolor * 2)) +
+ 	      ((g*max_value / gx_max_color_value) << bitspercolor) +
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index f29333db37bf..25314d5dfc08 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -38,6 +38,7 @@ bin/wftopfa
 %%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/alps/README.gdevalps
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/bj10v/gdev10v.jis
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/dmprt/gdevdmpr.sj
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/ChangeLog
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/ert.txt
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt
@@ -57,64 +58,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-EUC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-EUC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V
-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/ETen-B5-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/ETen-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
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Ext-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Hankaku
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Hiragana
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Identity-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Identity-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Katakana
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/NWP-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/NWP-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/RKSJ-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/RKSJ-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/Roman
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
-share/ghostscript/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V
-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/Decoding/StandardEncoding
-share/ghostscript/%%GS_VERSION%%/Resource/Decoding/Unicode
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
@@ -211,12 +154,15 @@ share/ghostscript/%%GS_VERSION%%/lib/cbjc800.ppd
 share/ghostscript/%%GS_VERSION%%/lib/cdj550.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690.upp
 share/ghostscript/%%GS_VERSION%%/lib/cdj690ec.upp
-share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/cidfmap
+share/ghostscript/%%GS_VERSION%%/lib/cid2code.ps
 share/ghostscript/%%GS_VERSION%%/lib/decrypt.ps
+share/ghostscript/%%GS_VERSION%%/lib/dmp_init.ps
+share/ghostscript/%%GS_VERSION%%/lib/dmp_site.ps
 share/ghostscript/%%GS_VERSION%%/lib/dnj750c.upp
 share/ghostscript/%%GS_VERSION%%/lib/dnj750m.upp
 share/ghostscript/%%GS_VERSION%%/lib/docie.ps
+share/ghostscript/%%GS_VERSION%%/lib/escp_24.src
 share/ghostscript/%%GS_VERSION%%/lib/errpage.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2c.ps
 share/ghostscript/%%GS_VERSION%%/lib/font2pcl.ps
@@ -229,7 +175,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_cidcm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciddc.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfm.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cidfn.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_cidtt.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs2.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_ciecs3.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_cmap.ps
@@ -250,7 +195,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_dscp.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fapi.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_fntem.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_icc.ps
@@ -282,7 +226,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_pfile.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_rdlin.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_res.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_resmp.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_resst.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s.xpm
 share/ghostscript/%%GS_VERSION%%/lib/gs_s_m.xbm
@@ -290,7 +233,6 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_sepr.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_setpd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_statd.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_std_e.ps
-share/ghostscript/%%GS_VERSION%%/lib/gs_stres.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_sym_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_t.xbm
 share/ghostscript/%%GS_VERSION%%/lib/gs_t.xpm
@@ -328,7 +270,6 @@ share/ghostscript/%%GS_VERSION%%/lib/pdf_draw.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_font.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_main.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_ops.ps
-share/ghostscript/%%GS_VERSION%%/lib/pdf_rbld.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdf_sec.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdfopt.ps
 share/ghostscript/%%GS_VERSION%%/lib/pdfwrite.ps
@@ -574,9 +515,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @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/CMap
-@dirrm share/ghostscript/%%GS_VERSION%%/Resource
+@dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
@@ -586,6 +525,7 @@ share/ghostscript/fonts/z003034l.pfm
 %%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
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/bj10v
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/alps
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index bd07968d029e..834327911bc7 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -31,6 +31,7 @@ else
 		lbp1310 lbp1510 lbp1610 lbp1710 lbp1810 lbp1910 \
 		lips2p lips3 lips4 bjc880j lips4v \
 		m8510 coslw2p coslwxl uniprint \
+		dmprt \
 		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
 		epag \
 		escpage lp2000 \
@@ -76,7 +77,7 @@ else
 		tiffcrle tiffg3 tiffg32d tiffg4 \
 		tiff12nc tiff24nc tifflzw tiffpack \
 		bbox \
-		devicen perm spotcmyk
+		devicen perm spotrgb spotcmyk
 fi
 
 for i; do
@@ -142,6 +143,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "coslwxl"  "CoStar LabelWriter XL" "$status_coslwxl" \
   "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" "$status_stp" \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" "$status_uniprint" \
+  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" "$status_dmprt" \
   "lj250"    "DEC LJ250 Companion color printer" "$status_lj250" \
   "declj250" "DEC LJ250 driver (alternate)" "$status_declj250" \
   "ap3250"   "Epson ActionPrinter 3250" "$status_ap3250" \
@@ -327,7 +329,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
   "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
   "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
-  "pngalpha" "PNG 32-bit RGBA Portable Network Graphics" "$status_pngalpha" \
+  "pnga"     "PNG with transparency" "$status_pnga" \
   "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
   "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
   "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \
@@ -346,6 +348,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "bbox"     "Bounding box output" "$status_bbox" \
   "devicen"  "DeviceN process color model device" "$status_devicen" \
   "perm"     "DeviceN which permutes color components" "$status_perm" \
+  "spotrgb"  "DeviceN with RGB and spot color support" "$status_spotrgb" \
   "spotcmyk" "DeviceN with CMYK and spot color support" "$status_spotcmyk" \
 2> $tempfile