1. Use ghostscript/ for DIST_SUBDIR (suggested by knu)

2. ADD HP inkjet drivers (suggested from ports-jp)

Submitted by:	knu, ports-jp
Reviewed by:	MAINTAINER

8 files changed, 99 insertions, 77 deletions

diff --git a/japanese/vfghostscript/Makefile b/japanese/vfghostscript/Makefile
index 112871c9bdec..4d760846071a 100644
--- a/japanese/vfghostscript/Makefile
+++ b/japanese/vfghostscript/Makefile
@@ -23,6 +23,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		gdevlips4-1.1.0.tar.gz \
 		bjc600j-0.9.tar.gz \
 		gdevmjc-0.7.tar.gz
+DIST_SUBDIR=	ghostscript
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
@@ -40,11 +41,11 @@ DOC_DIR=${PREFIX}/lib/ghostscript/doc
 # after the distributed patches
 pre-patch:
 	@(cd ${WRKSRC} ; \
-	  tar xzf ${DISTDIR}/gs261j10.tar.gz ; \
-	  tar xzf ${DISTDIR}/gs261d13.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
-	  tar xzf ${DISTDIR}/bjc600j-0.9.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevlips4-1.1.0.tar.gz ; \
+	  tar xzf ${_DISTDIR}/gs261j10.tar.gz ; \
+	  tar xzf ${_DISTDIR}/gs261d13.tar.gz ; \
+	  tar xzf ${_DISTDIR}/gdevmjc-0.7.tar.gz ; \
+	  tar xzf ${_DISTDIR}/bjc600j-0.9.tar.gz ; \
+	  tar xzf ${_DISTDIR}/gdevlips4-1.1.0.tar.gz ; \
 	  ${PATCH} ${PATCH_ARGS} < gs261j.diff ; \
 	  ${PATCH} ${PATCH_ARGS} <${FILESDIR}/gdevep82.patch ; \
 	  ${PATCH} ${PATCH_ARGS} <${FILESDIR}/bjc600j.dif.patch >/dev/null 2>&1; \
@@ -98,10 +99,10 @@ post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/paramod ${PREFIX}/bin ;
 	@(cd ${PREFIX}/lib/ghostscript ; \
 	  ${CP} ${WRKSRC}/bjc600j/*.ps . ; \
-	tar xzf ${DISTDIR}/ghostscript-fonts-2.6.2.tar.gz ; \
+	tar xzf ${_DISTDIR}/ghostscript-fonts-2.6.2.tar.gz ; \
 	${CP} ${PREFIX}/lib/ghostscript/kanji/vflib.ps ${PREFIX}/lib/ghostscript/kanji/kconfig.ps ; \
 	cd fonts ;\
-	tar xzf ${DISTDIR}/ghostscript-fonts-4.0.tar.gz ; \
+	tar xzf ${_DISTDIR}/ghostscript-fonts-4.0.tar.gz ; \
 	${PATCH} < ${FILESDIR}/Fontmap.diff ; \
 	${CAT} Fontmap >> ../Fontmap ; \
 	${RM} Fontmap* ; \
diff --git a/japanese/vfghostscript/distinfo b/japanese/vfghostscript/distinfo
index f35631baf0bc..6d9304474632 100644
--- a/japanese/vfghostscript/distinfo
+++ b/japanese/vfghostscript/distinfo
@@ -1,8 +1,8 @@
-MD5 (ghostscript-2.6.2.tar.gz) = 3976c1841d3fb968bd406f6c7678fa36
-MD5 (ghostscript-fonts-2.6.2.tar.gz) = 07dff233406da5ce2795881176c5808f
-MD5 (ghostscript-fonts-4.0.tar.gz) = 4d85a26bb5c7fc48dc112bdcd553ca69
-MD5 (gs261j10.tar.gz) = e2c6fcafba3992341268136742d0f027
-MD5 (gs261d13.tar.gz) = 08843969acbf96c4aacdc13fc7709240
-MD5 (gdevlips4-1.1.0.tar.gz) = 40e5c1e3cabff0babdfbee0347550b55
-MD5 (bjc600j-0.9.tar.gz) = e6cfffc16bf0daa0264ead2382549e49
-MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
+MD5 (ghostscript/ghostscript-2.6.2.tar.gz) = 3976c1841d3fb968bd406f6c7678fa36
+MD5 (ghostscript/ghostscript-fonts-2.6.2.tar.gz) = 07dff233406da5ce2795881176c5808f
+MD5 (ghostscript/ghostscript-fonts-4.0.tar.gz) = 4d85a26bb5c7fc48dc112bdcd553ca69
+MD5 (ghostscript/gs261j10.tar.gz) = e2c6fcafba3992341268136742d0f027
+MD5 (ghostscript/gs261d13.tar.gz) = 08843969acbf96c4aacdc13fc7709240
+MD5 (ghostscript/gdevlips4-1.1.0.tar.gz) = 40e5c1e3cabff0babdfbee0347550b55
+MD5 (ghostscript/bjc600j-0.9.tar.gz) = e6cfffc16bf0daa0264ead2382549e49
+MD5 (ghostscript/gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index a058f8e6823e..e1704e44a00d 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -27,6 +27,7 @@ MASTER_SITES=	${MASTER_SITE_GNU} \
 MASTER_SITE_SUBDIR=	ghostscript asami/LOCAL_PORTS taoka .
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${GS_DRIVERS}
+DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -70,20 +71,20 @@ DECRYPT_PDF=	pdf_sec.ps
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	@${TAR} -C ${WRKSRC} --unlink -xzf ${DISTDIR}/gs${PORTVERSION}-vflib-1.2.tar.gz
-	@${TAR} -C ${WRKSRC} --unlink -xzf ${DISTDIR}/gs${PORTVERSION}-jpdf-0.2.tar.gz
+	@${TAR} -C ${WRKSRC} --unlink -xzf ${_DISTDIR}/gs${PORTVERSION}-vflib-1.2.tar.gz
+	@${TAR} -C ${WRKSRC} --unlink -xzf ${_DISTDIR}/gs${PORTVERSION}-jpdf-0.2.tar.gz
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevlips-2.3.2-510.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/epag-3.09.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdev10v.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevlips-2.3.2-510.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/epag-3.09.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevmjc-0.8.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
-	  ${TAR} -C gdevdmpr --unlink -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevalps-0.21.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevrpdl-1.4-510.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  ${TAR} -C gdevdmpr --unlink -xzf ${_DISTDIR}/dmprt-2.01.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevalps-0.21.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevrpdl-1.4-510.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
 	  )
 
 pre-patch:
@@ -91,7 +92,7 @@ pre-patch:
 		${PATCH} -d ${WRKDIR} -p --forward --quiet -E
 	@${CAT} ${WRKSRC}/gs${PORTVERSION}-jpdf-0.2/gs${PORTVERSION}-jpdf-0.2.diff | \
 		${PATCH} -d ${WRKDIR} -p --forward --quiet -E
-	@${GZCAT} ${DISTDIR}/gs${PORTVERSION}-VFlibBM-PL2.diff.gz | \
+	@${GZCAT} ${_DISTDIR}/gs${PORTVERSION}-VFlibBM-PL2.diff.gz | \
 		${PATCH} -d ${WRKDIR} -p --forward --quiet -E
 
 post-patch:
@@ -128,14 +129,14 @@ post-patch:
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	@${TAR} -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_STD}
+	@${TAR} -C ${PREFIX}/share/ghostscript/fonts -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
 
 post-build:
 	@(cd ${PRINTER}/epag-3.09 ;  ${MAKE})
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
+	${INSTALL_DATA} ${_DISTDIR}/pdf_sec.ps ${GSINST_DIR}
 	${INSTALL_PROGRAM} ${PRINTER}/epag-3.09/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index 047654f2191d..3e6d1629f80a 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -1,16 +1,16 @@
-MD5 (ghostscript-5.10.tar.gz) = b8dbc2595c06305f452a9c38bd0effef
-MD5 (gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
-MD5 (gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
-MD5 (gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
-MD5 (gdevlips-2.3.2-510.tar.gz) = d4eacdc3b716521aee1a1364089cad43
-MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
-MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
-MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-MD5 (gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
-MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
-MD5 (gdevrpdl-1.4-510.tar.gz) = 1751b9bf3f62df857c6bd063ff6b9ecd
-MD5 (gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
-MD5 (epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
-MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
-MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
-MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (ghostscript/ghostscript-5.10.tar.gz) = b8dbc2595c06305f452a9c38bd0effef
+MD5 (ghostscript/gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
+MD5 (ghostscript/gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
+MD5 (ghostscript/gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
+MD5 (ghostscript/gdevlips-2.3.2-510.tar.gz) = d4eacdc3b716521aee1a1364089cad43
+MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
+MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
+MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
+MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
+MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
+MD5 (ghostscript/gdevrpdl-1.4-510.tar.gz) = 1751b9bf3f62df857c6bd063ff6b9ecd
+MD5 (ghostscript/gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
+MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
+MD5 (ghostscript/ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
+MD5 (ghostscript/ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
+MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 735a0c7e9cf7..16bf7f488a1f 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -20,12 +20,14 @@ MASTER_SITES=	${MASTER_SITE_GNU} \
 		http://www.humblesoft.com/pub/ \
 		http://www6.vc-net.ne.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
-		http://www.epkowa.on.arena.ne.jp/pips/data/lp1900/
+		http://www.epkowa.on.arena.ne.jp/pips/data/lp1900/\
+		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/hpinkjet/g}
 # first for ${MASTER_SITE_GNU}, second for ${MASTER_SITE_LOCAL},
 # third for ${MASTER_SITE_PORTS_JP}
 MASTER_SITE_SUBDIR=	ghostscript asami/LOCAL_PORTS taoka .
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${GS_DRIVERS}
+DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -65,26 +67,28 @@ GS_DRIVERS+=	gdevalps-0.21.tar.gz
 GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
 GS_DRIVERS+=	gdevrpdl-1.4.tar.gz
 GS_DRIVERS+=	eplaser-2.0.2-550.tgz
+GS_DRIVERS+=	hpijs0.97.tar.gz
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	@${TAR} -C ${WRKSRC} --unlink -xzf ${DISTDIR}/gs5.50-vflib-1.0.tar.gz
+	@${TAR} -C ${WRKSRC} --unlink -xzf ${_DISTDIR}/gs5.50-vflib-1.0.tar.gz
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevlips-2.3.6-550.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdev10v.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevlips-2.3.6-550.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevmjc-0.8.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
-	  ${TAR} -C gdevdmpr --unlink -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/epag-3.09.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevalps-0.21.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/gdevrpdl-1.4.tar.gz ; \
-	  ${TAR} --unlink -xzf ${DISTDIR}/eplaser-2.0.2-550.tgz ; \
+	  ${TAR} -C gdevdmpr --unlink -xzf ${_DISTDIR}/dmprt-2.01.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/epag-3.09.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevalps-0.21.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevrpdl-1.4.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/eplaser-2.0.2-550.tgz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/hpijs0.97.tar.gz ; \
 	)
 
 pre-patch:
@@ -105,6 +109,9 @@ post-patch:
 	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-5.50 ${WRKSRC}; \
 	  ${CP} gdevrpdl-1.4/gdevrpdl.c gdevrpdl-1.4/gdevrpdl.mak ${WRKSRC}; \
 	  ${CP} eplaser/gdevescv.[ch] eplaser/gdevescv.mak eplaser/gdevesmv.c eplaser/gdevesmv.mak ${WRKSRC}; \
+	  ${CP} hpijs0.97/gdevhpij.[ch] ${WRKSRC}; \
+	  ${SED} -n -e '/^### -* Hewlett-Packard Co. Inkjet Driver -*/,/^###/p' \
+	    hpijs0.97/contrib.mak | ${SED} '$d' > ${WRKSRC}/gdevhpij.mak; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
@@ -126,21 +133,25 @@ post-patch:
 	@${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevescv.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevesmv.mak >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevhpij.mak >> ${WRKSRC}/contrib.mak
+	@${PATCH} ${PATCH_ARGS} -d ${PRINTER}/hpijs0.97 < ${FILESDIR}/hpijs.patch
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj
 
 post-build:
 	@(cd ${PRINTER}/epag-3.09 ;  ${MAKE})
+	@(cd ${PRINTER}/hpijs0.97 ;  ${MAKE})
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_STD}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
+	${INSTALL_DATA} ${_DISTDIR}/pdf_sec.ps ${GSINST_DIR}
 	${INSTALL_PROGRAM} ${PRINTER}/epag-3.09/ert ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${PRINTER}/hpijs0.97/hpijs ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index 9a7abe9fd128..a1b9dd9ca50d 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -1,15 +1,16 @@
-MD5 (gnu-gs-5.50a.tar.gz) = c12ea8dd56cfc453c99bd8864dfc90db
-MD5 (gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
-MD5 (gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
-MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
-MD5 (gs5.50-vflib-1.0.tar.gz) = e934d1bd3a48a1c151e2a15af0640c97
-MD5 (gdevlips-2.3.6-550.tar.gz) = 07bf7a0d6112ae86ed832b308c5f3fbb
-MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
-MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
-MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-MD5 (gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
-MD5 (epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
-MD5 (gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
-MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
-MD5 (gdevrpdl-1.4.tar.gz) = c273943f9c7ad85dd58bb8aca0738854
-MD5 (eplaser-2.0.2-550.tgz) = 0332c31a2aab211d64f6e728558e1cb3
+MD5 (ghostscript/gnu-gs-5.50a.tar.gz) = c12ea8dd56cfc453c99bd8864dfc90db
+MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
+MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
+MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (ghostscript/gs5.50-vflib-1.0.tar.gz) = e934d1bd3a48a1c151e2a15af0640c97
+MD5 (ghostscript/gdevlips-2.3.6-550.tar.gz) = 07bf7a0d6112ae86ed832b308c5f3fbb
+MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
+MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
+MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
+MD5 (ghostscript/gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
+MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
+MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
+MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
+MD5 (ghostscript/gdevrpdl-1.4.tar.gz) = c273943f9c7ad85dd58bb8aca0738854
+MD5 (ghostscript/eplaser-2.0.2-550.tgz) = 0332c31a2aab211d64f6e728558e1cb3
+MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/japanese/vfghostscript55/pkg-plist b/japanese/vfghostscript55/pkg-plist
index b2080c1a78fa..83a15acaea14 100644
--- a/japanese/vfghostscript55/pkg-plist
+++ b/japanese/vfghostscript55/pkg-plist
@@ -9,6 +9,7 @@ bin/gsdj500
 bin/gslj
 bin/gslp
 bin/gsnd
+bin/hpijs
 bin/pdf2dsc
 bin/pdf2ps
 bin/printafm
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index 5675b8b4e158..c2b13a8a125e 100644
--- a/japanese/vfghostscript55/scripts/configure
+++ b/japanese/vfghostscript55/scripts/configure
@@ -4,7 +4,7 @@
 
 if [ ! "X"${BATCH} = "X" ] ; then
 
-PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev lp3000c.dev lp8000c.dev lp8200c.dev lp8300c.dev lp8500c.dev lp8600f.dev lp8400f.dev lp8300f.dev lp1900.dev lp1800.dev'
+PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev lp3000c.dev lp8000c.dev lp8200c.dev lp8300c.dev lp8500c.dev lp8600f.dev lp8400f.dev lp8300f.dev lp1900.dev lp1800.dev hpijs.dev DJ630.dev DJ6xx.dev DJ6xxP.dev DJ8xx.dev DJ9xx.dev DJ9xxVIP.dev AP21xx.dev'
 
 sed -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev st800.dev uniprint.dev bmp16m.dev ${PRINTER_JAPAN};" \
     < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
@@ -134,6 +134,13 @@ Have fun with this new configuration style !     -andreas \n\n\
    "pjetxl"   "alternate HP PaintJet XL driver" OFF \
    "pjxl"     "HP PaintJet XL color printer" ON \
    "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
+   "DJ6xx"    "HP DeskJet 600C Series, e-Series (e-20)" ON \
+   "DJ6xxP"   "HP DJ 600C Series Photo" ON \
+   "DJ630"    "HP DJ 630C Series" ON \
+   "DJ8xx"    "HP DJ 800C Series" ON \
+   "DJ9xx"    "HP DJ 900C Series, Photo Smart" ON \
+   "DJ9xxVIP" "HP DJ 990C Series, Photo Smart" ON \
+   "AP21xx"   "Apollo 2100 Series" ON \
    "m8510"    "C.Itoh M8510 printer" OFF \
    "cp50"     "Mitsubishi CP50 color" OFF \
    "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" OFF \