From d047fba8feb898ea0edb39af0aadf1925d9f1943 Mon Sep 17 00:00:00 2001
From: Ying-Chieh Liao <ijliao@FreeBSD.org>
Date: Fri, 10 May 2002 03:15:19 +0000
Subject: [PATCH] Spin off HPIJS driver

PR:		37890, 37891
Submitted by:	Ports Fury
---
 print/ghostscript-afpl/Makefile  | 46 +++----------------------------
 print/ghostscript-afpl/distinfo  |  1 -
 print/ghostscript-afpl/pkg-plist |  4 ---
 print/ghostscript-gnu/Makefile   | 47 ++++----------------------------
 print/ghostscript-gnu/distinfo   |  1 -
 print/ghostscript-gnu/pkg-plist  |  4 ---
 print/ghostscript-gpl/Makefile   | 46 +++----------------------------
 print/ghostscript-gpl/distinfo   |  1 -
 print/ghostscript-gpl/pkg-plist  |  4 ---
 print/ghostscript7/Makefile      | 47 ++++----------------------------
 print/ghostscript7/distinfo      |  1 -
 print/ghostscript7/pkg-plist     |  4 ---
 print/ghostscript8/Makefile      | 46 +++----------------------------
 print/ghostscript8/distinfo      |  1 -
 print/ghostscript8/pkg-plist     |  4 ---
 15 files changed, 22 insertions(+), 235 deletions(-)

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 3f6fbcbef645..5515938a93d2 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.04
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -21,10 +21,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
-MASTER_SITE_SUBDIR=	${PORTNAME} \
-			gimp-print/:gprint \
-			hpinkjet/:hpijs \
-			ghostscript/:ports_jp
+MASTER_SITE_SUBDIR=	ghostscript/:DEFAULT,fonts,ports_jp \
+			gimp-print/:gprint
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:DEFAULT \
 		${GS_FONTS_STD}:fonts \
@@ -34,7 +32,6 @@ DISTFILES=	${GS_SRCS}:DEFAULT \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
-		${HPIJS_SRCS}:hpijs \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp \
 		${BJ10V_SRCS}:ports_jp \
@@ -147,13 +144,6 @@ GPRINT_VERS=	4.2.1
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
-# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed)
-# http://hpinkjet.sourceforge.net/
-HPIJS=		hpijs
-HPIJS_VERS=	1.0.4
-HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
-HPIJS_SRCS=	${HPIJS_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -257,9 +247,6 @@ post-extract:
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   extracting ${HPIJS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -303,12 +290,6 @@ post-patch:
 		${WRKSRC}/src/unixinst.mak
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/lib/gs_res.ps
-# for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
-		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' \
-			${WRKSRC}/${HPIJS_NAME}/configure
-	${PERL} -pi -e 's|#include <malloc.h>||g' \
-		${WRKSRC}/${HPIJS_NAME}/platform.h
 # for DMPRT driver
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g ; \
 		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
@@ -400,11 +381,6 @@ post-configure:
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   running configure script for ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--prefix=${PREFIX}
 
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
@@ -424,10 +400,6 @@ pre-build:
 		${WRKSRC}/${GPRINT}/gimp-print
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
 		${WRKSRC}/${GPRINT}/libgimpprint.a
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   building ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -522,9 +494,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${DATADIR}/${PORTVERSION}/${PCL3}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} server in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
 .for i in dmp_init.ps dmp_site.ps escp_24.src
@@ -567,13 +536,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
 		${DOCSDIR}/${PORTVERSION}/${GPRINT}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.for i in hpijs_readme.html gs_hpijs.png
-	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index f70ed92e0624..96f35da1a645 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -6,7 +6,6 @@ MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
-MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index cc00589f9615..2d1db2b75ebc 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -13,7 +13,6 @@ bin/gslj
 bin/gslp
 bin/gsnd
 %%SHLIB%%bin/gsx
-bin/hpijs
 bin/lprsetup.sh
 bin/pcl3opts
 bin/pdf2dsc
@@ -48,8 +47,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
@@ -531,7 +528,6 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 85b0d1400b8f..355c51064254 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.05
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
-		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
+MASTER_SITES=	${MASTER_SITE_GNU:S/$/:fonts/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -21,10 +22,8 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs705/
-MASTER_SITE_SUBDIR=	${PORTNAME} \
-			gimp-print/:gprint \
-			hpinkjet/:hpijs \
-			ghostscript/:ports_jp
+MASTER_SITE_SUBDIR=	ghostscript/:DEFAULT,fonts,ports_jp \
+			gimp-print/:gprint
 PKGNAMESUFFIX=	-gnu
 DISTFILES=	${GS_SRCS}:DEFAULT \
 		${GS_FONTS_STD}:fonts \
@@ -34,7 +33,6 @@ DISTFILES=	${GS_SRCS}:DEFAULT \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
-		${HPIJS_SRCS}:hpijs \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp \
 		${BJ10V_SRCS}:ports_jp \
@@ -143,13 +141,6 @@ GPRINT_VERS=	4.2.1
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
-# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed)
-# http://hpinkjet.sourceforge.net/
-HPIJS=		hpijs
-HPIJS_VERS=	1.0.4
-HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
-HPIJS_SRCS=	${HPIJS_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -251,9 +242,6 @@ post-extract:
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   extracting ${HPIJS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -297,12 +285,6 @@ post-patch:
 		${WRKSRC}/src/unixinst.mak
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/lib/gs_res.ps
-# for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
-		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' \
-			${WRKSRC}/${HPIJS_NAME}/configure
-	${PERL} -pi -e 's|#include <malloc.h>||g' \
-		${WRKSRC}/${HPIJS_NAME}/platform.h
 # for DMPRT driver
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g ; \
 		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
@@ -382,11 +364,6 @@ post-configure:
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   running configure script for ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--prefix=${PREFIX}
 
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
@@ -404,10 +381,6 @@ pre-build:
 		${WRKSRC}/${GPRINT}/gimp-print
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
 		${WRKSRC}/${GPRINT}/libgimpprint.a
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   building ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -502,9 +475,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${DATADIR}/${PORTVERSION}/${PCL3}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} server in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
 .for i in dmp_init.ps dmp_site.ps escp_24.src
@@ -547,13 +517,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
 		${DOCSDIR}/${PORTVERSION}/${GPRINT}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.for i in hpijs_readme.html gs_hpijs.png
-	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index 6c9c6c2fd255..9c1be7829701 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -6,7 +6,6 @@ MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
-MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index 1be29cd8bb60..6080d8c59a62 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -13,7 +13,6 @@ bin/gslj
 bin/gslp
 bin/gsnd
 %%SHLIB%%bin/gsx
-bin/hpijs
 bin/lprsetup.sh
 bin/pcl3opts
 bin/pdf2dsc
@@ -49,8 +48,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
@@ -555,7 +552,6 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 3f6fbcbef645..5515938a93d2 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.04
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -21,10 +21,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
-MASTER_SITE_SUBDIR=	${PORTNAME} \
-			gimp-print/:gprint \
-			hpinkjet/:hpijs \
-			ghostscript/:ports_jp
+MASTER_SITE_SUBDIR=	ghostscript/:DEFAULT,fonts,ports_jp \
+			gimp-print/:gprint
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:DEFAULT \
 		${GS_FONTS_STD}:fonts \
@@ -34,7 +32,6 @@ DISTFILES=	${GS_SRCS}:DEFAULT \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
-		${HPIJS_SRCS}:hpijs \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp \
 		${BJ10V_SRCS}:ports_jp \
@@ -147,13 +144,6 @@ GPRINT_VERS=	4.2.1
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
-# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed)
-# http://hpinkjet.sourceforge.net/
-HPIJS=		hpijs
-HPIJS_VERS=	1.0.4
-HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
-HPIJS_SRCS=	${HPIJS_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -257,9 +247,6 @@ post-extract:
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   extracting ${HPIJS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -303,12 +290,6 @@ post-patch:
 		${WRKSRC}/src/unixinst.mak
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/lib/gs_res.ps
-# for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
-		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' \
-			${WRKSRC}/${HPIJS_NAME}/configure
-	${PERL} -pi -e 's|#include <malloc.h>||g' \
-		${WRKSRC}/${HPIJS_NAME}/platform.h
 # for DMPRT driver
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g ; \
 		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
@@ -400,11 +381,6 @@ post-configure:
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   running configure script for ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--prefix=${PREFIX}
 
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
@@ -424,10 +400,6 @@ pre-build:
 		${WRKSRC}/${GPRINT}/gimp-print
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
 		${WRKSRC}/${GPRINT}/libgimpprint.a
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   building ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -522,9 +494,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${DATADIR}/${PORTVERSION}/${PCL3}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} server in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
 .for i in dmp_init.ps dmp_site.ps escp_24.src
@@ -567,13 +536,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
 		${DOCSDIR}/${PORTVERSION}/${GPRINT}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.for i in hpijs_readme.html gs_hpijs.png
-	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index f70ed92e0624..96f35da1a645 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -6,7 +6,6 @@ MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
-MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index cc00589f9615..2d1db2b75ebc 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -13,7 +13,6 @@ bin/gslj
 bin/gslp
 bin/gsnd
 %%SHLIB%%bin/gsx
-bin/hpijs
 bin/lprsetup.sh
 bin/pcl3opts
 bin/pdf2dsc
@@ -48,8 +47,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
@@ -531,7 +528,6 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 85b0d1400b8f..355c51064254 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.05
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
-		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
+MASTER_SITES=	${MASTER_SITE_GNU:S/$/:fonts/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -21,10 +22,8 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs705/
-MASTER_SITE_SUBDIR=	${PORTNAME} \
-			gimp-print/:gprint \
-			hpinkjet/:hpijs \
-			ghostscript/:ports_jp
+MASTER_SITE_SUBDIR=	ghostscript/:DEFAULT,fonts,ports_jp \
+			gimp-print/:gprint
 PKGNAMESUFFIX=	-gnu
 DISTFILES=	${GS_SRCS}:DEFAULT \
 		${GS_FONTS_STD}:fonts \
@@ -34,7 +33,6 @@ DISTFILES=	${GS_SRCS}:DEFAULT \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
-		${HPIJS_SRCS}:hpijs \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp \
 		${BJ10V_SRCS}:ports_jp \
@@ -143,13 +141,6 @@ GPRINT_VERS=	4.2.1
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
-# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed)
-# http://hpinkjet.sourceforge.net/
-HPIJS=		hpijs
-HPIJS_VERS=	1.0.4
-HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
-HPIJS_SRCS=	${HPIJS_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -251,9 +242,6 @@ post-extract:
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   extracting ${HPIJS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -297,12 +285,6 @@ post-patch:
 		${WRKSRC}/src/unixinst.mak
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/lib/gs_res.ps
-# for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
-		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' \
-			${WRKSRC}/${HPIJS_NAME}/configure
-	${PERL} -pi -e 's|#include <malloc.h>||g' \
-		${WRKSRC}/${HPIJS_NAME}/platform.h
 # for DMPRT driver
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g ; \
 		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
@@ -382,11 +364,6 @@ post-configure:
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   running configure script for ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--prefix=${PREFIX}
 
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
@@ -404,10 +381,6 @@ pre-build:
 		${WRKSRC}/${GPRINT}/gimp-print
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
 		${WRKSRC}/${GPRINT}/libgimpprint.a
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   building ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -502,9 +475,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${DATADIR}/${PORTVERSION}/${PCL3}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} server in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
 .for i in dmp_init.ps dmp_site.ps escp_24.src
@@ -547,13 +517,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
 		${DOCSDIR}/${PORTVERSION}/${GPRINT}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.for i in hpijs_readme.html gs_hpijs.png
-	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index 6c9c6c2fd255..9c1be7829701 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -6,7 +6,6 @@ MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
-MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index 1be29cd8bb60..6080d8c59a62 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -13,7 +13,6 @@ bin/gslj
 bin/gslp
 bin/gsnd
 %%SHLIB%%bin/gsx
-bin/hpijs
 bin/lprsetup.sh
 bin/pcl3opts
 bin/pdf2dsc
@@ -49,8 +48,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
@@ -555,7 +552,6 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 3f6fbcbef645..5515938a93d2 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.04
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -21,10 +21,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
-MASTER_SITE_SUBDIR=	${PORTNAME} \
-			gimp-print/:gprint \
-			hpinkjet/:hpijs \
-			ghostscript/:ports_jp
+MASTER_SITE_SUBDIR=	ghostscript/:DEFAULT,fonts,ports_jp \
+			gimp-print/:gprint
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:DEFAULT \
 		${GS_FONTS_STD}:fonts \
@@ -34,7 +32,6 @@ DISTFILES=	${GS_SRCS}:DEFAULT \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
 		${GPRINT_SRCS}:gprint \
-		${HPIJS_SRCS}:hpijs \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp \
 		${BJ10V_SRCS}:ports_jp \
@@ -147,13 +144,6 @@ GPRINT_VERS=	4.2.1
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
-# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed)
-# http://hpinkjet.sourceforge.net/
-HPIJS=		hpijs
-HPIJS_VERS=	1.0.4
-HPIJS_NAME=	${HPIJS}-${HPIJS_VERS}
-HPIJS_SRCS=	${HPIJS_NAME}.tar.gz
-
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -257,9 +247,6 @@ post-extract:
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   extracting ${HPIJS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -303,12 +290,6 @@ post-patch:
 		${WRKSRC}/src/unixinst.mak
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/lib/gs_res.ps
-# for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
-		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' \
-			${WRKSRC}/${HPIJS_NAME}/configure
-	${PERL} -pi -e 's|#include <malloc.h>||g' \
-		${WRKSRC}/${HPIJS_NAME}/platform.h
 # for DMPRT driver
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g ; \
 		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
@@ -400,11 +381,6 @@ post-configure:
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   running configure script for ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--prefix=${PREFIX}
 
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
@@ -424,10 +400,6 @@ pre-build:
 		${WRKSRC}/${GPRINT}/gimp-print
 	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
 		${WRKSRC}/${GPRINT}/libgimpprint.a
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   building ${HPIJS} server ..."
-	cd ${WRKSRC}/${HPIJS_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
@@ -522,9 +494,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${DATADIR}/${PORTVERSION}/${PCL3}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} server in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin
 # for DMPRT driver
 	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
 .for i in dmp_init.ps dmp_site.ps escp_24.src
@@ -567,13 +536,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \
 		${DOCSDIR}/${PORTVERSION}/${GPRINT}
 .endfor
-# for HPinkjet driver
-	${ECHO_MSG} ">>>   installing ${HPIJS} docs ..."
-	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.for i in hpijs_readme.html gs_hpijs.png
-	${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \
-		${DOCSDIR}/${PORTVERSION}/${HPIJS}
-.endfor
 # for MD2K driver
 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
 	${MKDIR} ${DOCSDIR}/${PORTVERSION}/${MD2K}
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index f70ed92e0624..96f35da1a645 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -6,7 +6,6 @@ MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
-MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index cc00589f9615..2d1db2b75ebc 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -13,7 +13,6 @@ bin/gslj
 bin/gslp
 bin/gsnd
 %%SHLIB%%bin/gsx
-bin/hpijs
 bin/lprsetup.sh
 bin/pcl3opts
 bin/pdf2dsc
@@ -48,8 +47,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
@@ -531,7 +528,6 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/eplaser