Update to 7.04.

Modifications against PR are:
  o $MASTER_SITES substitution.
  o Typo in scripts/configure.

I don't know why $MLINKS entries are not in generated plist...

PR:		ports/36673
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

10 files changed, 543 insertions, 188 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index d9d173daf1b6..a991ebaf3fd6 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -6,32 +6,45 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	7.03
-PORTREVISION=	4
+PORTVERSION=	7.04
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gimp_print,hpijs/} \
-		http://members.ozemail.com.au/~geoffk/pdfencrypt/:pdf \
-		http://www.gelhaus.net/hp880c/1.4beta/:gdevcd \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
-		http://www.harsch.net/Download/:gdevdj \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs703/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
-		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
-MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print/:gimp_print \
-			hpinkjet/:hpijs
+		http://www.harsch.net/Download/:dj970 \
+		${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,gimp-print/:gprint,} \
+		${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,hpinkjet/:hpijs,} \
+		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
+		${MASTER_SITE_PORTS_JP:S,%SUBDIR%/,ghostscript/:ports_jp,} \
+		http://www.humblesoft.com/pub/:epag \
+		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/:eplaser \
+		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
+		http://www.linuxprinting.org/download/printing/:gdi \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-afpl
-DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
-		${GS_FONTS_STD}:DEFAULT,fonts \
-		${GS_FONTS_OTHER}:DEFAULT,fonts,gatekeeper \
-		${DECRYPT_PDF}:pdf \
-		${HP8XX_DRV}:gdevcd \
-		${HPDJ_SRC}:hpdj_pcl3 \
-		${PCL3_SRC}:hpdj_pcl3 \
-		${HP970_DRV}:gdevdj \
-		${GPRINT_SRC}:gatekeeper,gimp_print \
-		${HPIJS_SRC}:gatekeeper,hpijs
+DISTFILES=	${GS_SRCS} \
+		${GS_FONTS_STD} \
+		${GS_FONTS_OTHER} \
+		${HP8XX_SRCS}:hp8xx \
+		${HPDJ_SRCS}:hpdj_pcl3 \
+		${PCL3_SRCS}:hpdj_pcl3 \
+		${DJ970_SRCS}:dj970 \
+		${GPRINT_SRCS}:gprint \
+		${HPIJS_SRCS}:hpijs \
+		${MD2K_SRCS}:md2k \
+		${ALPS_SRCS}:ports_jp \
+		${BJ10V_SRCS}:ports_jp \
+		${LIPS_SRCS}:ports_jp \
+		${DMPRT_SRCS}:ports_jp \
+		${EPAG_SRCS}:epag \
+		${EPLASER_SRCS}:eplaser \
+		${MJC_SRCS}:ports_jp \
+		${NPDL_SRCS}:npdl \
+		${GDI_SRCS}:gdi
 DIST_SUBDIR=	ghostscript
-EXTRACT_ONLY=	${GS_SOURCES}
+EXTRACT_ONLY=	${GS_SRCS}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -42,10 +55,10 @@ NO_CDROM=	"Can only be distributed for free"
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	CC="${CC}" CXX="${CXX}" XCFLAGS="${XCFLAGS}"
-MAKEFILE=	src/unix-gcc.mak
-ALL_TARGET=	all pcl3opts
+MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
+		XCFLAGS="${XCFLAGS}"
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
 
 MAN1=		ansi2knr.1 dvipdf.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
@@ -73,7 +86,21 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
 MAKE_ENV+=	WITHOUT_X11="${WITHOUT_X11}"
 .endif
 
-GS_SOURCES=	${DISTNAME}${EXTRACT_SUFX}
+.if defined(WITH_SHLIB)
+.undef WITHOUT_X11
+USE_GTK=	yes
+MAKE_ENV+=	GS_SHLIB_VER="${SHLIB_VER}"
+ALL_TARGET=	so pcl3opts
+INSTALL_TARGET=	soinstall
+INSTALLS_SHLIB=	yes
+SHLIB_VER=	1
+PLIST_SUB+=	SHLIB="" SHLIB_VER="${SHLIB_VER}"
+.else
+ALL_TARGET=	all pcl3opts
+PLIST_SUB+=	SHLIB="@comment "
+.endif
+
+GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
@@ -83,54 +110,113 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
-# Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
+# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
 # http://www.gelhaus.net/hp880c/
 HP8XX=		cdj880
-HP8XX_DRV=	gdevcd8.tar.gz
+HP8XX_SRCS=	gdevcd8.tar.gz
 
-# HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
+# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser
 # still present, just for the case pcl3 is missing some hpdj feature
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
 HPDJ=		hpdj
 HPDJ_VERS=	2.6
 HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
-HPDJ_SRC=	${HPDJ_NAME}.tar.gz
+HPDJ_SRCS=	${HPDJ_NAME}.tar.gz
 HPDJ_MAN1=	gs-hpdj.1
 
 # PCL3 (hpdj successor now in RELEASE quality)
-# additional driver for HP PCL3 Printers, by Martin Lottermoser
+# additional driver for HP PCL3 printers, by Martin Lottermoser
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
 PCL3=		pcl3
 PCL3_VERS=	3.3
 PCL3_NAME=	${PCL3}-${PCL3_VERS}
-PCL3_SRC=	${PCL3_NAME}.tar.gz
+PCL3_SRCS=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
-# additional driver for HP DeskJet 970, supports duplex printing
+# DJ970 - additional driver for HP DeskJet 970, supports duplex printing
 # http://www.harsch.net/Ghostscript/ghostscript.html
-HP970_DRV=	gdevdj9.c.gz
+DJ970=		gdevdj9
+DJ970_SRCS=	${DJ970}.c.gz
 
 # Gimp-Print - very high quality driver for Epson, HPs,...
 # http://gimp-print.sourceforge.net/
 GPRINT=		gimp-print
 GPRINT_VERS=	4.2.0
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
-GPRINT_SRC=	${GPRINT_NAME}.tar.gz
+GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
-# HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series
+# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed)
 # http://hpinkjet.sourceforge.net/
 HPIJS=		hpijs
-HPIJS_VERS=	1.0.2
+HPIJS_VERS=	1.0.4
 HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
-HPIJS_SRC=	${HPIJS_NAME}.tar.gz
+HPIJS_SRCS=	${HPIJS_NAME}.tar.gz
+
+# MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
+# http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
+MD2K=		md2k
+MD2K_VERS=	0.2a
+MD2K_NAME=	gdevmd2k-${MD2K_VERS}
+MD2K_SRCS=	${MD2K_NAME}.tar.gz
+
+# ALPS - additional driver for Alps MD-5000
+ALPS=		alps
+ALPS_VERS=	0.2
+ALPS_NAME=	gdevalps-${ALPS_VERS}
+ALPS_SRCS=	gdevalps-0.21.tar.gz
+
+# BJ10V - additional driver for Canon BJ-10V
+BJ10V=		bj10v
+BJ10V_NAME=	gdev10v
+BJ10V_SRCS=	${BJ10V_NAME}.tar.gz
+
+# LIPS - additional driver for Canon LIPS II+/III/IVc/IV printers
+LIPS=		lips
+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/
+EPAG=		epag
+EPAG_VERS=	3.09
+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
+EPLASER=	eplaser
+EPLASER_VERS=	3.0.1
+EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
+EPLASER_SRCS=	${EPLASER_NAME}-651.tgz
+
+# MJC - additional driver for Epson MachJet series
+MJC=		mjc
+MJC_VERS=	0.8
+MJC_NAME=	gdevmjc-${MJC_VERS}
+MJC_SRCS=	${MJC_NAME}.tar.gz
+
+# NPDL - additional driver for NEC Printer Description Language printers
+NPDL=		npdl
+NPDL_VERS=	1.6.3
+NPDL_NAME=	gdevnpdl-${NPDL_VERS}
+NPDL_SRCS=	${NPDL_NAME}.tar.gz
+
+# GDI - additional driver for Samsung SmartGDI laser printers
+GDI=		gdi
+GDI_NAME=	samsung-gdi-driver
+GDI_SRCS=	${GDI_NAME}.tar.gz
 
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
 
-# replacement for pdf_sec.ps, that allows you to read encrypted PDF files
-DECRYPT_PDF=	pdf_sec.ps
-
 .SILENT:
 
 pre-everything::
@@ -150,40 +236,81 @@ post-extract:
 # new devices !
 #
 # for HP8XX driver
-	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
 # for HPDJ driver
-	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC}
+	${ECHO_MSG} ">>>   extracting ${HPDJ_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS}
 	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
-	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC}
-	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
+	${ECHO_MSG} ">>>   extracting ${PCL3_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
+	${LN} -sf ${PCL3_NAME} ${WRKSRC}/${PCL3}
 	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
-# for HP DeskJet 970 driver
-	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src
-	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+# for DJ970 driver
+	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS}
 # for Gimp-Print driver
-	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC}
+	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
 # for HPinkjet driver
-	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
+	${ECHO_MSG} ">>>   extracting ${HPIJS_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS}
+# for MD2K driver
+	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
+	${LN} -sf ${MD2K_NAME} ${WRKSRC}/${MD2K}
+# for ALPS driver
+	${ECHO_MSG} ">>>   extracting ${ALPS_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${ALPS_SRCS}
+	${LN} -sf ${ALPS_NAME} ${WRKSRC}/${ALPS}
+# for BJ10V driver
+	${ECHO_MSG} ">>>   extracting ${BJ10V_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${BJ10V_SRCS}
+# for LIPS driver
+	${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}
+# for EPLASER driver
+	${ECHO_MSG} ">>>   extracting ${EPLASER_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRCS}
+	${LN} -sf ${EPLASER_NAME} ${WRKSRC}/${EPLASER}
+# for MJC driver
+	${ECHO_MSG} ">>>   extracting ${MJC_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS}
+	${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
+# for NPDL driver
+	${ECHO_MSG} ">>>   extracting ${NPDL_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRCS}
+# for GDI driver
+	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
 
 post-patch:
 	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
 		${WRKSRC}/src/unix-gcc.mak
 	${PERL} -pi -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
+	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
+		${WRKSRC}/lib/gs_res.ps
 # for HPinkjet driver
 	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
 		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' \
 			${WRKSRC}/${HPIJS_NAME}/configure
 	${PERL} -pi -e 's|#include <malloc.h>||g' \
 		${WRKSRC}/${HPIJS_NAME}/platform.h
+# for DMPRT driver
+	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g ; \
+		 s|%%GS_VERSION%%|${PORTVERSION}|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
@@ -201,17 +328,55 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
 		>> ${WRKSRC}/src/contrib.mak
-# for HP DeskJet 970 driver
-	${ECHO_MSG} ">>>   adding DJ970 driver to contrib.mak ..."
+# for DJ970 driver
+	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   adding ${GPRINT} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/stp.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   adding ${HPIJS} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/hpijs.contrib.mak \
+# for MD2K driver
+	${ECHO_MSG} ">>>   adding ${MD2K} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \
+		>> ${WRKSRC}/src/contrib.mak
+# for ALPS driver
+	${ECHO_MSG} ">>>   adding ${ALPS} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${ALPS_NAME}/gdevalps.mak-5.50 \
+		>> ${WRKSRC}/src/contrib.mak
+# for BJ10V driver
+	${ECHO_MSG} ">>>   adding ${BJ10V} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${BJ10V_NAME}/gdev10v.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for LIPS driver
+	${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 \
+		>> ${WRKSRC}/src/contrib.mak
+# for EPLASER driver
+	${ECHO_MSG} ">>>   adding ${EPLASER} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv6.mak \
+		>> ${WRKSRC}/src/contrib.mak
+	${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv6.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for MJC driver
+	${ECHO_MSG} ">>>   adding ${MJC} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for NPDL driver
+	${ECHO_MSG} ">>>   adding ${NPDL} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for GDI driver
+	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/gdi.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
@@ -225,7 +390,7 @@ do-configure:
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
 # for Gimp-Print driver
-	${ECHO_MSG} ">>>   running configure script for ${GPRINT} driver ..."
+	${ECHO_MSG} ">>>   running configure script for ${GPRINT} library ..."
 	cd ${WRKSRC}/${GPRINT_NAME} ; \
 		${SETENV} ${MAKE_ENV} ${SH} ./configure \
 			--without-cups --without-translated-ppds \
@@ -235,7 +400,7 @@ post-configure:
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
 # for HPinkjet driver
-	${ECHO_MSG} ">>>   running configure script for ${HPIJS} driver ..."
+	${ECHO_MSG} ">>>   running configure script for ${HPIJS} server ..."
 	cd ${WRKSRC}/${HPIJS_NAME} ; \
 		${SETENV} ${MAKE_ENV} ${SH} ./configure \
 			--prefix=${PREFIX}
@@ -245,60 +410,108 @@ pre-build:
 	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
+	${LN} -sf ${WRKSRC}/src/unix-gcc.mak ${WRKSRC}/Makefile
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   building ${GPRINT} library ..."
 	cd ${WRKSRC}/${GPRINT_NAME} ; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT} ..."
-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \
-		${WRKSRC}/src
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/ghost/*.[ch] \
 		${WRKSRC}/src
+	${MKDIR} ${WRKSRC}/${GPRINT}
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \
+		${WRKSRC}/${GPRINT}/gimp-print
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
-		${WRKSRC}/obj
+		${WRKSRC}/${GPRINT}/libgimpprint.a
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   building ${HPIJS} server ..."
 	cd ${WRKSRC}/${HPIJS_NAME} ; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
-	${ECHO_MSG} ">>>   creating symlinks for ${HPIJS} ..."
-.for file in gdevijs.[ch] ijs.[ch] ijs_client.[ch] ijs_exec_unix.c unistd_.h
-	${LN} -sf ${WRKSRC}/${HPIJS_NAME}/${file} \
-		${WRKSRC}/src
+# for MD2K driver
+	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
+.for i in gdevmd2k.c
+	${LN} -sf ${WRKSRC}/${MD2K_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for ALPS driver
+	${ECHO_MSG} ">>>   creating symlinks for ${ALPS} ..."
+.for i in gdevalps.c
+	${LN} -sf ${WRKSRC}/${ALPS_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for BJ10V driver
+	${ECHO_MSG} ">>>   creating symlinks for ${BJ10V} ..."
+.for i in gdev10v.c
+	${LN} -sf ${WRKSRC}/${BJ10V_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for LIPS driver
+	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
+.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c gdevrpdl.c
+	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for EPAG driver
+	${ECHO_MSG} ">>>   building ${EPAG} utility ..."
+	cd ${WRKSRC}/${EPAG_NAME} ; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
+	${ECHO_MSG} ">>>   creating symlinks for ${EPAG} ..."
+.for i in gdevepag.c
+	${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for EPLASER driver
+	${ECHO_MSG} ">>>   creating symlinks for ${EPLASER} ..."
+.for i in gdevescv.[ch] gdevesmv.c
+	${LN} -sf ${WRKSRC}/${EPLASER_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for MJC driver
+	${ECHO_MSG} ">>>   creating symlinks for ${MJC} ..."
+.for i in gdevmjc.c mjbarrie.c mjbksep.c mjespdtc.c mjespdtm.c mjespdty.c \
+	mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c
+	${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for NPDL driver
+	${ECHO_MSG} ">>>   creating symlinks for ${NPDL} ..."
+.for i in gdevnpdl.c
+	${LN} -sf ${WRKSRC}/${NPDL_NAME}/${i} ${WRKSRC}/src
 .endfor
 
 pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
-	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
+	${ECHO_MSG} ">>>   extracting ghostscript fonts ..."
 	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
 	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
 	${ECHO_MSG} ">>>   stripping gs ..."
-	strip ${PREFIX}/bin/gs
+.if defined(WITH_SHLIB)
+	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
+	${LN} -sf gsc ${PREFIX}/bin/gs
+.else
+	${STRIP_CMD} ${PREFIX}/bin/gs
+.endif
 # for HPDJ driver
 	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${MANPREFIX}/man/man1
 .endfor
 	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
-	${MKDIR} ${DATADIR}/${PORTVERSION}/hpdj
+	${MKDIR} ${DATADIR}/${PORTVERSION}/${HPDJ}
 	${ECHO_MSG} ">>>   installing files in ${HPDJ} destdir ..."
 .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
 	margins-Letter.ps margins-LetterRotated.ps
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DATADIR}/${PORTVERSION}/hpdj
+		${DATADIR}/${PORTVERSION}/${HPDJ}
 .endfor
 # for PCL3 driver
+	${ECHO_MSG} ">>>   installing ${PCL3} utility in bindir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
 	${ECHO_MSG} ">>>   installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${MANPREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
 	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
-	${MKDIR} ${DATADIR}/${PORTVERSION}/pcl3
+	${MKDIR} ${DATADIR}/${PORTVERSION}/${PCL3}
 	${ECHO_MSG} ">>>   installing files in ${PCL3} destdir ..."
 .for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
 	ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
@@ -306,58 +519,126 @@ post-install:
 	ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
 	ps/margins-LetterRotated.ps
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
-		${DATADIR}/${PORTVERSION}/pcl3
-.endfor
-# for Gimp-Print driver
-	${ECHO_MSG} ">>>   creating ${GPRINT} destdir ..."
-	${MKDIR} ${DATADIR}/${PORTVERSION}/gimp-print
-	${ECHO_MSG} ">>>   installing files in ${GPRINT} destdir ..."
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
-		${DATADIR}/${PORTVERSION}/gimp-print
+		${DATADIR}/${PORTVERSION}/${PCL3}
 .endfor
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   installing ${HPIJS} server in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin
-	${ECHO_MSG} ">>>   creating ${HPIJS} destdir ..."
-	${MKDIR} ${DATADIR}/${PORTVERSION}/hpijs
-	${ECHO_MSG} ">>>   installing files in ${HPIJS} destdir ..."
-.for i in hpijs_readme.html gs_hpijs.png printerdb_append append_db.sh
-	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
-		${DATADIR}/${PORTVERSION}/hpijs
+# 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}/${PORTVERSION}/lib
 .endfor
+# for EPAG driver
+	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
 # contributed UPP driver
 	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
 	${INSTALL_DATA} ${FILESDIR}/${i} \
 		${DATADIR}/${PORTVERSION}/lib
 .endfor
-# for reading encrypted PDFs
-	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \
-		${DATADIR}/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff
 #
 .if !defined(NOPORTDOCS)
 	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
-# install hpdj docu, not necessary for runtime
-# note: old hpdj driver has its files in ${WRKSRC}/src
-	${ECHO_MSG} ">>>   creating ${HPDJ} docu destdir ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/hpdj
-	${ECHO_MSG} ">>>   installing files in ${HPDJ} docu destdir ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}
+# for HPDJ driver
+	${ECHO_MSG} ">>>   installing ${HPDJ} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPDJ}
 .for i in NEWS hpdj.html
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${PORTVERSION}/hpdj
+		${DOCSDIR}/${PORTVERSION}/${HPDJ}
 .endfor
-# install pcl3 docu, not necessary for runtime
-# note: new pcl3 driver has a subdir of its own
-	${ECHO_MSG} ">>>   creating ${PCL3} docu destdir ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/pcl3
-	${ECHO_MSG} ">>>   installing files in ${PCL3} docu destdir ..."
+# for PCL3 driver
+	${ECHO_MSG} ">>>   installing ${PCL3} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${PCL3}
 .for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/pcl3
+		${DOCSDIR}/${PORTVERSION}/${PCL3}
+.endfor
+# for Gimp-Print driver
+	${ECHO_MSG} ">>>   installing ${GPRINT} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${GPRINT}
+.for i in README
+	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
+		${DOCSDIR}/${PORTVERSION}/${GPRINT}
+.endfor
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   installing ${HPIJS} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS}
+.for i in hpijs_readme.html gs_hpijs.png
+	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${HPIJS}
+.endfor
+# for MD2K driver
+	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
+.for i in README.jis
+	${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${MD2K}
+.endfor
+# for ALPS driver
+	${ECHO_MSG} ">>>   installing ${ALPS} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${ALPS}
+.for i in README.gdevalps
+	${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${ALPS}
+.endfor
+# for BJ10V driver
+	${ECHO_MSG} ">>>   installing ${BJ10V} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${BJ10V}
+.for i in gdev10v.jis
+	${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${BJ10V}
+.endfor
+# for LIPS driver
+	${ECHO_MSG} ">>>   installing ${LIPS} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${LIPS}
+.for i in Gdevlips.htm
+	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${LIPS}
+.endfor
+# for DMPRT driver
+	${ECHO_MSG} ">>>   installing ${DMPRT} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${DMPRT}
+.for i in gdevdmpr.sj
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
+		${DOCSDIR}/${PORTVERSION}/${DMPRT}
+.endfor
+# for EPAG driver
+	${ECHO_MSG} ">>>   installing ${EPAG} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPAG}
+.for i in ert.txt gdevepag.txt ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${EPAG}
+.endfor
+.for i in psprint gsepagif.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${EPAG}
+.endfor
+# for EPLASER driver
+	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${EPLASER}
+.for i in readme-eplaser-651.euc
+	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${EPLASER}
+.endfor
+# for MJC driver
+	${ECHO_MSG} ">>>   installing ${MJC} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MJC}
+.for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc
+	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${MJC}
+.endfor
+# for NPDL driver
+	${ECHO_MSG} ">>>   installing ${NPDL} docs ..."
+	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${NPDL}
+.for i in gdevnpdl.jis
+	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/${i} \
+		${DOCSDIR}/${PORTVERSION}/${NPDL}
 .endfor
 .endif
 	${ECHO_MSG} "> post-installation tasks completed."
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 502fc5947b9c..c7ec65ad8a3f 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,11 +1,19 @@
-MD5 (ghostscript/ghostscript-7.03.tar.gz) = d9b5c31e0df09db9c439eec01c077532
+MD5 (ghostscript/ghostscript-7.04.tar.bz2) = 4fffc7520a510dac7b1cfb98fca8e724
 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
-MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6
-MD5 (ghostscript/hpijs-1.0.2.tar.gz) = 750923f29a5b70551ddea1d91b819cfa
+MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
+MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
+MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
+MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
+MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
+MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
+MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
+MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254
+MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
+MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
+MD5 (ghostscript/samsung-gdi-driver.tar.gz) = d85da4a9e26f2d751a22b6f1e19fc6d1
diff --git a/print/ghostscript-gpl/files/hpijs.contrib.mak b/print/ghostscript-gpl/files/hpijs.contrib.mak
deleted file mode 100644
index 6e94367c778c..000000000000
--- a/print/ghostscript-gpl/files/hpijs.contrib.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-### ------------- IJS Interface -------------- ###
-
-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ)
-
-$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c
-
-$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c
-
-$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c
-
-$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
-
-$(DD)ijs.dev : $(ijs_) $(DD)page.dev
-	$(SETPDEV) $(DD)ijs $(ijs_)
-
diff --git a/print/ghostscript-gpl/files/patch-lib:gs_init.ps b/print/ghostscript-gpl/files/patch-lib:gs_init.ps
index d3e7e8130021..70de88245ddc 100644
--- a/print/ghostscript-gpl/files/patch-lib:gs_init.ps
+++ b/print/ghostscript-gpl/files/patch-lib:gs_init.ps
@@ -1,6 +1,6 @@
---- lib/gs_init.ps.orig	Mon Apr  9 15:20:03 2001
-+++ lib/gs_init.ps	Wed Jun 20 04:05:12 2001
-@@ -1263,7 +1263,7 @@
+--- lib/gs_init.ps.orig	Fri Feb  1 12:25:45 2002
++++ lib/gs_init.ps	Sat Feb  9 01:42:10 2002
+@@ -1274,7 +1274,7 @@
  % Set the default screen and BG/UCR.
  /.setdefaultbgucr {
    systemdict /setblackgeneration known {
@@ -9,8 +9,8 @@
    } if
  } bind def
  /.useloresscreen {	% - .useloresscreen <bool>
-@@ -1815,3 +1815,7 @@
- (END GC) VMDEBUG
+@@ -1874,3 +1874,7 @@
+ userdict /AGM_preserve_spots false put
  
  % The interpreter will run the initial procedure (start).
 +
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
index 4c6b7163bb5d..94085a8e0710 100644
--- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Sat Sep 15 17:55:32 2001
-+++ src/unix-gcc.mak	Sat Dec 15 04:19:08 2001
+--- src/unix-gcc.mak.orig	Fri Feb  1 15:27:58 2002
++++ src/unix-gcc.mak	Sat Feb  9 04:34:53 2002
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -54,7 +54,7 @@
  
 -PSRCDIR=libpng
 +PSRCDIR=${LOCALBASE}/include
- PVERSION=10012
+ PVERSION=10201
  
  # Choose whether to use a shared version of the PNG library, and if so,
  # what its name is.
@@ -74,7 +74,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -196,7 +196,7 @@
+@@ -203,7 +203,7 @@
  
  # Define the name of the C compiler.
  
@@ -83,28 +83,38 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -229,9 +229,9 @@
+@@ -220,9 +220,9 @@
+ # Define the added flags for standard, debugging, profiling 
+ # and shared object builds.
+ 
+-CFLAGS_STANDARD=-O2
+-CFLAGS_DEBUG=-g -O
+-CFLAGS_PROFILE=-pg -O2
++CFLAGS_STANDARD?=-O2
++CFLAGS_DEBUG=-g
++CFLAGS_PROFILE=-pg
+ CFLAGS_SO=-fPIC
+ 
+ # Define the other compilation flags.  Add at most one of the following:
+@@ -236,7 +236,7 @@
  # We don't include -ansi, because this gets in the way of the platform-
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+#XCFLAGS=
++XCFLAGS+=-I${.CURDIR}/gimp-print
  
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+CFLAGS+=$(XCFLAGS)
+ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -240,7 +240,7 @@
+@@ -247,7 +247,7 @@
  #	-R /usr/local/xxx/lib:/usr/local/lib
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
 -XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
++XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -273,7 +273,7 @@
+@@ -280,7 +280,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -113,7 +123,7 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -285,12 +285,12 @@
+@@ -292,12 +292,12 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
diff --git a/print/ghostscript-gpl/files/stp.contrib.mak b/print/ghostscript-gpl/files/stp.contrib.mak
index 613116007dd3..862d329324ee 100644
--- a/print/ghostscript-gpl/files/stp.contrib.mak
+++ b/print/ghostscript-gpl/files/stp.contrib.mak
@@ -4,14 +4,11 @@
 
 stp_=$(GLOBJ)gdevstp.$(OBJ)
 
-STPINCDIR=-I$(GLSRC)
-STPLIBDIR=-L$(GLOBJ)
 STPLIB=gimpprint
 
 $(DD)stp.dev:	$(stp_) $(DD)page.dev
 	$(SETPDEV) $(DD)stp $(stp_)
-	$(ADDMOD) $(DD)stp -link $(STPLIBDIR)
 	$(ADDMOD) $(DD)stp -lib $(STPLIB)
 
 $(GLOBJ)gdevstp.$(OBJ) : $(GLSRC)gdevstp.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(STPINCDIR) $(GLSRC)gdevstp.c
+	$(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(GLSRC)gdevstp.c
diff --git a/print/ghostscript-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index 41d47a97d7fb..8c9cd4496d84 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -11,7 +11,7 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://members.ozemail.com.au/~geoffk/pdfencrypt/
 	o HP8XX driver for HP DeskJet 880C/882C/895C
 	  - http://www.gelhaus.net/hp880c/
-	o HP970 driver for HP DeskJet 970CXi
+	o DJ970 driver for HP DeskJet 970CXi
 	  - http://www.harsch.net/Ghostscript/ghostscript.html
 	o PCL3 and HPDJ driver for HP DeskJet series
 	  - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
@@ -19,6 +19,8 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://gimp-print.sourceforge.net/
 	o HPinkjet driver for HP PhotoSmart/DeskJet series
 	  - http://hpinkjet.sourceforge.net/
+	o Spacial drivers for verious printer models mainly sold in Japan
+	  - Alps, Canon, Epson, NEC, Ricoh,...
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index fa9ebdd6cf08..6558bb895327 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -1,17 +1,21 @@
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
+bin/ert
 bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
+%%SHLIB%%bin/gsc
 bin/gsdj
 bin/gsdj500
 bin/gslj
 bin/gslp
 bin/gsnd
+%%SHLIB%%bin/gsx
 bin/hpijs
 bin/lprsetup.sh
+bin/pcl3opts
 bin/pdf2dsc
 bin/pdf2ps
 bin/pdfopt
@@ -30,8 +34,30 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
+%%SHLIB%%lib/libgs.so
+%%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
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gsepagif.sh
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/psprint
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-651.euc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mjc
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mje
+%%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
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
@@ -57,9 +83,11 @@ share/ghostscript/%%GS_VERSION%%/doc/History3.htm
 share/ghostscript/%%GS_VERSION%%/doc/History4.htm
 share/ghostscript/%%GS_VERSION%%/doc/History5.htm
 share/ghostscript/%%GS_VERSION%%/doc/History6.htm
+share/ghostscript/%%GS_VERSION%%/doc/History7.htm
 share/ghostscript/%%GS_VERSION%%/doc/Htmstyle.htm
 share/ghostscript/%%GS_VERSION%%/doc/Humor.htm
 share/ghostscript/%%GS_VERSION%%/doc/Install.htm
+share/ghostscript/%%GS_VERSION%%/doc/Issues.htm
 share/ghostscript/%%GS_VERSION%%/doc/Language.htm
 share/ghostscript/%%GS_VERSION%%/doc/Lib.htm
 share/ghostscript/%%GS_VERSION%%/doc/Maintain.htm
@@ -95,17 +123,12 @@ share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
 share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
 share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
 share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
-share/ghostscript/%%GS_VERSION%%/gimp-print/README
 share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
 share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
 share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
-share/ghostscript/%%GS_VERSION%%/hpijs/append_db.sh
-share/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
-share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
-share/ghostscript/%%GS_VERSION%%/hpijs/printerdb_append
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
 share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
@@ -143,9 +166,12 @@ 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/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
@@ -495,14 +521,23 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/fonts
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
-@dirrm share/ghostscript/%%GS_VERSION%%/hpijs
 @dirrm share/ghostscript/%%GS_VERSION%%/hpdj
-@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
 @dirrm share/ghostscript
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
+%%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%%
 %%PORTDOCS%%@dirrm share/doc/ghostscript
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index 0d6b5743ebe6..d38894e6e079 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -14,22 +14,45 @@ other programs in the ports collection might need some of the default gs \n\
 file format drivers. The gs5 default drivers are preselected. \n\
 Have fun with this new configuration style !     -andreas \n\n\
   Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+  "x11"      "X Window System version 11, release >=4" ON \
+  "x11alpha" "X Window System masquer. as device with alpha capability" ON \
+  "x11cmyk"  "X Window System masquer. as 1-bit-per-plane CMYK device" ON \
+  "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" OFF \
+  "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" OFF \
+  "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" OFF \
+  "x11gray2" "X Window System as a 2-bit gray-scale device" ON \
+  "x11gray4" "X Window System as a 4-bit gray-scale device" ON \
+  "x11mono"  "X Window System masquer. as black-and-white device" ON \
+  "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \
+  "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \
+  "md2k"     "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" ON \
+  "md5k"     "ALPS MD-5000 Eco Mode [MD2K]" ON \
+  "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" ON \
+  "md50Eco"  "ALPS MD-5000 Eco Mode [ALPS]" ON \
+  "md1xMono" "ALPS MD-1x00 Monochrome [ALPS]" ON \
   "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
   "iwhi"     "Apple Imagewriter, high-resolution mode" OFF \
   "iwlo"     "Apple Imagewriter, low-resolution mode" OFF \
   "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
   "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" OFF \
-  "bj10e"    "Canon BubbleJet BJ10e" ON \
-  "bj200"    "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \
+  "bj10e"    "Canon BubbleJet BJ-10e" ON \
+  "bj10v"    "Canon BubbleJet BJ-10v [BJ10V]" ON \
+  "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" ON \
+  "bj200"    "Canon BubbleJet BJ-200 and BJC-240(b&w)" ON \
   "bjc600"   "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" ON \
   "bjc800"   "Canon Color BubbleJet BJC-240/800" ON \
   "lbp8"     "Canon LBP-8II laser printer" OFF \
-  "lips3"    "Canon LIPS III laser printer in English (CaPSL) mode" OFF \
+  "lips2p"   "Canon LIPS II+ [LIPS]" ON \
+  "lips3"    "Canon LIPS III [LIPS]" ON \
+  "lips4"    "Canon LIPS IV [LIPS]" ON \
+  "bjc880j"  "Canon LIPS IVc (BJC-680J/880J) [LIPS]" ON \
+  "lips4v"   "Canon LIPS IV, vector output mode [LIPS]" ON \
   "m8510"    "C.Itoh M8510 printer" OFF \
   "coslw2p"  "CoStar LabelWriter II II/Plus" OFF \
   "coslwxl"  "CoStar LabelWriter XL" OFF \
-  "stp"      "Configurable Canon/Epson/Lexmark/HP driver (Gimp-Print)" ON \
+  "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" ON \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
+  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" ON \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
   "ap3250"   "Epson ActionPrinter 3250" OFF \
@@ -37,8 +60,34 @@ Have fun with this new configuration style !     -andreas \n\n\
   "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
   "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" OFF \
   "lp8000"   "Epson LP-8000 line printer" OFF \
+  "epag"     "Epson ESC/Page laser printer (generic) [EPAG]" ON \
+  "escpage"  "Epson ESC/Page laser printer (generic) [LIPS]" ON \
+  "lp2000"   "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" ON \
+  "lp8800c"  "Epson LP-8800C color laser printer [EPLASER]" ON \
+  "lp8300c"  "Epson LP-8300C color laser printer [EPLASER]" ON \
+  "lp8500c"  "Epson LP-8500C color laser printer [EPLASER]" ON \
+  "lp3000c"  "Epson LP-3000C color laser printer [EPLASER]" ON \
+  "lp8200c"  "Epson LP-8200C color laser printer [EPLASER]" ON \
+  "lp8000c"  "Epson LP-8000C color laser printer [EPLASER]" ON \
+  "lp2200"   "Epson LP-2200 laser printer [EPLASER]" ON \
+  "lp9400"   "Epson LP-9400(R) laser printer [EPLASER]" ON \
+  "lp8700"   "Epson LP-8700(R) laser printer [EPLASER]" ON \
+  "lp8100"   "Epson LP-8100(R) laser printer [EPLASER]" ON \
+  "lp8600f"  "Epson LP-8600FX(N) laser printer [EPLASER]" ON \
+  "lp8400f"  "Epson LP-8400FX(N) laser printer [EPLASER]" ON \
+  "lp8300f"  "Epson LP-8300F laser printer [EPLASER]" ON \
+  "lp1900"   "Epson LP-1900(N) laser printer [EPLASER]" ON \
+  "lp9600s"  "Epson LP-9600S laser printer [EPLASER]" ON \
+  "lp9600"   "Epson LP-9600 laser printer [EPLASER]" ON \
+  "lp9300"   "Epson LP-9300 laser printer [EPLASER]" ON \
+  "lp8600"   "Epson LP-8600FX(N) laser printer [EPLASER]" ON \
+  "lp1800"   "Epson LP-1800 laser printer [EPLASER]" ON \
   "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \
   "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
+  "mjc180"   "Epson MachJet series 180dpi, CMYK [MJC]" ON \
+  "mjc360"   "Epson MachJet series 360dpi, CMYK [MJC]" ON \
+  "mjc720"   "Epson MachJet series 720dpi, CMYK [MJC]" ON \
+  "mj500c"   "Epson MachJet MJ-500C 360dpi, CMY or mono [MJC]" ON \
   "st800"    "Epson Stylus 800 printer" OFF \
   "stcolor"  "Epson Stylus Color and II/IIs/1500 (see driver docu)" OFF \
   "photoex"  "Epson Stylus Color Photo, Photo EX, Photo 700" OFF \
@@ -52,12 +101,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
   "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" OFF \
   "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" ON \
-  "cdj670"   "HP DeskJet 670/690 (HP8XX driver)" ON \
-  "cdj850"   "HP DeskJet 850/855/870/1100 (HP8XX driver)" ON \
-  "cdj880"   "HP DeskJet 880 (HP8XX driver)" ON \
-  "cdj890"   "HP DeskJet 890 (HP8XX driver)" ON \
-  "cdj1600"  "HP DeskJet 1600 (HP8XX driver)" ON \
-  "cdj970"   "HP DeskJet 970CXi (HP970 driver)" ON \
+  "cdj670"   "HP DeskJet 670/690 [HP8XX]" ON \
+  "cdj850"   "HP DeskJet 850/855/870/1100 [HP8XX]" ON \
+  "cdj880"   "HP DeskJet 880 [HP8XX]" ON \
+  "cdj890"   "HP DeskJet 890 [HP8XX]" ON \
+  "cdj1600"  "HP DeskJet 1600 [HP8XX]" ON \
+  "cdj970"   "HP DeskJet 970CXi [DJ970]" ON \
   "laserjet" "HP LaserJet" ON \
   "ljetplus" "HP LaserJet Plus" ON \
   "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
@@ -78,9 +127,9 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
   "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
-  "pcl3"     "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \
-  "hpdj"     "HP PCL 3+ (old drv.)" ON \
-  "ijs"      "HP PhotoSmart/DeskJet series (HP developed driver)" ON \
+  "pcl3"     "HP PCL 3+ (generic) [PCL3]" ON \
+  "hpdj"     "HP PCL 3+ (old drv.) [HPDJ]" ON \
+  "ijs"      "HP PhotoSmart/DeskJet series [HPinkjet]" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
@@ -88,6 +137,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "lxm5700m" "Lexmark 5700 monotone" OFF \
   "cp50"     "Mitsubishi CP50 color" OFF \
   "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" OFF \
+  "npdl"     "NEC Printer Description Language [NPDL]" ON \
   "oce9050"  "OCE 9050 printer" OFF \
   "oki182"   "Okidata MicroLine 182" OFF \
   "okiibm"   "Okidata MicroLine IBM-compatible printers" OFF \
@@ -95,6 +145,8 @@ Have fun with this new configuration style !     -andreas \n\n\
   "atx24"    "Practical Automation ATX-24 label printer" OFF \
   "atx38"    "Practical Automation ATX-38 label printer" OFF \
   "r4081"    "Ricoh 4081 laser printer" OFF \
+  "rpdl"     "Ricoh Printer Description Language [LIPS]" ON \
+  "gdi"      "Samsung SmartGDI laser printer [GDI]" ON \
   "sj48"     "StarJet 48 inkjet printer" OFF \
   "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
   "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
@@ -173,17 +225,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" ON \
   "tifflzw"  "TIFF LZW,      tag = 5,     mono" ON \
   "tiffpack" "TIFF PackBits, tag = 32773, mono" ON \
-  "x11"      "X Window System version 11, release >=4" ON \
-  "x11alpha" "X Window System masquer. as device with alpha capability" ON \
-  "x11cmyk"  "X Window System masquer. as 1-bit-per-plane CMYK device" ON \
-  "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" OFF \
-  "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" OFF \
-  "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" OFF \
-  "x11gray2" "X Window System as a 2-bit gray-scale device" ON \
-  "x11gray4" "X Window System as a 4-bit gray-scale device" ON \
-  "x11mono"  "X Window System masquer. as black-and-white device" ON \
-  "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \
-  "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -211,7 +252,7 @@ esac
 #	> ${WRKSRC}/src/unix-gcc.mak.new
 # XXX new:
 echo "DEVICE_DEVS=$choice" \
-	| perl -pe 's|"([a-z0-9]+)"|\$(DD)\1.dev|g' \
+	| perl -pe 's|"([A-Za-z0-9]+)"|\$(DD)\1.dev|g' \
 	> ${WRKSRC}/src/unix-gcc.mak.new
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index 1f3e4f8e51a3..f5140cab665e 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -10,8 +10,8 @@ ifndef WITHOUT_X11
 DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
 endif
 
-DEVICE_DEVS+= \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
 !EOT
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.d!
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
 sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \