Update print/ghostscript{,-nox11} to 6.0.1nb2. Changes from version

6.0.1nb1 include updating the hpijs driver to the latest released version
1.0.2.  The new HPIJS device is "ijs" and replaces several older devices:

	AP21xx DJ630 DJ6xx DJ6xxP DJ8xx DJ9xx DJ9xxVIP

So if you are using any of the above devices, you must use the new gs IJS
interface documented in:

	${PREFIX}/share/doc/html/ghostscript/hpijs/hpijs_readme.html

This update is based on pkg/15470 by IWAMOTO Toshihiro <toshii@netbsd.org>.
Changes to the HPIJS driver include:

      *	Fixed a problem printing Photo Full Bleed on the Photosmart 100.
      *	Meet the Debian Free Software Guidelines (DFSG).
      *	Fixed a setpagedevice problem with the IJS client. PageSize can now
	be set from postscript.
      *	Fixed a off-by-one error in IJS server.
      *	Added support for the following printers:

	    Deskjet 656           Photosmart 100        Apollo P-22
	    Deskjet 825/845       Photosmart 1115       Apollo P2500
	    Deskjet 920           Photosmart 1215       Apollo P2600
	    Deskjet 940/948       Photosmart 1315
	    Deskjet 995           CP 1160
	    Deskjet 1125          CP 1700
	    Deskjet 1220
	    Deskjet 2250

      *	Added support for the IJS interface.
      *	Added support for Duplex. When Duplex mode is set, top and bottom
	margins are set to 1/2 inch.
      *	Added support for the following paper sizes:

	    Photo, Photo Full Bleed, A6, B4, B5, Oufuku-Hagaki, Hagaki

      *	The PrintMode command has been replaced with separate commands:

	    Quality, ColorMode, MediaType and PenSet.

      *	Changed top margin from 1/3 to 1/8 inch. Also, changed the bottom
	margin to 1/2 inch.  Note, on the 6xx series the maximum bottom
	margin is .46 inch for black and .587 for color.  This means for
	the 6xx series, color printing to within 1/2 inch bottom margin is
	not guaranteed.

5 files changed, 39 insertions, 91 deletions

diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile
index 9454ab90e33..1f254d752c7 100644
--- a/print/ghostscript-nox11/Makefile
+++ b/print/ghostscript-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/12/20 22:31:09 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/03 21:27:20 jlam Exp $
 
 PKGNAME=	ghostscript-nox11-${GS_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Aladdin Postscript interpreter without X11 drivers
 
 CONFLICTS=	ghostscript{,-x11}-[0-9]*
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 20f747d5fe6..cb924daade1 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2002/01/11 17:00:27 fredb Exp $
+# $NetBSD: Makefile.common,v 1.29 2002/02/03 21:27:20 jlam Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -13,7 +13,8 @@ HOMEPAGE=		http://www.cs.wisc.edu/~ghost/index.html
 DEPENDS+=		ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 DEPENDS+=		watanabe-vfont-19930318:../../fonts/watanabe_vfont
 
-USE_GMAKE=		YES
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
 GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/gs${GS_VERS}
@@ -46,15 +47,19 @@ GIMPPRINT_WRKSRC=	${WRKDIR}/${GIMPPRINT}
 SITES_${GIMPPRINT_SRCS}=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 DISTFILES+=			${GIMPPRINT_SRCS}
 EXTRACT_ONLY+=			${GIMPPRINT_SRCS}
-GIMPPRINT_CONFIGURE_ARGS=	--without-gimp --with-ghost
+GIMPPRINT_CONFIGURE_ARGS=	${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}
+HPIJS_GSFILES=		gdevijs.c gdevijs.h
+HPIJS_GSFILES+=		ijs.c ijs.h ijs_client.c ijs_client.h ijs_exec_unix.c
+HPIJS_GSFILES+=		unistd_.h
 SITES_${HPIJS_SRCS}=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
 DISTFILES+=		${HPIJS_SRCS}
 EXTRACT_ONLY+=		${HPIJS_SRCS}
+HPIJS_CONFIGURE_ARGS=	${CONFIGURE_ARGS}
 
 # Additional driver for several HP deskjets
 HPDJ_DRV=		hpdj-2.6
@@ -154,43 +159,6 @@ LDFLAGS+=		-L${LOCALBASE}/bsd/lib -Wl,-R${LOCALBASE}/bsd/lib
 FPU_TYPE?=		1
 MAKE_FLAGS+=		FPU_TYPE=${FPU_TYPE}
 
-# Determine the endianness of the CPU by checking header files.
-.if !defined(MACHINE_ENDIAN)
-_ENDIAN_H_FILES=	/usr/include/sys/endian.h
-_ENDIAN_H_FILES+=	/usr/include/machine/endian.h
-_ENDIAN_H_FILES+=	/usr/include/endian.h
-_ENDIAN_H_FILES+=	/usr/include/sys/byteorder.h
-_ENDIAN_H_FILES+=	/dev/null
-.  for FILE in ${_ENDIAN_H_FILES}
-.    if exists(${FILE})
-_ENDIAN_H?=		${FILE:S/\/usr\/include\///}
-.    endif
-.  endfor
-MACHINE_ENDIAN!=							\
-	if (								\
-		${ECHO} "\#include <${_ENDIAN_H}>";			\
-		${ECHO} "\#ifndef BYTE_ORDER";				\
-		${ECHO} "\#ifdef _BIG_ENDIAN";				\
-		${ECHO} "\#define BYTE_ORDER 4321";			\
-		${ECHO} "\#else";					\
-		${ECHO} "\#define BYTE_ORDER 1234";			\
-		${ECHO} "\#endif";					\
-		${ECHO} "\#endif";					\
-		${ECHO} "BYTE_ORDER";					\
-	   ) | ${CC} -E - | ${GREP} "4321" >/dev/null 2>&1;		\
-	then								\
-		${ECHO} big;						\
-	else								\
-		${ECHO} little;						\
-	fi
-MAKEFLAGS+=	MACHINE_ENDIAN="${MACHINE_ENDIAN}"
-.  endif
-
-.if defined(MACHINE_ENDIAN) && (${MACHINE_ENDIAN} == "little")
-HPIJS_CFLAGS+=		-DIS_LITTLE_ENDIAN
-MAKE_ENV+=		HPIJS_CFLAGS="${HPIJS_CFLAGS}"
-.endif
-
 PLIST_SUBST+=		GS_VERS=${GS_VERS}vflib
 
 MAKEFRAGS=		${FILESDIR}/devs.nox11
@@ -233,33 +201,30 @@ post-patch:
 	${SED}	-e "s|epsimage\.src|${GSDATADIR}/lib/escp_24.src|g"	\
 		${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps
 
-GS_CONF_PREREQ+=	hpijs-driver
-hpijs-driver:
+GS_CONF_PREREQ+=	hpijs-configure
+hpijs-configure:
 	@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"		\
+	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
+		${CONFIGURE_ENV}					\
+		${CONFIGURE_SCRIPT} ${HPIJS_CONFIGURE_ARGS} &&		\
+	${CP} ${HPIJS_GSFILES} ${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
+GS_BUILD_PREREQ+=	hpijs-build
+hpijs-build:
+	@cd ${HPIJS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all
+
+GS_INSTALL_PREREQ+=	hpijs-install
+hpijs-install:
 	@cd ${HPIJS_WRKSRC} &&						\
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} default
+	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install docdir=${HTMLDIR}/hpijs
 
-GS_CONF_PREREQ+=	gimpprint-driver
-gimpprint-driver:
+GS_CONF_PREREQ+=	gimpprint-configure
+gimpprint-configure:
 	@cd ${GIMPPRINT_WRKSRC} &&					\
 	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
-		${CONFIGURE_ENV}					\
+		${GIMPPRINT_CONFIGURE_ENV}				\
 		${CONFIGURE_SCRIPT} ${GIMPPRINT_CONFIGURE_ARGS} &&	\
 	cd ${GIMPPRINT_WRKSRC}/src/ghost &&				\
 	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all-local &&		\
@@ -296,11 +261,12 @@ do-configure: ${GS_CONF_PREREQ}
 	) > ${WRKDIR}/unix-gcc.mak
 	${MV} -f ${WRKDIR}/unix-gcc.mak ${WRKSRC}/src
 
-post-build: hpijs-server
+post-build: ${GS_BUILD_PREREQ}
+
+post-install: ${GS_INSTALL_PREREQ}
 
 post-install:
 	strip ${PREFIX}/bin/gs
-	${INSTALL_PROGRAM} ${HPIJS_WRKSRC}/hpijs ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${GIMPPRINT_WRKSRC}/src/ghost/README		\
 		${DOCDIR}/README.stp
@@ -318,11 +284,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mje ${DOCDIR}/${MJC_DRV}
 	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV}
 	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
-	${INSTALL_DATA_DIR} ${HTMLDIR}/hpijs
-	${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
 
 .include "../../graphics/png/buildlink.mk"
 .include "../../japanese/vflib-lib/buildlink.mk"
diff --git a/print/ghostscript-nox11/PLIST b/print/ghostscript-nox11/PLIST
index 164c9042440..04192b910cd 100644
--- a/print/ghostscript-nox11/PLIST
+++ b/print/ghostscript-nox11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/12/21 04:29:10 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/03 21:27:20 jlam Exp $
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
@@ -103,14 +103,8 @@ share/doc/html/ghostscript/Unix-lpr.htm
 share/doc/html/ghostscript/Use.htm
 share/doc/html/ghostscript/Xfonts.htm
 share/doc/html/ghostscript/hpijs/append_db.sh
+share/doc/html/ghostscript/hpijs/gs_hpijs.png
 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/printerdb_append
 share/doc/html/ghostscript/ps2epsi.txt
 share/examples/ghostscript/alphabet.ps
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index bb3d6fa274f..438068d162f 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/12/20 22:31:09 jlam Exp $
+$NetBSD: distinfo,v 1.8 2002/02/03 21:27:20 jlam Exp $
 
 SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
 Size (ghostscript/ghostscript-6.01.tar.bz2) = 2974476 bytes
@@ -8,8 +8,8 @@ SHA1 (ghostscript/pdf_sec.ps) = e185f12cb8764ce2d7d32931c6dbd5e05df8722f
 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
@@ -32,6 +32,7 @@ SHA1 (ghostscript/samsung-gdi-driver.tar.gz) = d9e29d5e018a27832e5d4681221387d35
 Size (ghostscript/samsung-gdi-driver.tar.gz) = 8909 bytes
 SHA1 (ghostscript/gs6.01-jpdf-exp.patch.gz) = 21f427a4c80871edab8c4d748b1fe1b7796cd876
 Size (ghostscript/gs6.01-jpdf-exp.patch.gz) = 59034 bytes
+SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
 SHA1 (patch-ab) = 26cea522dbe2e2cc57a5fdc60130f309c76c6991
 SHA1 (patch-ac) = 576e0bc659d771f9d634921a0cc6752ab9739a92
 SHA1 (patch-ad) = 9b6e66132583a698ebef277caf343c6919f42f72
@@ -54,6 +55,5 @@ SHA1 (patch-at) = a627398bca6e9fbdc5f881d514de6b10d2c187dd
 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
diff --git a/print/ghostscript-nox11/files/devs.nox11 b/print/ghostscript-nox11/files/devs.nox11
index 59e156f4d67..f6fcb6966d1 100644
--- a/print/ghostscript-nox11/files/devs.nox11
+++ b/print/ghostscript-nox11/files/devs.nox11
@@ -1,15 +1,8 @@
-# $NetBSD: devs.nox11,v 1.4 2001/12/20 22:31:09 jlam Exp $
+# $NetBSD: devs.nox11,v 1.5 2002/02/03 21:27:20 jlam Exp $
 #
 # 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 @@ DEVICE_DEVS+=	\
 	$(DD)gdi.dev \
 	$(DD)hl7x0.dev \
 	$(DD)hpdj.dev \
-	$(DD)hpijs.dev \
+	$(DD)ijs.dev \
 	$(DD)ibmpro.dev \
 	$(DD)imagen.dev \
 	$(DD)inferno.dev \