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

2 files changed, 32 insertions, 31 deletions

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