Attachment 20827 Details for Bug 36674 – file.diff

[patch] file.diff

file.diff (text/plain), 87.07 KB, created by tkato on 2002-04-03 00:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-04-03 00:10:01 UTC

Size: 87.07 KB

patch

obsolete

>diff -urN /usr/ports/print/ghostscript-gnu/Makefile print/ghostscript-gnu/Makefile
>--- /usr/ports/print/ghostscript-gnu/Makefile	Wed Apr  3 07:59:15 2002
>+++ print/ghostscript-gnu/Makefile	Wed Apr  3 08:02:33 2002
>@@ -6,35 +6,46 @@
> #
> 
> PORTNAME=	ghostscript
>-PORTVERSION=	6.52
>-PORTREVISION=	5
>+PORTVERSION=	6.53
> CATEGORIES=	print
>-MASTER_SITES=	${MASTER_SITE_GNU:S/$/:fonts/} \
>-		${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_GNU} \
>+		${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/gnu/gs652/ \
>-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
>-		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
>-# gatekeeper is an exception, it is the only GNU site which carries
>-# some of the other files, so add it although it is listed inside
>-# MASTER_SITE_GNU
>-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/gnu/fonts/ \
>+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs653/
>+MASTER_SITE_SUBDIR=	${PORTNAME}
> PKGNAMESUFFIX=	-gnu
>-DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
>-		${GS_FONTS_STD}:fonts \
>-		${GS_FONTS_OTHER}: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
> 
>@@ -43,7 +54,8 @@
> 
> USE_BZIP2=	yes
> USE_GMAKE=	yes
>-MAKE_ENV=	CC="${CC}" CXX="${CXX}" XCFLAGS="${XCFLAGS}"
>+MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
>+		XCFLAGS="${XCFLAGS}"
> MAKEFILE=	src/unix-gcc.mak
> ALL_TARGET=	all pcl3opts
> PLIST_SUB=	GS_VERSION=${PORTVERSION}
>@@ -72,7 +84,7 @@
> MAKE_ENV+=	WITHOUT_X11="${WITHOUT_X11}"
> .endif
> 
>-GS_SOURCES=	${DISTNAME}${EXTRACT_SUFX}
>+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
>@@ -82,54 +94,113 @@
> 
> # 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::
>@@ -149,38 +220,79 @@
> # 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|%%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
>@@ -194,13 +306,47 @@
> 	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
> 	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.51.add \
> 		>> ${WRKSRC}/src/contrib.mak
>-# for Gimp-Print driver
>-	${ECHO_MSG} ">>>   adding ${GPRINT} driver to contrib.mak ..."
>-	${CAT} ${FILESDIR}/stp.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 HPinkjet driver
>-	${ECHO_MSG} ">>>   adding ${HPIJS} driver to contrib.mak ..."
>-	${CAT} ${FILESDIR}/hpijs.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:
>@@ -214,7 +360,7 @@
> 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 \
>@@ -224,7 +370,7 @@
> 			--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}
>@@ -239,55 +385,95 @@
> 	cd ${WRKSRC}/${GPRINT_NAME} ; \
> 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
> 	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT} ..."
>+	${MKDIR} ${WRKSRC}/${GPRINT}
> 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \
>-		${WRKSRC}/src
>-	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/ghost/*.[ch] \
>-		${WRKSRC}/src
>+		${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
>+	${STRIP_CMD} ${PREFIX}/bin/gs
> # 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 \
>@@ -295,58 +481,126 @@
> 	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 -urN /usr/ports/print/ghostscript-gnu/distinfo print/ghostscript-gnu/distinfo
>--- /usr/ports/print/ghostscript-gnu/distinfo	Thu Jan 24 20:19:07 2002
>+++ print/ghostscript-gnu/distinfo	Wed Apr  3 02:24:30 2002
>@@ -1,11 +1,19 @@
>-MD5 (ghostscript/ghostscript-6.52.tar.bz2) = 5a1b698b8fbece1e23e4d8d9ff552762
>+MD5 (ghostscript/ghostscript-6.53.tar.bz2) = fc61954bddd6252f992b8bc1f4cc8761
> MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
> MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
>-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 -urN /usr/ports/print/ghostscript-gnu/files/gdi.contrib.mak print/ghostscript-gnu/files/gdi.contrib.mak
>--- /usr/ports/print/ghostscript-gnu/files/gdi.contrib.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/gdi.contrib.mak	Thu Mar 21 01:02:08 2002
>@@ -0,0 +1,12 @@
>+### ---------------- The Samsung SmartGDI laser printer devices --------- ###
>+### Note : this driver is used by Samsung SmartGDI compatible printers.   ###
>+###
>+
>+GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
>+
>+$(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gsparam_h)
>+	$(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
>+
>+$(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
>+	$(SETPDEV) $(DD)gdi $(GDIMONO)
>+
>diff -urN /usr/ports/print/ghostscript-gnu/files/hpijs.contrib.mak print/ghostscript-gnu/files/hpijs.contrib.mak
>--- /usr/ports/print/ghostscript-gnu/files/hpijs.contrib.mak	Fri Dec 28 16:38:14 2001
>+++ print/ghostscript-gnu/files/hpijs.contrib.mak	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/print/ghostscript-gnu/files/patch-alps:gdevalps.mak print/ghostscript-gnu/files/patch-alps:gdevalps.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-alps:gdevalps.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-alps:gdevalps.mak	Thu Mar 21 01:02:09 2002
>@@ -0,0 +1,25 @@
>+--- alps/gdevalps.mak-5.50.orig	Sat Jan 12 13:21:12 2002
>++++ alps/gdevalps.mak-5.50	Sat Jan 12 13:23:45 2002
>+@@ -2,15 +2,15 @@
>+ 
>+ alps_=$(GLOBJ)gdevalps.$(OBJ)
>+ 
>+-md50Mono.dev: $(alps_) page.dev
>+-	$(SETPDEV) md50Mono $(alps_)
>++$(DD)md50Mono.dev: $(alps_) $(DD)page.dev
>++	$(SETPDEV) $(DD)md50Mono $(alps_)
>+ 
>+-md50Eco.dev: $(alps_) page.dev
>+-	$(SETPDEV) md50Eco $(alps_)
>++$(DD)md50Eco.dev: $(alps_) $(DD)page.dev
>++	$(SETPDEV) $(DD)md50Eco $(alps_)
>+ 
>+-md1xMono.dev: $(alps_) page.dev
>+-	$(SETPDEV) md1xMono $(alps_)
>++$(DD)md1xMono.dev: $(alps_) $(DD)page.dev
>++	$(SETPDEV) $(DD)md1xMono $(alps_)
>+ 
>+-$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(PDEVH)
>++$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c  $(gdevprn_h) $(PDEVH)
>+ 	$(GLCC) $(GLO_)gdevalps.$(OBJ) $(C_) $(GLSRC)gdevalps.c
>+ 
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c print/ghostscript-gnu/files/patch-eplaser:gdevescv.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-eplaser:gdevescv.c	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,43 @@
>+--- eplaser/gdevescv.c.orig	Fri Dec 21 15:50:22 2001
>++++ eplaser/gdevescv.c	Fri Mar 15 04:27:39 2002
>+@@ -1760,13 +1760,13 @@
>+ 
>+ /* Process the next piece of an image. */
>+ private int
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+ escv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used)
>+ #else
>+ escv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height)
>+ #endif
>+ {
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+     gx_device *dev = info->dev;
>+ #endif
>+     gx_device_vector *const	vdev = (gx_device_vector *) dev;
>+@@ -1784,7 +1784,7 @@
>+ 
>+     {
>+ 
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+ 	if (height == 260)
>+ 	    height = 1;
>+ #endif
>+@@ -1922,13 +1922,13 @@
>+ 
>+ 
>+ private int
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+ escv_image_end_image(gx_image_enum_common_t * info, bool draw_last)
>+ #else
>+ escv_image_end_image(gx_device *dev, gx_image_enum_common_t * info, bool draw_last)
>+ #endif
>+ {
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+     gx_device *dev = info->dev;
>+ #endif
>+     gx_device_vector		*const vdev = (gx_device_vector *) dev;
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,43 @@
>+--- eplaser/gdevesmv.c.orig	Fri Dec 14 10:50:14 2001
>++++ eplaser/gdevesmv.c	Fri Mar 15 04:28:41 2002
>+@@ -1799,13 +1799,13 @@
>+ 
>+ /* Process the next piece of an image. */
>+ private int
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+ esmv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used)
>+ #else
>+ esmv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height)
>+ #endif
>+ {
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+     gx_device *dev = info->dev;
>+ #endif
>+     gx_device_vector *const	vdev = (gx_device_vector *) dev;
>+@@ -1823,7 +1823,7 @@
>+ 
>+     {
>+ 
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+ 	if (height == 260)
>+ 	    height = 1;
>+ #endif
>+@@ -1980,13 +1980,13 @@
>+ 
>+ 
>+ private int
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+ esmv_image_end_image(gx_image_enum_common_t * info, bool draw_last)
>+ #else
>+ esmv_image_end_image(gx_device * dev, gx_image_enum_common_t * info, bool draw_last)
>+ #endif
>+ {
>+-#if GS_VERSION_MAJOR == 6
>++#if GS_VERSION_MAJOR >= 6
>+     gx_device *dev = info->dev;
>+ #endif
>+     gx_device_vector		*const vdev = (gx_device_vector *) dev;
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-gdev10v:gdev10v.mak print/ghostscript-gnu/files/patch-gdev10v:gdev10v.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-gdev10v:gdev10v.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-gdev10v:gdev10v.mak	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,22 @@
>+--- gdev10v/gdev10v.mak.orig	Thu Oct 12 11:17:50 2000
>++++ gdev10v/gdev10v.mak	Thu Oct 12 11:21:12 2000
>+@@ -1,12 +1,13 @@
>+ ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
>+ 
>+-bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ)
>+-bj10v.dev: $(bj10v_)
>+-	$(SHP)gssetdev bj10v $(bj10v_)
>+-bj10vh.dev: $(bj10v_)
>+-	$(SHP)gssetdev bj10vh $(bj10v_)
>++bj10v_=$(GLOBJ)gdev10v.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
>++$(DD)bj10v.dev: $(bj10v_) $(DD)page.dev
>++	$(SETPDEV) $(DD)bj10v $(bj10v_)
>++$(DD)bj10vh.dev: $(bj10v_) $(DD)page.dev
>++	$(SETPDEV) $(DD)bj10vh $(bj10v_)
>+ 
>+ # Uncomment the following line if you are using MS-DOS on PC9801 series.
>+ 
>+-gdev10v.$(OBJ): gdevbj10.c $(PDEVH)
>++$(GLOBJ)gdev10v.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH)
>++	$(GLCC) $(GLO_)gdev10v.$(OBJ) $(C_) $(GLSRC)gdev10v.c
>+ #	$(CCC) -DPC9801 gdev10v.c
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-lib:gs_res.ps print/ghostscript-gnu/files/patch-lib:gs_res.ps
>--- /usr/ports/print/ghostscript-gnu/files/patch-lib:gs_res.ps	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-lib:gs_res.ps	Thu Mar 21 01:02:08 2002
>@@ -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 -urN /usr/ports/print/ghostscript-gnu/files/patch-lips:gdevlips.mak print/ghostscript-gnu/files/patch-lips:gdevlips.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-lips:gdevlips.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-lips:gdevlips.mak	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,18 @@
>+--- lips/gdevlips.mak.orig	Thu Nov  2 12:12:13 2000
>++++ lips/gdevlips.mak	Wed Feb 13 07:29:36 2002
>+@@ -43,15 +43,6 @@
>+ $(GLOBJ)lp2000.dev: $(escpage_) $(DD)page.dev
>+ 	$(SETPDEV) $(DD)lp2000 $(escpage_)
>+ 
>+-### --- The NEC NPDL language printer device ------ ###
>+-
>+-npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
>+-$(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
>+-	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
>+-
>+-$(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
>+-	$(SETPDEV) $(DD)npdl $(npdl_)
>+-	
>+ ### --- The RICOH RPDL language printer device ------ ###
>+ 
>+ rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-md2k:gdevmd2k.mak print/ghostscript-gnu/files/patch-md2k:gdevmd2k.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-md2k:gdevmd2k.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-md2k:gdevmd2k.mak	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,19 @@
>+--- md2k/gdevmd2k.mak-5.50.orig	Sun Nov 19 18:42:20 2000
>++++ md2k/gdevmd2k.mak-5.50	Sun Nov 19 18:52:14 2000
>+@@ -3,11 +3,11 @@
>+ 
>+ md2k_=$(GLOBJ)gdevmd2k.$(OBJ)
>+ 
>+-md2k.dev: $(md2k_) page.dev
>+-	$(SETPDEV) md2k $(md2k_)
>++$(DD)md2k.dev: $(md2k_) $(DD)page.dev
>++	$(SETPDEV) $(DD)md2k $(md2k_)
>+ 
>+-md5k.dev: $(md2k_) page.dev
>+-	$(SETPDEV) md5k $(md2k_)
>++$(DD)md5k.dev: $(md2k_) $(DD)page.dev
>++	$(SETPDEV) $(DD)md5k $(md2k_)
>+ 
>+-$(GLOBJ)gdevmd2k.$(OBJ): gdevmd2k.c $(PDEVH) $(gsparam_h)
>++$(GLOBJ)gdevmd2k.$(OBJ): $(GLSRC)gdevmd2k.c $(PDEVH) $(gsparam_h)
>+ 	$(GLCC) $(GLO_)gdevmd2k.$(OBJ) $(C_) $(GLSRC)gdevmd2k.c
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-mjc:gdevmjc.c print/ghostscript-gnu/files/patch-mjc:gdevmjc.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-mjc:gdevmjc.c	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-mjc:gdevmjc.c	Thu Mar 21 01:02:09 2002
>@@ -0,0 +1,335 @@
>+--- mjc/gdevmjc.c.orig	Tue May 23 19:16:52 2000
>++++ mjc/gdevmjc.c	Tue May 23 19:17:44 2000
>+@@ -43,7 +43,8 @@
>+ #include <limits.h>
>+ #include "gdevprn.h"
>+ #include "gdevpcl.h"
>+-#include "gsprops.h"
>++#include "gsparam.h"
>++#include "gsstate.h"
>+ 
>+ #include "mjmtx2.c"
>+ #include "mjbksep.c"
>+@@ -150,7 +151,9 @@
>+ 
>+ /* Undefined macros expected to be defined in gdevpcl.h */
>+ #define PAPER_SIZE_A3_NOBI 28
>++#ifndef PAPER_SIZE_A2
>+ #define PAPER_SIZE_A2 29
>++#endif
>+ #define PAPER_SIZE_B4 30
>+ #define PAPER_SIZE_B5 31
>+ 
>+@@ -190,14 +193,12 @@
>+ private dev_proc_print_page(mjc720_print_page);
>+ private dev_proc_print_page(mj500c_print_page);
>+ 
>+-private dev_proc_get_props(mj_get_props);
>+-private dev_proc_put_props(mj_put_props);
>++private dev_proc_get_params(mj_get_params);
>++private dev_proc_put_params(mj_put_params);
>+ 
>+ private void expand_line(P4(word*, int, int, int));
>+-private int put_prop_float(P5(gs_prop_item *, float *, float, float, int));
>+-private int put_prop_int(P5(gs_prop_item *, int *, int, int, int));
>+-
>+-private void set_bpp(P2(gx_device *, int));
>++private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int));
>++private void mj_set_bpp(P2(gx_device *, int));
>+ 
>+ private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int ));
>+ 
>+@@ -224,7 +225,7 @@
>+ #define mj    ((gx_device_mj *) pdev)
>+ 
>+ #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\
>+-    prn_device_body(gx_device_printer, procs, dev_name,\
>++    prn_device_body(gx_device_mj, procs, dev_name,\
>+     WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\
>+     bpp, 0, 0, 0, 0, print_page)
>+ 
>+@@ -235,9 +236,9 @@
>+ }
>+ 
>+ 
>+-#define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\
>++#define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\
>+ 	proc_colour_open,\
>+-	gdev_pcl_get_initial_matrix,\
>++	gx_default_get_initial_matrix,\
>+ 	gx_default_sync_output,\
>+ 	gdev_prn_output_page,\
>+ 	gdev_prn_close,\
>+@@ -249,15 +250,15 @@
>+ 	NULL,	/* copy_color */\
>+ 	NULL,	/* draw_line */\
>+ 	gx_default_get_bits,\
>+-	proc_get_props,\
>+-	proc_put_props\
>++	proc_get_params,\
>++	proc_put_params\
>+ }
>+ 
>+ private int mjc_open(P1(gx_device *));
>+ private int mj_colour_open(P1(gx_device *));
>+ 
>+ private gx_device_procs mj_procs =
>+-mj_colour_procs(mjc_open, mj_get_props, mj_put_props);
>++mj_colour_procs(mjc_open, mj_get_params, mj_put_params);
>+ 
>+ gx_device_mj far_data gs_mjc180_device =
>+ mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL,
>+@@ -306,14 +307,14 @@
>+   static const float mj_b4[4] = { MJ700V2C_MARGINS_B4 };
>+   static const float mj_b5[4] = { MJ700V2C_MARGINS_B5 };
>+   static const float mj_letter[4] = { MJ700V2C_MARGINS_LETTER };
>+-  const float _ds *m;
>++  const float *m;
>+   int psize;
>+ 
>+   int paper_size;
>+ 
>+   /* Set up colour params if put_props has not already done so */
>+   if (pdev->color_info.num_components == 0)
>+-    set_bpp(pdev, pdev->color_info.depth);
>++    mj_set_bpp(pdev, pdev->color_info.depth);
>+ 
>+   paper_size = gdev_mjc_paper_size(pdev);
>+   if (paper_size == PAPER_SIZE_A2 ) {
>+@@ -332,10 +333,7 @@
>+     m = mj_letter;
>+   }
>+ 
>+-  pdev->l_margin = m[0];
>+-  pdev->b_margin = m[1];
>+-  pdev->r_margin = m[2];
>+-  pdev->t_margin = m[3];
>++  gx_device_set_margins(pdev, m, true);
>+ 
>+   switch (mj->colorcomp) {
>+   case 1:
>+@@ -360,80 +358,74 @@
>+  * and control over the bits-per-pixel used in output rendering */
>+ /* Added properties for DeskJet 5xxC */
>+ 
>+-private const gs_prop_item props_mj[] = {
>+-  /* Read-write properties. */
>+-  prop_def("Density", prt_int),
>+-  prop_def("Cyan", prt_int),
>+-  prop_def("Magenta", prt_int),
>+-  prop_def("Yellow", prt_int),
>+-  prop_def("Black", prt_int),
>+-  prop_def("Dither", prt_int),
>+-  prop_def("ColorComponent", prt_int),
>+-  prop_def("Direction", prt_int),
>+-  prop_def("MicroWeave", prt_int),
>+-  prop_def("DotSize", prt_int),
>+-};
>+-
>+ private int
>+-mj_get_props(gx_device *pdev, gs_prop_item *plist)
>+-{	int start = gdev_prn_get_props(pdev, plist);
>+-	if ( plist != 0 ) {
>+-		register gs_prop_item *pi = plist + start;
>+-		memcpy(pi, props_mj, sizeof(props_mj));
>+-		pi[0].value.i = mj->density;
>+-		pi[1].value.i = mj->cyan;
>+-		pi[2].value.i = mj->magenta;
>+-		pi[3].value.i = mj->yellow;
>+-		pi[4].value.i = mj->black;
>+-		pi[5].value.i = mj->dither;
>+- 		pi[6].value.i = mj->colorcomp;
>+-		pi[7].value.i = mj->direction;
>+-		pi[8].value.i = mj->microweave;
>+-		pi[9].value.i = mj->dotsize;
>+-	}
>+-	return start + sizeof(props_mj) / sizeof(gs_prop_item);
>++mj_get_params(gx_device *pdev, gs_param_list *plist)
>++{	int code = gdev_prn_get_params(pdev, plist);
>++	if ( code < 0 ||
>++	    (code = param_write_int(plist, "Density", &mj->density)) < 0 ||
>++	    (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 ||
>++	    (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 ||
>++	    (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 ||
>++	    (code = param_write_int(plist, "Black", &mj->black)) < 0 ||
>++	    (code = param_write_int(plist, "Dither", &mj->dither)) < 0 ||
>++	    (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 ||
>++	    (code = param_write_int(plist, "Direction", &mj->direction)) < 0 ||
>++	    (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 ||
>++	    (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0
>++	   )
>++	  return code;
>++	return code;
>+ }
>+ 
>+ /* Put properties. */
>+ private int
>+-mj_put_props(gx_device *pdev,  gs_prop_item *plist,  int count)
>++mj_put_params(gx_device *pdev, gs_param_list *plist)
>+ {
>+-	static const argn = 10;
>+-/* 	gs_prop_item *known[argn]; */
>+- 	gs_prop_item *known[10];
>+ 	int old_bpp = mj->color_info.depth;
>+ 	int bpp = 0;
>+ 	int code = 0;
>+-
>+-	props_extract(plist, count, props_mj, argn, known, 0);
>+-	code = gdev_prn_put_props(pdev, plist, count);
>+-	if ( code < 0 ) return code;
>+-
>+-	code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code);
>+-	code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code);
>+-	code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code);
>+-	code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code);
>+-	code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code);
>+-	code = put_prop_int(known[5], &mj->dither, 0, 1, code);
>+- 	code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code);
>+-	code = put_prop_int(known[7], &mj->direction, 1, 2, code);
>+-	code = put_prop_int(known[8], &mj->microweave, 0, 1, code);
>+-	code = put_prop_int(known[9], &mj->dotsize, 0, 1, code);
>+-
>++	int density = mj->density;
>++	int cyan = mj->cyan;
>++	int magenta = mj->magenta;
>++	int yellow = mj->yellow;
>++	int black = mj->black;
>++	int dither = mj->dither;
>++	int colorcomp = mj->colorcomp;
>++	int direction = mj->direction;
>++	int microweave = mj->microweave;
>++	int dotsize = mj->dotsize;
>++	code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code);
>++	code = mj_put_param_int(plist, "Cyan", &cyan, 0, INT_MAX, code);
>++	code = mj_put_param_int(plist, "Magenta", &magenta, 0, INT_MAX, code);
>++	code = mj_put_param_int(plist, "Yellow", &yellow, 0, INT_MAX, code);
>++	code = mj_put_param_int(plist, "Black", &black, 0, INT_MAX, code);
>++	code = mj_put_param_int(plist, "Dither", &dither, 0, 1, code);
>++	code = mj_put_param_int(plist, "ColorComponent", &colorcomp, 1, 4, code);
>++	code = mj_put_param_int(plist, "Direction", &direction, 1, 2, code);
>++	code = mj_put_param_int(plist, "MicroWeave", &microweave, 0, 1, code);
>++	code = mj_put_param_int(plist, "DotSize", &dotsize, 0, 1, code);
>++	code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code);
>+ 	if ( code < 0 )
>+-	  return_error(code);
>+-
>+-	if (bpp != 0) {
>+-	  set_bpp(pdev, bpp);
>+-	  
>+-	  /* Close the device; gs_putdeviceprops will reopen it. */
>++	  return code;
>++	mj->density = density;
>++	mj->cyan = cyan;
>++	mj->magenta = magenta;
>++	mj->yellow = yellow;
>++	mj->black = black;
>++	mj->dither = dither;
>++	mj->colorcomp = colorcomp;
>++	mj->direction = direction;
>++	mj->microweave = microweave;
>++	mj->dotsize = dotsize;
>++	if ( bpp != 0 ) {
>++	  mj_set_bpp(pdev, bpp);
>++	  gdev_prn_put_params(pdev, plist);
>+ 	  if ( bpp != old_bpp && pdev->is_open )
>+-	    { int ccode = gs_closedevice(pdev);
>+-	      if ( ccode < 0 ) return ccode;
>+-	    }
>++	    return gs_closedevice(pdev);
>++	  return 0;
>+ 	}
>+-
>+-	return code;
>++	else
>++	  return gdev_prn_put_params(pdev, plist);
>+ }
>+ 
>+ /* ------ Internal routines ------ */
>+@@ -1163,7 +1155,8 @@
>+ 
>+   /* Send each scan line in turn */
>+   {
>+-    long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi;
>++    long int lend = pdev->height - 
>++	(dev_t_margin_points(pdev) + dev_b_margin_points(pdev));
>+     int cErr, mErr, yErr, kErr;
>+     int this_pass, i;
>+     long int lnum;
>+@@ -1685,39 +1678,25 @@
>+ }
>+ 
>+ private int
>+-put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code)
>+-{
>+-  if ( pi == 0 )
>+-    return (code);
>+-  
>+-  if ( pi->value.i < minval || pi->value.i > maxval )
>+-    { pi->status = pv_rangecheck;
>+-      return (gs_error_rangecheck);
>+-    }
>+-  else
>+-    { *property = pi->value.i;
>+-      return (code ? code : 1);
>+-    }
>+-}	
>+-
>+-private int
>+-put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code)
>+-{
>+-  if ( pi == 0 )
>+-    return (code);
>+-  
>+-  if ( pi->value.f < minval || pi->value.f > maxval )
>+-    { pi->status = pv_rangecheck;
>+-      return (gs_error_rangecheck);
>+-    }
>+-  else
>+-    { *property = pi->value.f;
>+-      return (code ? code : 1);
>+-    }
>++mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue,
>++  int minval, int maxval, int ecode)
>++{	int code, value;
>++	switch ( code = param_read_int(plist, pname, &value) )
>++	{
>++	default:
>++		return code;
>++	case 1:
>++		return ecode;
>++	case 0:
>++		if ( value < minval || value > maxval )
>++		   param_signal_error(plist, pname, gs_error_rangecheck);
>++		*pvalue = value;
>++		return (ecode < 0 ? ecode : 1);
>++	}
>+ }	
>+ 
>+ private void
>+-set_bpp(gx_device *pdev, int bits_per_pixel)
>++mj_set_bpp(gx_device *pdev, int bits_per_pixel)
>+ { gx_device_color_info *ci = &pdev->color_info;
>+   /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */
>+   int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : 
>+@@ -1725,9 +1704,9 @@
>+   ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3);
>+   ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp);
>+   ci->max_gray = (bpp >= 8 ? 255 : 1);
>+-  ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
>+-  ci->dither_gray = (bpp >= 8 ? 5 : 2);
>+-  ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
>++  ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
>++  ci->dither_grays = (bpp >= 8 ? 5 : 2);
>++  ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
>+ }
>+ 
>+ /* This returns either the number of pixels in a scan line, or the number
>+@@ -1736,7 +1715,7 @@
>+ gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount)
>+ {
>+   word raster_width =
>+-    pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin);
>++    pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]);
>+   return (pixelcount ?
>+           (uint)raster_width :
>+           (uint)((raster_width * pdev->color_info.depth + 7) >> 3));
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-mjc:gdevmjc.mak print/ghostscript-gnu/files/patch-mjc:gdevmjc.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-mjc:gdevmjc.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-mjc:gdevmjc.mak	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,43 @@
>+--- mjc/gdevmjc.mak.orig	Tue May 23 19:19:13 2000
>++++ mjc/gdevmjc.mak	Tue May 23 19:19:40 2000
>+@@ -4,25 +4,22 @@
>+ # Supports MJ-700V2C, MJ-5000C, MJ-900C, MJ-800C, MJ-500C
>+ #
>+ ##
>+-#
>+-#  Append this file to Makefile
>+-#
>+-##
>+-MJCSRC = gdevmjc.c mjmtx2.c mjbksep.c mjhtocmy.c mjvtbl.c \
>+-	mjgrnsp.c mjgrnsp2.c mjespdtc.c mjespdtm.c mjespdty.c mjbarrie.c
>++MJCSRC = $(GLSRC)gdevmjc.c $(GLSRC)mjmtx2.c $(GLSRC)mjbksep.c \
>++	$(GLSRC)mjhtocmy.c $(GLSRC)mjvtbl.c $(GLSRC)mjgrnsp.c \
>++	$(GLSRC)mjgrnsp2.c $(GLSRC)mjespdtc.c $(GLSRC)mjespdtm.c \
>++	$(GLSRC)mjespdty.c $(GLSRC)mjbarrie.c
>+ 
>+-mj700v2c_=gdevmjc.$(OBJ) $(HPPCL)
>++mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL)
>+ 
>+ # To make A4 paper the default, change the second line below this to
>+-gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
>+-	$(CCC) -DA4 gdevmjc.c
>+-
>+-mjc180.dev: $(mj700v2c_)
>+-	$(SHP)gssetdev mjc180 $(mj700v2c_)
>+-mjc360.dev: $(mj700v2c_)
>+-	$(SHP)gssetdev mjc360 $(mj700v2c_)
>+-mjc720.dev: $(mj700v2c_)
>+-	$(SHP)gssetdev mjc720 $(mj700v2c_)
>+-mj500c.dev: $(mj700v2c_)
>+-	$(SHP)gssetdev mj500c $(mj700v2c_)
>++$(GLOBJ)gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
>++	$(GLCC) -DA4 $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c
>+ 
>++$(GLOBJ)mjc180.dev: $(mj700v2c_) $(DD)page.dev
>++	$(SETPDEV) $(DD)mjc180 $(mj700v2c_)
>++$(GLOBJ)mjc360.dev: $(mj700v2c_) $(DD)page.dev
>++	$(SETPDEV) $(DD)mjc360 $(mj700v2c_)
>++$(GLOBJ)mjc720.dev: $(mj700v2c_) $(DD)page.dev
>++	$(SETPDEV) $(DD)mjc720 $(mj700v2c_)
>++$(GLOBJ)mj500c.dev: $(mj700v2c_) $(DD)page.dev
>++	$(SETPDEV) $(DD)mj500c $(mj700v2c_)
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-src:dmp_site.ps print/ghostscript-gnu/files/patch-src:dmp_site.ps
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:dmp_site.ps	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-src:dmp_site.ps	Wed Apr  3 02:24:44 2002
>@@ -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 -urN /usr/ports/print/ghostscript-gnu/files/patch-src:gdevdmpr.c print/ghostscript-gnu/files/patch-src:gdevdmpr.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:gdevdmpr.c	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-src:gdevdmpr.c	Tue Apr  2 23:03:50 2002
>@@ -0,0 +1,11 @@
>+--- src/gdevdmpr.c.orig	Tue May 13 20:43:37 1997
>++++ src/gdevdmpr.c	Tue Apr  2 01:16:25 2002
>+@@ -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 -urN /usr/ports/print/ghostscript-gnu/files/patch-src:gdevdmpr.mak print/ghostscript-gnu/files/patch-src:gdevdmpr.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:gdevdmpr.mak	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-src:gdevdmpr.mak	Tue Apr  2 23:03:50 2002
>@@ -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 -urN /usr/ports/print/ghostscript-gnu/files/patch-src:gdevgdi.c print/ghostscript-gnu/files/patch-src:gdevgdi.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:gdevgdi.c	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-src:gdevgdi.c	Thu Mar 21 01:02:10 2002
>@@ -0,0 +1,19 @@
>+--- src/gdevgdi.c.orig	Fri Feb  9 04:51:11 2001
>++++ src/gdevgdi.c	Tue Aug 21 11:17:56 2001
>+@@ -24,6 +24,7 @@
>+ /* SAMSUNG GDI driver for Ghostscript */
>+ #include "gdevprn.h"
>+ #include "gdevpcl.h"
>++#include "gsparam.h"
>+ 
>+ 
>+ /*
>+@@ -126,7 +127,7 @@
>+ private int
>+ gdi_open(gx_device *pdev)
>+ {	/* Change the margins if necessary. */
>+-	const float _ds *m = 0;
>++	const float *m = 0;
>+ 	bool move_origin = true;
>+ 
>+ 	static const float m_a4[4] = { GDI_MARGINS_A4 };
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-src:gdevlbp8.c print/ghostscript-gnu/files/patch-src:gdevlbp8.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:gdevlbp8.c	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript-gnu/files/patch-src:gdevlbp8.c	Thu Mar 21 01:02:09 2002
>@@ -0,0 +1,70 @@
>+--- src/gdevlbp8.c.orig	Thu Mar  9 03:40:41 2000
>++++ src/gdevlbp8.c
>+@@ -22,6 +22,8 @@
>+ 
>+ /* 
>+   Modifications:
>++    3.10.00 Johnny Lam
>++            Removed LIPS III code, as it's obsoleted by gdevlips driver.
>+     2.2.97  Lauri Paatero
>+             Changed CSI command into ESC [. DCS commands may still need to be changed
>+             (to ESC P).
>+@@ -49,7 +51,6 @@
>+ 
>+ /* The device descriptors */
>+ private dev_proc_print_page(lbp8_print_page);
>+-private dev_proc_print_page(lips3_print_page);
>+ 
>+ gx_device_printer far_data gs_lbp8_device =
>+   prn_device(prn_std_procs, "lbp8",
>+@@ -58,14 +59,6 @@
>+ 	0.16, 0.2, 0.32, 0.21,		/* margins: left, bottom, right, top */
>+ 	1, lbp8_print_page);
>+ 
>+-gx_device_printer far_data gs_lips3_device =
>+-  prn_device(prn_std_procs, "lips3",
>+-	82,				/* width_10ths, 8.3" */
>+-	117,				/* height_10ths, 11.7" */
>+-	X_DPI, Y_DPI,
>+-	0.16, 0.27, 0.23, 0.27,		/* margins */
>+-	1, lips3_print_page);
>+-
>+ /* ------ Internal routines ------ */
>+ 
>+ #define ESC 0x1b
>+@@ -84,23 +77,6 @@
>+ 
>+ static const char *lbp8_end = NULL;
>+ 
>+-static const char lips3_init[] = {
>+-  ESC, '<', /* soft reset */
>+-  DCS, '0', 'J', ST, /* JOB END */
>+-  DCS, '3', '1', ';', '3', '0', '0', ';', '2', 'J', ST, /* 300dpi, LIPS3 JOB START */
>+-  ESC, '<',  /* soft reset */
>+-  DCS, '2', 'y', 'P', 'r', 'i', 'n', 't', 'i', 'n', 'g', '(', 'g', 's', ')', ST,  /* Printing (gs) display */
>+-  ESC, '[', '?', '1', 'l',  /* auto cr-lf disable */
>+-  ESC, '[', '?', '2', 'h', /* auto ff disable */
>+-  ESC, '[', '1', '1', 'h', /* set mode */
>+-  ESC, '[', '7', ' ', 'I', /* select unit size (300dpi)*/
>+-  ESC, '[', 'f' /* move to home position */
>+-};
>+-
>+-static const char lips3_end[] = {
>+-  DCS, '0', 'J', ST  /* JOB END */
>+-};
>+-
>+ /* Send the page to the printer.  */
>+ private int
>+ can_print_page(gx_device_printer *pdev, FILE *prn_stream,
>+@@ -203,11 +179,4 @@
>+ lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream)
>+ {	return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init),
>+ 			      lbp8_end, sizeof(lbp8_end));
>+-}
>+-
>+-/* Print a LIPS III page. */
>+-private int
>+-lips3_print_page(gx_device_printer *pdev, FILE *prn_stream)
>+-{	return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init),
>+-			      lips3_end, sizeof(lips3_end));
>+ }
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-src:gdevxini.c print/ghostscript-gnu/files/patch-src:gdevxini.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:gdevxini.c	Wed Sep 12 04:12:18 2001
>+++ print/ghostscript-gnu/files/patch-src:gdevxini.c	Thu Jan  1 09:00:00 1970
>@@ -1,14 +0,0 @@
>---- src/gdevxini.c.orig	Tue Jun  5 15:38:57 2001
>-+++ src/gdevxini.c	Wed Jun 20 04:17:15 2001
>-@@ -655,8 +655,10 @@
>-     }
>-     x_set_buffer(xdev);
>-     /* Clear the destination pixmap to avoid initializing with garbage. */
>--    xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
>-+    if (xdev->dest == (Pixmap) 0) {
>-+    	xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
>- 		  xdev->bpixmap : (Pixmap) xdev->win);
>-+    }
>-     if (xdev->dest != (Pixmap) 0) {
>- 	XSetForeground(xdev->dpy, xdev->gc, xdev->background);
>- 	XFillRectangle(xdev->dpy, xdev->dest, xdev->gc,
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-src:gp_unifs.c print/ghostscript-gnu/files/patch-src:gp_unifs.c
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:gp_unifs.c	Mon Nov  5 22:49:12 2001
>+++ print/ghostscript-gnu/files/patch-src:gp_unifs.c	Thu Jan  1 09:00:00 1970
>@@ -1,60 +0,0 @@
>---- src/gp_unifs.c.orig	Tue Jun  5 15:31:44 2001
>-+++ src/gp_unifs.c	Sun Jul 15 22:57:50 2001
>-@@ -28,6 +27,8 @@
>- #include "gsutil.h"		/* for string_match */
>- #include "stat_.h"
>- #include "dirent_.h"
>-+#include "unistd_.h"
>-+#include <stdlib.h>             /* for mkstemp/mktemp */
>- #include <sys/param.h>		/* for MAXPATHLEN */
>- 
>- /* Some systems (Interactive for example) don't define MAXPATHLEN,
>-@@ -57,22 +58,44 @@
>- FILE *
>- gp_open_scratch_file(const char *prefix, char fname[gp_file_name_sizeof],
>- 		     const char *mode)
>--{				/* The -8 is for XXXXXX plus a possible final / and -. */
>--    int len = gp_file_name_sizeof - strlen(prefix) - 8;
>--
>--    if (gp_gettmpdir(fname, &len) != 0)
>-+{	/* The -8 is for XXXXXX plus a possible final / and -. */
>-+    int prefix_length = strlen(prefix);
>-+    int len = gp_file_name_sizeof - prefix_length - 8;
>-+
>-+    if (gp_file_name_is_absolute(prefix, prefix_length))
>-+	*fname = 0;
>-+    else if (gp_gettmpdir(fname, &len) != 0)
>- 	strcpy(fname, "/tmp/");
>-     else {
>- 	if (strlen(fname) != 0 && fname[strlen(fname) - 1] != '/')
>- 	    strcat(fname, "/");
>-     }
>-+    if (strlen(fname) + prefix_length + 8 >= gp_file_name_sizeof)
>-+	return 0;		/* file name too long */
>-     strcat(fname, prefix);
>-     /* Prevent trailing X's in path from being converted by mktemp. */
>-     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
>- 	strcat(fname, "-");
>-     strcat(fname, "XXXXXX");
>-+
>-+#ifdef HAVE_MKSTEMP
>-+    {
>-+	    int file;
>-+	    FILE *fp;
>-+
>-+	    file = mkstemp(fname);
>-+	    if (file < -1)
>-+		    return NULL;
>-+	    fp = fdopen(file, mode);
>-+	    if (fp == NULL)
>-+		    close(file);
>-+		    
>-+	    return fp;
>-+    }
>-+#else
>-     mktemp(fname);
>-     return gp_fopentemp(fname, mode);
>-+#endif
>- }
>- 
>- /* Open a file with the given name, as a stream of uninterpreted bytes. */
>diff -urN /usr/ports/print/ghostscript-gnu/files/patch-src:unix-gcc.mak print/ghostscript-gnu/files/patch-src:unix-gcc.mak
>--- /usr/ports/print/ghostscript-gnu/files/patch-src:unix-gcc.mak	Fri Dec 28 16:38:15 2001
>+++ print/ghostscript-gnu/files/patch-src:unix-gcc.mak	Thu Mar 21 01:02:08 2002
>@@ -1,5 +1,5 @@
>---- src/unix-gcc.mak.orig	Tue Jul 10 12:01:06 2001
>-+++ src/unix-gcc.mak	Sat Dec 15 04:22:49 2001
>+--- src/unix-gcc.mak.orig	Tue Feb  5 09:20:42 2002
>++++ src/unix-gcc.mak	Fri Feb  8 05:16:49 2002
> @@ -27,14 +27,15 @@
>  # source, generated intermediate file, and object directories
>  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
>@@ -46,23 +46,30 @@
>  datadir = $(prefix)/share
>  gsdir = $(datadir)/ghostscript
>  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
>-@@ -104,6 +105,15 @@
>+@@ -103,14 +104,6 @@
>+ #	  No execution time or space penalty.
>  
>  GENOPT=
>+-# Choose capability options.
>+-
>+-# -DHAVE_MKSTEMP
>+-#	uses mkstemp instead of mktemp
>+-#		This gets rid of several security warnings that look
>+-#		ominous.  Enable this if you wish to get rid of them.
>+-
>+-CAPOPT= -DHAVE_MKSTEMP
>  
>-+# Choose capability options.
>-+
>-+# -DHAVE_MKSTEMP
>-+#	uses mkstemp instead of mktemp
>-+#		This gets rid of several security warnings that look
>-+#		ominous.  Enable this if you wish to get rid of them.
>-+
>-+CAPOPT= -DHAVE_MKSTEMP
>-+
>+ # Choose capability options.
>+ 
>+@@ -121,7 +114,6 @@
>+ 
>+ CAPOPT= -DHAVE_MKSTEMP
>+ 
>+-
>  # Define the name of the executable file.
>  
>  GS=gs
>-@@ -129,7 +139,7 @@
>+@@ -147,7 +139,7 @@
>  # You may need to change this if the IJG library version changes.
>  # See jpeg.mak for more information.
>  
>@@ -71,7 +78,7 @@
>  JVERSION=6
>  
>  # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
>-@@ -149,14 +159,14 @@
>+@@ -167,14 +159,14 @@
>  # You may need to change this if the libpng version changes.
>  # See libpng.mak for more information.
>  
>@@ -88,7 +95,7 @@
>  LIBPNG_NAME=png
>  
>  # Define the directory where the zlib sources are stored.
>-@@ -168,7 +178,7 @@
>+@@ -186,7 +178,7 @@
>  # what its name is (usually libz, but sometimes libgz).
>  # See gs.mak and Make.htm for more information.
>  
>@@ -97,7 +104,16 @@
>  #ZLIB_NAME=gz
>  ZLIB_NAME=z
>  
>-@@ -183,7 +193,7 @@
>+@@ -197,6 +189,8 @@
>+ IJSSRCDIR=ijs
>+ IJSEXECTYPE=unix
>+ 
>++STPLIB=gimpprint
>++
>+ # Define how to build the library archives.  (These are not used in any
>+ # standard configuration.)
>+ 
>+@@ -208,7 +202,7 @@
>  
>  # Define the name of the C compiler.
>  
>@@ -106,28 +122,38 @@
>  
>  # Define the name of the linker for the final link step.
>  # Normally this is the same as the C compiler.
>-@@ -216,9 +226,9 @@
>+@@ -225,9 +219,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:
>+@@ -241,7 +235,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.
>-@@ -227,7 +237,7 @@
>+@@ -252,7 +246,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
>  
>-@@ -260,7 +270,7 @@
>+@@ -285,7 +279,7 @@
>  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
>  # not in $(XINCLUDE).
>  
>@@ -136,7 +162,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
>-@@ -272,12 +282,12 @@
>+@@ -297,12 +291,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
>@@ -152,12 +178,3 @@
>  
>  # Define whether this platform has floating point hardware:
>  #	FPU_TYPE=2 means floating point is faster than fixed point.
>-@@ -406,7 +416,7 @@
>- 
>- # Define the compilation rules and flags.
>- 
>--CCFLAGS=$(GENOPT) $(CFLAGS)
>-+CCFLAGS=$(GENOPT) $(CAPOPT) $(CFLAGS)
>- CC_=$(CC) `cat $(AK)` $(CCFLAGS)
>- CCAUX=$(CC) `cat $(AK)`
>- CC_LEAF=$(CC_) -fomit-frame-pointer
>diff -urN /usr/ports/print/ghostscript-gnu/files/stp.contrib.mak print/ghostscript-gnu/files/stp.contrib.mak
>--- /usr/ports/print/ghostscript-gnu/files/stp.contrib.mak	Fri Dec 28 01:47:05 2001
>+++ print/ghostscript-gnu/files/stp.contrib.mak	Thu Jan  1 09:00:00 1970
>@@ -1,17 +0,0 @@
>-### --------------- Gimp-Print/stp Driver ---------------------------- ###
>-### Be careful to add the exact contents of this file; cut and paste   ###
>-### may corrupt the file and cause mysterious make errors              ###
>-
>-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
>diff -urN /usr/ports/print/ghostscript-gnu/pkg-descr print/ghostscript-gnu/pkg-descr
>--- /usr/ports/print/ghostscript-gnu/pkg-descr	Tue Jan 15 04:16:22 2002
>+++ print/ghostscript-gnu/pkg-descr	Thu Mar 21 01:02:10 2002
>@@ -11,7 +11,7 @@
> 	  - 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 @@
> 	  - 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 -urN /usr/ports/print/ghostscript-gnu/pkg-plist print/ghostscript-gnu/pkg-plist
>--- /usr/ports/print/ghostscript-gnu/pkg-plist	Fri Dec 28 16:38:16 2001
>+++ print/ghostscript-gnu/pkg-plist	Wed Apr  3 02:13:36 2002
>@@ -1,6 +1,7 @@
> bin/bdftops
> bin/dvipdf
> bin/eps2eps
>+bin/ert
> bin/fixmswrd.pl
> bin/font2c
> bin/gs
>@@ -12,6 +13,7 @@
> bin/gsnd
> bin/hpijs
> bin/lprsetup.sh
>+bin/pcl3opts
> bin/pdf2dsc
> bin/pdf2ps
> bin/pdfopt
>@@ -24,25 +26,47 @@
> bin/ps2pdf
> bin/ps2pdf12
> bin/ps2pdf13
>+bin/ps2pdf14
> bin/ps2pdfwr
> bin/ps2ps
> bin/pv.sh
> bin/sysvlp.sh
> bin/unix-lpr.sh
> bin/wftopfa
>+%%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
> %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
> share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
> share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
>+share/ghostscript/%%GS_VERSION%%/doc/CJK.htm
>+share/ghostscript/%%GS_VERSION%%/doc/CJKTTCID.htm
> share/ghostscript/%%GS_VERSION%%/doc/COPYING
> share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
> share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
> share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
>-share/ghostscript/%%GS_VERSION%%/doc/Current.htm
> share/ghostscript/%%GS_VERSION%%/doc/DLL.htm
> share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
> share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
>@@ -78,8 +102,17 @@
> share/ghostscript/%%GS_VERSION%%/doc/Use.htm
> share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
> share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
>-share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
> share/ghostscript/%%GS_VERSION%%/examples/chess.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/all_ac1.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/all_ag1.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/all_aj1.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/all_aj2.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/all_ak1.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/gscjk_ac.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/gscjk_ag.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/gscjk_aj.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/gscjk_ak.ps
>+share/ghostscript/%%GS_VERSION%%/examples/cjk/iso2022.ps
> share/ghostscript/%%GS_VERSION%%/examples/colorcir.ps
> share/ghostscript/%%GS_VERSION%%/examples/doretree.ps
> share/ghostscript/%%GS_VERSION%%/examples/escher.ps
>@@ -90,17 +123,19 @@
> 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/CIDFnmap
>+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.ARP
>+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Bae
>+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.CJK
>+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Koc
>+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Ore
>+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Sol
> share/ghostscript/%%GS_VERSION%%/lib/Fontmap
> share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
> share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
>@@ -138,9 +173,12 @@
> 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
>@@ -486,14 +524,24 @@
> @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/cjk
> @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 -urN /usr/ports/print/ghostscript-gnu/scripts/configure print/ghostscript-gnu/scripts/configure
>--- /usr/ports/print/ghostscript-gnu/scripts/configure	Fri Dec 28 16:38:17 2001
>+++ print/ghostscript-gnu/scripts/configure	Wed Apr  3 02:33:36 2002
>@@ -9,22 +9,45 @@
> 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 \
>   "dl2100"   "DEClaser 2100" OFF \
>   "la50"     "DEC LA50" OFF \
>   "la70"     "DEC LA70" OFF \
>@@ -38,8 +61,34 @@
>   "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 \
>@@ -53,12 +102,12 @@
>   "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 \
>@@ -79,9 +128,9 @@
>   "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 \
>@@ -89,6 +138,7 @@
>   "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 \
>@@ -96,6 +146,8 @@
>   "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 \
>@@ -176,17 +228,6 @@
>   "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=$?
>@@ -214,7 +255,7 @@
> #	> ${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 -urN /usr/ports/print/ghostscript-gnu/scripts/configure.batch print/ghostscript-gnu/scripts/configure.batch
>--- /usr/ports/print/ghostscript-gnu/scripts/configure.batch	Sun Dec 30 16:58:14 2001
>+++ print/ghostscript-gnu/scripts/configure.batch	Wed Apr  3 02:34:30 2002
>@@ -5,7 +5,7 @@
> 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)dl2100.dev \$(DD)la50.dev \$(DD)la70.dev \$(DD)la75.dev \$(DD)la75plus.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ln03.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)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)xes.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)sxlcrt.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)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
>+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)bj10v.dev \$(DD)bj10vh.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)dl2100.dev \$(DD)la50.dev \$(DD)la70.dev \$(DD)la75.dev \$(DD)la75plus.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ln03.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8000.dev \$(DD)lp8800c.dev \$(DD)lp8000c.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)lp9600.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)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)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.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)xes.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)sxlcrt.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)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
> !EOT
> 
> # create one new Makefile, where DEVICE_DEVS contains all wanted devices

Actions: View | Diff

Attachments on bug 36674: 20827