4 files changed, 29 insertions, 26 deletions

diff --git a/korean/ftghostscript5/Makefile b/korean/ftghostscript5/Makefile
index ae125b6e4f9d..9e54374c8772 100644
--- a/korean/ftghostscript5/Makefile
+++ b/korean/ftghostscript5/Makefile
@@ -27,6 +27,7 @@ DISTNAME=	${PKGNAME}
 DISTFILES=	${PCL3_DRV} ${DECRYPT_PDF} ${GS_SOURCES} \
 		${VFLIB_GS} ${KFFTYPE} ${KFFTYPE_PATCH} \
 		${HFFTYPE} ${GS_CID_PATCH}
+DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES} ${PCL3_DRV}
 
 MAINTAINER=	cjh@FreeBSD.org
@@ -76,20 +77,20 @@ post-extract:
 	@${PATCH} -d ${WRKSRC} --forward --quiet -E < ${WRKSRC}/zmedia2.c-5.10.diff
 
 pre-patch:
-	cd ${WRKSRC} && tar -xzf ${DISTDIR}/${VFLIB_GS} && \
+	cd ${WRKSRC} && tar -xzf ${_DISTDIR}/${VFLIB_GS} && \
 	${PATCH} -s -p1 < gs5.10-vflib-1.1/gs5.10-vflib-1.1.diff
-	cd ${WRKSRC} && tar -xzf ${DISTDIR}/${KFFTYPE} && \
+	cd ${WRKSRC} && tar -xzf ${_DISTDIR}/${KFFTYPE} && \
 	cd ${WRKSRC}/kfftype &&  \
 	for file in ${KFFTYPE_PATCH}; do \
-		${PATCH} -s -p0 < ${DISTDIR}/$$file; \
+		${PATCH} -s -p0 < ${_DISTDIR}/$$file; \
 	done && \
 	${CP} -r ${WRKSRC}/kfftype/* ${WRKSRC}/
-	cd ${WRKSRC} && tar -xzf ${DISTDIR}/${HFFTYPE} && \
+	cd ${WRKSRC} && tar -xzf ${_DISTDIR}/${HFFTYPE} && \
 	${CP} -r ${WRKSRC}/gs5-hfftype-0.2/* ${WRKSRC}/
 	cd ${WRKSRC} && ${PATCH} -s -p1 < \
 	${WRKSRC}/gs5-hfftype-0.2/gs5.10-hfftype.diff
 	cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < \
-	${DISTDIR}/${GS_CID_PATCH}
+	${_DISTDIR}/${GS_CID_PATCH}
 
 do-configure:
 	@(cd ${WRKSRC}; ${SH} tar_cat )
@@ -104,7 +105,7 @@ pre-install:
 
 post-install:
 	strip ${PREFIX}/bin/gs
-	${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+	${INSTALL_DATA} ${_DISTDIR}/${DECRYPT_PDF} \
 		${PREFIX}/share/ghostscript/5.10ft
 	$(MKDIR) ${PREFIX}/libexec/lpr
 	${INSTALL_SCRIPT} $(WRKSRC)/pj-gs.sh ${PREFIX}/libexec/lpr
diff --git a/korean/ftghostscript5/distinfo b/korean/ftghostscript5/distinfo
index 0626c3700086..030fff231feb 100644
--- a/korean/ftghostscript5/distinfo
+++ b/korean/ftghostscript5/distinfo
@@ -1,9 +1,9 @@
-MD5 (hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
-MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
-MD5 (ghostscript-5.10.tar.gz) = b8dbc2595c06305f452a9c38bd0effef
-MD5 (gs5.10-vflib-1.1.tar.gz) = 856599571b5c9845595d830ad2b31b5f
-MD5 (gs5-kfftype.tar.gz) = 960047c6530e3678ee340d62adfbc3a8
-MD5 (gs5-kfftype-patch1.diff) = 1fd23208c9355a2df242ecaa1b8ea8f7
-MD5 (gs5-kfftype-patch2.diff) = 0babbfde38132acc9e5128672660a6c4
-MD5 (gs5-hfftype-0.2.tar.gz) = c78230aa7f2488ecc1a298f3da908275
-MD5 (gs5.10-cid-bugfix.diff) = 9675c4e4eeb795eee45956ddd6ed67c4
+MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
+MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (ghostscript/ghostscript-5.10.tar.gz) = b8dbc2595c06305f452a9c38bd0effef
+MD5 (ghostscript/gs5.10-vflib-1.1.tar.gz) = 856599571b5c9845595d830ad2b31b5f
+MD5 (ghostscript/gs5-kfftype.tar.gz) = 960047c6530e3678ee340d62adfbc3a8
+MD5 (ghostscript/gs5-kfftype-patch1.diff) = 1fd23208c9355a2df242ecaa1b8ea8f7
+MD5 (ghostscript/gs5-kfftype-patch2.diff) = 0babbfde38132acc9e5128672660a6c4
+MD5 (ghostscript/gs5-hfftype-0.2.tar.gz) = c78230aa7f2488ecc1a298f3da908275
+MD5 (ghostscript/gs5.10-cid-bugfix.diff) = 9675c4e4eeb795eee45956ddd6ed67c4
diff --git a/korean/ghostscript55httf/Makefile b/korean/ghostscript55httf/Makefile
index 59ba6d1ed6ea..ada2b1e95bfa 100644
--- a/korean/ghostscript55httf/Makefile
+++ b/korean/ghostscript55httf/Makefile
@@ -8,13 +8,14 @@
 PORTNAME=	ghostscript
 PORTVERSION=	5.50
 PORTREVISION=	1
-PKGNAMESUFFIX=	-httf
 CATEGORIES=	korean print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
+PKGNAMESUFFIX=	-httf
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${DECRYPT_PDF}
+DIST_SUBDIR=	ghostscript
 
 PATCH_SITES=	ftp://ftp.kr.FreeBSD.org/pub/users/cjh/gs-ko/
 PATCHFILES=	gs5.50-httf-19990114_1.diff.gz
@@ -64,7 +65,7 @@ post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-* ${WRKSRC}/jpeg
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-* ${WRKSRC}/libpng
 	${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak
-	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
+	cd ${WRKSRC} && unzip -Lao ${_DISTDIR}/${HP850_DRV}
 	${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak
 
 do-configure:
@@ -83,9 +84,9 @@ pre-build:
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript ; \
-			${TAR} -xzf ${DISTDIR}/${GS_FONTS_STD})
+			${TAR} -xzf ${_DISTDIR}/${GS_FONTS_STD})
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
-			${TAR} -xzf ${DISTDIR}/${GS_FONTS_OTHER})
+			${TAR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER})
 
 # install the readme and license file of the hp8xxx driver as well
 post-install:
@@ -98,7 +99,7 @@ post-install:
 		${PREFIX}/share/ghostscript/5.50httf/doc
 	${RMDIR} ${PREFIX}/share/ghostscript/5.50httf/hangul/fonts
 .if defined(PDFENCRYPT)
-	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${PREFIX}/share/ghostscript/5.50httf
+	${INSTALL_DATA} ${_DISTDIR}/pdf_sec.ps ${PREFIX}/share/ghostscript/5.50httf
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
diff --git a/korean/ghostscript55httf/distinfo b/korean/ghostscript55httf/distinfo
index b9de285354c7..295949c69006 100644
--- a/korean/ghostscript55httf/distinfo
+++ b/korean/ghostscript55httf/distinfo
@@ -1,6 +1,7 @@
-MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
-MD5 (ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
-MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
-MD5 (ghostscript-fonts-other-5.50.tar.gz) = e3540578f33caf5dfc384e5518890f57
-MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
-MD5 (gs5.50-httf-19990114_1.diff.gz) = fd25b6d228783aca369646696234ea1b
+MD5 (ghostscript/ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
+MD5 (ghostscript/ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
+MD5 (ghostscript/ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
+MD5 (ghostscript/ghostscript-fonts-other-5.50.tar.gz) = e3540578f33caf5dfc384e5518890f57
+MD5 (ghostscript/hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
+MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (ghostscript/gs5.50-httf-19990114_1.diff.gz) = fd25b6d228783aca369646696234ea1b