Use new version 1.3 of the hp8xx package, which also supports

HP670, HP690, HP850, HP855, HP870, HP890, HP1100 and HP1600 color printers.

4 files changed, 41 insertions, 13 deletions

diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index f91c2ac665b..c1b10434640 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 1998/11/12 00:44:39 tron Exp $
+# $NetBSD: Makefile,v 1.30 1998/11/29 16:34:27 frueauf Exp $
 #
 
 DISTNAME=	ghostscript-5.50
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-		ftp://bonk.ethz.ch/gs-driver-distrib/ \
+		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${PDF_SEC}
@@ -37,8 +37,8 @@ GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 GS_FONTS_STD=	ghostscript-fonts-std-5.10a.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
-# Additional driver HP 850, see http://bonk.ethz.ch/hp850/hp850.html
-HP850_DRV=	hp850.zip
+# Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
+HP850_DRV=	hp8xxs13.zip
 
 # PostScript source to decode encrypted PDF files
 PDF_SEC=	pdf_sec.ps
@@ -59,7 +59,7 @@ SCRIPT_SUFFIX=	.batch
 
 post-extract:
 	${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
-	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
+	cd ${WRKSRC} && unzip -uLa ${DISTDIR}/${HP850_DRV}
 	${CP} ${DISTDIR}/${PDF_SEC} ${WRKSRC}
 
 do-configure:
diff --git a/print/ghostscript5/files/md5 b/print/ghostscript5/files/md5
index c6095a5d303..30a48b3b0fc 100644
--- a/print/ghostscript5/files/md5
+++ b/print/ghostscript5/files/md5
@@ -1,8 +1,8 @@
-$NetBSD: md5,v 1.9 1998/11/04 21:42:12 mycroft Exp $
+$NetBSD: md5,v 1.10 1998/11/29 16:34:27 frueauf Exp $
 
 MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
 MD5 (ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
 MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
 MD5 (ghostscript-fonts-std-5.10a.tar.gz) = 8462a429e2672d332a510da076dca6d2
-MD5 (hp850.zip) = e37477210305e027c45f82d04d1613d1
+MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript5/patches/patch-af b/print/ghostscript5/patches/patch-af
index c0b40dd162d..d42c6e8e61d 100644
--- a/print/ghostscript5/patches/patch-af
+++ b/print/ghostscript5/patches/patch-af
@@ -1,8 +1,36 @@
-$NetBSD: patch-af,v 1.1 1998/11/04 23:36:49 mycroft Exp $
+$NetBSD: patch-af,v 1.2 1998/11/29 16:34:28 frueauf Exp $
 
---- devs.mak.orig	Mon Sep 14 22:03:52 1998
-+++ devs.mak	Wed Nov  4 18:15:26 1998
-@@ -896,8 +896,8 @@
+--- devs.mak.orig	Tue Sep 15 04:03:52 1998
++++ devs.mak	Sun Nov 29 00:06:38 1998
+@@ -461,6 +461,27 @@
+ ljetplus.dev: $(HPMONO) page.dev
+ 	$(SETPDEV2) ljetplus $(HPMONO)
+ 
++### -------------- cdj850 - HP 850c Driver under development ------------- ###
++### Since this driver is in the development-phase it is not distributed    ###
++### with ghostscript, but it is available via anonymous ftp from:          ###
++###                        ftp://bonk.ethz.ch                              ###
++### For questions about this driver, please contact:                       ###
++###       Uli Wortmann (E-Mail address inside the driver-package)          ###
++   
++cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV2) cdj850 $(cdeskjet8_)
++
++cdj670.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV2) cdj670 $(cdeskjet8_)
++
++cdj890.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV2) cdj890 $(cdeskjet8_)
++
++cdj1600.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV2) cdj1600 $(cdeskjet8_)
++
+ ### Selecting ljet2p provides TIFF (mode 2) compression on LaserJet III,
+ ### IIIp, IIId, IIIsi, IId, and IIp. 
+ 
+@@ -896,8 +917,8 @@
  png_i_=-include $(PNGGENDIR)$(D)libpng
  
  $(GLOBJ)gdevpng.$(OBJ): $(GLSRC)gdevpng.c\
diff --git a/print/ghostscript5/scripts/configure.batch b/print/ghostscript5/scripts/configure.batch
index 39580219b44..152b8982db3 100644
--- a/print/ghostscript5/scripts/configure.batch
+++ b/print/ghostscript5/scripts/configure.batch
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: configure.batch,v 1.4 1998/11/04 23:42:27 mycroft Exp $
+# $NetBSD: configure.batch,v 1.5 1998/11/29 16:34:28 frueauf Exp $
 #
 
 # without that no way :)
 touch ${WRKSRC}/makefile
 
 cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev cljet5.dev deskjet.dev djet500.dev laserjet.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev oce9050.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev jpeg.dev jpeggray.dev miff24.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev plan9bm.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev hl7x0.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev lj4dith.dev lp8000.dev lq850.dev m8510.dev necp6.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev cif.dev inferno.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev sgirgb.dev
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev cljet5.dev deskjet.dev djet500.dev laserjet.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev oce9050.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev jpeg.dev jpeggray.dev miff24.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev plan9bm.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cdj670.dev cdj890.dev cdj1600.dev cp50.dev declj250.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev hl7x0.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev lj4dith.dev lp8000.dev lq850.dev m8510.dev necp6.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev cif.dev inferno.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev sgirgb.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices