Updated printer drivers:

 (1) from gdevlips4-1.2.0, gdevnpdl-1.4, epag-3.08 to gdevlips-2.3.2-510
	[Merged printer driver sources (gdevnpdl and epag) into
	 the gdevlips's tar-ball]

 (2) from gdevrpdl-1.0 to gdevrpdl-1.2-510

 (3) from gdevalps-0.1 to gdevalps-0.2

 (4) from gdevmjc-0.7 to gdevmjc-0.8
        Submitted by:	candy@ops.dti.ne.jp

Added a printer driver:

 (5) gdevmd2k-0.2a

Added a patch (patches/patch-ac) to be able to use A4 in lj5mono and lj5gray

Fixed files/mk5 (pdf_sec.ps)
	Sbumitted by:	MIHIRA Sanpei Yoshiro <sanpei>

	and

	Submitted by:   Tatsuto Toyonaga <toyonaga@msd.ts.fujitsu.co.jp>
	PR:		ports/11755

7 files changed, 442 insertions, 562 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index eb11d9a156f6..d124ed07ba92 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.29 1999/03/10 00:14:48 taoka Exp $
+# $Id: Makefile,v 1.30 1999/04/16 23:35:00 sada Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -13,17 +13,17 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		ftp://ftp.uu.net/graphics/png/src/ \
 		ftp://ftp.uu.net/graphics/jpeg/ \
-		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
 		${MASTER_SITE_LOCAL} \
 		${MASTER_SITE_PORTS_JP} \
+		http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/ \
 		http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/ \
 		http://www.jaist.ac.jp/~daisuke/Linux/gs/gs5/Original-sources/OLD/ \
 		http://www.rd.nacsis.ac.jp/~katayama/homepage/ghostscript/jpdf/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
-		http://www.bpe.es.osaka-u.ac.jp/~watanabe/ \
-		ftp://ftp.humblesoft.com/pub/ \
-		http://www.necs.co.jp/~umi/
+		http://www.necs.co.jp/~umi/ \
+		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
+		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.10/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -46,14 +46,13 @@ GS_SOURCES+=	libpng-0.96.tgz
 GS_DRIVERS=	gs5.10-vflib-1.2.tar.gz
 GS_DRIVERS+=	gs5.10-jpdf-0.2.tar.gz
 GS_DRIVERS+=	gs5.10-VFlibBM-PL2.diff.gz
-GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
-GS_DRIVERS+=	gdevmjc-0.7.tar.gz
-GS_DRIVERS+=	gdevrpdl.tar.gz
+GS_DRIVERS+=	gdevlips-2.3.2-510.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.4.tar.gz
-GS_DRIVERS+=	epag-3.08.tar.gz
-GS_DRIVERS+=	gdevalps-0.1.tar.gz
+GS_DRIVERS+=	gdevalps-0.2.tar.gz
+GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
+GS_DRIVERS+=	gdevrpdl-1.2-510.tar.gz
 #  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,41 +81,36 @@ pre-patch:
 post-patch:
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  tar xzf ${DISTDIR}/gdevlips4-1.2.0.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevlips-2.3.2-510.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 ; \
-	  ${MKDIR} ${PRINTER}/gdevnpdl ; \
-	  tar -C gdevnpdl -xzf ${DISTDIR}/gdevnpdl-1.4.tar.gz ; \
-	  tar xzf ${DISTDIR}/epag-3.08.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevalps-0.1.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevalps-0.2.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevrpdl-1.2-510.tar.gz ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
-	  ${CP} gdevmjc-0.7/gdevmjc.c gdevmjc-0.7/mjc.dev ${WRKSRC}; \
-	  ${CP} gdevlips4-1.2.0/gdevlips4.c gdevlips4-1.2.0/gdevlips4.mak ${WRKSRC}; \
+	  ${CP} gdevmjc-0.8/*.[ch] gdevmjc-0.8/gdevmjc.mak ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.2-510/*.[ch] gdevlips-2.3.2-510/gdevlips.mak ${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} gdevrpdl/gdevrpdl.c gdevrpdl/gdevrpdl.mak ${WRKSRC}; \
-	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
-	  ${CP} gdevalps/gdevalps.c gdevalps/gdevalps.mk ${WRKSRC}; \
+	  ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak ${WRKSRC}; \
+	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak ${WRKSRC}; \
+	  ${CP} gdevrpdl-1.2-510/gdevrpdl.c gdevrpdl-1.2-510/gdevrpdl.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
+#	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/unix-gcc.mak
-	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/unix-gcc.mak
-	@${CAT} ${WRKSRC}/gdevlips4.mak >> ${WRKSRC}/unix-gcc.mak
+	@${CAT} ${WRKSRC}/gdevlips.mak >> ${WRKSRC}/unix-gcc.mak
+#	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/unix-gcc.mak
-	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/unix-gcc.mak
-	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
-	@${CAT} ${WRKSRC}/gdevalps.mk >> ${WRKSRC}/unix-gcc.mak
-
-post-build:
-	@(cd ${PRINTER}/epag-3.08 ;  ${MAKE})
+	@${CAT} ${WRKSRC}/gdevmjc.mak >> ${WRKSRC}/unix-gcc.mak
+	@${CAT} ${WRKSRC}/gdevalps.mak >> ${WRKSRC}/unix-gcc.mak
+	@${CAT} ${WRKSRC}/gdevmd2k.mak >> ${WRKSRC}/unix-gcc.mak
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
@@ -124,7 +118,6 @@ pre-install:
 	@tar -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
-	${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README ${DOC_DIR}/README.gs5.10-vflib ; \
@@ -133,21 +126,21 @@ post-install:
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-jpdf-0.2/README ${DOC_DIR}/README.gs5.10-jpdf ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
-	  ${CP} ${PRINTER}/gdevlips4-1.2.0/Readme ${DOC_DIR}/gdevlips4.euc ; \
-	  ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \
-	  ${CP} ${PRINTER}/gdevmjc-0.7/MJ700V2C.FAQ ${DOC_DIR} ; \
+	  ${CP} ${PRINTER}/gdevlips-2.3.2-510/Gdevlips.htm ${DOC_DIR} ; \
+	  ${CP} ${PRINTER}/gdevlips-2.3.2-510/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/ ; \
+	  ${CP} ${PRINTER}/gdevmjc-0.8/README.mje ${DOC_DIR}/gdevmjc-0.8/ ; \
+	  ${CP} ${PRINTER}/gdevmjc-0.8/cpem.doc ${DOC_DIR}/gdevmjc-0.8/ ; \
+	  ${CP} ${PRINTER}/gdevalps-0.2/README.gdevalps ${DOC_DIR}/README.gdevalps ; \
+	  ${CP} ${PRINTER}/gdevmd2k-0.2a/README.jis ${DOC_DIR}/gdevmd2k.jis ; \
+	  ${CP} ${PRINTER}/gdevrpdl-1.2-510/gdevrpdl.doc ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/gdevdmpr.sj ${DOC_DIR} ; \
-	  ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_init.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_site.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_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 ; \
 	)
 .if defined(PDFENCRYPT)
 	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index 4db23abe2b56..98751191fab6 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -4,14 +4,13 @@ MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
 MD5 (gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
 MD5 (gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
 MD5 (gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
-MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
-MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
-MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
+MD5 (gdevlips-2.3.2-510.tar.gz) = d4eacdc3b716521aee1a1364089cad43
+MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-MD5 (gdevnpdl-1.4.tar.gz) = 1b3e62370d10e76a10fdc663e54e3b28
-MD5 (epag-3.08.tar.gz) = e5e57176f55abc2c5224d405b5c402d1
-MD5 (gdevalps-0.1.tar.gz) = 67c9da9feae4e16938e43d5430cbd9c5
+MD5 (gdevalps-0.2.tar.gz) = 8690b96eeb79fe770983a86beae84a11
+MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
+MD5 (gdevrpdl-1.2-510.tar.gz) = c1dda082bc614753e6294e306f3e7914
 MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
-MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749
+MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/japanese/vfghostscript5/files/gdevmjc.c.patch b/japanese/vfghostscript5/files/gdevmjc.c.patch
index b1313a081801..02c2ed71fae1 100644
--- a/japanese/vfghostscript5/files/gdevmjc.c.patch
+++ b/japanese/vfghostscript5/files/gdevmjc.c.patch
@@ -1,3 +1,12 @@
+This is gdevmjc.c-0.8 patch for ghostscript 5.50 by kurosawa
+with mj_put_params() fix by Inagaki Kentaro.
+
+NO WARRANTY
+
+-- Toshihiro Kanda <candy@ops.dti.ne.jp>
+
+
+>>>>>>>>>>>>>>> original (0.7) patch preamble >>>>>>>>>>>>>>
 From root Fri Nov 22 01:20:20 1996
 Received: from theta.iis.u-tokyo.ac.jp by daikon.fujita3.iis.u-tokyo.ac.jp (AIX 3.2/UCB 5.64/3.4W2)
 	id AA18127; Fri, 22 Nov 1996 01:20:20 +0900
@@ -31,462 +40,332 @@ X-Mailer: mnews [version 1.19PL2] 1996-01/26(Fri)
 # $B%*%j%8%J%k$+$i$N%Q%C%A$K$7$?$O$:$G$9$1$I(B, $B:#F|$N>u67$@$H$A$g$C$H<+?.(B
 # $B$r;}$F$J$$(B(^^;)
 
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
-*** gdevmjc.c.org	Fri Nov 22 00:27:16 1996
---- gdevmjc.c	Fri Nov 22 00:35:20 1996
-***************
-*** 43,49 ****
-  #include <limits.h>
-  #include "gdevprn.h"
-  #include "gdevpcl.h"
-! #include "gsprops.h"
-  
-  /***
-   *** Note: Original driver gdevcdj.c for HP color printer was written 
---- 43,50 ----
-  #include <limits.h>
-  #include "gdevprn.h"
-  #include "gdevpcl.h"
-! #include "gsparam.h"
-! #include "gsstate.h"
-  
-  /***
-   *** Note: Original driver gdevcdj.c for HP color printer was written 
-***************
-*** 139,145 ****
---- 140,148 ----
-  
-  /* 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
-  
-***************
-*** 179,193 ****
-  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 void expand_line(word *, int, int, int);
-  
-! private int put_prop_float(gs_prop_item *, float *, float, float, int);
-! private int put_prop_int(gs_prop_item *, int *, int, int, int);
-! 
-! private void set_bpp(gx_device *, int);
-  
-  private uint gdev_prn_rasterwidth(const gx_device_printer *, int );
-  
---- 182,194 ----
-  private dev_proc_print_page(mjc720_print_page);
-  private dev_proc_print_page(mj500c_print_page);
-  
-! private dev_proc_get_params(mj_get_params);
-! private dev_proc_put_params(mj_put_params);
-  
-  private void expand_line(word *, int, int, 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(const gx_device_printer *, int );
-  
-***************
-*** 214,220 ****
-  #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,\
-      WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\
-      bpp, 0, 0, 0, 0, print_page)
-  
---- 215,221 ----
-  #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_mj, procs, dev_name,\
-      WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\
-      bpp, 0, 0, 0, 0, print_page)
-  
-***************
-*** 226,234 ****
-  }
-  
-  
-! #define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\
-  	proc_colour_open,\
-! 	gdev_pcl_get_initial_matrix,\
-  	gx_default_sync_output,\
-  	gdev_prn_output_page,\
-  	gdev_prn_close,\
---- 227,235 ----
-  }
-  
-  
-! #define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\
-  	proc_colour_open,\
-! 	gx_default_get_initial_matrix,\
-  	gx_default_sync_output,\
-  	gdev_prn_output_page,\
-  	gdev_prn_close,\
-***************
-*** 240,247 ****
-  	NULL,	/* copy_color */\
-  	NULL,	/* draw_line */\
-  	gx_default_get_bits,\
-! 	proc_get_props,\
-! 	proc_put_props\
-  }
-  
-  private int mjc_open(gx_device *);
---- 241,248 ----
-  	NULL,	/* copy_color */\
-  	NULL,	/* draw_line */\
-  	gx_default_get_bits,\
-! 	proc_get_params,\
-! 	proc_put_params\
-  }
-  
-  private int mjc_open(gx_device *);
-***************
-*** 249,255 ****
-  
-  
-  private gx_device_procs mj_procs =
-! mj_colour_procs(mjc_open, mj_get_props, mj_put_props);
-  
-  gx_device_mj far_data gs_mjc180_device =
-  mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL,
---- 250,256 ----
-  
-  
-  private gx_device_procs mj_procs =
-! 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,
-***************
-*** 305,311 ****
-  
-    /* 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);
-  
-    paper_size = gdev_mjc_paper_size(pdev);
-    if (paper_size == PAPER_SIZE_A2 ) {
---- 306,312 ----
-  
-    /* Set up colour params if put_props has not already done so */
-    if (pdev->color_info.num_components == 0)
-!     mj_set_bpp(pdev, pdev->color_info.depth);
-  
-    paper_size = gdev_mjc_paper_size(pdev);
-    if (paper_size == PAPER_SIZE_A2 ) {
-***************
-*** 324,333 ****
-      m = mj_letter;
-    }
-  
-!   pdev->l_margin = m[0];
-!   pdev->b_margin = m[1];
-!   pdev->r_margin = m[2];
-!   pdev->t_margin = m[3];
-  
-    switch (mj->colorcomp) {
-    case 1:
---- 325,331 ----
-      m = mj_letter;
-    }
-  
-!   gx_device_set_margins(pdev, m, true);
-  
-    switch (mj->colorcomp) {
-    case 1:
-***************
-*** 352,430 ****
-   * 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);
-  }
-  
-  /* Put properties. */
-  private int
-! mj_put_props(gx_device *pdev, gs_prop_item *plist, int count)
-  {
-- 	static const argn = 10;
-- 	gs_prop_item *known[argn];
-  	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);
-  
-  	if ( code < 0 )
-! 	  return_error(code);
-  
-! 	if (bpp != 0) {
-! 	  set_bpp(pdev, bpp);
-! 	  
-! 	  /* Close the device; gs_putdeviceprops will reopen it. */
-  	  if ( bpp != old_bpp && pdev->is_open )
-! 	    { int ccode = gs_closedevice(pdev);
-! 	      if ( ccode < 0 ) return ccode;
-! 	    }
-  	}
-! 
-! 	return code;
-  }
-  
-  /* ------ Internal routines ------ */
---- 350,427 ----
-   * and control over the bits-per-pixel used in output rendering */
-  /* Added properties for DeskJet 5xxC */
-  
-  private int
-! 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_params(gx_device *pdev, gs_param_list *plist)
-  {
-  	int old_bpp = mj->color_info.depth;
-  	int bpp = 0;
-  	int code = 0;
-! 	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", &density, 0, INT_MAX, code);
-! 	code = mj_put_param_int(plist, "Magenta", &density, 0, INT_MAX, code);
-! 	code = mj_put_param_int(plist, "Yellow", &density, 0, INT_MAX, code);
-! 	code = mj_put_param_int(plist, "Black", &density, 0, INT_MAX, code);
-! 	code = mj_put_param_int(plist, "Dither", &density, 0, 1, code);
-! 	code = mj_put_param_int(plist, "ColorComponent", &density, 1, 4, code);
-! 	code = mj_put_param_int(plist, "Direction", &density, 1, 2, code);
-! 	code = mj_put_param_int(plist, "MicroWeave", &density, 0, 1, code);
-! 	code = mj_put_param_int(plist, "DotSize", &density, 0, 1, code);
-! 	code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code);
-  
-  	if ( code < 0 )
-! 	  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 )
-! 	    return gs_closedevice(pdev);
-! 	  return 0;
-  	}
-! 	else
-! 	  return gdev_prn_put_params(pdev, plist);
-  }
-  
-  /* ------ Internal routines ------ */
-***************
-*** 947,953 ****
-  
-    /* Send each scan line in turn */
-    {
-!     long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi;
-      int cErr, mErr, yErr, kErr;
-      int this_pass, i;
-      long int lnum;
---- 944,951 ----
-  
-    /* Send each scan line in turn */
-    {
-!     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;
-***************
-*** 1323,1361 ****
-  }
-  
-  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);
-!     }
-  }	
-  
-  private void
-! 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 : 
---- 1321,1345 ----
-  }
-  
-  private int
-! 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
-! 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 : 
-***************
-*** 1363,1371 ****
-    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);
-  }
-  
-  /* This returns either the number of pixels in a scan line, or the number
---- 1347,1355 ----
-    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_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
-***************
-*** 1374,1380 ****
-  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);
-    return (pixelcount ?
-            (uint)raster_width :
-            (uint)((raster_width * pdev->color_info.depth + 7) >> 3));
---- 1358,1364 ----
-  gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount)
-  {
-    word raster_width =
-!     pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]);
-    return (pixelcount ?
-            (uint)raster_width :
-            (uint)((raster_width * pdev->color_info.depth + 7) >> 3));
-
+--- gdevmjc.c.orig	Fri Jun  4 00:54:24 1999
++++ gdevmjc.c	Fri Jun  4 01:06:06 1999
+@@ -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,
+@@ -313,7 +314,7 @@
+ 
+   /* 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 --git a/japanese/vfghostscript5/files/mjc.dev.patch b/japanese/vfghostscript5/files/mjc.dev.patch
index 9ec7aba53f29..2cc721011dbd 100644
--- a/japanese/vfghostscript5/files/mjc.dev.patch
+++ b/japanese/vfghostscript5/files/mjc.dev.patch
@@ -1,29 +1,18 @@
-*** mjc.dev.orig	Sun Apr 20 01:41:48 1997
---- mjc.dev	Sun Apr 20 01:43:46 1997
-***************
-*** 16,27 ****
-  gdevmjc.$(OBJ): gdevmjc.c $(PDEVH) $(gdevpcl_h)
-  	$(CCC) 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_)
-  
---- 16,27 ----
-  gdevmjc.$(OBJ): gdevmjc.c $(PDEVH) $(gdevpcl_h)
-  	$(CCC) gdevmjc.c
-  
-! mjc180.dev: $(mj700v2c_) page.dev
-! 	$(SETPDEV) mjc180 $(mj700v2c_)
-! mjc360.dev: $(mj700v2c_) page.dev
-! 	$(SETPDEV) mjc360 $(mj700v2c_)
-! mjc720.dev: $(mj700v2c_) page.dev
-! 	$(SETPDEV) mjc720 $(mj700v2c_)
-! mj500c.dev: $(mj700v2c_) page.dev
-! 	$(SETPDEV) mj500c $(mj700v2c_)
-  
+--- gdevmjc.mak.~1~	Thu Sep  5 16:01:29 1996
++++ gdevmjc.mak	Sun Jun  6 23:58:16 1999
+@@ -18,11 +18,11 @@
+ 	$(CCC) -DA4 gdevmjc.c
+ 
+ mjc180.dev: $(mj700v2c_)
+-	$(SHP)gssetdev mjc180 $(mj700v2c_)
++	$(SETPDEV) mjc180 $(mj700v2c_)
+ mjc360.dev: $(mj700v2c_)
+-	$(SHP)gssetdev mjc360 $(mj700v2c_)
++	$(SETPDEV) mjc360 $(mj700v2c_)
+ mjc720.dev: $(mj700v2c_)
+-	$(SHP)gssetdev mjc720 $(mj700v2c_)
++	$(SETPDEV) mjc720 $(mj700v2c_)
+ mj500c.dev: $(mj700v2c_)
+-	$(SHP)gssetdev mj500c $(mj700v2c_)
++	$(SETPDEV) mj500c $(mj700v2c_)
+ 
diff --git a/japanese/vfghostscript5/files/patch-ac b/japanese/vfghostscript5/files/patch-ac
new file mode 100644
index 000000000000..13eb934d79ae
--- /dev/null
+++ b/japanese/vfghostscript5/files/patch-ac
@@ -0,0 +1,14 @@
+--- gdevlj56.c.orig	Fri Dec 18 09:56:18 1998
++++ gdevlj56.c	Fri Jun 11 18:30:44 1999
+@@ -185,7 +185,11 @@
+ 	/* Write the page header. */
+ 	{ static const byte page_header[] = {
+ 	    dub(ePortraitOrientation), da(pxaOrientation),
++#ifdef A4
++	    dub(eA4Paper), da(pxaMediaSize),
++#else
+ 	    dub(eLetterPaper), da(pxaMediaSize),
++#endif
+ 	    dub(eAutoSelect), da(pxaMediaSource),
+ 	    pxtBeginPage,
+ 	    dusp(0, 0), da(pxaPoint),
diff --git a/japanese/vfghostscript5/pkg-plist b/japanese/vfghostscript5/pkg-plist
index 544b804ed968..8ecf250829c8 100644
--- a/japanese/vfghostscript5/pkg-plist
+++ b/japanese/vfghostscript5/pkg-plist
@@ -1,5 +1,4 @@
 bin/bdftops
-bin/ert
 bin/font2c
 bin/gs
 bin/gsbj
@@ -43,10 +42,11 @@ share/ghostscript/5.10vflib/decrypt.ps
 share/ghostscript/5.10vflib/dmp_init.ps
 share/ghostscript/5.10vflib/dmp_site.ps
 share/ghostscript/5.10vflib/doc/COPYING
-share/ghostscript/5.10vflib/doc/MJ700V2C.FAQ
+share/ghostscript/5.10vflib/doc/Gdevlips.htm
 share/ghostscript/5.10vflib/doc/NEWS
 share/ghostscript/5.10vflib/doc/README
 share/ghostscript/5.10vflib/doc/README.CID.gs5.10-vflib
+share/ghostscript/5.10vflib/doc/README.gdevalps
 share/ghostscript/5.10vflib/doc/README.gs5.10-jpdf
 share/ghostscript/5.10vflib/doc/README.gs5.10-vflib
 share/ghostscript/5.10vflib/doc/bug-form.txt
@@ -55,20 +55,19 @@ share/ghostscript/5.10vflib/doc/current.txt
 share/ghostscript/5.10vflib/doc/devices.txt
 share/ghostscript/5.10vflib/doc/djgpp.sj
 share/ghostscript/5.10vflib/doc/drivers.txt
-share/ghostscript/5.10vflib/doc/epag-3.08/FILES
-share/ghostscript/5.10vflib/doc/epag-3.08/adjust.ps
-share/ghostscript/5.10vflib/doc/epag-3.08/ert.txt
-share/ghostscript/5.10vflib/doc/epag-3.08/gdevepag.txt
-share/ghostscript/5.10vflib/doc/epag-3.08/gsepagif.sh
-share/ghostscript/5.10vflib/doc/epag-3.08/psprint
 share/ghostscript/5.10vflib/doc/fonts.txt
 share/ghostscript/5.10vflib/doc/gdev10v.jis
 share/ghostscript/5.10vflib/doc/gdevdmpr.sj
-share/ghostscript/5.10vflib/doc/gdevlips4.euc
-share/ghostscript/5.10vflib/doc/gdevmjc.jis
-share/ghostscript/5.10vflib/doc/gdevnpdl.jis
+share/ghostscript/5.10vflib/doc/gdevmd2k.jis
+share/ghostscript/5.10vflib/doc/gdevmjc-0.8/README.mjc
+share/ghostscript/5.10vflib/doc/gdevmjc-0.8/README.mje
+share/ghostscript/5.10vflib/doc/gdevmjc-0.8/README.noz
+share/ghostscript/5.10vflib/doc/gdevmjc-0.8/MJ700V2C.FAQ
+share/ghostscript/5.10vflib/doc/gdevmjc-0.8/cpem.doc
+share/ghostscript/5.10vflib/doc/gdevrpdl.doc 
 share/ghostscript/5.10vflib/doc/gs261j.doc
 share/ghostscript/5.10vflib/doc/gs261j.jis
+share/ghostscript/5.10vflib/doc/gs_statd.dif
 share/ghostscript/5.10vflib/doc/helpers.txt
 share/ghostscript/5.10vflib/doc/hershey.txt
 share/ghostscript/5.10vflib/doc/history1.txt
@@ -392,10 +391,10 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
-@dirrm share/ghostscript/fonts
-@dirrm share/ghostscript/5.10vflib/kanji
-@dirrm share/ghostscript/5.10vflib/examples
-@dirrm share/ghostscript/5.10vflib/doc/epag-3.08
+@dirrm share/ghostscript/5.50vflib/doc/gdevmjc-0.8
 @dirrm share/ghostscript/5.10vflib/doc
+@dirrm share/ghostscript/5.10vflib/examples
+@dirrm share/ghostscript/5.10vflib/kanji
 @dirrm share/ghostscript/5.10vflib
+@dirrm share/ghostscript/fonts
 @dirrm share/ghostscript
diff --git a/japanese/vfghostscript5/scripts/configure b/japanese/vfghostscript5/scripts/configure
index b2bc2b235385..add2bb6a2ccd 100644
--- a/japanese/vfghostscript5/scripts/configure
+++ b/japanese/vfghostscript5/scripts/configure
@@ -4,7 +4,7 @@
 
 if [ ! "X"${BATCH} = "X" ] ; then
 
-PRINTER_JAPAN=' epag.dev mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips3.dev lips4.dev lips4c.dev rpdlA3.dev rpdlA4.dev rpdlB4.dev rpdlB5.dev bj10v.dev bj10vh.dev dmprt.dev npdl.dev alps.dev'
+PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev bjc880j.dev lp2000.dev escpage.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev'
 
 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;" \
@@ -64,7 +64,6 @@ Have fun with this new configuration style !     -andreas \n\n\
    "x11cmyk"  "X masquer. as 1-bit-per-plane CMYK device" ON \
    "x11gray2" "X masquer. as device with 2-bit gray-scale device" ON \
    "x11mono"  "X masquer. as black-and-white device" ON \
-   "alps"     "ALPS MD5000 monochrome driver" ON \
    "ap3250"   "Epson AP3250" OFF \
    "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
    "bj10e"    "Canon BubbleJet BJ10e" ON \
@@ -85,7 +84,13 @@ Have fun with this new configuration style !     -andreas \n\n\
    "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
    "dmprt"    "Generic Printer" ON \
    "dnj650c"  "HP DesignJet 650C" OFF \
-   "epag"     "Epson ESC/Page laser printer 60-600dpi, mono" ON \
+   "escpage"  "Epson ESC/Page laser printer 60-600dpi, mono" ON \
+   "lp2000"   "Epson LP-2000/3000/7000/7000G, mono" ON \
+   "md2k"     "ALPS MD2000/2010/4000/1300/1500/5000 driver" ON \
+   "md5k"     "ALPS MD5000 driver" ON \
+   "md50Mono" "ALPS MD5000 monochrome driver" OFF \
+   "md50Eco"  "ALPS MD5000 monochrome driver, economy mode" OFF \
+   "md1xMono" "ALPS MD1300 MD5000 monochrome driver" OFF \
    "mjc180"   "Epson MachJet series  180dpi, CMYK" ON \
    "mjc360"   "Epson MachJet series  360dpi, CMYK" ON \
    "mjc720"   "Epson MachJet series  720dpi, CMYK" ON \
@@ -102,9 +107,11 @@ Have fun with this new configuration style !     -andreas \n\n\
    "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
    "laserjet" "HP LaserJet" ON \
    "lbp8"     "Canon LBP-8II laser printer" OFF \
+   "lips2p"   "Canon LIPS II+ laser printer " ON \
    "lips3"    "Canon LIPS III laser printer " ON \
-   "lips4"    "Canon LIPSIV laser printer 600dpi, mono" ON \
-   "lips4c"   "Canon LIPSIV laser printer 600dpi,CMYK" ON \
+   "lips4"    "Canon LIPSIV laser printer, mono" ON \
+   "bjc880j"  "Canon LIPSIV BubbleJet printer, CMYK" ON \
+   "lips4v"   "Canon LIPSIV laser printer(Vector)" ON \
    "lj250"    "DEC LJ250 Companion color printer" OFF \
    "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
    "ljet3"    "HP LaserJet III* with Delta Row compression" ON \
@@ -112,11 +119,13 @@ Have fun with this new configuration style !     -andreas \n\n\
    "ljet4"    "HP LaserJet 4 (defaults to 600 dpi)" ON \
    "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
    "ljetplus" "HP LaserJet Plus" ON \
+   "lj5mono"  "H-P LaserJet 5 & 6 family (PCL XL), bitmap" OFF \
+   "lj5gray"  "H-P LaserJet 5 & 6 family (PCL XL), gray-scale bitmap" OFF \
    "lp2563"   "HP 2563B line printer" OFF \
    "lp8000"   "Epson LP8000 laser printer" OFF \
    "m8510"    "C.Itoh M8510 printer" OFF \
    "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
-   "npdl"      "NEC Printer Description Language (NPDL)" ON \
+   "npdl"     "NEC Printer Description Language (NPDL)" ON \
    "nwp533"   "Sony Microsystems NWP533 laser printer" OFF \
    "oce9050"  "OCE 9050 printer" OFF \
    "oki182"   "Okidata MicroLine 182" OFF \
@@ -127,10 +136,8 @@ Have fun with this new configuration style !     -andreas \n\n\
    "pjxl"     "HP PaintJet XL color printer" ON \
    "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
    "r4081"    "Ricoh 4081 laser printer" OFF \
-   "rpdlA3"  "Ricoh Printer Description Language (RPDL) A3 600 dpi" ON \
-   "rpdlA4"  "Ricoh Printer Description Language (RPDL) A4 600 dpi" ON \
-   "rpdlB4"  "Ricoh Printer Description Language (RPDL) B4 600 dpi" ON \
-   "rpdlB5"  "Ricoh Printer Description Language (RPDL) B5 600 dpi" ON \
+   "nx100f"  "Ricoh Printer Description Language (RPDL) (fixed)" ON \
+   "nx100v"  "Ricoh Printer Description Language (RPDL) (variable)" ON \
    "sj48"     "StarJet 48 inkjet printer" OFF \
    "st800"    "Epson Stylus 800 printer" ON \
    "stcolor"  "Epson Stylus Color" ON \