Add lbp8, the Canon LBP-8 printer device driver. This was not built before

because I incorrectly thought it was part of the Canon LIPS III driver code.
Many thanks to Jukka Marin <jmarin@pyy.jmp.fi> for pointing this out.

4 files changed, 94 insertions, 22 deletions

diff --git a/print/ghostscript-nox11/files/devs.nox11 b/print/ghostscript-nox11/files/devs.nox11
index 46f1bd0c926..e10188c3ef6 100644
--- a/print/ghostscript-nox11/files/devs.nox11
+++ b/print/ghostscript-nox11/files/devs.nox11
@@ -1,4 +1,4 @@
-# $NetBSD: devs.nox11,v 1.1.1.1 2000/05/07 02:04:34 jlam Exp $
+# $NetBSD: devs.nox11,v 1.2 2000/10/04 13:17:07 jlam Exp $
 #
 # non-X11 drivers for Ghostscript
 
@@ -71,6 +71,7 @@ DEVICE_DEVS+=	\
 	$(DD)jpeg.dev \
 	$(DD)jpeggray.dev \
 	$(DD)laserjet.dev \
+	$(DD)lbp8.dev \
 	$(DD)lips2p.dev \
 	$(DD)lips3.dev \
 	$(DD)lips4.dev \
diff --git a/print/ghostscript-nox11/files/patch-sum b/print/ghostscript-nox11/files/patch-sum
index efa3b76a3c2..7c211a16273 100644
--- a/print/ghostscript-nox11/files/patch-sum
+++ b/print/ghostscript-nox11/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.3 2000/05/08 05:20:51 itohy Exp $
+$NetBSD: patch-sum,v 1.4 2000/10/04 13:17:07 jlam Exp $
 
 MD5 (patch-aa) = 2fe1989abfcbf9543d76759c9eac9a6e
 MD5 (patch-ab) = 39216d8ef04a53137de88b579e080f02
 MD5 (patch-ac) = 3d8f958ef61f44e22e1a78f797d4e85b
 MD5 (patch-ad) = a04b78abb81f358192829e92f455ad62
-MD5 (patch-ae) = 1e662b3ef642ded5a8cb215a007f1e95
+MD5 (patch-ae) = 5b5047be97ee7159327e09e1dec31b0f
 MD5 (patch-af) = b664ee17e734eae3ae3b79ebddc95c5b
 MD5 (patch-ag) = 5e477488b958d79fb061d0f7cb5e9091
 MD5 (patch-ah) = 8ca81ee23cab14a6eead57f635017669
@@ -22,4 +22,5 @@ MD5 (patch-as) = d24b83fa59818aa97c307a472eea5a5a
 MD5 (patch-at) = 66635b4c02eb8dc6e76e146bdfc53777
 MD5 (patch-au) = ae4ec0e86849e6ace7f2e61373b20077
 MD5 (patch-av) = ba6b627be636df846f40abe4f6c93b1b
+MD5 (patch-aw) = 512e4fd75c538e9b974e5a98e5c6fb7e
 MD5 (patch-bug-workaround) = 709891b6690b2957868daba5fb536f95
diff --git a/print/ghostscript-nox11/patches/patch-ae b/print/ghostscript-nox11/patches/patch-ae
index 4febc00bc43..dd28a8bdcfd 100644
--- a/print/ghostscript-nox11/patches/patch-ae
+++ b/print/ghostscript-nox11/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/10/04 13:17:08 jlam Exp $
 
 --- src/contrib.mak.orig	Thu Mar 16 03:09:42 2000
-+++ src/contrib.mak	Mon May  1 20:26:23 2000
++++ src/contrib.mak
 @@ -343,7 +343,7 @@
  	$(SETPDEV) $(DD)coslw2p $(coslw_)
  
@@ -11,32 +11,30 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
  
  $(GLOBJ)gdevcslw.$(OBJ) : $(GLSRC)gdevcslw.c $(PDEVH)
  	$(GLCC) $(GLO_)gdevcslw.$(OBJ) $(C_) $(GLSRC)gdevcslw.c
-@@ -551,16 +551,18 @@
+@@ -547,7 +547,7 @@
+ $(GLOBJ)gdev3852.$(OBJ) : $(GLSRC)gdev3852.c $(PDEVH) $(gdevpcl_h)
+ 	$(GLCC) $(GLO_)gdev3852.$(OBJ) $(C_) $(GLSRC)gdev3852.c
+ 
+-### ---------- The Canon LBP-8II and LIPS III printer devices ---------- ###
++### ----------------- The Canon LBP-8II printer device ----------------- ###
  ### Note: these drivers were contributed by users.                       ###
  ### For questions about these drivers, please contact                    ###
  ###       Lauri Paatero, lauri.paatero@paatero.pp.fi                     ###
--
--lbp8_=$(GLOBJ)gdevlbp8.$(OBJ)
--$(DD)lbp8.dev : $(lbp8_) $(DD)page.dev
--	$(SETPDEV) $(DD)lbp8 $(lbp8_)
--
+@@ -556,11 +556,14 @@
+ $(DD)lbp8.dev : $(lbp8_) $(DD)page.dev
+ 	$(SETPDEV) $(DD)lbp8 $(lbp8_)
+ 
 -$(DD)lips3.dev : $(lbp8_) $(DD)page.dev
 -	$(SETPDEV) $(DD)lips3 $(lbp8_)
 -
--$(GLOBJ)gdevlbp8.$(OBJ) : $(GLSRC)gdevlbp8.c $(PDEVH)
--	$(GLCC) $(GLO_)gdevlbp8.$(OBJ) $(C_) $(GLSRC)gdevlbp8.c
-+#
-+# Use the gdevlips drivers from http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
-+#
-+#lbp8_=$(GLOBJ)gdevlbp8.$(OBJ)
-+#$(DD)lbp8.dev : $(lbp8_) $(DD)page.dev
-+#	$(SETPDEV) $(DD)lbp8 $(lbp8_)
+ $(GLOBJ)gdevlbp8.$(OBJ) : $(GLSRC)gdevlbp8.c $(PDEVH)
+ 	$(GLCC) $(GLO_)gdevlbp8.$(OBJ) $(C_) $(GLSRC)gdevlbp8.c
++
++# For the Canon LIPS printer devices, use the gdevlips drivers from
++# http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
 +#
 +#$(DD)lips3.dev : $(lbp8_) $(DD)page.dev
 +#	$(SETPDEV) $(DD)lips3 $(lbp8_)
-+#
-+#$(GLOBJ)gdevlbp8.$(OBJ) : $(GLSRC)gdevlbp8.c $(PDEVH)
-+#	$(GLCC) $(GLO_)gdevlbp8.$(OBJ) $(C_) $(GLSRC)gdevlbp8.c
  
  ### -------------- The Epson LP-8000 laser printer device -------------- ###
  ### Note: this driver was contributed by a user: please contact Oleg     ###
diff --git a/print/ghostscript-nox11/patches/patch-aw b/print/ghostscript-nox11/patches/patch-aw
new file mode 100644
index 00000000000..d128e1c5ade
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-aw
@@ -0,0 +1,72 @@
+$NetBSD: patch-aw,v 1.1 2000/10/04 13:17:08 jlam Exp $
+
+--- src/gdevlbp8.c.orig	Thu Mar  9 03:40:41 2000
++++ src/gdevlbp8.c
+@@ -22,6 +22,8 @@
+ 
+ /* 
+   Modifications:
++    3.10.00 Johnny Lam
++            Removed LIPS III code, as it's obsoleted by gdevlips driver.
+     2.2.97  Lauri Paatero
+             Changed CSI command into ESC [. DCS commands may still need to be changed
+             (to ESC P).
+@@ -49,7 +51,6 @@
+ 
+ /* The device descriptors */
+ private dev_proc_print_page(lbp8_print_page);
+-private dev_proc_print_page(lips3_print_page);
+ 
+ gx_device_printer far_data gs_lbp8_device =
+   prn_device(prn_std_procs, "lbp8",
+@@ -58,14 +59,6 @@
+ 	0.16, 0.2, 0.32, 0.21,		/* margins: left, bottom, right, top */
+ 	1, lbp8_print_page);
+ 
+-gx_device_printer far_data gs_lips3_device =
+-  prn_device(prn_std_procs, "lips3",
+-	82,				/* width_10ths, 8.3" */
+-	117,				/* height_10ths, 11.7" */
+-	X_DPI, Y_DPI,
+-	0.16, 0.27, 0.23, 0.27,		/* margins */
+-	1, lips3_print_page);
+-
+ /* ------ Internal routines ------ */
+ 
+ #define ESC 0x1b
+@@ -84,23 +77,6 @@
+ 
+ static const char *lbp8_end = NULL;
+ 
+-static const char lips3_init[] = {
+-  ESC, '<', /* soft reset */
+-  DCS, '0', 'J', ST, /* JOB END */
+-  DCS, '3', '1', ';', '3', '0', '0', ';', '2', 'J', ST, /* 300dpi, LIPS3 JOB START */
+-  ESC, '<',  /* soft reset */
+-  DCS, '2', 'y', 'P', 'r', 'i', 'n', 't', 'i', 'n', 'g', '(', 'g', 's', ')', ST,  /* Printing (gs) display */
+-  ESC, '[', '?', '1', 'l',  /* auto cr-lf disable */
+-  ESC, '[', '?', '2', 'h', /* auto ff disable */
+-  ESC, '[', '1', '1', 'h', /* set mode */
+-  ESC, '[', '7', ' ', 'I', /* select unit size (300dpi)*/
+-  ESC, '[', 'f' /* move to home position */
+-};
+-
+-static const char lips3_end[] = {
+-  DCS, '0', 'J', ST  /* JOB END */
+-};
+-
+ /* Send the page to the printer.  */
+ private int
+ can_print_page(gx_device_printer *pdev, FILE *prn_stream,
+@@ -203,11 +179,4 @@
+ lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream)
+ {	return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init),
+ 			      lbp8_end, sizeof(lbp8_end));
+-}
+-
+-/* Print a LIPS III page. */
+-private int
+-lips3_print_page(gx_device_printer *pdev, FILE *prn_stream)
+-{	return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init),
+-			      lips3_end, sizeof(lips3_end));
+ }