From owner-ports-jp@jp.freebsd.org  Thu Dec  3 02:19:36 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id CAA24029;
	Thu, 3 Dec 1998 02:19:36 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mail.tg.rim.or.jp (root@mail.tg.rim.or.jp [202.247.130.149])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with ESMTP id CAA24016
	for <ports-jp@jp.freebsd.org>; Thu, 3 Dec 1998 02:19:33 +0900 (JST)
	(envelope-from inagaki@tg.rim.or.jp)
Received: from lunatic.kareidoscope.ne.jp (cs2d239.ppp.infoweb.ne.jp [202.219.141.199])
	by mail.tg.rim.or.jp (8.8.5/3.6W-RIMNET-98-06-09) with ESMTP id CAA25204
	for <ports-jp@jp.freebsd.org>; Thu, 3 Dec 1998 02:19:28 +0900 (JST)
Received: from localhost (localhost.kareidoscope.ne.jp [127.0.0.1])
	by lunatic.kareidoscope.ne.jp (8.9.1/3.7W) with ESMTP id CAA81291
	for <ports-jp@jp.freebsd.org>; Thu, 3 Dec 1998 02:17:53 +0900 (JST)
To: ports-jp@jp.freebsd.org
From: Inagaki Kentaro (=?iso-2022-jp?B?GyRCMHAzQDdyQkBPOhsoQg==?=) <inagaki@tg.rim.or.jp>
X-Mailer: Mew version 1.94b2 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Thu_Dec__3_02:17:28_1998_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19981203021751O.inagaki@tg.rim.or.jp>
Date: Thu, 03 Dec 1998 02:17:51 +0900
X-Dispatcher: imput version 981124(IM104)
Lines: 517
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: ports-jp 5347
Subject: [ports-jp 5347] japanese/vfghostscript5 with dj505jc driver
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: inagaki@tg.rim.or.jp

----Next_Part(Thu_Dec__3_02:17:28_1998_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B0p3@$G$9!#(B

$B:G6a!"0J2<$N%W%j%s%?$rF~<j$7$^$7$?$N$G(Bjapanese/vfghostscript5$B$G;H$&$Y(B
$B$/D4::$7$?=j(BMJC-810C$B$K$D$$$F$O$A$g$C$H$^$($K(BCc:$B$7$^$7$?LdBj$,$"$j(B
PC-PR101/J110R$B$K$$$?$C$F$O%I%i%$%P$,L5$$$H8@$&>u67$G$7$?!#(B

EPSON LP-1500
EPSON MJC-810C
NEC PC-PR101/J110R

$B$=$3$G$3$N>u67$r2?$H$+$9$Y$/$,$s$P$C$F$_$^$7$?!#(B
$B$^$:(BPC-PR101/J110R$B$O(BHP DeskJet 505J Plus$B$N(BOEM$B$H$N>pJs$r$b$H$K(B
japanese/vfghostscript$B$G;H$o$l$F$$$k(Bbjc600j-0.9.tar.gz$B$+$i%I%i%$%P$r$b$C(B
$B$FMh$F6/0z$K%Q%C%A$r$"$F$F8+$^$7$?!#(B

$B0JA0N.$5$l$?(BELF$BBP:v$:$_$N(Bjapanese/vfghostscript5$B$KBP$9$k%Q%C%A$G$9!#(B

----
$B0p3@7rB@O:(B
inagaki@tg.rim.or.jp

----Next_Part(Thu_Dec__3_02:17:28_1998_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=dj505jc.patch

diff -ruNx CVS /usr/ports/japanese/vfghostscript5/Makefile japanese/vfghostscript5/Makefile
--- /usr/ports/japanese/vfghostscript5/Makefile	Thu Dec  3 01:37:58 1998
+++ japanese/vfghostscript5/Makefile	Thu Dec  3 01:37:21 1998
@@ -108,6 +108,8 @@
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevcdj.c.patch
+	@${CP} ${FILESDIR}/dj505jc.mak ${WRKSRC}
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/unix-gcc.mak
@@ -115,6 +117,7 @@
 	@${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}/dj505jc.mak >> ${WRKSRC}/unix-gcc.mak
 
 post-build:
 	@(cd ${PRINTER}/epag-3.01 ;  ${MAKE})
diff -ruNx CVS /usr/ports/japanese/vfghostscript5/files/dj505jc.mak japanese/vfghostscript5/files/dj505jc.mak
--- /usr/ports/japanese/vfghostscript5/files/dj505jc.mak	Thu Jan  1 09:00:00 1970
+++ japanese/vfghostscript5/files/dj505jc.mak	Sun Nov 29 14:37:27 1998
@@ -0,0 +1,23 @@
+##
+## HP DeskJet 505J and 505J Plus driver 
+#
+# Supports
+#   HP DeskJet 505J
+#   HP DeskJet 505J Plus
+#   NEC PC-PR101/J110R (DeskJet 505J Plus)
+#
+##
+#
+#  Append this file to Makefile
+#
+##
+# *    dj505j  H-P DeskJet 505J (8 bit/pixel Grayscale)
+# *    dj505jc  H-P DeskJet 505J Plus (8 bit/pixel Grayscale
+#                                    and 24 bit/pixel CMY color)
+#
+dj505j.dev: $(cdeskjet_) page.dev
+	$(SETPDEV) dj505j $(cdeskjet_)
+
+dj505jc.dev: $(cdeskjet_) page.dev
+	$(SETPDEV) dj505jc $(cdeskjet_)
+
diff -ruNx CVS /usr/ports/japanese/vfghostscript5/files/gdevcdj.c.patch japanese/vfghostscript5/files/gdevcdj.c.patch
--- /usr/ports/japanese/vfghostscript5/files/gdevcdj.c.patch	Thu Jan  1 09:00:00 1970
+++ japanese/vfghostscript5/files/gdevcdj.c.patch	Sun Nov 29 11:24:24 1998
@@ -0,0 +1,385 @@
+*** gdevcdj.c.orig	Mon Jul 21 12:39:31 1997
+--- gdevcdj.c	Sun Nov 29 09:45:45 1998
+***************
+*** 87,109 ****
+   *     4 - pj:		HP PaintJet
+   *     5 - pjxl:	HP PaintJet XL
+   *     6 - declj250:	DEC LJ250
+   *** The DesignJet 650C driver was contributed by Koert Zeilstra;
+   *** please contact koert@zen.cais.com if you have questions.
+!  *     7 - dnj650c      HP DesignJet 650C
+   *** The LaserJet 4 driver with dithering was contributed by Eckhard
+   *** Rueggeberg; please contact eckhard@ts.go.dlr.de if you have questions.
+!  *     8 - lj4dith:	HP LaserJet 4 with dithering
+   *** The ESC/P driver (for Epson ESC/P compatible printers) was written by
+   *** Yoshio Kuniyoshi <yoshio@nak.math.keio.ac.jp>, but is not maintained at
+   *** the moment.
+!  *     9 - esc/p:       Epson ESC/P-compatible printers
+   *** The BJC600 driver (which also works for BJC4000) was written first
+   *** by Yoshio Kuniyoshi <yoshio@nak.math.keio.ac.jp> and later modified by
+   *** Yves Arrouye <Yves.Arrouye@imag.fr>. The current driver has been
+   *** completely rewritten by me (YA) for good color handling.
+!  *    10 - bjc600:	BJC 600//4000 printers
+   *** The BJC800 driver is based on the bjc600 one. By YA too.
+!  *    11 - bjc800:	BJC 800 printer
+   ***/
+  
+  /*
+--- 87,111 ----
+   *     4 - pj:		HP PaintJet
+   *     5 - pjxl:	HP PaintJet XL
+   *     6 - declj250:	DEC LJ250
++  *** dj505j was added to this driver by toyoda@plum.fuis.fukui-u.ac.jp
++  *     7 - dj505j:      HP DeskJet 505J
+   *** The DesignJet 650C driver was contributed by Koert Zeilstra;
+   *** please contact koert@zen.cais.com if you have questions.
+!  *     8 - dnj650c      HP DesignJet 650C
+   *** The LaserJet 4 driver with dithering was contributed by Eckhard
+   *** Rueggeberg; please contact eckhard@ts.go.dlr.de if you have questions.
+!  *     9 - lj4dith:	HP LaserJet 4 with dithering
+   *** The ESC/P driver (for Epson ESC/P compatible printers) was written by
+   *** Yoshio Kuniyoshi <yoshio@nak.math.keio.ac.jp>, but is not maintained at
+   *** the moment.
+!  *     10 - esc/p:       Epson ESC/P-compatible printers
+   *** The BJC600 driver (which also works for BJC4000) was written first
+   *** by Yoshio Kuniyoshi <yoshio@nak.math.keio.ac.jp> and later modified by
+   *** Yves Arrouye <Yves.Arrouye@imag.fr>. The current driver has been
+   *** completely rewritten by me (YA) for good color handling.
+!  *    11 - bjc600:	BJC 600//4000 printers
+   *** The BJC800 driver is based on the bjc600 one. By YA too.
+!  *    12 - bjc800:	BJC 800 printer
+   ***/
+  
+  /*
+***************
+*** 168,173 ****
+--- 170,177 ----
+  #define PAINTJET_PRINT_LIMIT 0.0	/* This is a guess.. */
+  #define ESC_P_PRINT_LIMIT    0.335
+  
++ #define DJ505J_PRINT_LIMIT   0.25
++ 
+  /* Margins are left, bottom, right, top. */
+  #define DESKJET_MARGINS_LETTER   0.25, 0.50, 0.25, 0.167
+  #define DESKJET_MARGINS_A4       0.125, 0.50, 0.143, 0.167
+***************
+*** 177,182 ****
+--- 181,189 ----
+  #define PAINTJET_MARGINS         0.167, 0.167, 0.167, 0.167
+  #define DESIGNJET_MARGINS        0.167, 0.167, 0.167, 0.167
+  
++ #define DJ505J_MARGINS_LETTER    0.125, 0.668, 0.125, 0.25  
++ #define DJ505J_MARGINS_A4        0.125, 0.668, 0.125, 0.25
++ 
+  /*
+   * With ESC/P commands, BJC-600 can print no more than 8 inches width.
+   * So it can't use full width of letter size paper.  Since non printable
+***************
+*** 211,221 ****
+  #define PJ180    3
+  #define PJXL180  4
+  #define DECLJ250 5
+! #define DNJ650C  6
+! #define LJ4DITH  7
+! #define ESC_P	 8
+! #define BJC600	 9
+! #define BJC800	 10
+  
+  /* No. of ink jets (used to minimise head movements) */
+  #define HEAD_ROWS_MONO 50
+--- 218,229 ----
+  #define PJ180    3
+  #define PJXL180  4
+  #define DECLJ250 5
+! #define DJ505J   6
+! #define DNJ650C  7
+! #define LJ4DITH  8
+! #define ESC_P	 9
+! #define BJC600	 10
+! #define BJC800	 11
+  
+  /* No. of ink jets (used to minimise head movements) */
+  #define HEAD_ROWS_MONO 50
+***************
+*** 239,244 ****
+--- 247,253 ----
+  private dev_proc_open_device(pjxl300_open);
+  private dev_proc_open_device(escp_open);
+  private dev_proc_open_device(bjc_open);
++ private dev_proc_open_device(dj505j_open);
+  
+  private dev_proc_print_page(declj250_print_page);
+  private dev_proc_print_page(dj500c_print_page);
+***************
+*** 250,255 ****
+--- 259,265 ----
+  private dev_proc_print_page(pjxl300_print_page);
+  private dev_proc_print_page(escp_print_page);
+  private dev_proc_print_page(bjc_print_page);
++ private dev_proc_print_page(dj505j_print_page);
+  
+  private dev_proc_get_params(cdj_get_params);
+  private dev_proc_get_params(pjxl_get_params);
+***************
+*** 493,498 ****
+--- 503,511 ----
+  private gx_device_procs escp_procs =
+  hp_colour_procs(escp_open, ep_get_params, ep_put_params);
+  
++ private gx_device_procs dj505j_procs =
++ hp_colour_procs(dj505j_open, cdj_get_params, cdj_put_params);
++ 
+  gx_device_cdj far_data gs_cdjmono_device =
+  cdj_device(cdj500_procs, "cdjmono", 300, 300, 1,
+  	   dj500c_print_page, 4, 0, 1);
+***************
+*** 552,557 ****
+--- 565,578 ----
+  cdj_device(escp_procs, "escpc", 360, 360, 24,
+  	   escp_print_page, 0, 0, 1);
+  
++ gx_device_cdj far_data gs_dj505j_device =
++ cdj_device(dj505j_procs, "dj505j", 300, 300, 8,
++ 	   dj505j_print_page, 4, 0, 1);
++ 
++ gx_device_cdj far_data gs_dj505jc_device =
++ cdj_device(dj505j_procs, "dj505jc", 300, 300, BITSPERPIXEL,
++ 	   dj505j_print_page, 4, 2, 1);
++ 
+  /* Args of bjc drivers are manualFeed, mediaType, printQuality, printColor,
+     mediaWeight_isSet, mediaWeight, (monochromePrint) */
+  
+***************
+*** 667,672 ****
+--- 688,698 ----
+  }
+  
+  private int
++ dj505j_open(gx_device *pdev)
++ { return hp_colour_open(pdev, DJ505J);
++ }
++ 
++ private int
+  hp_colour_open(gx_device *pdev, int ptype)
+  {	/* Change the margins if necessary. */
+    static const float dj_a4[4] = { DESKJET_MARGINS_A4 };
+***************
+*** 676,681 ****
+--- 702,709 ----
+    static const float dnj_all[4] = { DESIGNJET_MARGINS };
+    static const float ep_a4[4] = { ESC_P_MARGINS_A4 };
+    static const float ep_letter[4] = { ESC_P_MARGINS_LETTER };
++   static const float djj_a4[4] = { DJ505J_MARGINS_A4 };
++   static const float djj_letter[4] = { DJ505J_MARGINS_LETTER };
+  
+    static float bjc_a3[4] = { BJC_MARGINS_A3 };		/* Not const! */
+    static float bjc_letter[4] = { BJC_MARGINS_LETTER };  /* Not const! */
+***************
+*** 708,713 ****
+--- 736,745 ----
+    case PJXL180:
+      m = pj_all;
+      break;
++   case DJ505J:
++     m = (gdev_pcl_paper_size(pdev) == PAPER_SIZE_A4 ? djj_a4 :
++ 	 djj_letter);
++     break;
+    case ESC_P:
+      m = (gdev_pcl_paper_size(pdev) == PAPER_SIZE_A4 ? ep_a4 :
+  	 ep_letter);
+***************
+*** 1245,1250 ****
+--- 1277,1289 ----
+    return hp_colour_print_page(pdev, prn_stream, bjc->ptype);
+  }
+  
++ /* The DeskJet505J can compress (mode 2) */
++ private int
++ dj505j_print_page(gx_device_printer * pdev, FILE * prn_stream)
++ {
++   return hp_colour_print_page(pdev, prn_stream, DJ505J);
++ }
++ 
+  /* MACROS FOR DITHERING (we use macros for compact source and faster code) */
+  /* Floyd-Steinberg dithering. Often results in a dramatic improvement in
+   * subjective image quality, but can also produce dramatic increases in
+***************
+*** 2058,2064 ****
+    }
+    
+    /* Initialize printer. */
+!   if (ptype == BJC600 || ptype == BJC800) {
+      bjc_init_page(pdev, prn_stream);
+    } else {
+        if (ptype == LJ4DITH)  {
+--- 2097,2110 ----
+    }
+    
+    /* Initialize printer. */
+!   if (ptype == DJ505J) {
+!     fputs("\x1B@", prn_stream);               /* Reset printer */
+!     fprintf(prn_stream, "\x1B_R%c%c",
+!             ((int)x_dpi) % 256, ((int)x_dpi) / 256); /* Set resolution */
+!   } else if (ptype == ESC_P) {
+!     fputs("\033@", prn_stream); /* Reset printer */
+!     ep_print_image(prn_stream, 'R', 0, 0); /* reset output routine */
+!   } else if (ptype == BJC600 || ptype == BJC800) {
+      bjc_init_page(pdev, prn_stream);
+    } else {
+        if (ptype == LJ4DITH)  {
+***************
+*** 2075,2080 ****
+--- 2121,2127 ----
+  
+  #define DOFFSET (dev_t_margin(pdev) - DESKJET_PRINT_LIMIT)	/* Print position */
+  #define POFFSET (dev_t_margin(pdev) - PAINTJET_PRINT_LIMIT)
++ #define JOFFSET (dev_t_margin(pdev) - DJ505J_PRINT_LIMIT)
+  #define EOFFSET (dev_t_margin(pdev) - ESC_P_PRINT_LIMIT)
+  #define BOFFSET (dev_t_margin(pdev) - bjc->printLimit)
+    switch (ptype) {
+***************
+*** 2101,2106 ****
+--- 2148,2174 ----
+      /* Select data compression */
+      compression = 9;
+      break;
++   case DJ505J:
++     {
++       int neg_comps = num_comps * (-1);
++       
++       /* Set depletion and shingling levels */
++       fprintf(prn_stream, "\x1B_D%c\x1B_E%c", cdj->depletion, cdj->shingling);
++       /* Move to top left of printed area */
++       fprintf(prn_stream, "\x1B_N%c", (int)(300 * JOFFSET));
++       /* Set number of planes ((-)1 is mono, (-)3 is (cmy)rgb */
++       fprintf(prn_stream, "\x1B_U%c%c",
++ 	      (*(unsigned int *)&neg_comps) % 256,
++ 	      (*(unsigned int *)&neg_comps) / 256);
++       /* Set raster width, then start raster graphics */
++       fprintf(prn_stream, "\x1B_S%c%c\x1B_A\x01",
++ 	      raster_width % 256, raster_width / 256 );
++       /* Select data compression */
++       compression = 2;
++       /* No combined escapes for raster transfers */
++       combined_escapes = 0;
++     }
++   break;
+    case DNJ650C:
+      fprintf (prn_stream, "\033%%0B"); /* Enter HPGL/2 mode */
+      fprintf (prn_stream, "BP5,1"); /* Turn off autorotation */
+***************
+*** 2228,2237 ****
+       /* Set compression if the mode has been defined. */
+      if (compression)
+        fprintf(prn_stream, "%dm", compression);
+!   }
+!   else if (ptype == BJC600 || ptype == BJC800)
+        ;				/* Currently, nothing to do. */
+!   else
+      if (compression)
+        fprintf(prn_stream, "\033*b%dM", compression);
+  
+--- 2296,2307 ----
+       /* Set compression if the mode has been defined. */
+      if (compression)
+        fprintf(prn_stream, "%dm", compression);
+!   } else if (ptype == BJC600 || ptype == BJC800)
+        ;				/* Currently, nothing to do. */
+!   else if (ptype == DJ505J) {
+!     if (compression)
+!       fprintf(prn_stream, "\x1B_M%c", compression);
+!   } else
+      if (compression)
+        fprintf(prn_stream, "\033*b%dM", compression);
+  
+***************
+*** 2316,2321 ****
+--- 2386,2394 ----
+  	    fputc('y', prn_stream);   /* Clear current and seed rows */
+  	    for (; num_blank_lines; num_blank_lines--)
+  	      fputc('w', prn_stream);
++ 	  } else if (ptype == DJ505J) {
++ 	    for (; num_blank_lines; num_blank_lines--)
++ 	      fprintf(prn_stream, "\x1B_W%c%c", 0, 0);
+  	  } else {
+  #if 0
+  /**************** The following code has been proposed ****************/
+***************
+*** 2339,2344 ****
+--- 2412,2420 ----
+  	} else {
+  	  if (combined_escapes)
+  	    fprintf(prn_stream, "%dy", num_blank_lines);
++ 	  else if (ptype == DJ505J)
++ 	    fprintf(prn_stream, "\x1B_Y%c%c",
++ 		    num_blank_lines % 256, num_blank_lines / 256);
+  	  else
+  	    fprintf(prn_stream, "\033*b%dY", num_blank_lines);
+  	}
+***************
+*** 2543,2548 ****
+--- 2619,2634 ----
+  		}
+  	    }
+  	    break;
++ 	  case DJ505J:
++ 	    { const char *plane = (byte *)plane_data[scan][i];
++ 	    const word *row = (word *)plane;
++ 	    const word *end_row = row + plane_size/W;
++ 	    int count2 = gdev_pcl_mode2compress(row, end_row, out_row_alt);
++ 	    
++ 	    out_data = out_row_alt;
++ 	    out_count = count2;
++ 	    }
++ 	  break;
+  	  case BJC600:
+  	  case BJC800:
+  	    { const byte *plane = (byte *)plane_data[scan][i];
+***************
+*** 2556,2561 ****
+--- 2642,2650 ----
+  	  if (output_plane) {
+  	    if (combined_escapes)
+  	      fprintf(prn_stream, "%d%c", out_count, "wvvv"[i]);
++ 	    else if (ptype == DJ505J)
++ 	      fprintf(prn_stream, "\x1B_%c%c%c", "WVVV"[i],
++ 		      out_count % 256, out_count / 256);
+  	    else if (ptype == BJC600 || ptype == BJC800) {
+  	      if (out_count)
+  		  bjc_raster_cmd(num_comps == 1 ? 3 : i,
+***************
+*** 2581,2595 ****
+      fputs("0M", prn_stream);
+  
+    /* end raster graphics */
+!   if (ptype == BJC600 || ptype == BJC800) {
+      bjc_finish_page(pdev, prn_stream);
+!   }
+!   else if (ptype != ESC_P) 
+      fputs("\033*rbC\033E", prn_stream);
+  
+    /* eject page */
+    if (ptype == PJ180)
+      fputc('\f', prn_stream);
+    else if (ptype == DNJ650C)
+      fputs ("\033*rC\033%0BPG;", prn_stream);
+    else if (ptype == BJC600 || ptype == BJC800)
+--- 2670,2687 ----
+      fputs("0M", prn_stream);
+  
+    /* end raster graphics */
+!   if (ptype == DJ505J)
+!     fputs("\x1B_C",prn_stream);                /* not reset yet */
+!   else  if (ptype == BJC600 || ptype == BJC800) {
+      bjc_finish_page(pdev, prn_stream);
+!   } else if (ptype != ESC_P) 
+      fputs("\033*rbC\033E", prn_stream);
+  
+    /* eject page */
+    if (ptype == PJ180)
+      fputc('\f', prn_stream);
++   else if (ptype == DJ505J)
++     fputs("\x0C\x1B@", prn_stream);    /* reset after eject page */
+    else if (ptype == DNJ650C)
+      fputs ("\033*rC\033%0BPG;", prn_stream);
+    else if (ptype == BJC600 || ptype == BJC800)
diff -ruNx CVS /usr/ports/japanese/vfghostscript5/files/gdevmjc.c.patch japanese/vfghostscript5/files/gdevmjc.c.patch
--- /usr/ports/japanese/vfghostscript5/files/gdevmjc.c.patch	Fri Dec  6 20:27:34 1996
+++ japanese/vfghostscript5/files/gdevmjc.c.patch	Thu Dec  3 01:04:17 1998
@@ -330,15 +330,15 @@
 ! 	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, "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 )
diff -ruNx CVS /usr/ports/japanese/vfghostscript5/scripts/configure japanese/vfghostscript5/scripts/configure
--- /usr/ports/japanese/vfghostscript5/scripts/configure	Thu Dec  3 01:37:58 1998
+++ japanese/vfghostscript5/scripts/configure	Thu Dec  3 00:46:07 1998
@@ -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'
+PRINTER_JAPAN=' dj505j dj505jc 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'
 
 sed -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev st800.dev uniprint.dev ${PRINTER_JAPAN};" \
     < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
@@ -68,6 +68,8 @@
    "cp50"     "Mitsubishi CP50 color" OFF \
    "declj250" "alternate DEC LJ250 driver" OFF \
    "deskjet"  "HP DeskJet and DeskJet Plus" ON \
+   "dj505j"   "HP DeskJet 505J, 8 bit/pixel gray-scale" ON \
+   "dj505jc"  "HP DeskJet 505J/505J Plus), 24 bit/pixel color" ON \
    "djet500"  "HP DeskJet 500" ON \
    "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
    "dmprt"    "Generic Printer" ON \

----Next_Part(Thu_Dec__3_02:17:28_1998_809)----
