>Number:         15470
>Category:       pkg
>Synopsis:       update hpijs in ghostscript-nox11
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 03 07:30:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     IWAMOTO Toshihiro
>Release:        1.5ZA, userland 1.5K
>Organization:
A lazy NetBSD developer
>Environment:
	
System: NetBSD kiku.my.domain 1.5ZA NetBSD 1.5ZA (KIKU) #119: Sat Jan 19 16:44:40 JST 2002 toshii@kiku.my.domain:/usr/src/syssrc/sys/arch/i386/compile/KIKU i386
Architecture: i386
Machine: i386
>Description:
	Newer version of hpijs driver for ghostscript is available.
	It supports duplex mode on deskjet990.
	http://hpinkjet.sourceforge.net/updates.php contains a summary of
	the changes from the current pkgsrc version.

	I send this pr instead of just committing because my patch may be
	incomplete.  If I receive no response about this, I'll commit
	in the next weekend.

>How-To-Repeat:
	N/A
>Fix:
	Apply the following patch:

Index: Makefile.common
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/print/ghostscript-nox11/Makefile.common,v
retrieving revision 1.28
diff -u -r1.28 Makefile.common
--- Makefile.common	2002/01/11 17:00:27	1.28
+++ Makefile.common	2002/02/03 11:09:21
@@ -49,7 +49,7 @@
 GIMPPRINT_CONFIGURE_ARGS=	--without-gimp --with-ghost
 
 # Drivers from the HP Inkjet Project (IJS/HPIJS)
-HPIJS_DRV=		hpijs0.97
+HPIJS_DRV=		hpijs-1.0.2
 HPIJS_SRCS=		${HPIJS_DRV}.tar.gz
 HPIJS_WRKSRC=		${WRKDIR}/${HPIJS_DRV}
 SITES_${HPIJS_SRCS}=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
@@ -236,24 +236,17 @@
 GS_CONF_PREREQ+=	hpijs-driver
 hpijs-driver:
 	@cd ${HPIJS_WRKSRC} &&						\
-	${CP} gdevhpij.* ${WRKSRC}/src &&				\
-	${HEAD} -474 contrib.mak | ${TAIL} -31 |			\
-		${SED}	-e "s|\$$(GLSRC)\([^ ]*\.dev\)|\$$(DD)\1|g"	\
-			-e "s|\(\$$(SETPDEV) \)|\1\$$(DD)|g"		\
+	${CP} gdevijs.* ijs* unistd_.h ${WRKSRC}/src &&			\
+	${HEAD} -518 contrib.mak | ${TAIL} -20				\
 		>> ${WRKSRC}/src/contrib.mak
 
 hpijs-server:
 	@cd ${HPIJS_WRKSRC} &&						\
-	for file in							\
-		aladdin.h compression.cpp				\
-		ernieplatform.h versioncode.cpp;			\
-	do								\
-		${SED}	-e "s|_LITTLE_ENDIAN|IS_LITTLE_ENDIAN|g"	\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-	@cd ${HPIJS_WRKSRC} &&						\
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} default
+	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
+		${CONFIGURE_ENV}					\
+		${CONFIGURE_SCRIPT} ${HPIJS_CONFIGURE_ARGS} &&		\
+	cd ${HPIJS_WRKSRC} &&						\
+	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 
 GS_CONF_PREREQ+=	gimpprint-driver
 gimpprint-driver:
@@ -322,7 +315,7 @@
 	${INSTALL_DATA} ${HPIJS_WRKSRC}/append_db.sh ${HTMLDIR}/hpijs
 	${INSTALL_DATA} ${HPIJS_WRKSRC}/printerdb_append ${HTMLDIR}/hpijs
 	${INSTALL_DATA} ${HPIJS_WRKSRC}/hpijs_readme.html ${HTMLDIR}/hpijs
-	${INSTALL_DATA} ${HPIJS_WRKSRC}/*.jpg ${HTMLDIR}/hpijs
+	${INSTALL_DATA} ${HPIJS_WRKSRC}/*.png ${HTMLDIR}/hpijs
 
 .include "../../graphics/png/buildlink.mk"
 .include "../../japanese/vflib-lib/buildlink.mk"
Index: PLIST
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/print/ghostscript-nox11/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	2001/12/21 04:29:10	1.3
+++ PLIST	2002/02/03 11:09:21
@@ -104,13 +104,7 @@
 share/doc/html/ghostscript/Xfonts.htm
 share/doc/html/ghostscript/hpijs/append_db.sh
 share/doc/html/ghostscript/hpijs/hpijs_readme.html
-share/doc/html/ghostscript/hpijs/gs_apdk.jpg
-share/doc/html/ghostscript/hpijs/printtool.jpg
-share/doc/html/ghostscript/hpijs/printtool2.jpg
-share/doc/html/ghostscript/hpijs/printtool3.jpg
-share/doc/html/ghostscript/hpijs/printtool4.jpg
-share/doc/html/ghostscript/hpijs/printtool5.jpg
-share/doc/html/ghostscript/hpijs/printtool7.jpg
+share/doc/html/ghostscript/hpijs/gs_hpijs.png
 share/doc/html/ghostscript/hpijs/printerdb_append
 share/doc/html/ghostscript/ps2epsi.txt
 share/examples/ghostscript/alphabet.ps
Index: distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/print/ghostscript-nox11/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	2001/12/20 22:31:09	1.7
+++ distinfo	2002/02/03 11:09:22
@@ -8,8 +8,8 @@
 Size (ghostscript/pdf_sec.ps) = 11158 bytes
 SHA1 (ghostscript/gimp-print-4.2.0.tar.gz) = 3460b23a1c36c7f5dcfacc8dce5d0ee5f051a086
 Size (ghostscript/gimp-print-4.2.0.tar.gz) = 4501914 bytes
-SHA1 (ghostscript/hpijs0.97.tar.gz) = 5f0dd18c71d6b33d4ed6fe4924031257e78e8e06
-Size (ghostscript/hpijs0.97.tar.gz) = 386722 bytes
+SHA1 (ghostscript/hpijs-1.0.2.tar.gz) = 027cc3762737eb25c6c4dc303924de2b0945cd65
+Size (ghostscript/hpijs-1.0.2.tar.gz) = 284472 bytes
 SHA1 (ghostscript/hpdj-2.6.tar.gz) = 1767295652292ab00b6859cf6699939be44e49e7
 Size (ghostscript/hpdj-2.6.tar.gz) = 143944 bytes
 SHA1 (ghostscript/dmprt-2.01.tar.gz) = 179c7bf3d0fde128e1ad8c7142301efa7ccb8ab0
@@ -54,6 +54,5 @@
 SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
 SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
 SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
-SHA1 (patch-ax) = 8d563208807aff24ea502e56633da0950afa2835
 SHA1 (patch-ay) = a39a1e27a2f8437103a93ac06e5f857ec5e32fa3
 SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
Index: files/devs.nox11
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/print/ghostscript-nox11/files/devs.nox11,v
retrieving revision 1.4
diff -u -r1.4 devs.nox11
--- files/devs.nox11	2001/12/20 22:31:09	1.4
+++ files/devs.nox11	2002/02/03 11:09:22
@@ -3,13 +3,6 @@
 # non-X11 drivers for Ghostscript
 
 DEVICE_DEVS+=	\
-	$(DD)AP21xx.dev \
-	$(DD)DJ630.dev \
-	$(DD)DJ6xx.dev \
-	$(DD)DJ6xxP.dev \
-	$(DD)DJ8xx.dev \
-	$(DD)DJ9xx.dev \
-	$(DD)DJ9xxVIP.dev \
 	$(DD)ap3250.dev \
 	$(DD)appledmp.dev \
 	$(DD)bit.dev \
@@ -70,7 +63,7 @@
 	$(DD)gdi.dev \
 	$(DD)hl7x0.dev \
 	$(DD)hpdj.dev \
-	$(DD)hpijs.dev \
+	$(DD)ijs.dev \
 	$(DD)ibmpro.dev \
 	$(DD)imagen.dev \
 	$(DD)inferno.dev \
>Release-Note:
>Audit-Trail:
>Unformatted: