>Number:         24526
>Category:       pkg
>Synopsis:       The in tree copy of print/hpijs is quite old and doesn't
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 22 13:57:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Paul Shupak
>Release:        NetBSD 1.6ZK
>Organization:
>Environment:
	
	
System: NetBSD svcs 1.6ZK NetBSD 1.6ZK (SVCS) #52: Sat Feb 21 16:24:59 PST 2004 root@svcs:/sys/arch/i386/compile/SVCS i386
Architecture: i386
Machine: i386
>Description:
	pkgsrc is at v 1.3.1; the latest distribution in v 1.5
>How-To-Repeat:
	examine the package
>Fix:
	Unified diff of pkgsrc/print/hpijs below:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/hpijs/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	17 Sep 2003 19:41:31 -0000	1.9
+++ Makefile	22 Feb 2004 13:48:47 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2003/09/17 19:41:31 grant Exp $
 
-DISTNAME=	hpijs-1.3
+DISTNAME=	hpijs-1.5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/hpijs/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	11 Sep 2002 00:01:29 -0000	1.1.1.1
+++ PLIST	22 Feb 2004 13:48:47 -0000
@@ -3,3 +3,4 @@
 share/doc/html/hpijs/gs_hpijs.png
 share/doc/html/hpijs/hpijs_readme.html
 @dirrm share/doc/html/hpijs
+@dirrm share/ppd/HP
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/hpijs/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	25 Jan 2003 09:37:38 -0000	1.3
+++ distinfo	22 Feb 2004 13:48:47 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.3 2003/01/25 09:37:38 jlam Exp $
 
-SHA1 (hpijs-1.3.tar.gz) = 4d030f1abf6962d2ad27c04cef4007054e4c2df7
-Size (hpijs-1.3.tar.gz) = 353361 bytes
-SHA1 (patch-aa) = bfbd3e6da490323641885ce0cd74ce4d6527bd41
+SHA1 (hpijs-1.5.tar.gz) = 42590063029a5f37ef9ea5da1c0e4710e3d1120b
+Size (hpijs-1.5.tar.gz) = 1141804 bytes
+SHA1 (patch-aa) = 3dfee377c42e6fee7f1a7abbba48c9fa95db29fd
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/print/hpijs/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	25 Jan 2003 08:51:47 -0000	1.2
+++ patches/patch-aa	22 Feb 2004 13:48:47 -0000
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2003/01/25 08:51:47 toshii Exp $
-
---- Makefile.in.orig	Thu Oct 31 11:53:08 2002
-+++ Makefile.in
-@@ -64,7 +64,7 @@ MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
+--- work/hpijs-1.5/Makefile.in	2004-02-21 15:13:15.000000000 -0800
++++ work/hpijs-1.5/Makefile.in.orig	2003-10-01 13:10:04.000000000 -0700
+@@ -80,7 +80,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-docdir = $(datadir)/doc/html/@PACKAGE@
++docdir = $(datadir)/doc/$(distdir)
+ ppddir = $(datadir)/ppd/HP
  
--docdir = $(datadir)/doc/$(distdir)
-+docdir = $(datadir)/doc/html/@PACKAGE@
+ @FOOMATIC_INSTALL_TRUE@foomatichook = install-foomatic
+@@ -635,7 +635,7 @@
+ install-foomatic:
+ 	mkdir -p $(DESTDIR)/$(ppddir)
+ 	rm -f $(DESTDIR)/$(ppddir)/HP*hpijs*.ppd*
+-	cp -f ppd/* $(DESTDIR)/$(ppddir)
++	cp -ax ppd/* $(DESTDIR)/$(ppddir)
+ 	gzip -f $(DESTDIR)/$(ppddir)/*
  
- 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 	dj3320.cpp dj3320.h dj3320_cmap.cpp ldlencap.h ljcolor.cpp ljcolor.h
+ uninstall-foomatic:
>Release-Note:
>Audit-Trail:
>Unformatted:
 		support models from the last few years.