Update to hpijs 2.1.4.

This release contains support for a number of new printers.

3 files changed, 99 insertions, 10 deletions

diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 55cf9e18e03..beb41a13e7a 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/29 01:51:23 gavan Exp $
 
-DISTNAME=	hpijs-1.7.1
+DISTNAME=	hpijs-2.1.4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
 
@@ -27,4 +27,5 @@ do-install:
 	cd ${WRKSRC} && ${CP} ppd/HP* ${PREFIX}/share/ppd/
 	${GZIP_CMD} ${PREFIX}/share/ppd/HP*.ppd
 
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/hpijs/PLIST b/print/hpijs/PLIST
index 9765748727e..f0631becb2d 100644
--- a/print/hpijs/PLIST
+++ b/print/hpijs/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/19 19:15:46 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/29 01:51:23 gavan Exp $
 bin/hpijs
 share/doc/html/hpijs/gs_hpijs.png
 share/doc/html/hpijs/hpijs_readme.html
 share/ppd/HP-2000C-hpijs.ppd.gz
 share/ppd/HP-2500C-hpijs.ppd.gz
 share/ppd/HP-2500CM-hpijs.ppd.gz
+share/ppd/HP-Business_Inkjet_1000-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_1100-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_1200-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_2200-hpijs.ppd.gz
@@ -14,20 +15,28 @@ share/ppd/HP-Business_Inkjet_2250TN-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_2280-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_2300-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_2600-hpijs.ppd.gz
+share/ppd/HP-Business_Inkjet_2800-hpijs.ppd.gz
 share/ppd/HP-Business_Inkjet_3000-hpijs.ppd.gz
 share/ppd/HP-Color_Inkjet_Printer_CP1160-hpijs.ppd.gz
 share/ppd/HP-Color_Inkjet_Printer_CP1700-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_2500-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_2550-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_3500-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_3550-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_3700-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_4500-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_4550-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_4600-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_4610-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_4650-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_5-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_5000-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_5500-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_5550-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_5M-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_8500-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_8550GN-hpijs.ppd.gz
+share/ppd/HP-Color_LaserJet_9500-hpijs.ppd.gz
 share/ppd/HP-Color_LaserJet_9500_MFP-hpijs.ppd.gz
 share/ppd/HP-DesignJet_ColorPro_CAD-hpijs.ppd.gz
 share/ppd/HP-DeskJet_1100C-hpijs.ppd.gz
@@ -35,6 +44,7 @@ share/ppd/HP-DeskJet_1120C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_1125C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_1200C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_1220C-hpijs.ppd.gz
+share/ppd/HP-DeskJet_1280-hpijs.ppd.gz
 share/ppd/HP-DeskJet_1600C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3320-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3325-hpijs.ppd.gz
@@ -43,6 +53,7 @@ share/ppd/HP-DeskJet_3425-hpijs.ppd.gz
 share/ppd/HP-DeskJet_350C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3520-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3528-hpijs.ppd.gz
+share/ppd/HP-DeskJet_3535-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3550-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3558-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3650-hpijs.ppd.gz
@@ -54,6 +65,9 @@ share/ppd/HP-DeskJet_3816-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3820-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3822-hpijs.ppd.gz
 share/ppd/HP-DeskJet_3840-hpijs.ppd.gz
+share/ppd/HP-DeskJet_3845-hpijs.ppd.gz
+share/ppd/HP-DeskJet_3920-hpijs.ppd.gz
+share/ppd/HP-DeskJet_3940-hpijs.ppd.gz
 share/ppd/HP-DeskJet_400-hpijs.ppd.gz
 share/ppd/HP-DeskJet_420C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_450-hpijs.ppd.gz
@@ -86,6 +100,7 @@ share/ppd/HP-DeskJet_648C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_6520-hpijs.ppd.gz
 share/ppd/HP-DeskJet_6540-hpijs.ppd.gz
 share/ppd/HP-DeskJet_656C-hpijs.ppd.gz
+share/ppd/HP-DeskJet_6600-hpijs.ppd.gz
 share/ppd/HP-DeskJet_660C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_670C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_670TV-hpijs.ppd.gz
@@ -138,12 +153,14 @@ share/ppd/HP-DeskJet_9600-hpijs.ppd.gz
 share/ppd/HP-DeskJet_960C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_970C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_975C-hpijs.ppd.gz
+share/ppd/HP-DeskJet_9800-hpijs.ppd.gz
 share/ppd/HP-DeskJet_980C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_990C-hpijs.ppd.gz
 share/ppd/HP-DeskJet_995C-hpijs.ppd.gz
 share/ppd/HP-LaserJet_1010-hpijs.ppd.gz
 share/ppd/HP-LaserJet_1012-hpijs.ppd.gz
 share/ppd/HP-LaserJet_1015-hpijs.ppd.gz
+share/ppd/HP-LaserJet_1022-hpijs.ppd.gz
 share/ppd/HP-LaserJet_1100-hpijs.ppd.gz
 share/ppd/HP-LaserJet_1100A-hpijs.ppd.gz
 share/ppd/HP-LaserJet_1150-hpijs.ppd.gz
@@ -159,6 +176,9 @@ share/ppd/HP-LaserJet_2300-hpijs.ppd.gz
 share/ppd/HP-LaserJet_2410-hpijs.ppd.gz
 share/ppd/HP-LaserJet_2420-hpijs.ppd.gz
 share/ppd/HP-LaserJet_2430-hpijs.ppd.gz
+share/ppd/HP-LaserJet_3015-hpijs.ppd.gz
+share/ppd/HP-LaserJet_3020-hpijs.ppd.gz
+share/ppd/HP-LaserJet_3030-hpijs.ppd.gz
 share/ppd/HP-LaserJet_3200-hpijs.ppd.gz
 share/ppd/HP-LaserJet_3200m-hpijs.ppd.gz
 share/ppd/HP-LaserJet_3200se-hpijs.ppd.gz
@@ -167,13 +187,16 @@ share/ppd/HP-LaserJet_3310_MFP-hpijs.ppd.gz
 share/ppd/HP-LaserJet_3320N_MFP-hpijs.ppd.gz
 share/ppd/HP-LaserJet_3320_MFP-hpijs.ppd.gz
 share/ppd/HP-LaserJet_3330_MFP-hpijs.ppd.gz
+share/ppd/HP-LaserJet_3380-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4000-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4050-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4100-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4200-hpijs.ppd.gz
+share/ppd/HP-LaserJet_4240-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4250-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4300-hpijs.ppd.gz
+share/ppd/HP-LaserJet_4345_MFP-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4350-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4L-hpijs.ppd.gz
 share/ppd/HP-LaserJet_4M-hpijs.ppd.gz
@@ -199,8 +222,13 @@ share/ppd/HP-LaserJet_8000-hpijs.ppd.gz
 share/ppd/HP-LaserJet_8100-hpijs.ppd.gz
 share/ppd/HP-LaserJet_8150-hpijs.ppd.gz
 share/ppd/HP-LaserJet_9000-hpijs.ppd.gz
-share/ppd/HP-LaserJet_9040_9050-hpijs.ppd.gz
-share/ppd/HP-LaserJet_9040_9050_MFP-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9000_MFP-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9040-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9040_MFP-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9050-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9050_MFP-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9055_MFP-hpijs.ppd.gz
+share/ppd/HP-LaserJet_9065_MFP-hpijs.ppd.gz
 share/ppd/HP-Mopier_240-hpijs.ppd.gz
 share/ppd/HP-Mopier_320-hpijs.ppd.gz
 share/ppd/HP-OfficeJet-hpijs.ppd.gz
@@ -296,7 +324,9 @@ share/ppd/HP-PhotoSmart_240-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_2600-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_2700-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_320-hpijs.ppd.gz
+share/ppd/HP-PhotoSmart_330-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_370-hpijs.ppd.gz
+share/ppd/HP-PhotoSmart_380-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_7150-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_7260-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_7268-hpijs.ppd.gz
@@ -308,7 +338,9 @@ share/ppd/HP-PhotoSmart_7660-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_7760-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_7960-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_8100-hpijs.ppd.gz
+share/ppd/HP-PhotoSmart_8200-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_8400-hpijs.ppd.gz
+share/ppd/HP-PhotoSmart_8700-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_P100-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_P1000-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_P1100-hpijs.ppd.gz
@@ -319,5 +351,61 @@ share/ppd/HP-PhotoSmart_P130-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_P1315-hpijs.ppd.gz
 share/ppd/HP-PhotoSmart_P230-hpijs.ppd.gz
 share/ppd/HP-e-printer_e20-hpijs.ppd.gz
-@dirrm share/doc/html/hpijs
+share/ppd/HP_Business_Inkjet_2250.ppd.gz
+share/ppd/HP_Business_Inkjet_2280.ppd.gz
+share/ppd/HP_Business_Inkjet_2600.ppd.gz
+share/ppd/HP_Business_Inkjet_2800.ppd.gz
+share/ppd/HP_Business_Inkjet_3000.ppd.gz
+share/ppd/HP_Color_LaserJet.ppd.gz
+share/ppd/HP_Color_LaserJet_2550.ppd.gz
+share/ppd/HP_Color_LaserJet_2800.ppd.gz
+share/ppd/HP_Color_LaserJet_4500.ppd.gz
+share/ppd/HP_Color_LaserJet_4550.ppd.gz
+share/ppd/HP_Color_LaserJet_5550.ppd.gz
+share/ppd/HP_Color_LaserJet_5M.ppd.gz
+share/ppd/HP_Color_LaserJet_8500.ppd.gz
+share/ppd/HP_Color_LaserJet_8550.ppd.gz
+share/ppd/HP_LaserJet_1200.ppd.gz
+share/ppd/HP_LaserJet_1220.ppd.gz
+share/ppd/HP_LaserJet_1320_Series.ppd.gz
+share/ppd/HP_LaserJet_2100_Series.ppd.gz
+share/ppd/HP_LaserJet_2200.ppd.gz
+share/ppd/HP_LaserJet_2410.ppd.gz
+share/ppd/HP_LaserJet_2420.ppd.gz
+share/ppd/HP_LaserJet_2430.ppd.gz
+share/ppd/HP_LaserJet_3200.ppd.gz
+share/ppd/HP_LaserJet_3300_Series.ppd.gz
+share/ppd/HP_LaserJet_4.ppd.gz
+share/ppd/HP_LaserJet_4000_Series.ppd.gz
+share/ppd/HP_LaserJet_4050_Series.ppd.gz
+share/ppd/HP_LaserJet_4100_MFP.ppd.gz
+share/ppd/HP_LaserJet_4100_Series.ppd.gz
+share/ppd/HP_LaserJet_4240.ppd.gz
+share/ppd/HP_LaserJet_4250.ppd.gz
+share/ppd/HP_LaserJet_4345_MFP.ppd.gz
+share/ppd/HP_LaserJet_4350.ppd.gz
+share/ppd/HP_LaserJet_4ML.ppd.gz
+share/ppd/HP_LaserJet_4MP.ppd.gz
+share/ppd/HP_LaserJet_4Si_v2011.110.ppd.gz
+share/ppd/HP_LaserJet_4V.ppd.gz
+share/ppd/HP_LaserJet_4_Plus.ppd.gz
+share/ppd/HP_LaserJet_5000_Series.ppd.gz
+share/ppd/HP_LaserJet_5100_Series.ppd.gz
+share/ppd/HP_LaserJet_5M.ppd.gz
+share/ppd/HP_LaserJet_5MP.ppd.gz
+share/ppd/HP_LaserJet_5Si.ppd.gz
+share/ppd/HP_LaserJet_5Si_Mopier.ppd.gz
+share/ppd/HP_LaserJet_6MP.ppd.gz
+share/ppd/HP_LaserJet_8000_Series.ppd.gz
+share/ppd/HP_LaserJet_8100_Series.ppd.gz
+share/ppd/HP_LaserJet_8150_Series.ppd.gz
+share/ppd/HP_LaserJet_9000_MFP.ppd.gz
+share/ppd/HP_LaserJet_9000_Series.ppd.gz
+share/ppd/HP_LaserJet_9040.ppd.gz
+share/ppd/HP_LaserJet_9040_9050_MFP.ppd.gz
+share/ppd/HP_LaserJet_9050.ppd.gz
+share/ppd/HP_LaserJet_9055_9065_MFP.ppd.gz
+share/ppd/HP_Mopier_240.ppd.gz
+share/ppd/HP_Mopier_320.ppd.gz
 @dirrm share/ppd
+@dirrm share/doc/html/hpijs
diff --git a/print/hpijs/distinfo b/print/hpijs/distinfo
index 5f4c435d6a8..2326f4f7368 100644
--- a/print/hpijs/distinfo
+++ b/print/hpijs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/03/26 13:59:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2006/01/29 01:51:23 gavan Exp $
 
-SHA1 (hpijs-1.7.1.tar.gz) = 7ed373a059ba01d9fc2f6f4181e33d49f08d0389
-RMD160 (hpijs-1.7.1.tar.gz) = ecf40047d7bca2913785ddb4e741b1efb47f0799
-Size (hpijs-1.7.1.tar.gz) = 845193 bytes
+SHA1 (hpijs-2.1.4.tar.gz) = 8b8baa2d410f8918ae2b8381811983c923b29703
+RMD160 (hpijs-2.1.4.tar.gz) = b498a578d89bdd2dcc12d2df846f9950df67db8d
+Size (hpijs-2.1.4.tar.gz) = 1928371 bytes
 SHA1 (patch-aa) = 1d89574d8f54cec6493304a663c0f546bd8df111
 SHA1 (patch-ab) = cf2224faf7bb81b6d656a3fe19c668413a54707c
 SHA1 (patch-ac) = b6bd6df7a30152df93d579e12d2b465f15c130c8