Add 'hpdj' generic PCL3/3+ ghostscript driver which supports C-Ret and other

enhancements.

7 files changed, 62 insertions, 17 deletions

diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 075312b100c..036f4d9a2e6 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 1999/10/17 23:47:37 simonb Exp $
+# $NetBSD: Makefile,v 1.40 1999/11/15 11:36:04 rh Exp $
 #
 
 DISTNAME=	ghostscript-5.50
@@ -6,9 +6,10 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
-		http://www.ozemail.com.au/~geoffk/pdfencrypt/
+		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${HP850_DRV} ${PDF_SEC}
+		${HP850_DRV} ${HPDJ_DRV} ${PDF_SEC}
 
 PATCH_SITES=	http://www.cs.wisc.edu/~ghost/aladdin/relnotes/gs550/
 PATCHFILES=	990524.txt 990220c.txt 990220b.txt 990220a.txt 990220.txt \
@@ -26,7 +27,7 @@ DEPENDS=	png-1.0.3:../../graphics/png
 
 USE_X11=	yes
 DIST_SUBDIR=	${DISTNAME:C/-.*$//}
-EXTRACT_ONLY=	${GS_SOURCES}
+EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
 WRKSRC=		${WRKDIR}/gs5.50
 MAKEFILE=	unix-gcc.mak
 ALL_TARGET=	std
@@ -51,6 +52,10 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 # Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
 HP850_DRV=	hp8xxs13.zip
 
+# Additional driver for several HP deskjets
+HPDJ_VER=	2.6
+HPDJ_DRV=	hpdj-${HPDJ_VER}.tar.gz
+
 # PostScript source to decode encrypted PDF files
 PDF_SEC=	pdf_sec.ps
 
@@ -61,6 +66,7 @@ PAPERSIZE_DEF=	-DA4
 SCRIPT_SUFFIX=	.batch
 
 post-extract:
+	${GTAR} -xf ${WRKDIR}/hpdj-${HPDJ_VER}/hpdj.tar -C ${WRKSRC}
 	${RM} -f ${WRKSRC}/jpeg
 	${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
 	cd ${WRKSRC} && unzip -uLa ${_DISTDIR}/${HP850_DRV}
@@ -71,6 +77,8 @@ pre-patch:
 	@${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
 	@${LN} -s . ${WRKSRC}/lib
 	@${LN} -s . ${WRKSRC}/src
+	@${PATCH} ${PATCH_ARGS} < ${WRKSRC}/zmedia2.c-5.50.diff
+	@${CAT} ${WRKSRC}/contrib.mak-5.50.add >>${WRKSRC}/contrib.mak
 
 post-patch:
 	@${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
diff --git a/print/ghostscript5/files/md5 b/print/ghostscript5/files/md5
index 729d948a9ec..35ed1213245 100644
--- a/print/ghostscript5/files/md5
+++ b/print/ghostscript5/files/md5
@@ -1,10 +1,11 @@
-$NetBSD: md5,v 1.11 1999/07/18 21:54:17 tron Exp $
+$NetBSD: md5,v 1.12 1999/11/15 11:36:09 rh Exp $
 
 MD5 (ghostscript/ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
 MD5 (ghostscript/ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
 MD5 (ghostscript/ghostscript-fonts-std-5.10a.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (ghostscript/ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
 MD5 (ghostscript/hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
+MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (ghostscript/990524.txt) = fa938c0f9a5c2848ca040b0ad3ecf1ac
 MD5 (ghostscript/990220c.txt) = e6b7f7b715d63e32688ed0917d8bf6fc
diff --git a/print/ghostscript5/files/patch-sum b/print/ghostscript5/files/patch-sum
index 4d4162e6816..8b20e86a641 100644
--- a/print/ghostscript5/files/patch-sum
+++ b/print/ghostscript5/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:00 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/15 11:36:09 rh Exp $
 
-MD5 (patch-aa) = aa3df2dc1d66c62d1e99eb4d1365dde0
+MD5 (patch-aa) = 9352d793f10faf5d43f9a03651b86685
 MD5 (patch-ab) = 9b2c0662b1f8e65c3dab1abd5b6f3f88
 MD5 (patch-af) = fe0ee02b0925399aa6f3216b77482346
 MD5 (patch-ag) = af60f2d8c2dc97609ee6240596abd32c
+MD5 (patch-ah) = 3e8217b7a5494c9623eda655ae88bbc7
+MD5 (patch-ai) = 0bbd7840cb931e18def4ebd1415abbdc
diff --git a/print/ghostscript5/patches/patch-aa b/print/ghostscript5/patches/patch-aa
index 77224a4f285..127f7f15c27 100644
--- a/print/ghostscript5/patches/patch-aa
+++ b/print/ghostscript5/patches/patch-aa
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.6 1998/11/12 14:37:14 agc Exp $
+$NetBSD: patch-aa,v 1.7 1999/11/15 11:36:10 rh Exp $
 
---- unix-gcc.mak.orig	Thu Sep 17 02:06:06 1998
-+++ unix-gcc.mak	Wed Nov  4 19:33:28 1998
-@@ -141,7 +141,7 @@
+--- unix-gcc.mak.orig	Thu Sep 17 08:06:06 1998
++++ unix-gcc.mak	Sun Nov 14 15:23:46 1999
+@@ -1,3 +1,4 @@
++DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev cljet5.dev deskjet.dev djet500.dev laserjet.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev oce9050.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev jpeg.dev jpeggray.dev miff24.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev plan9bm.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cdj670.dev cdj890.dev cdj1600.dev cp50.dev declj250.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev hl7x0.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev lj4dith.dev lp8000.dev lq850.dev m8510.dev necp6.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev cif.dev inferno.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev sgirgb.dev hpdj.dev
+ #    Copyright (C) 1997, 1998 Aladdin Enterprises.  All rights reserved.
+ # 
+ # This file is part of Aladdin Ghostscript.
+@@ -141,7 +142,7 @@
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -11,7 +16,7 @@ $NetBSD: patch-aa,v 1.6 1998/11/12 14:37:14 agc Exp $
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -153,7 +153,7 @@
+@@ -153,7 +154,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -20,7 +25,7 @@ $NetBSD: patch-aa,v 1.6 1998/11/12 14:37:14 agc Exp $
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -224,7 +224,7 @@
+@@ -224,7 +225,7 @@
  # SVR4 may need -lnsl.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -29,7 +34,7 @@ $NetBSD: patch-aa,v 1.6 1998/11/12 14:37:14 agc Exp $
  
  # Define the include switch(es) for the X11 header files.
  # This can be null if handled in some other way (e.g., the files are
-@@ -234,7 +234,7 @@
+@@ -234,7 +235,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -38,7 +43,7 @@ $NetBSD: patch-aa,v 1.6 1998/11/12 14:37:14 agc Exp $
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -246,12 +246,12 @@
+@@ -246,12 +247,12 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
@@ -54,7 +59,7 @@ $NetBSD: patch-aa,v 1.6 1998/11/12 14:37:14 agc Exp $
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -295,23 +295,23 @@
+@@ -295,23 +296,23 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
diff --git a/print/ghostscript5/patches/patch-ah b/print/ghostscript5/patches/patch-ah
new file mode 100644
index 00000000000..d40bf54ecec
--- /dev/null
+++ b/print/ghostscript5/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 1999/11/15 11:36:10 rh Exp $
+
+--- unixinst.mak.orig	Tue Sep 15 04:03:52 1998
++++ unixinst.mak	Sun Nov 14 12:01:40 1999
+@@ -48,7 +48,7 @@
+ 	do if ( test -f $$f ); then $(INSTALL_PROGRAM) $$f $(scriptdir)/$$f; fi;\
+ 	done'
+ 
+-MAN1_PAGES=gs pdf2dsc pdf2ps ps2ascii ps2epsi ps2pdf ps2ps
++MAN1_PAGES=gs pdf2dsc pdf2ps ps2ascii ps2epsi ps2pdf ps2ps gs-hpdj
+ install-data: gs.1
+ 	-mkdir $(mandir)
+ 	-mkdir $(man1dir)
diff --git a/print/ghostscript5/patches/patch-ai b/print/ghostscript5/patches/patch-ai
new file mode 100644
index 00000000000..7178cf2b216
--- /dev/null
+++ b/print/ghostscript5/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 1999/11/15 11:36:10 rh Exp $
+
+--- pagecount.c.orig	Sun Nov 15 12:33:04 1998
++++ pagecount.c	Sun Nov 14 15:54:12 1999
+@@ -33,10 +33,6 @@
+ 
+ /*****************************************************************************/
+ 
+-#ifndef _XOPEN_SOURCE
+-#define _XOPEN_SOURCE	500
+-#endif
+-
+ /* Standard headers */
+ #include <errno.h>
+ #include <stdio.h>
diff --git a/print/ghostscript5/pkg/PLIST b/print/ghostscript5/pkg/PLIST
index 51121db00c1..6c453e4e9bf 100644
--- a/print/ghostscript5/pkg/PLIST
+++ b/print/ghostscript5/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/11/04 21:42:13 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/11/15 11:36:10 rh Exp $
 bin/bdftops
 bin/dvipdf
 bin/font2c
@@ -18,6 +18,7 @@ bin/ps2pdf
 bin/ps2ps
 bin/wftopfa
 man/man1/gs.1
+man/man1/gs-hpdj.1
 man/man1/pdf2dsc.1
 man/man1/pdf2ps.1
 man/man1/ps2ascii.1