- Update the additional hp850 driver to newest release 1.3

- Since the author decided to put a version number into his archive,
  we can now safely fetch the file from his site.
- patch-ad is useless now
- updated the configure and configure.batch script, to show all possible
  drivers
- install hp850 drivers license and readme file in the gs doc dir
- update the DESCR file, mention the two add on packages in this port
- The new driver supports the following additional printers:
  Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
  See announcement on http://bonk.ethz.ch/hp850/hp850.html
Please note, that some of the drivers have certain restrictions
and produce huge output files ... Please read the release notes !!!
The author makes suggestions on his website, what driver to choose
if you need a fast printout, see
	http://bonk.ethz.ch/hp850/hp850-readme.1.3.html

7 files changed, 44 insertions, 22 deletions

diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 068978971c39..20cc68f5cf69 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -3,13 +3,13 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.19 1998/04/01 01:43:05 asami Exp $
+# $Id: Makefile,v 1.20 1998/04/19 18:34:50 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.10
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
-		http://freefall.freebsd.org/~andreas/download/ \
+		ftp://bonk.ethz.ch/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${DECRYPT_PDF}
@@ -36,7 +36,7 @@ GS_FONTS_STD=	ghostscript-fonts-std-5.10.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
 # Additional driver HP 850, see http://bonk.ethz.ch/hp850/hp850.html
-HP850_DRV=	hp850-1.2.zip
+HP850_DRV=	hp8xxs13.zip
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
@@ -61,7 +61,7 @@ post-extract:
 	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg-6b
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-1.0.1 ${WRKSRC}/libpng
-	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
+	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
 
 do-configure:
 .if defined(BATCH)
@@ -79,9 +79,14 @@ pre-install:
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
 			tar -xzf ${DISTDIR}/${GS_FONTS_OTHER})
 
+# install the readme and license file of the hp8xxx driver as well
 post-install:
 	strip ${PREFIX}/bin/gs
 	${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
 		${PREFIX}/share/ghostscript/5.10
+	${INSTALL_DATA} ${DISTDIR}/license.hp8 \
+		${PREFIX}/share/ghostscript/5.10/doc
+	${INSTALL_DATA} ${DISTDIR}/readme.hp8 \
+		${PREFIX}/share/ghostscript/5.10/doc
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index e5eaf7f3ce82..6daaf3cc70c7 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -2,5 +2,5 @@ MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (ghostscript-5.10gnu.tar.gz) = 6706117129a5f63dff3a5a2bf4258630
 MD5 (ghostscript-fonts-std-5.10.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-5.10.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
-MD5 (hp850-1.2.zip) = e37477210305e027c45f82d04d1613d1
+MD5 (hp8xxs13.zip) = 070ece77d5e4534b8fc0a5f095addfb0
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript7/files/patch-aa b/print/ghostscript7/files/patch-aa
index a85c443dd632..475af97f4c75 100644
--- a/print/ghostscript7/files/patch-aa
+++ b/print/ghostscript7/files/patch-aa
@@ -1,5 +1,5 @@
 --- unix-gcc.mak.orig	Tue Nov 25 03:29:01 1997
-+++ unix-gcc.mak	Sun Apr 19 19:34:18 1998
++++ unix-gcc.mak	Thu Jun  4 21:44:45 1998
 @@ -130,7 +130,7 @@
  # You may need to change this if the IJG library version changes.
  # See jpeg.mak for more information.
@@ -130,7 +130,7 @@
  
  infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
  	$(CP_) $(ZSRC)infblock.c .
-@@ -4584,8 +4584,13 @@
+@@ -4584,8 +4584,22 @@
  
  cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
  
@@ -139,8 +139,17 @@
  cdeskjet.dev: $(cdeskjet_) page.dev
  	$(SETPDEV) cdeskjet $(cdeskjet_)
 +
++cdj670.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj670 $(cdeskjet8_)
++
 +cdj850.dev: $(cdeskjet8_) page.dev
 +	$(SETPDEV) cdj850 $(cdeskjet8_)
++
++cdj890.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj890 $(cdeskjet8_)
++
++cdj1600.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj1600 $(cdeskjet8_)
  
  cdjcolor.dev: $(cdeskjet_) page.dev
  	$(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript7/pkg-descr b/print/ghostscript7/pkg-descr
index f6a390ab85f9..ed75b6ea01b3 100644
--- a/print/ghostscript7/pkg-descr
+++ b/print/ghostscript7/pkg-descr
@@ -1,20 +1,23 @@
-This is Aladdin Ghostscript, the non-GPL version that comes
-with a licence different from the GPL. Read the file PUBLIC in the
-work/gsX.Y directory or in /usr/local/share/ghostscript/X.Y/doc/PUBLIC
-after installation for details !
+This is Aladdin Ghostscript, the non-GPL version that comes with a licence
+different from the GPL. Read the file PUBLIC in the work/gsX.Y directory or
+in ${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
 
-Ghostscript is the well-known PostScript interpreter which is
-available for all common and most esoteric platforms and supports
-many different printers and some displays.
+Ghostscript is the well-known PostScript interpreter which is available for
+all common and most esoteric platforms and supports many different printers
+and some displays.
 
-The official ghostscript Web page:
+Official ghostscript homepage, see:
 	http://www.cs.wisc.edu/~ghost/index.html
 
-Thomas Merz has written a Ghostscript manual which is available in
-PDF from this site (456k) and also from Thomas Merz's site in Germany.
-
+This FreeBSD port includes two useful add-on packages:
+	o Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
+	  see announcement on
+		 http://bonk.ethz.ch/hp850/hp850.html
+	o Support for pdfencrypt, see description on
+	  	http://www.ozemail.com.au/~geoffk/pdfencrypt/
+		
+Thomas Merz has written a Ghostscript manual in PDF format:
 	http://www.cs.wisc.edu/~ghost/merz.html
 
-On the german site the manual is also available in German language.
-
+The manual is also available in German language, see:
 	http://www.muc.de/~tm/free/free.html
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index db30576f3d49..ae66b158c069 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -63,6 +63,7 @@ share/ghostscript/5.10/doc/history3.txt
 share/ghostscript/5.10/doc/humor.txt
 share/ghostscript/5.10/doc/install.txt
 share/ghostscript/5.10/doc/language.txt
+share/ghostscript/5.10/doc/license.hp8
 share/ghostscript/5.10/doc/lib.txt
 share/ghostscript/5.10/doc/make.txt
 share/ghostscript/5.10/doc/new-user.txt
@@ -70,6 +71,7 @@ share/ghostscript/5.10/doc/ps2epsi.txt
 share/ghostscript/5.10/doc/ps2pdf.txt
 share/ghostscript/5.10/doc/psfiles.txt
 share/ghostscript/5.10/doc/public.txt
+share/ghostscript/5.10/doc/readme.hp8
 share/ghostscript/5.10/doc/unix-lpr.txt
 share/ghostscript/5.10/doc/use.txt
 share/ghostscript/5.10/doc/xfonts.txt
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index a099d996f396..2bddd0ff9663 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -30,7 +30,10 @@ Have fun with this new configuration style !     -andreas \n\n\
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
   "cdj500"   "HP DeskJet 500C (same as cdjcolor)" ON \
   "cdj550"   "HP DeskJet 550C/560C" ON \
-  "cdj850"   "HP DeskJet 850/855/870/890" ON \
+  "cdj670"   "HP DeskJet 670/690" ON \
+  "cdj850"   "HP DeskJet 850/855/870/1100" ON \
+  "cdj890"   "HP DeskJet 890" ON \
+  "cdj1600"  "HP DeskJet 1600" ON \
   "cp50"     "Mitsubishi CP50 color" ON \
   "declj250" "alternate DEC LJ250 driver" ON \
   "deskjet"  "HP DeskJet and DeskJet Plus" ON \
diff --git a/print/ghostscript7/scripts/configure.batch b/print/ghostscript7/scripts/configure.batch
index fe9c8d6918a9..b7735752554c 100644
--- a/print/ghostscript7/scripts/configure.batch
+++ b/print/ghostscript7/scripts/configure.batch
@@ -4,7 +4,7 @@
 touch ${WRKSRC}/makefile
 
 cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.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 cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev lq850.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.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 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 cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.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 pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.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 cdj670.dev cdj850.dev cdj890.dev cdj1600.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev lq850.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.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 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 cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.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 pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices