o Change the distfile from Aladdin ghostscript 5.50 to GNU ghostscript 5.50

o Add a printer driver for EPSON laser printer (LP-8XXX, LP-3000C, etc)
    crerated by EPSON KOWA Corp. (www.epkowa.co.jp)

o Update several printer drivers (epag-3.09 and gdevalps-0.21)

o Use ${PORTSDIR}/graphics/{png,jpeg} instead of
   the files jpegsrc.v6b and libpng-1.0.2 fetched by this port
   when compiling.

o Fix PLIST (two entries "bin/ert")

o Add bmp16m driver to defalut printer drivers.

o Use CC/CFLAGS/PREFIX defined in make.conf

Submitted by: "KATO Tsuguru" <tkato@prontomail.ne.jp>
Obtained from: ports-jp@jp.freebsd.org

16 files changed, 413 insertions, 112 deletions

diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 49755bcb6815..737bd9897384 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: Japanese Aladdin ghostscript + vector font library(FreeType)
+# New ports collection makefile for: Japanese GNU ghostscript + vector font library(FreeType)
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	vfghostscript
-PORTVERSION=	5.50
+PORTVERSION=	5.50a
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
-		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-		ftp://ftp.uu.net/graphics/png/src/ \
-		ftp://ftp.uu.net/graphics/jpeg/ \
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://ftp.cs.wisc.edu/ghost/gnu/gs550/ \
+		ftp://ftp.cs.wisc.edu/ghost/gnu/fonts/ \
 		http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
 		${MASTER_SITE_LOCAL} \
@@ -21,50 +20,52 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		http://www.rd.nacsis.ac.jp/~katayama/homepage/ghostscript/jpdf/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \
-		ftp://ftp.humblesoft.com/pub/ \
+		http://www.humblesoft.com/pub/ \
 		http://www.necs.co.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
-		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs${PORTVERSION}/
-# former for ${MASTER_SITE_LOCAL}, latter for ${MASTER_SITE_PORTS_JP}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS .
-DISTNAME=	ghostscript-${PORTVERSION}
+		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.50/ \
+		http://www.epkowa.on.arena.ne.jp/pips/data/lp8500/
+# first for ${MASTER_SITE_GNU}, second for ${MASTER_SITE_LOCAL},
+# third for ${MASTER_SITE_PORTS_JP}
+MASTER_SITE_SUBDIR=	ghostscript asami/LOCAL_PORTS .
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
+EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+		VFlib2.24:${PORTSDIR}/japanese/vflib
 
-EXTRACT_ONLY=	ghostscript-${PORTVERSION}.tar.gz jpegsrc.v6b.tar.gz libpng-1.0.2.tar.gz
-WRKSRC=		${WRKDIR}/gs${PORTVERSION}
+WRKSRC=		${WRKDIR}/gs5.50
+
+USE_XLIB=	yes
+USE_GMAKE=	yes
 MAKEFILE=	unix-gcc.mak
-#MAKE_FLAGS=	prefix=${PREFIX} CFLAGS="${CFLAGS}" -f
-ALL_TARGET=	
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1 ps2ps.1
 
-USE_GMAKE=	yes
 CFLAGS+=	-DA4
-GSINST_DIR=	${PREFIX}/share/ghostscript/${PORTVERSION}vflib
+GSINST_DIR=	${PREFIX}/share/ghostscript/5.50vflib
 DOC_DIR=	${GSINST_DIR}/doc
 PRINTER=	${WRKSRC}/jp-printers
-GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
-GS_SOURCES+=	jpegsrc.v6b.tar.gz
-GS_SOURCES+=	libpng-1.0.2.tar.gz
-GS_DRIVERS=	gs${PORTVERSION}-vflib-1.0.tar.gz
-GS_DRIVERS+=	gdevlips-2.3.2.tar.gz
+GS_SOURCES=	gnu-gs-5.50a.tar.gz
+GS_DRIVERS=	gs5.50-vflib-1.0.tar.gz
+GS_DRIVERS+=	gdevlips-2.3.6-550.tar.gz
 GS_DRIVERS+=	gdevmjc-0.8.tar.gz
 GS_DRIVERS+=	gdev10v.tar.gz
 GS_DRIVERS+=	dmprt-2.01.tar.gz
 GS_DRIVERS+=	gdevnpdl-1.6.2.tar.gz
-GS_DRIVERS+=	epag-3.08.tar.gz
-GS_DRIVERS+=	gdevalps-0.2.tar.gz
+GS_DRIVERS+=	epag-3.09.tar.gz
+GS_DRIVERS+=	gdevalps-0.21.tar.gz
 GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
 GS_DRIVERS+=	gdevrpdl-1.2.tar.gz
+GS_DRIVERS+=	eplaser-1.1.1-550.tgz
 #  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
 #  unless the files really change.
-GS_FONTS_STD=	ghostscript-fonts-std-${PORTVERSION}.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-${PORTVERSION}.tar.gz
+GS_FONTS_STD=	gnu-gs-fonts-std-6.0.tar.gz
+GS_FONTS_OTHER=	gnu-gs-fonts-other-6.0.tar.gz
 
 pre-fetch:
 .if !defined(PDFENCRYPT)
@@ -72,38 +73,43 @@ pre-fetch:
 	@${ECHO_MSG} "\"PDFENCRYPT=yes\" to argument of make."
 .endif
 
+post-extract:
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
+	@( ${MKDIR} ${PRINTER} ; \
+	  cd ${PRINTER} ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevlips-2.3.6-550.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdev10v.tar.gz ; \
+	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
+	  ${TAR} -C gdevdmpr --unlink -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/epag-3.09.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevalps-0.21.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevrpdl-1.2.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/eplaser-1.1.1-550.tgz ; \
+	)
+
 pre-patch:
 	@(cd ${WRKSRC} ; \
-	tar xzf ${DISTDIR}/gs${PORTVERSION}-vflib-1.0.tar.gz ;\
-	${MV} ../jpeg-6b jpeg ; \
-	${MV} ../libpng-1.0.2 libpng ; \
-	${PATCH} -s -p1 < ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/gs${PORTVERSION}-vflib-1.0.diff \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gs5.50-vflib-1.0.tar.gz ;\
+	  ${PATCH} -s -p1 < ${WRKSRC}/gs5.50-vflib-1.0/gs5.50-vflib-1.0.diff \
 		>/dev/null 2>&1)
 
 post-patch:
-	@( ${MKDIR} ${PRINTER} ; \
-	  cd ${PRINTER} ; \
-	  tar xzf ${DISTDIR}/gdevlips-2.3.2.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdev10v.tar.gz ; \
-	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
-	  tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
-	  tar xzf ${DISTDIR}/epag-3.08.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevalps-0.2.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevrpdl-1.2.tar.gz ; \
+	@( cd ${PRINTER} ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
 	  ${CP} gdevmjc-0.8/*.[ch] gdevmjc-0.8/gdevmjc.mak ${WRKSRC}; \
-	  ${CP} gdevlips-2.3.2/gdevlips.[ch] gdevlips-2.3.2/gdevlips.mak ${WRKSRC}; \
-	  ${CP} gdevlips-2.3.2/gdevl4[rv].c gdevlips-2.3.2/gdevlprn.[ch] ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.6-550/gdevlips.[ch] gdevlips-2.3.6-550/gdevlips.mak ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.6-550/gdevl4[rv].c gdevlips-2.3.6-550/gdevlprn.[ch] ${WRKSRC}; \
 	  ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h   ${WRKSRC}; \
-	  ${CP} epag-3.08/gdevepag.c epag-3.08/gdevepag.mak ${WRKSRC}; \
+	  ${CP} epag-3.09/gdevepag.c epag-3.09/gdevepag.mak ${WRKSRC}; \
 	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
-	  ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-${PORTVERSION} ${WRKSRC}; \
-	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-${PORTVERSION} ${WRKSRC}; \
+	  ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-5.50 ${WRKSRC}; \
+	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-5.50 ${WRKSRC}; \
 	  ${CP} gdevrpdl-1.2/gdevrpdl.c gdevrpdl-1.2/gdevrpdl.mak ${WRKSRC}; \
+	  ${CP} eplaser/gdevescv.[ch] eplaser/gdevescv.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
@@ -112,6 +118,7 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips.mak.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevescv.c.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/contrib.mak
@@ -119,27 +126,31 @@ post-patch:
 	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevmjc.mak >> ${WRKSRC}/contrib.mak
-	@${CAT} ${WRKSRC}/gdevalps.mak-${PORTVERSION} >> ${WRKSRC}/contrib.mak
-	@${CAT} ${WRKSRC}/gdevmd2k.mak-${PORTVERSION} >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevalps.mak-5.50 >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevescv.mak >> ${WRKSRC}/contrib.mak
+
+pre-build:
+	${MKDIR} ${WRKSRC}/obj
 
 post-build:
-	@(cd ${PRINTER}/epag-3.08 ;  ${MAKE})
+	@(cd ${PRINTER}/epag-3.09 ;  ${MAKE})
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	@tar -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
-	${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${PRINTER}/epag-3.09/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
-	  ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
-	  ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
-	  ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/OLD-DOC/gs261j11-doc/* ${DOC_DIR} ; \
+	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
+	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/OLD-DOC/gs261d13-doc/*.sj ${DOC_DIR} ; \
+	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/OLD-DOC/gs261j11-doc/* ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
-	  ${CP} ${PRINTER}/gdevlips-2.3.2/Gdevlips.htm ${DOC_DIR} ; \
-	  ${CP} ${PRINTER}/gdevlips-2.3.2/gs_statd.dif ${DOC_DIR} ; \
+	  ${CP} ${PRINTER}/gdevlips-2.3.6-550/Gdevlips.htm ${DOC_DIR} ; \
+	  ${CP} ${PRINTER}/gdevlips-2.3.6-550/gs_statd.dif ${DOC_DIR} ; \
 	  ${MKDIR} ${DOC_DIR}/gdevmjc-0.8 ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/README.mjc ${DOC_DIR}/gdevmjc-0.8/ ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/README.noz ${DOC_DIR}/gdevmjc-0.8/ ; \
@@ -155,13 +166,14 @@ post-install:
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_DIR} ; \
-	  ${MKDIR} ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/FILES ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/*.txt ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/adjust.ps ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/gsepagif.sh ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/psprint ${DOC_DIR}/epag-3.08 ; \
+	  ${MKDIR} ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/FILES ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/*.txt ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/adjust.ps ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/gsepagif.sh ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/psprint ${DOC_DIR}/epag-3.09 ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/gdevmjc.ps ${GSINST_DIR} ; \
+	  ${CP} ${PRINTER}/eplaser/readme-eplaser.euc ${DOC_DIR} ; \
 	)
 .if defined(PDFENCRYPT)
 	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index 921b859a3800..435bd3c5009e 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -1,16 +1,15 @@
-MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
-MD5 (jpegsrc.v6b.tar.gz) = dbd5f3b47ed13132f04c685d608a7547
-MD5 (libpng-1.0.2.tar.gz) = a8b093154f07f7b82e5c9bb77c11a0c4
+MD5 (gnu-gs-5.50a.tar.gz) = c12ea8dd56cfc453c99bd8864dfc90db
 MD5 (gs5.50-vflib-1.0.tar.gz) = e934d1bd3a48a1c151e2a15af0640c97
-MD5 (gdevlips-2.3.2.tar.gz) = 5484c0530330adb7d7bb8ec4daf37203
+MD5 (gdevlips-2.3.6-550.tar.gz) = 07bf7a0d6112ae86ed832b308c5f3fbb
 MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-MD5 (epag-3.08.tar.gz) = e5e57176f55abc2c5224d405b5c402d1
-MD5 (gdevalps-0.2.tar.gz) = 8690b96eeb79fe770983a86beae84a11
-MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
+MD5 (epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
+MD5 (gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
+MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (gdevrpdl-1.2.tar.gz) = af11f7926674b5b59c2028efab281889
-MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
-MD5 (ghostscript-fonts-other-5.50.tar.gz) = e3540578f33caf5dfc384e5518890f57
+MD5 (eplaser-1.1.1-550.tgz) = 91857f6775249f3cb98cd6d645020556
+MD5 (gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
+MD5 (gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/japanese/vfghostscript55/files/gdevescv.c.patch b/japanese/vfghostscript55/files/gdevescv.c.patch
new file mode 100644
index 000000000000..e3a63fad8480
--- /dev/null
+++ b/japanese/vfghostscript55/files/gdevescv.c.patch
@@ -0,0 +1,11 @@
+--- jp-printers/eplaser/gdevescv.c.org	Thu Aug 24 18:23:06 2000
++++ jp-printers/eplaser/gdevescv.c	Sat Sep  2 16:43:12 2000
+@@ -49,7 +49,7 @@
+ #include "gscspace.h"
+ #include "gsutil.h"
+ #include "gdevvec.h"
+-#include "gdevpstr.h"
++//#include "gdevpstr.h"
+ #include "ghost.h"
+ #include "gzstate.h"
+ #include "imemory.h"
diff --git a/japanese/vfghostscript55/files/patch-ae b/japanese/vfghostscript55/files/patch-ae
new file mode 100644
index 000000000000..c7ba33748bf1
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-ae
@@ -0,0 +1,21 @@
+--- files.h.orig	Sat Sep  2 05:32:09 2000
++++ files.h	Sat Sep  2 05:49:59 2000
+@@ -1,3 +1,7 @@
++/*
++Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.2. 1998/04/06
++*/
++
+ /* Copyright (C) 1989, 1995, 1996, 1997, 1998 Aladdin Enterprises.  All rights reserved.
+   
+   This file is part of GNU Ghostscript.
+@@ -20,10 +24,6 @@
+   affiliated with the Free Software Foundation or the GNU Project.  GNU
+   Ghostscript, as distributed by Aladdin Enterprises, does not require any
+   GNU software to build or run it.
+-/*
+-Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.2. 1998/04/06
+-*/
+-
+ */
+ 
+ /*$Id: files.h $ */
diff --git a/japanese/vfghostscript55/files/patch-af b/japanese/vfghostscript55/files/patch-af
new file mode 100644
index 000000000000..ad34e9ea40ae
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-af
@@ -0,0 +1,21 @@
+--- gdevxxf.c.orig	Sat Sep  2 05:32:10 2000
++++ gdevxxf.c	Sat Sep  2 06:09:40 2000
+@@ -1,3 +1,7 @@
++/*
++Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.4. 1998/05/13
++*/
++
+ /* Copyright (C) 1993, 1997, 1998 Aladdin Enterprises.  All rights reserved.
+   
+   This file is part of GNU Ghostscript.
+@@ -20,10 +24,6 @@
+   affiliated with the Free Software Foundation or the GNU Project.  GNU
+   Ghostscript, as distributed by Aladdin Enterprises, does not require any
+   GNU software to build or run it.
+-/*
+-Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.4. 1998/05/13
+-*/
+-
+ */
+ 
+ /*$Id: gdevxxf.c $ */
diff --git a/japanese/vfghostscript55/files/patch-ag b/japanese/vfghostscript55/files/patch-ag
new file mode 100644
index 000000000000..9688a7b217ff
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-ag
@@ -0,0 +1,34 @@
+--- gp_unifs.c.orig	Mon Feb 14 11:28:25 2000
++++ gp_unifs.c	Fri Jul 28 23:53:04 2000
+@@ -33,6 +33,7 @@
+ #include "stat_.h"
+ #include "dirent_.h"
+ #include <sys/param.h>		/* for MAXPATHLEN */
++#include <unistd.h>
+ 
+ /* Some systems (Interactive for example) don't define MAXPATHLEN,
+  * so we define it here.  (This probably should be done via a Config-Script.)
+@@ -63,6 +64,8 @@
+ 		     const char *mode)
+ {				/* The -8 is for XXXXXX plus a possible final / and -. */
+     int len = gp_file_name_sizeof - strlen(prefix) - 8;
++    int fd;
++    FILE *f;
+ 
+     if (gp_getenv("TEMP", fname, &len) != 0)
+ 	strcpy(fname, "/tmp/");
+@@ -75,8 +78,12 @@
+     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
+ 	strcat(fname, "-");
+     strcat(fname, "XXXXXX");
+-    mktemp(fname);
+-    return fopen(fname, mode);
++    fd = mkstemp(fname);
++    if (fd == -1)
++    	return NULL;
++    if ((f = fdopen(fd, mode)) == NULL)
++    	close(fd);
++    return f;
+ }
+ 
+ /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/japanese/vfghostscript55/files/patch-ah b/japanese/vfghostscript55/files/patch-ah
new file mode 100644
index 000000000000..aee04b39d512
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-ah
@@ -0,0 +1,10 @@
+--- gs_init.ps.orig	Thu Jan  2 19:23:13 1997
++++ gs_init.ps	Thu Jan  2 19:24:46 1997
+@@ -1363,3 +1363,7 @@
+ (END GC) VMDEBUG
+ 
+ % The interpreter will run the initial procedure (start).
++
++% unofficial patch:
++% make it possible to print from within acroread pdf viewer
++/Default currenthalftone /Halftone defineresource pop
diff --git a/japanese/vfghostscript55/files/patch-ai b/japanese/vfghostscript55/files/patch-ai
new file mode 100644
index 000000000000..36aad3fb34bf
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-ai
@@ -0,0 +1,21 @@
+--- gxccache.c.orig	Sat Sep  2 05:32:10 2000
++++ gxccache.c	Sat Sep  2 06:34:23 2000
+@@ -1,3 +1,7 @@
++/*
++Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.4. 1998/05/13
++*/
++
+ /* Copyright (C) 1989, 1995, 1996, 1997, 1998 Aladdin Enterprises.  All rights reserved.
+   
+   This file is part of GNU Ghostscript.
+@@ -20,10 +24,6 @@
+   affiliated with the Free Software Foundation or the GNU Project.  GNU
+   Ghostscript, as distributed by Aladdin Enterprises, does not require any
+   GNU software to build or run it.
+-/*
+-Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.4. 1998/05/13
+-*/
+-
+ */
+ 
+ /*$Id: gxccache.c $ */
diff --git a/japanese/vfghostscript55/files/patch-aj b/japanese/vfghostscript55/files/patch-aj
new file mode 100644
index 000000000000..7035b87c6efc
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-aj
@@ -0,0 +1,21 @@
+--- gxccman.c.vflib	Sat Sep  2 05:32:10 2000
++++ gxccman.c	Sat Sep  2 06:36:55 2000
+@@ -1,3 +1,7 @@
++/*
++Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.3. 1998/05/12
++*/
++
+ /* Copyright (C) 1989, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
+   
+   This file is part of GNU Ghostscript.
+@@ -20,10 +24,6 @@
+   affiliated with the Free Software Foundation or the GNU Project.  GNU
+   Ghostscript, as distributed by Aladdin Enterprises, does not require any
+   GNU software to build or run it.
+-/*
+-Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.3. 1998/05/12
+-*/
+-
+ */
+ 
+ /*$Id: gxccman.c $ */
diff --git a/japanese/vfghostscript55/files/patch-ak b/japanese/vfghostscript55/files/patch-ak
new file mode 100644
index 000000000000..6496f52a0f2a
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-ak
@@ -0,0 +1,21 @@
+--- gxxfont.h.orig	Sat Sep  2 05:32:10 2000
++++ gxxfont.h	Sat Sep  2 06:06:25 2000
+@@ -1,3 +1,7 @@
++/*
++Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.4. 1998/05/13
++*/
++
+ /* Copyright (C) 1992, 1993, 1994, 1996 Aladdin Enterprises.  All rights reserved.
+   
+   This file is part of GNU Ghostscript.
+@@ -20,10 +24,6 @@
+   affiliated with the Free Software Foundation or the GNU Project.  GNU
+   Ghostscript, as distributed by Aladdin Enterprises, does not require any
+   GNU software to build or run it.
+-/*
+-Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.4. 1998/05/13
+-*/
+-
+ */
+ 
+ /*$Id: gxxfont.h $ */
diff --git a/japanese/vfghostscript55/files/patch-al b/japanese/vfghostscript55/files/patch-al
new file mode 100644
index 000000000000..309532fe8769
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-al
@@ -0,0 +1,127 @@
+--- unix-gcc.mak.orig	Sat Sep  2 04:47:06 2000
++++ unix-gcc.mak	Sat Sep  2 04:58:56 2000
+@@ -57,11 +57,10 @@
+ # initialization files (gs_*.ps) and the fonts.
+ 
+ # If your system has installbsd, change install to installbsd in the next line.
+-INSTALL = install -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ 
+-prefix = /usr/local
++prefix = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+@@ -142,14 +141,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=96
+ 
+ # Choose whether to use a shared version of the PNG library, and if so,
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define the directory where the zlib sources are stored.
+@@ -161,7 +160,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+@@ -180,7 +179,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -213,7 +212,7 @@
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+ XCFLAGS=
+ 
+-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+@@ -222,7 +221,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
+ 
+ LDFLAGS=$(XLDFLAGS) -fno-common
+ 
+@@ -242,7 +241,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I${X11BASE}/include
+ 
+ # 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
+@@ -257,17 +256,17 @@
+ #XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L${X11BASE}/lib
+ XLIBDIR=
+-XLIBS=Xt Xext X11
++XLIBS=Xt ICE SM Xext X11
+ 
+ # Define the directory/ies for the VFlib files.
+ # If you use FreeType, Add ttf to VFLIBS
+ #VFINCLUDE=-I/usr/local/include
+ #VFLIBDIRS=-L/usr/local/lib
+ #VFLIBS=VFlib
+-VFINCLUDE=
+-VFLIBDIRS=
++VFINCLUDE=-I${LOCALBASE}/include
++VFLIBDIRS=-L${LOCALBASE}/lib
+ VFLIBS=VFlib2 ttf
+ 
+ # Define whether this platform has floating point hardware:
+@@ -337,16 +336,10 @@
+ 
+ MAKEFILE=$(GLSRC)unix-gcc.mak
+ 
+-# Define the ANSI-to-K&R dependency.  There isn't one, but we do have to
+-# detect whether we're running a version of gcc with the const optimization
+-# bug.
+-
+-AK=$(GLGENDIR)/cc.tr
+-
+ # Define the compilation rules and flags.
+ 
+ CCFLAGS=$(GENOPT) $(CFLAGS)
+-CC_=$(CC) `cat $(AK)` $(CCFLAGS)
++CC_=$(CC) $(CCFLAGS)
+ CCAUX=$(CC)
+ #We can't use -fomit-frame-pointer with -pg....
+ #CC_LEAF=$(CC_)
+@@ -367,7 +360,3 @@
+ include $(GLSRC)unixtail.mak
+ include $(GLSRC)unix-end.mak
+ include $(GLSRC)unixinst.mak
+-
+-# This has to come last so it won't be taken as the default target.
+-$(AK):
+-	if ( gcc --version | grep "2.7.[01]" >/dev/null || test `gcc --version` = 2.7.2 ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/japanese/vfghostscript55/files/patch-am b/japanese/vfghostscript55/files/patch-am
new file mode 100644
index 000000000000..baeacd331cb3
--- /dev/null
+++ b/japanese/vfghostscript55/files/patch-am
@@ -0,0 +1,21 @@
+--- zfile.c.orig	Sat Sep  2 05:32:15 2000
++++ zfile.c	Sat Sep  2 05:52:48 2000
+@@ -1,3 +1,7 @@
++/*
++Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.2. 1998/04/06
++*/
++
+ /* Copyright (C) 1989, 1995, 1996, 1997, 1998 Aladdin Enterprises.  All rights reserved.
+   
+   This file is part of GNU Ghostscript.
+@@ -20,10 +24,6 @@
+   affiliated with the Free Software Foundation or the GNU Project.  GNU
+   Ghostscript, as distributed by Aladdin Enterprises, does not require any
+   GNU software to build or run it.
+-/*
+-Akira Tanaka <akr@jaist.ac.jp> modified for gs5.10-vflib-1.2. 1998/04/06
+-*/
+-
+ */
+ 
+ /*$Id: zfile.c $ */
diff --git a/japanese/vfghostscript55/pkg-comment b/japanese/vfghostscript55/pkg-comment
index 7d6f10cc3378..4775bdd6c0d1 100644
--- a/japanese/vfghostscript55/pkg-comment
+++ b/japanese/vfghostscript55/pkg-comment
@@ -1 +1 @@
-Aladdin Postscript and PDF interpreter with Japanese vector font library
+GNU Postscript and PDF interpreter with Japanese vector font library
diff --git a/japanese/vfghostscript55/pkg-descr b/japanese/vfghostscript55/pkg-descr
index 9a148fdd05d8..749f58da20dc 100644
--- a/japanese/vfghostscript55/pkg-descr
+++ b/japanese/vfghostscript55/pkg-descr
@@ -1,6 +1,4 @@
-This is Aladdin Ghostscript 5.03, the non-GPL version that comes
-with a licence different from the GPL. Read the file PUBLIC in the
-/usr/local/share/ghostscript/5.03vflib/doc/ directory for details !
+This is GNU Ghostscript 5.50a.
 
 Ghostscript is the well-known PostScript interpreter which is
 available for all common and most esoteric platforms and supports
diff --git a/japanese/vfghostscript55/pkg-plist b/japanese/vfghostscript55/pkg-plist
index 9f56f342f766..b2080c1a78fa 100644
--- a/japanese/vfghostscript55/pkg-plist
+++ b/japanese/vfghostscript55/pkg-plist
@@ -17,7 +17,6 @@ bin/ps2epsi
 bin/ps2pdf
 bin/ps2ps
 bin/wftopfa
-bin/ert
 share/ghostscript/5.50vflib/Fontmap
 share/ghostscript/5.50vflib/acctest.ps
 share/ghostscript/5.50vflib/align.ps
@@ -48,9 +47,7 @@ share/ghostscript/5.50vflib/dmp_init.ps
 share/ghostscript/5.50vflib/dmp_site.ps
 share/ghostscript/5.50vflib/doc/Bug-form.htm
 share/ghostscript/5.50vflib/doc/C-style.htm
-share/ghostscript/5.50vflib/doc/COPYING
 share/ghostscript/5.50vflib/doc/Commprod.htm
-share/ghostscript/5.50vflib/doc/Copying.htm
 share/ghostscript/5.50vflib/doc/Current.htm
 share/ghostscript/5.50vflib/doc/DLL.htm
 share/ghostscript/5.50vflib/doc/Devices.htm
@@ -71,10 +68,8 @@ share/ghostscript/5.50vflib/doc/Lib.htm
 share/ghostscript/5.50vflib/doc/Make.htm
 share/ghostscript/5.50vflib/doc/New-user.htm
 share/ghostscript/5.50vflib/doc/News.htm
-share/ghostscript/5.50vflib/doc/PUBLIC
 share/ghostscript/5.50vflib/doc/Ps2pdf.htm
 share/ghostscript/5.50vflib/doc/Psfiles.htm
-share/ghostscript/5.50vflib/doc/Public.htm
 share/ghostscript/5.50vflib/doc/README.gdevalps
 share/ghostscript/5.50vflib/doc/README.gs5.10-vflib
 share/ghostscript/5.50vflib/doc/Readme.htm
@@ -96,14 +91,15 @@ share/ghostscript/5.50vflib/doc/gdevrpdl.doc
 share/ghostscript/5.50vflib/doc/gs261j.doc
 share/ghostscript/5.50vflib/doc/gs261j.jis
 share/ghostscript/5.50vflib/doc/gs_statd.dif
-share/ghostscript/5.50vflib/doc/epag-3.08/FILES
-share/ghostscript/5.50vflib/doc/epag-3.08/gdevepag.txt
-share/ghostscript/5.50vflib/doc/epag-3.08/ert.txt
-share/ghostscript/5.50vflib/doc/epag-3.08/adjust.ps
-share/ghostscript/5.50vflib/doc/epag-3.08/gsepagif.sh
-share/ghostscript/5.50vflib/doc/epag-3.08/psprint
+share/ghostscript/5.50vflib/doc/epag-3.09/FILES
+share/ghostscript/5.50vflib/doc/epag-3.09/gdevepag.txt
+share/ghostscript/5.50vflib/doc/epag-3.09/ert.txt
+share/ghostscript/5.50vflib/doc/epag-3.09/adjust.ps
+share/ghostscript/5.50vflib/doc/epag-3.09/gsepagif.sh
+share/ghostscript/5.50vflib/doc/epag-3.09/psprint
 share/ghostscript/5.50vflib/doc/kfvflib.sj
 share/ghostscript/5.50vflib/doc/ps2epsi.txt
+share/ghostscript/5.50vflib/doc/readme-eplaser.euc
 share/ghostscript/5.50vflib/docie.ps
 share/ghostscript/5.50vflib/escp_24.src
 share/ghostscript/5.50vflib/examples/alphabet.ps
@@ -294,6 +290,8 @@ share/ghostscript/fonts/fhirw.gsf
 share/ghostscript/fonts/fhirw.pfm
 share/ghostscript/fonts/fkarw.gsf
 share/ghostscript/fonts/fkarw.pfm
+share/ghostscript/fonts/fonts.dir
+share/ghostscript/fonts/fonts.scale
 share/ghostscript/fonts/hrger.pfa
 share/ghostscript/fonts/hrgerb.gsf
 share/ghostscript/fonts/hrgerd.gsf
@@ -406,7 +404,7 @@ share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/5.50vflib/doc/gdevmjc-0.8
-@dirrm share/ghostscript/5.50vflib/doc/epag-3.08
+@dirrm share/ghostscript/5.50vflib/doc/epag-3.09
 @dirrm share/ghostscript/5.50vflib/doc
 @dirrm share/ghostscript/5.50vflib/examples
 @dirrm share/ghostscript/5.50vflib/vflib
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index f0142d1f9b4f..a5f5a1da8f60 100644
--- a/japanese/vfghostscript55/scripts/configure
+++ b/japanese/vfghostscript55/scripts/configure
@@ -4,18 +4,9 @@
 
 if [ ! "X"${BATCH} = "X" ] ; then
 
-PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev'
+PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev lp3000c lp8000c lp8200c lp8500c'
 
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
-    -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
-    -e "s;XLDFLAGS=;XLDFLAGS= -L/usr/local/lib;" \
-    -e "s;XLIBS=Xt;XLIBS=Xt ICE SM;" \
-    -e "s;^VFINCLUDE=;VFINCLUDE=-I/usr/local/include;" \
-    -e "s;^VFLIBDIRS=;VFLIBDIRS=-L/usr/local/lib;" \
-    -e "s;PVERSION=96;PVERSION=102;" \
-    -e "s;SHARE_ZLIB=0;SHARE_ZLIB=1;" \
-    -e "s;CC=gcc;CC=cc;" \
-    -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev st800.dev uniprint.dev ${PRINTER_JAPAN};" \
+sed -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev st800.dev uniprint.dev bmp16m.dev ${PRINTER_JAPAN};" \
     < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
     mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
 touch ${WRKSRC}/makefile
@@ -24,16 +15,7 @@ else
 
 # Define the directories for the X11 library files.
 # This can be null if these files are in the default linker search path.
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
-    -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
-    -e "s;XLDFLAGS=;XLDFLAGS= -L/usr/local/lib;" \
-    -e "s;XLIBS=Xt;XLIBS=Xt ICE SM;" \
-    -e "s;^VFINCLUDE=;VFINCLUDE=-I/usr/local/include;" \
-    -e "s;^VFLIBDIRS=;VFLIBDIRS=-L/usr/local/lib;" \
-    -e "s;PVERSION=96;PVERSION=102;" \
-    -e "s;SHARE_ZLIB=0;SHARE_ZLIB=1;" \
-    -e "s;CC=gcc;CC=cc;" \
-    -e "s;^DEVICE_DEVS=.*;;" \
+sed -e "s;^DEVICE_DEVS=.*;;" \
     -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
     -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
     -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
@@ -111,6 +93,10 @@ Have fun with this new configuration style !     -andreas \n\n\
    "lp8000"   "Epson LP8000 laser printer" OFF \
    "st800"    "Epson Stylus 800 printer" ON \
    "stcolor"  "Epson Stylus Color" ON \
+   "lp3000c"  "Epson LP-3000C color laser printer" ON \
+   "lp8000c"  "Epson LP-8000C color laser printer" ON \
+   "lp8200c"  "Epson LP-8200C color laser printer" ON \
+   "lp8500c"  "Epson LP-8500C color laser printer" ON \
    "ibmpro"   "IBM 9-pin Proprinter" OFF \
    "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
    "imagen"   "Imagen ImPress printers" OFF \
@@ -173,7 +159,7 @@ Have fun with this new configuration style !     -andreas \n\n\
    "bmpmono"  "Monochrome MS Windows .BMP file format" OFF \
    "bmp16"    "4-bit EGA/VGA .BMP file format" OFF \
    "bmp256"   "8-bit 256-color .BMP file format" OFF \
-   "bmp16m"   "24-bit .BMP file format" OFF \
+   "bmp16m"   "24-bit .BMP file format" ON \
    "cgmmono"  "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
    "cgm8"     "8-bit 256-color CGM -- DITTO" OFF \
    "cgm24"    "24-bit color CGM -- DITTO" OFF \