Update to hpijs-1.3. Closes PR pkg/19213. Changes are:

 1. Added the following new printer support.
	Deskjet 450, Deskjet 3320, Deskjet 3420, Deskjet 3425,
	Deskjet 3810, Deskjet 3816, Deskjet 3822, Deskjet 6122,
	Deskjet 6127, Photosmart 230, Photosmart 7550, PSC 2100,
	PSC 2150, PSC 2200
 2. Made a change to configure.in to check for uint32_t in stdint.h,
  machine/types.h and inttypes.h.
 3. Added 600 dpi Best and 1200 dpi Photo to DJ9xx.
 4. Added a new paper size for printing covers on Deskjet 3425.
 5. Fixed a DJ850 extra page and top margin problem.
 6. Fixed a Deskjet 1120/1125 multiple page problem. These printers now
  use the DJ9xx device class with limited support.

plus a pkgsrc patch which enables output buffering.  This should
reduce system load.

4 files changed, 25 insertions, 10 deletions

diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 3a3d3e648a6..81d7eb59488 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2002/09/29 07:38:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/25 08:51:47 toshii Exp $
 
-DISTNAME=	hpijs-1.2.2
+DISTNAME=	hpijs-1.3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
 
 MAINTAINER=	jlam@netbsd.org
-COMMENT=	HP inkjet printer driver server
 HOMEPAGE=	http://hpinkjet.sourceforge.net/
+COMMENT=	HP inkjet printer driver server
 
 CONFLICTS=	ghostscript<=6.0.1nb4 ghostscript-nox11<=6.0.1nb4
 
diff --git a/print/hpijs/distinfo b/print/hpijs/distinfo
index 2e57d2f8395..897d8bbd505 100644
--- a/print/hpijs/distinfo
+++ b/print/hpijs/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/11 00:01:28 jlam Exp $
+$NetBSD: distinfo,v 1.2 2003/01/25 08:51:47 toshii Exp $
 
-SHA1 (hpijs-1.2.2.tar.gz) = dbedc99d96fdac5bd3cfe6204ad94119bae0113c
-Size (hpijs-1.2.2.tar.gz) = 302285 bytes
-SHA1 (patch-aa) = b7b5e892205fe901baad1d77a0b97cf80314581b
+SHA1 (hpijs-1.3.tar.gz) = 4d030f1abf6962d2ad27c04cef4007054e4c2df7
+Size (hpijs-1.3.tar.gz) = 353361 bytes
+SHA1 (patch-aa) = bfbd3e6da490323641885ce0cd74ce4d6527bd41
+SHA1 (patch-ab) = cd266d816512fdb0a7f8789396c4f7c200136ff5
diff --git a/print/hpijs/patches/patch-aa b/print/hpijs/patches/patch-aa
index da79e650394..2de2f733147 100644
--- a/print/hpijs/patches/patch-aa
+++ b/print/hpijs/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 00:01:29 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/25 08:51:47 toshii Exp $
 
---- Makefile.in.orig	Tue Sep 10 16:50:09 2002
+--- Makefile.in.orig	Thu Oct 31 11:53:08 2002
 +++ Makefile.in
 @@ -64,7 +64,7 @@ MAKEINFO = @MAKEINFO@
  PACKAGE = @PACKAGE@
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/09/11 00:01:29 jlam Exp $
 +docdir = $(datadir)/doc/html/@PACKAGE@
  
  bin_PROGRAMS = hpijs
- hpijs_SOURCES = hpijs.cpp ijs_server.c ijs.c ijs_exec_unix.c models.cpp breaks_open.cpp 	dj9xxvip.cpp dj9xx.cpp capture.cpp colormatch.cpp colormatcher_open.cpp 	compression.cpp context.cpp create_so.cpp creator.cpp 	dj600.cpp dj630.cpp dj660.cpp dj690.cpp dj6xx.cpp dj8xx.cpp dj600_maps.cpp 	dj660_maps.cpp dj690_maps.cpp dj895_maps.cpp dj895_maps2.cpp dj970_maps.cpp 	dj970_maps2.cpp dj970_maps3.cpp filterhpa.cpp apollo21xx.cpp apollo2560.cpp apollo2xxx.cpp 	dj8x5.cpp psp100.cpp phobos_cmaps.cpp dj350.cpp halftoner.cpp halftoner_open.cpp 	globals.cpp header.cpp htmtxhi.cpp pmselect.cpp 	job.cpp printer.cpp registry.cpp scaler.cpp 	scaler_open.cpp script.cpp systemservices.cpp services.cpp 	translator.cpp version.cpp versioncode.cpp hpijs97.cpp  	djgenericvip.cpp dj540.cpp dj850.cpp dj850_maps.cpp dj890.cpp 	apollo21xx.h apollo2560.h apollo2xxx.h colormatch.h colormatcher_open.h 	compression.h config.h context.h dj350.h dj400.h dj540.h 	dj600.h dj630.h dj660.h dj690.h dj6xx.h dj8x5.h dj8xx.h dj850.h dj890.h dj9xx.h dj9xxvip.h 	ernieplatform.h filterhpa.h global_types.h halftoner.h font.h debug.h 	halftoner_open.h header.h hpijs.h hpijs97.h hpprint_c_api.h 	hpprintapi.h hptypes.h htfed.h ijs.h ijs_server.h internal.h 	interp.h interp_data_50.h io_defs.h job.h models.h modes.h platform.h pmselect.h 	printer.h psp100.h resources.h scaler_open.h scaler_prop.h script.h services.h 	systemservices.h unistd_.h ijs_client.h djgenericvip.h ljmono.h ljmono.cpp 
+ hpijs_SOURCES = hpijs.cpp ijs_server.c ijs.c ijs_exec_unix.c models.cpp breaks_open.cpp 	dj9xxvip.cpp dj9xx.cpp capture.cpp colormatch.cpp colormatcher_open.cpp 	compression.cpp context.cpp create_so.cpp creator.cpp 	dj600.cpp dj630.cpp dj660.cpp dj690.cpp dj6xx.cpp dj8xx.cpp dj600_maps.cpp 	dj660_maps.cpp dj690_maps.cpp dj895_maps.cpp dj895_maps2.cpp dj970_maps.cpp 	dj970_maps2.cpp dj970_maps3.cpp filterhpa.cpp apollo21xx.cpp apollo2560.cpp apollo2xxx.cpp 	dj8x5.cpp psp100.cpp phobos_cmaps.cpp dj350.cpp halftoner.cpp halftoner_open.cpp 	globals.cpp header.cpp htmtxhi.cpp pmselect.cpp 	job.cpp printer.cpp registry.cpp scaler.cpp 	scaler_open.cpp script.cpp systemservices.cpp services.cpp 	translator.cpp version.cpp versioncode.cpp hpijs97.cpp  	djgenericvip.cpp dj540.cpp dj850.cpp dj850_maps.cpp dj890.cpp 	apollo21xx.h apollo2560.h apollo2xxx.h colormatch.h colormatcher_open.h 	compression.h config.h context.h dj350.h dj400.h dj540.h 	dj600.h dj630.h dj660.h dj690.h dj6xx.h dj8x5.h dj8xx.h dj850.h dj890.h dj9xx.h dj9xxvip.h 	ernieplatform.h filterhpa.h global_types.h halftoner.h font.h debug.h 	halftoner_open.h header.h hpijs.h hpijs97.h hpprint_c_api.h 	hpprintapi.h hptypes.h htfed.h ijs.h ijs_server.h internal.h 	interp.h interp_data_50.h io_defs.h job.h models.h modes.h platform.h pmselect.h 	printer.h psp100.h resources.h scaler_open.h scaler_prop.h script.h services.h 	systemservices.h unistd_.h ijs_client.h djgenericvip.h ljmono.h ljmono.cpp 	dj3320.cpp dj3320.h dj3320_cmap.cpp ldlencap.h ljcolor.cpp ljcolor.h
diff --git a/print/hpijs/patches/patch-ab b/print/hpijs/patches/patch-ab
new file mode 100644
index 00000000000..d896f5b98d8
--- /dev/null
+++ b/print/hpijs/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2003/01/25 08:51:48 toshii Exp $
+
+--- configure.orig	Sat Nov 30 20:46:42 2002
++++ configure
+@@ -1653,7 +1653,8 @@ MYFLAGS="$MYFLAGS -DAPDK_DJ660 -DAPDK_DJ
+ -DAPDK_APOLLO2XXX -DAPDK_APOLLO21XX -DAPDK_APOLLO2560 -DAPDK_DJ600 \
+ -DAPDK_DJ350 -DAPDK_DJ8x5 -DAPDK_PSP100 -DAPDK_AUTODUPLEX \
+ -DAPDK_HIGH_RES_MODES -DAPDK_LJMONO -DAPDK_DJ540 -DAPDK_DJ850 \
+--DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP"
++-DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
++-DAPDK_BUFFER_SEND"
+ 
+ echo $ac_n "checking "which type of build"""... $ac_c" 1>&6
+ echo "configure:1660: checking "which type of build"" >&5