A few hours later the import I received patch to ameriolate ports.

Since this is rather minor change and it is too short (8 hours)
between last and this commit, I don't bump PORTREVISION for this time.

Submitted by:	KATO Tsuguru <dai_fugo@geocities.co.jp> to ports-jp@jp ML

8 files changed, 146 insertions, 133 deletions

diff --git a/print/ghostscript-gnu-cjk/Makefile b/print/ghostscript-gnu-cjk/Makefile
index 46e086dc154..37994b854ae 100644
--- a/print/ghostscript-gnu-cjk/Makefile
+++ b/print/ghostscript-gnu-cjk/Makefile
@@ -10,16 +10,17 @@ PORTVERSION=	6.52
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.gyve.org/pub/gs-cjk/M2/ \
 		ftp://ftp.gyve.org/pub/gs-cjk/ \
-		${GPRINT_SITE} ${HPIJS_SITE} ${NPDL_SITE} ${EPAG_SITE} \
-		${ALPS_SITE} ${LIPS_SITE} ${EPLASER_SITE} \
+		${GPRINT_SITE} ${HPIJS_SITE} \
+		${ALPS_SITE} ${BJ10V_SITE} ${EPAG_SITE} ${EPLASER_SITE} \
+		${LIPS_SITE} ${MD2K_SITE} ${MJC_SITE} ${NPDL_SITE} \
 		${MASTER_SITE_GNU} \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-gnu-cjk
 DISTFILES=	${GS_SRC} ${GS_CJK_PATCH} ${CMAP} ${CJKFONTS} \
-		${GPRINT_SRC} ${HPIJS_SRC} ${NPDL_SRC} ${EPAG_SRC} \
-		${ALPS_SRC} ${LIPS_SRC} ${EPLASER_SRC} ${BJ_SRC} ${MD2K_SRC} \
-		${MJC_SRC}
+		${GPRINT_SRC} ${HPIJS_SRC} \
+		${ALPS_SRC} ${BJ10V_SRC} ${EPAG_SRC} ${EPLASER_SRC} \
+		${LIPS_SRC} ${MD2K_SRC} ${MJC_SRC} ${NPDL_SRC}
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRC}
 
@@ -38,6 +39,10 @@ PLIST_SUB=	GS_VERSION=${PORTVERSION}
 
 XCFLAGS=	-DUPD_SIGNAL=0
 
+.if !defined(NO_A4)
+XCFLAGS+=	-DA4
+.endif
+
 GS_SRC=		${DISTNAME}${EXTRACT_SUFX}
 GS_CJK=		gs6.51-cjk-M2-R3
 GS_CJK_PATCH=	${GS_CJK}.tar.gz
@@ -67,7 +72,7 @@ GPRINT_SITE=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,gimp-print,}
 
 # HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series
 HPIJS=		hpijs
-HPIJS_VERS=	1.0
+HPIJS_VERS=	1.0.1
 HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
 HPIJS_SRC=	${HPIJS_NAME}.tar.gz
 HPIJS_SITE=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,hpinkjet,}
@@ -76,20 +81,6 @@ HPIJS_SITE=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,hpinkjet,}
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
 
-# NPDL - NEC Printer Description Language driver
-NPDL=		gdevnpdl
-NPDL_VERS=	1.6.3
-NPDL_NAME=	${NPDL}-${NPDL_VERS}
-NPDL_SRC=	${NPDL_NAME}.tar.gz
-NPDL_SITE=	http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/
-
-# EPAG - Epson ESC/Page Language driver
-EPAG=		epag
-EPAG_VERS=	3.09
-EPAG_NAME=	${EPAG}-${EPAG_VERS}
-EPAG_SRC=	${EPAG_NAME}.tar.gz
-EPAG_SITE=	http://www.humblesoft.com/pub/
-
 # ALPS - Alps MD-5000 printer driver
 ALPS=		gdevalps
 ALPS_VERS=	0.2
@@ -97,12 +88,18 @@ ALPS_NAME=	${ALPS}-${ALPS_VERS}
 ALPS_SRC=	${ALPS}-0.21.tar.gz
 ALPS_SITE=	${MASTER_SITE_PORTS_JP}
 
-# LIPS - Canon LIPS II+/III/IVc/IV printer driver
-LIPS=		gdevlips
-LIPS_VERS=	2.4.0
-LIPS_NAME=	${LIPS}-${LIPS_VERS}
-LIPS_SRC=	${LIPS_NAME}.tar.gz
-LIPS_SITE=	${MASTER_SITE_PORTS_JP}
+# BJ10V - Canon BJ-10V printer driver
+BJ10V=		gdev10v
+BJ10V_NAME=	${BJ10V}
+BJ10V_SRC=	${BJ10V_NAME}.tar.gz
+BJ10V_SITE=	${MASTER_SITE_PORTS_JP}
+
+# EPAG - Epson ESC/Page Language driver
+EPAG=		epag
+EPAG_VERS=	3.09
+EPAG_NAME=	${EPAG}-${EPAG_VERS}
+EPAG_SRC=	${EPAG_NAME}.tar.gz
+EPAG_SITE=	http://www.humblesoft.com/pub/
 
 # EPLASER - Epson Kowa developed printer driver for ESC/Page Laser printers
 EPLASER=	eplaser
@@ -111,35 +108,41 @@ EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
 EPLASER_SRC=	${EPLASER_NAME}-651.tgz
 EPLASER_SITE=	http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/
 
-# bj10v driver
-BJ=		gdev10v
-BJ_NAME=	${BJ}
-BJ_SRC=		${BJ_NAME}.tar.gz
+# LIPS - Canon LIPS II+/III/IVc/IV printer driver
+LIPS=		gdevlips
+LIPS_VERS=	2.4.0
+LIPS_NAME=	${LIPS}-${LIPS_VERS}
+LIPS_SRC=	${LIPS_NAME}.tar.gz
+LIPS_SITE=	${MASTER_SITE_PORTS_JP}
 
-# md2k driver
+# MD2K - Alps MD-2000/2010/4000/1300/1500/5000 printer driver
 MD2K=		gdevmd2k
 MD2K_VERS=	0.2a
 MD2K_NAME=	${MD2K}-${MD2K_VERS}
 MD2K_SRC=	${MD2K_NAME}.tar.gz
+MD2K_SITE=	http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 
-# mjc driver
+# MJC - Epson MachJet series printer driver
 MJC=		gdevmjc
 MJC_VERS=	0.8
 MJC_NAME=	${MJC}-${MJC_VERS}
 MJC_SRC=	${MJC_NAME}.tar.gz
+MJC_SITE=	${MASTER_SITE_PORTS_JP}
 
-.if defined(NO_A4)
-.else
-XCFLAGS+=	-DA4
-.endif
+# NPDL - NEC Printer Description Language driver
+NPDL=		gdevnpdl
+NPDL_VERS=	1.6.3
+NPDL_NAME=	${NPDL}-${NPDL_VERS}
+NPDL_SRC=	${NPDL_NAME}.tar.gz
+NPDL_SITE=	http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/
+
+.SILENT:
 
-pre-fetch:
+pre-everything::
 .if !defined(NO_A4)
-	@${ECHO_MSG} "Type \"make NO_A4=yes\" if you want not set A4 paper default."
+	${ECHO_MSG} "Type \"make NO_A4=yes\" if you want not set A4 paper default."
 .endif
 
-.SILENT:
-
 post-extract:
 	${ECHO_MSG} ">>> in post-extract ..."
 	${LN} -sf `cd ${PORTSDIR}/graphics/jpeg && ${MAKE} -V WRKSRC` \
@@ -158,35 +161,34 @@ post-extract:
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
-# for NPDL driver
-	${ECHO_MSG} ">>>   extracting ${NPDL_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRC}
-# for EPAG driver
-	${ECHO_MSG} ">>>   extracting ${EPAG_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRC}
 # for ALPS driver
 	${ECHO_MSG} ">>>   extracting ${ALPS_SRC} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${ALPS_SRC}
 	${LN} -sf ${ALPS_NAME} ${WRKSRC}/${ALPS}
+# for BJ10V driver
+	${ECHO_MSG} ">>>   extracting ${BJ10V_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${BJ10V_SRC}
+# for EPAG driver
+	${ECHO_MSG} ">>>   extracting ${EPAG_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRC}
+# for EPLASER driver
+	${ECHO_MSG} ">>>   extracting ${EPLASER_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRC}
 # for LIPS driver
 	${ECHO_MSG} ">>>   extracting ${LIPS_SRC} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRC}
 	${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS}
-# for EPLASER driver
-	${ECHO_MSG} ">>>   extracting ${EPLASER_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRC}
-# for bj10v driver
-	${ECHO_MSG}  ">>>   extracting ${BJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${BJ_SRC}
-	${CP} ${WRKSRC}/${BJ_NAME}/gdev10v.c ${WRKSRC}/src
-# for md2k driver
-	${ECHO_MSG}  ">>>   extracting ${MD2K_SRC} ..."
+# for MD2K driver
+	${ECHO_MSG} ">>>   extracting ${MD2K_SRC} ..."
 	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${MD2K_SRC}
-	${CP} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.c ${WRKSRC}/src
-# for mjc driver
+	${LN} -sf ${MD2K_NAME} ${WRKSRC}/${MD2K}
+# for MJC driver
 	${ECHO_MSG} ">>>   extracting ${MJC_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${MJC_SRC}
-	${CP} ${WRKSRC}/${MJC_NAME}/*.[ch] ${WRKSRC}/src
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRC}
+	${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
+# for NPDL driver
+	${ECHO_MSG} ">>>   extracting ${NPDL_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRC}
 
 post-patch:
 	${ECHO_MSG} ">>> in post-patch ..."
@@ -218,38 +220,40 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${HPIJS} driver to contrib.mak ..."
 	${CAT} ${PORTSDIR}/print/ghostscript-gnu/files/hpijs.contrib.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 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 ALPS driver
 	${ECHO_MSG} ">>>   adding ${ALPS} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${ALPS_NAME}/gdevalps.mak-5.50 \
 		>>  ${WRKSRC}/src/contrib.mak
-# for LIPS driver
-	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
+# for BJ10V driver
+	${ECHO_MSG} ">>>   adding ${BJ10V} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${BJ10V_NAME}/gdev10v.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 bj10v driver
-	${ECHO_MSG} ">>>   adding ${BJ} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${BJ_NAME}/gdev10v.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for md2k driver
+# for LIPS driver
+	${ECHO_MSG} ">>>   adding ${LIPS} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
+		>>  ${WRKSRC}/src/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 mjc driver
+# for MJC driver
 	${ECHO_MSG} ">>>   adding ${MJC} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.mak \
-		>>  ${WRKSRC}/src/contrib.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
 
 do-configure:
 	${ECHO_MSG} ">>> in do-configure ..."
@@ -291,28 +295,37 @@ pre-build:
 .for file in gdevijs.[ch] ijs.[ch] ijs_client.[ch] ijs_exec_unix.c unistd_.h
 	${LN} -sf ${WRKSRC}/${HPIJS_NAME}/${file} ${WRKSRC}/src
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   creating symlinks for ${NPDL} ..."
-	${LN} -sf ${WRKSRC}/${NPDL_NAME}/gdevnpdl.c ${WRKSRC}/src
+# for ALPS driver
+	${ECHO_MSG} ">>>   creating symlinks for ${ALPS} ..."
+	${LN} -sf ${WRKSRC}/${ALPS_NAME}/gdevalps.c ${WRKSRC}/src
+# for BJ10V driver
+	${ECHO_MSG} ">>>   creating symlinks for ${BJ10V} ..."
+	${LN} -sf ${WRKSRC}/${BJ10V_NAME}/gdev10v.c ${WRKSRC}/src
 # for EPAG driver
 	${ECHO_MSG} ">>>   building ert (Epson printer utility)..."
 	cd ${WRKSRC}/${EPAG_NAME} ; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 	${ECHO_MSG} ">>>   creating symlinks for ${EPAG} ..."
 	${LN} -sf ${WRKSRC}/${EPAG_NAME}/gdevepag.c ${WRKSRC}/src
-# for ALPS driver
-	${ECHO_MSG} ">>>   creating symlinks for ${ALPS} ..."
-	${LN} -sf ${WRKSRC}/${ALPS_NAME}/gdevalps.c ${WRKSRC}/src
-# for LIPS driver
-	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
-.for file in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevrpdl.c
-	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${file} ${WRKSRC}/src
-.endfor
 # for EPLASER driver
 	${ECHO_MSG} ">>>   creating symlinks for ${EPLASER} ..."
 .for file in gdevescv.[ch] gdevesmv.c
 	${LN} -sf ${WRKSRC}/${EPLASER_NAME}/${file} ${WRKSRC}/src
 .endfor
+# for LIPS driver
+	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
+.for file in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevrpdl.c
+	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${file} ${WRKSRC}/src
+.endfor
+# for MD2K driver
+	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
+	${LN} -sf ${WRKSRC}/${MD2K_NAME}/gdevmd2k.c ${WRKSRC}/src
+# for MJC driver
+	${ECHO_MSG} ">>>   creating symlinks for ${MJC} ..."
+	${LN} -sf ${WRKSRC}/${MJC_NAME}/*.c ${WRKSRC}/src
+# for NPDL driver
+	${ECHO_MSG} ">>>   creating symlinks for ${NPDL} ..."
+	${LN} -sf ${WRKSRC}/${NPDL_NAME}/gdevnpdl.c ${WRKSRC}/src
 
 do-install:
 	${ECHO_MSG} ">>> in do-install ..."
@@ -353,36 +366,37 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/${GS_CJK}/${i} \
 		${DOCSDIR}/${PORTVERSION}/CJK
 .endfor
-# EPAG documents
-	${MKDIR} ${PRINTER_DOC}/${EPAG_NAME}
+	${MKDIR} ${PRINTER_DOC}
+# for ALPS driver
+	${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/README.gdevalps ${PRINTER_DOC}
+# for BJ10V driver
+	${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/gdev10v.jis ${PRINTER_DOC}
+# for EPAG driver
+	${MKDIR} ${PRINTER_DOC}/${EPAG}
 .for i in ert.txt gdevepag.txt ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \
-		${PRINTER_DOC}/${EPAG_NAME}
+		${PRINTER_DOC}/${EPAG}
 .endfor
 .for i in psprint gsepagif.sh
 	${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \
-		${PRINTER_DOC}/${EPAG_NAME}
+		${PRINTER_DOC}/${EPAG}
 .endfor
-# NPDL document
-	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.jis ${PRINTER_DOC}
-# ALPS document
-	${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/README.gdevalps ${PRINTER_DOC}
-# LIPS document
-	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/Gdevlips.htm ${PRINTER_DOC}
-# EPLASER document
+# for EPLASER driver
 	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/readme-eplaser-651.euc \
 		${PRINTER_DOC}
-# bj10v document
-	${INSTALL_DATA} ${WRKSRC}/${BJ_NAME}/gdev10v.jis ${PRINTER_DOC}
-# md2k document
+# for LIPS driver
+	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/Gdevlips.htm ${PRINTER_DOC}
+# for MD2K driver
 	${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/README.jis \
 		${PRINTER_DOC}/README.${MD2K}
-# MJC document
+# for MJC driver
 	${MKDIR} ${PRINTER_DOC}/${MJC}
 .for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc
 	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
 		${PRINTER_DOC}/${MJC}
 .endfor
+# for NPDL driver
+	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.jis ${PRINTER_DOC}
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript-gnu-cjk/distinfo b/print/ghostscript-gnu-cjk/distinfo
index 25a79b2d13e..95cebac0a9b 100644
--- a/print/ghostscript-gnu-cjk/distinfo
+++ b/print/ghostscript-gnu-cjk/distinfo
@@ -2,12 +2,12 @@ MD5 (ghostscript/ghostscript-6.52.tar.bz2) = 5a1b698b8fbece1e23e4d8d9ff552762
 MD5 (ghostscript/gs6.51-cjk-M2-R3.tar.gz) = 6f8e90effe12527a4c3b36ea4ce47b3c
 MD5 (ghostscript/adobe-cmaps-200109.tar.gz) = 95ced0f35e107899ce11e8689e9cbdff
 MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6
-MD5 (ghostscript/hpijs-1.0.tar.gz) = 9ec7d86d2cc2dd613f8829891b02104b
-MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
-MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
+MD5 (ghostscript/hpijs-1.0.1.tar.gz) = 4ac76910a69eb781e35c8eca31db6008
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
-MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
-MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254
-MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
+MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
+MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254
+MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
+MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
+MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
diff --git a/print/ghostscript-gnu-cjk/files/patch-gdev10v.mak.patch b/print/ghostscript-gnu-cjk/files/patch-gdev10v:gdev10v.mak
index 25a8317379b..25a8317379b 100644
--- a/print/ghostscript-gnu-cjk/files/patch-gdev10v.mak.patch
+++ b/print/ghostscript-gnu-cjk/files/patch-gdev10v:gdev10v.mak
diff --git a/print/ghostscript-gnu-cjk/files/patch-gdevmd2k.mak.patch b/print/ghostscript-gnu-cjk/files/patch-gdevmd2k:gdevmd2k.mak
index 713377c8290..67e1251c594 100644
--- a/print/ghostscript-gnu-cjk/files/patch-gdevmd2k.mak.patch
+++ b/print/ghostscript-gnu-cjk/files/patch-gdevmd2k:gdevmd2k.mak
@@ -1,5 +1,5 @@
---- gdevmd2k-0.2a/gdevmd2k.mak-5.50.orig	Sun Nov 19 18:42:20 2000
-+++ gdevmd2k-0.2a/gdevmd2k.mak-5.50	Sun Nov 19 18:52:14 2000
+--- gdevmd2k/gdevmd2k.mak-5.50.orig	Sun Nov 19 18:42:20 2000
++++ gdevmd2k/gdevmd2k.mak-5.50	Sun Nov 19 18:52:14 2000
 @@ -3,11 +3,11 @@
  
  md2k_=$(GLOBJ)gdevmd2k.$(OBJ)
diff --git a/print/ghostscript-gnu-cjk/files/patch-gdevmjc.c b/print/ghostscript-gnu-cjk/files/patch-gdevmjc:gdevmjc.c
index 8188c0d142d..60f256743c0 100644
--- a/print/ghostscript-gnu-cjk/files/patch-gdevmjc.c
+++ b/print/ghostscript-gnu-cjk/files/patch-gdevmjc:gdevmjc.c
@@ -1,5 +1,5 @@
---- src/gdevmjc.c.orig	Tue May 23 19:16:52 2000
-+++ src/gdevmjc.c	Tue May 23 19:17:44 2000
+--- gdevmjc/gdevmjc.c.orig	Tue May 23 19:16:52 2000
++++ gdevmjc/gdevmjc.c	Tue May 23 19:17:44 2000
 @@ -43,7 +43,8 @@
  #include <limits.h>
  #include "gdevprn.h"
diff --git a/print/ghostscript-gnu-cjk/files/patch-gdevmjc.mak b/print/ghostscript-gnu-cjk/files/patch-gdevmjc:gdevmjc.mak
index f54213e3035..cd3d954495a 100644
--- a/print/ghostscript-gnu-cjk/files/patch-gdevmjc.mak
+++ b/print/ghostscript-gnu-cjk/files/patch-gdevmjc:gdevmjc.mak
@@ -1,5 +1,5 @@
---- gdevmjc-0.8/gdevmjc.mak.orig	Tue May 23 19:19:13 2000
-+++ gdevmjc-0.8/gdevmjc.mak	Tue May 23 19:19:40 2000
+--- gdevmjc/gdevmjc.mak.orig	Tue May 23 19:19:13 2000
++++ gdevmjc/gdevmjc.mak	Tue May 23 19:19:40 2000
 @@ -4,25 +4,22 @@
  # Supports MJ-700V2C, MJ-5000C, MJ-900C, MJ-800C, MJ-500C
  #
diff --git a/print/ghostscript-gnu-cjk/pkg-plist b/print/ghostscript-gnu-cjk/pkg-plist
index 1c2fc0efc17..3a5955b51e0 100644
--- a/print/ghostscript-gnu-cjk/pkg-plist
+++ b/print/ghostscript-gnu-cjk/pkg-plist
@@ -15,11 +15,11 @@ bin/gs
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/README.gdevalps
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/README.gdevmd2k
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/ert.txt
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/gdevepag.txt
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/ChangeLog
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/psprint
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/gsepagif.sh
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/ert.txt
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/gdevepag.txt
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/ChangeLog
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/psprint
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/gsepagif.sh
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc/MJ700V2C.FAQ
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc/README.mjc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc/README.mje
@@ -520,7 +520,6 @@ share/ghostscript/Resource/ag14/CMap/UniGB-UCS2-H
 @dirrm share/ghostscript/Resource/rksj-cmaps
 @dirrm share/ghostscript/Resource
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/CJK
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmd2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/epag
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers
diff --git a/print/ghostscript-gnu-cjk/scripts/configure b/print/ghostscript-gnu-cjk/scripts/configure
index cce57674897..cdf34595fab 100644
--- a/print/ghostscript-gnu-cjk/scripts/configure
+++ b/print/ghostscript-gnu-cjk/scripts/configure
@@ -20,20 +20,20 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 MD2000/2010/4000/1300/1500/5000 driver" ON \
-  "md5k"     "ALPS MD5000 driver" 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-1x Monochrome [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 \
-  "bj10v"    "Canon BubbleJet BJ10v" ON \
-  "bj10vh"   "Canon BubbleJet BJ10vh" ON \
-  "bj200"    "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \
+  "bj10e"    "Canon BubbleJet BJ-10e" ON \
+  "bj10v"    "Canon BubbleJet BJ-10v [BJ]" ON \
+  "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ]" 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 \
@@ -82,10 +82,10 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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" ON \
-  "mjc360"   "Epson MachJet series  360dpi, CMYK" ON \
-  "mjc720"   "Epson MachJet series  720dpi, CMYK" ON \
-  "mj500c"   "Epson MachJet MJ-500C 360dpi, CMY or mono" ON \
+  "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 \
@@ -119,7 +119,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
   "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
-  "ijs"      "HP PhotoSmart/DeskJet series (HP developed driver) [HPinkjet]" ON \
+  "ijs"      "HP PhotoSmart/DeskJet series (HP developed) [HPinkjet]" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \