- Update MASTER_SITES for MD2K driver

- Remove HPDJ driver completely (officially discontinued)
- Add KRGB support patch for IJS driver
- Bump GS_REVISION

Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Tested by:	Jose M Rodriguez <josemi@freebsd.jazztel.es>
PR:		ports/81962

14 files changed, 38 insertions, 164 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 99e1282..03678fc 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -12,9 +12,9 @@ PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
-		http://home.vrweb.de/~martin.lottermoser/pcl3dist/:hpdj_pcl3 \
+		http://home.vrweb.de/martin.lottermoser/pcl3dist/:pcl3 \
 		http://www.harsch.net/Download/:dj970 \
-		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
+		http://www33.ocn.ne.jp/~higamasa/gdevmd2k/:md2k \
 		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
 		ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \
 		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
@@ -31,8 +31,7 @@ MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 PKGNAMESUFFIX=	-gnu
 DISTFILES=	${GS_SRCS}:gs_srcs \
 		${HP8XX_SRCS}:hp8xx \
-		${HPDJ_SRCS}:hpdj_pcl3 \
-		${PCL3_SRCS}:hpdj_pcl3 \
+		${PCL3_SRCS}:pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
 		${MD2K_SRCS}:md2k \
@@ -59,6 +58,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
+# normazile WRKSRC so things like cups-pstoraster may work
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 CONFLICTS=	ghostscript-afpl* ghostscript-gpl*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
@@ -121,20 +123,7 @@ GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
 HP8XX=		cdj880
 HP8XX_SRCS=	gdevcd8.tar.gz
 
-# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser
-# still present, just for the case pcl3 is missing some hpdj feature
-# http://home.vrweb.de/martin.lottermoser/pcl3.html
-#
-# FIXME: This driver is no longer available at Martin Lottermoser's site!
-HPDJ=		hpdj
-HPDJ_VERS=	2.6
-HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
-HPDJ_SRCS=	${HPDJ_NAME}.tar.gz
-HPDJ_MAN1=	gs-hpdj.1
-MAN1+=		${HPDJ_MAN1}
-
-# PCL3 (hpdj successor now in RELEASE quality)
-# additional driver for HP PCL3 printers, by Martin Lottermoser
+# PCL3 - additional driver for HP PCL3 printers, by Martin Lottermoser
 # http://home.vrweb.de/martin.lottermoser/pcl3.html
 PCL3=		pcl3
 PCL3_VERS=	3.3
@@ -163,7 +152,7 @@ GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
-# http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
+# http://www33.ocn.ne.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
 MD2K_VERS=	0.2a
 MD2K_NAME=	gdevmd2k-${MD2K_VERS}
@@ -214,8 +203,8 @@ EPAG_VERS=	3.09
 EPAG_NAME=	${EPAG}-${EPAG_VERS}
 EPAG_SRCS=	${EPAG_NAME}.tar.gz
 
-# EPLASER - additional driver for ESC/Page printers (Epson Kowa developed)
-# http://www.epkowa.co.jp/english/linux_e/index.html
+# EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp.
+# http://www.avasys.jp/english/linux_e/index.html
 EPLASER=	eplaser
 EPLASER_VERS=	3.1.4
 EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
@@ -265,6 +254,8 @@ pre-everything::
 
 post-extract:
 	${ECHO_MSG} ">>> in post-extract ..."
+# normazile WRKSRC so things like cups-pstoraster may work
+	${LN} -sf ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}
 # ** 3rd party driver **
 # Note: don't forget to add those devices in scripts/configure,
 # which update unix-gcc.mak to build gs with these new devices!
@@ -272,10 +263,6 @@ post-extract:
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
-# for HPDJ driver
-	${ECHO_MSG} ">>>   extracting ${HPDJ_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS}
-	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
@@ -365,10 +352,6 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
-# for HPDJ driver
-	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
-		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
 	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
@@ -537,19 +520,6 @@ post-install:
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
-# for HPDJ driver
-	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
-.for i in ${HPDJ_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/src/${i} ${MANPREFIX}/man/man1
-.endfor
-	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
-	${MKDIR} ${DATADIR}/${GS_VERSION}/${HPDJ}
-	${ECHO_MSG} ">>>   installing files in ${HPDJ} destdir ..."
-.for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
-	margins-Letter.ps margins-LetterRotated.ps
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DATADIR}/${GS_VERSION}/${HPDJ}
-.endfor
 # for PCL3 driver
 	${ECHO_MSG} ">>>   installing ${PCL3} utility in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
@@ -590,13 +560,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}
-# for HPDJ driver
-	${ECHO_MSG} ">>>   installing ${HPDJ} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${HPDJ}
-.for i in NEWS hpdj.html
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${GS_VERSION}/${HPDJ}
-.endfor
 # for PCL3 driver
 	${ECHO_MSG} ">>>   installing ${PCL3} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${PCL3}
diff --git a/print/ghostscript-gnu/Makefile.inc b/print/ghostscript-gnu/Makefile.inc
index 927cd6e..347f709 100644
--- a/print/ghostscript-gnu/Makefile.inc
+++ b/print/ghostscript-gnu/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	7.07
-GS_REVISION=	12
+GS_REVISION=	13
 GS_EPOCH=	0
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index 3871ad5..737edea 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -2,8 +2,6 @@ MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
 SIZE (ghostscript/ghostscript-7.07.tar.bz2) = 4138372
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
-MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
-SIZE (ghostscript/hpdj-2.6.tar.gz) = 143944
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add b/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add
index 1d2c46b..e69de29 100644
--- a/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add
+++ b/print/ghostscript-gnu/files/patch-src:contrib.mak-5.94.add
@@ -1,14 +0,0 @@
---- src/contrib.mak-5.94.add.orig	Sun Oct 17 05:20:06 1999
-+++ src/contrib.mak-5.94.add	Tue Jun 19 03:20:13 2001
-@@ -102,11 +102,6 @@
- $(GLOBJ)hpdjprn.$(OBJ): $(GLSRC)hpdjprn.c
- 	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)hpdjprn.c
- 
--$(GLOBJ)pclcomp.$(OBJ): $(GLSRC)pclcomp.c
--	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pclcomp.c
--
--$(GLOBJ)pagecount.$(OBJ): $(GLSRC)pagecount.c
--	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pagecount.c
- 
- 
- $(DD)hpdj.dev: $(hpdj_) $(DD)page.dev
diff --git a/print/ghostscript-gnu/pkg-descr b/print/ghostscript-gnu/pkg-descr
index 4503558..eb7bd17 100644
--- a/print/ghostscript-gnu/pkg-descr
+++ b/print/ghostscript-gnu/pkg-descr
@@ -7,14 +7,14 @@ Public License, which allows free use, and free copying and redistribution
 under certain conditions (including, in some cases, commercial distribution).
 
 This is the older version 7, for those that can't (or don't want to) use
-the newer GhostScript version 8.
+the newer Ghostscript version 8.
 
 This port includes add-on packages (not part of the official gs release)
-	o HP2200 driver for HP DeskJet 8xx and Business Inkjet 2200
-	  - http://hp.sourceforge.net/gs-hp2200.php
+	o HP8XX driver for HP DeskJet 880C/882C/895C
+	  - http://www.gelhaus.net/hp880c/
 	o DJ970 driver for HP DeskJet 970CXi
 	  - http://www.harsch.net/Ghostscript/ghostscript.html
-	o PCL3 and HPDJ driver for HP DeskJet series
+	o PCL3 driver for HP DeskJet series
 	  - http://home.vrweb.de/martin.lottermoser/pcl3.html
 	o Gimp-Print driver for Canon/Epson/Lexmark/HP printers
 	  - http://gimp-print.sourceforge.net/
@@ -24,3 +24,4 @@ This port includes add-on packages (not part of the official gs release)
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
 WWW: http://www.cs.wisc.edu/~ghost/doc/gnu/index.htm
+     http://www.ghostscript.com/
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index ed0febe..4f496a9 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -47,8 +47,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/psprint
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gdi/README
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
@@ -128,12 +126,6 @@ share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
 share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
 share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
 share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
-share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.ARP
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Bae
@@ -369,7 +361,6 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
 share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
-@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/examples/cjk
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
@@ -380,7 +371,6 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lxm3200
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gdi
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/epag
diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure
index 7971d12..d4bc264 100644
--- a/print/ghostscript-gnu/scripts/configure
+++ b/print/ghostscript-gnu/scripts/configure
@@ -52,7 +52,7 @@ else
 		cljet5 cljet5c cljet5pr lj5mono lj5gray \
 		pj pjetxl pjxl paintjet \
 		pjxl300 pxlmono pxlcolor \
-		pcl3 hpdj \
+		pcl3 \
 		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
 		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
 		cp50 necp6 \
@@ -247,7 +247,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" "$status_pxlmono" \
   "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" "$status_pxlcolor" \
   "pcl3"     "HP PCL 3+ (generic) [PCL3]" "$status_pcl3" \
-  "hpdj"     "HP PCL 3+ (old drv.) [HPDJ]" "$status_hpdj" \
   "ijs"      "HP Inkjet and other raster devices" "$status_ijs" \
   "ibmpro"   "IBM 9-pin Proprinter" "$status_ibmpro" \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" "$status_jetp3852" \
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 99e1282..03678fc 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -12,9 +12,9 @@ PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
-		http://home.vrweb.de/~martin.lottermoser/pcl3dist/:hpdj_pcl3 \
+		http://home.vrweb.de/martin.lottermoser/pcl3dist/:pcl3 \
 		http://www.harsch.net/Download/:dj970 \
-		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
+		http://www33.ocn.ne.jp/~higamasa/gdevmd2k/:md2k \
 		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
 		ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \
 		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
@@ -31,8 +31,7 @@ MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 PKGNAMESUFFIX=	-gnu
 DISTFILES=	${GS_SRCS}:gs_srcs \
 		${HP8XX_SRCS}:hp8xx \
-		${HPDJ_SRCS}:hpdj_pcl3 \
-		${PCL3_SRCS}:hpdj_pcl3 \
+		${PCL3_SRCS}:pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
 		${MD2K_SRCS}:md2k \
@@ -59,6 +58,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
+# normazile WRKSRC so things like cups-pstoraster may work
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 CONFLICTS=	ghostscript-afpl* ghostscript-gpl*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
@@ -121,20 +123,7 @@ GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
 HP8XX=		cdj880
 HP8XX_SRCS=	gdevcd8.tar.gz
 
-# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser
-# still present, just for the case pcl3 is missing some hpdj feature
-# http://home.vrweb.de/martin.lottermoser/pcl3.html
-#
-# FIXME: This driver is no longer available at Martin Lottermoser's site!
-HPDJ=		hpdj
-HPDJ_VERS=	2.6
-HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
-HPDJ_SRCS=	${HPDJ_NAME}.tar.gz
-HPDJ_MAN1=	gs-hpdj.1
-MAN1+=		${HPDJ_MAN1}
-
-# PCL3 (hpdj successor now in RELEASE quality)
-# additional driver for HP PCL3 printers, by Martin Lottermoser
+# PCL3 - additional driver for HP PCL3 printers, by Martin Lottermoser
 # http://home.vrweb.de/martin.lottermoser/pcl3.html
 PCL3=		pcl3
 PCL3_VERS=	3.3
@@ -163,7 +152,7 @@ GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
-# http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
+# http://www33.ocn.ne.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
 MD2K_VERS=	0.2a
 MD2K_NAME=	gdevmd2k-${MD2K_VERS}
@@ -214,8 +203,8 @@ EPAG_VERS=	3.09
 EPAG_NAME=	${EPAG}-${EPAG_VERS}
 EPAG_SRCS=	${EPAG_NAME}.tar.gz
 
-# EPLASER - additional driver for ESC/Page printers (Epson Kowa developed)
-# http://www.epkowa.co.jp/english/linux_e/index.html
+# EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp.
+# http://www.avasys.jp/english/linux_e/index.html
 EPLASER=	eplaser
 EPLASER_VERS=	3.1.4
 EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
@@ -265,6 +254,8 @@ pre-everything::
 
 post-extract:
 	${ECHO_MSG} ">>> in post-extract ..."
+# normazile WRKSRC so things like cups-pstoraster may work
+	${LN} -sf ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}
 # ** 3rd party driver **
 # Note: don't forget to add those devices in scripts/configure,
 # which update unix-gcc.mak to build gs with these new devices!
@@ -272,10 +263,6 @@ post-extract:
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
-# for HPDJ driver
-	${ECHO_MSG} ">>>   extracting ${HPDJ_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS}
-	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
@@ -365,10 +352,6 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
-# for HPDJ driver
-	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
-		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
 	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
@@ -537,19 +520,6 @@ post-install:
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
-# for HPDJ driver
-	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
-.for i in ${HPDJ_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/src/${i} ${MANPREFIX}/man/man1
-.endfor
-	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
-	${MKDIR} ${DATADIR}/${GS_VERSION}/${HPDJ}
-	${ECHO_MSG} ">>>   installing files in ${HPDJ} destdir ..."
-.for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
-	margins-Letter.ps margins-LetterRotated.ps
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DATADIR}/${GS_VERSION}/${HPDJ}
-.endfor
 # for PCL3 driver
 	${ECHO_MSG} ">>>   installing ${PCL3} utility in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
@@ -590,13 +560,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}
-# for HPDJ driver
-	${ECHO_MSG} ">>>   installing ${HPDJ} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${HPDJ}
-.for i in NEWS hpdj.html
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${GS_VERSION}/${HPDJ}
-.endfor
 # for PCL3 driver
 	${ECHO_MSG} ">>>   installing ${PCL3} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${PCL3}
diff --git a/print/ghostscript7/Makefile.inc b/print/ghostscript7/Makefile.inc
index 927cd6e..347f709 100644
--- a/print/ghostscript7/Makefile.inc
+++ b/print/ghostscript7/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	7.07
-GS_REVISION=	12
+GS_REVISION=	13
 GS_EPOCH=	0
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index 3871ad5..737edea 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -2,8 +2,6 @@ MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
 SIZE (ghostscript/ghostscript-7.07.tar.bz2) = 4138372
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
-MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
-SIZE (ghostscript/hpdj-2.6.tar.gz) = 143944
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript7/files/patch-src:contrib.mak-5.94.add b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
index 1d2c46b..e69de29 100644
--- a/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
+++ b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
@@ -1,14 +0,0 @@
---- src/contrib.mak-5.94.add.orig	Sun Oct 17 05:20:06 1999
-+++ src/contrib.mak-5.94.add	Tue Jun 19 03:20:13 2001
-@@ -102,11 +102,6 @@
- $(GLOBJ)hpdjprn.$(OBJ): $(GLSRC)hpdjprn.c
- 	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)hpdjprn.c
- 
--$(GLOBJ)pclcomp.$(OBJ): $(GLSRC)pclcomp.c
--	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pclcomp.c
--
--$(GLOBJ)pagecount.$(OBJ): $(GLSRC)pagecount.c
--	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pagecount.c
- 
- 
- $(DD)hpdj.dev: $(hpdj_) $(DD)page.dev
diff --git a/print/ghostscript7/pkg-descr b/print/ghostscript7/pkg-descr
index 4503558..eb7bd17 100644
--- a/print/ghostscript7/pkg-descr
+++ b/print/ghostscript7/pkg-descr
@@ -7,14 +7,14 @@ Public License, which allows free use, and free copying and redistribution
 under certain conditions (including, in some cases, commercial distribution).
 
 This is the older version 7, for those that can't (or don't want to) use
-the newer GhostScript version 8.
+the newer Ghostscript version 8.
 
 This port includes add-on packages (not part of the official gs release)
-	o HP2200 driver for HP DeskJet 8xx and Business Inkjet 2200
-	  - http://hp.sourceforge.net/gs-hp2200.php
+	o HP8XX driver for HP DeskJet 880C/882C/895C
+	  - http://www.gelhaus.net/hp880c/
 	o DJ970 driver for HP DeskJet 970CXi
 	  - http://www.harsch.net/Ghostscript/ghostscript.html
-	o PCL3 and HPDJ driver for HP DeskJet series
+	o PCL3 driver for HP DeskJet series
 	  - http://home.vrweb.de/martin.lottermoser/pcl3.html
 	o Gimp-Print driver for Canon/Epson/Lexmark/HP printers
 	  - http://gimp-print.sourceforge.net/
@@ -24,3 +24,4 @@ This port includes add-on packages (not part of the official gs release)
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
 WWW: http://www.cs.wisc.edu/~ghost/doc/gnu/index.htm
+     http://www.ghostscript.com/
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index ed0febe..4f496a9 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -47,8 +47,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/psprint
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gdi/README
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
@@ -128,12 +126,6 @@ share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
 share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
 share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
 share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
-share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.ARP
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Bae
@@ -369,7 +361,6 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
 share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
-@dirrm share/ghostscript/%%GS_VERSION%%/hpdj
 @dirrm share/ghostscript/%%GS_VERSION%%/examples/cjk
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
@@ -380,7 +371,6 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lxm3200
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gdi
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/epag
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index 7971d12..d4bc264 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -52,7 +52,7 @@ else
 		cljet5 cljet5c cljet5pr lj5mono lj5gray \
 		pj pjetxl pjxl paintjet \
 		pjxl300 pxlmono pxlcolor \
-		pcl3 hpdj \
+		pcl3 \
 		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
 		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
 		cp50 necp6 \
@@ -247,7 +247,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" "$status_pxlmono" \
   "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" "$status_pxlcolor" \
   "pcl3"     "HP PCL 3+ (generic) [PCL3]" "$status_pcl3" \
-  "hpdj"     "HP PCL 3+ (old drv.) [HPDJ]" "$status_hpdj" \
   "ijs"      "HP Inkjet and other raster devices" "$status_ijs" \
   "ibmpro"   "IBM 9-pin Proprinter" "$status_ibmpro" \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" "$status_jetp3852" \