3 files changed, 19 insertions, 50 deletions

diff --git a/korean/munhwafonts-cid/Makefile b/korean/munhwafonts-cid/Makefile
index 6b9525a51409..0ea126efb920 100644
--- a/korean/munhwafonts-cid/Makefile
+++ b/korean/munhwafonts-cid/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	munhwafonts-cid
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean print
-MASTER_SITES=	ftp://ftp.ora.com/pub/examples/nutshell/cjkv/adobe/ \
-		ftp://ftp.ora.com/pub/examples/nutshell/cjkv/adobe/samples/
+MASTER_SITES=	ftp://ftp.ora.com/pub/examples/nutshell/cjkv/adobe/samples/
 DISTNAME=	${PORTNAME}
-DISTFILES=	${CID_FONTS_KO} ${CID_CMAP_KO}
-EXTRACT_ONLY=	${CID_CMAP_KO}
+DISTFILES=	${CID_FONTS_KO}
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Munhwa CID fonts collection(Basic set)
@@ -21,24 +20,21 @@ COMMENT=	Munhwa CID fonts collection(Basic set)
 # sample fonts(cid, free Korean fonts is just only one.. :< )
 CID_FONTS_KO=   Munhwa-Regular Munhwa-Bold \
 		MunhwaGothic-Regular MunhwaGothic-Bold
-# CID CMAP
-CID_CMAP_KO=    ak12.tar.Z
+FONTSDIR=	share/fonts/CIDFont
 
 NO_BUILD=	YES
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/ghostscript/fonts
-	${MKDIR} ${PREFIX}/share/ghostscript/fonts/CMap
+	${MKDIR} ${PREFIX}/${FONTSDIR}
 	${INSTALL_DATA} ${FILESDIR}/Munhwa-Regular-KSC-EUC-H.gsf \
 			${FILESDIR}/MunhwaGothic-Regular-KSC-EUC-H.gsf \
 			${FILESDIR}/Munhwa-Bold-KSC-EUC-H.gsf \
 			${FILESDIR}/MunhwaGothic-Bold-KSC-EUC-H.gsf \
-			${PREFIX}/share/ghostscript/fonts
+			${PREFIX}/${FONTSDIR}
 	for file in ${CID_FONTS_KO}; do \
 		${INSTALL_DATA} ${DISTDIR}/$$file \
-			${PREFIX}/share/ghostscript/fonts; \
+			${PREFIX}/${FONTSDIR}; \
 	done
-	${INSTALL_DATA} ${WRKDIR}/ak12/CMap/* \
-			${PREFIX}/share/ghostscript/fonts/CMap
 
 .include <bsd.port.mk>
diff --git a/korean/munhwafonts-cid/distinfo b/korean/munhwafonts-cid/distinfo
index 22188d0b71c1..82858da2e93d 100644
--- a/korean/munhwafonts-cid/distinfo
+++ b/korean/munhwafonts-cid/distinfo
@@ -10,6 +10,3 @@ SIZE (MunhwaGothic-Regular) = 2740212
 MD5 (MunhwaGothic-Bold) = ee897289af86228d89d8c03891717bdd
 SHA256 (MunhwaGothic-Bold) = 9512f0de7871f777f521f1173822654c2bbb68883679eb4282a734a2cb1d39b6
 SIZE (MunhwaGothic-Bold) = 575817
-MD5 (ak12.tar.Z) = 200d96e9f911208666cb547bc738bd47
-SHA256 (ak12.tar.Z) = 167a3c7eaefc8cdf6be1f3ebc09ded4527d23deeea7a5ee706db140978cc2c23
-SIZE (ak12.tar.Z) = 792646
diff --git a/korean/munhwafonts-cid/pkg-plist b/korean/munhwafonts-cid/pkg-plist
index be0dd9a35c95..117ad9867b4d 100644
--- a/korean/munhwafonts-cid/pkg-plist
+++ b/korean/munhwafonts-cid/pkg-plist
@@ -1,34 +1,10 @@
-share/ghostscript/fonts/CMap/Adobe-Korea1-0
-share/ghostscript/fonts/CMap/Adobe-Korea1-1
-share/ghostscript/fonts/CMap/Adobe-Korea1-2
-share/ghostscript/fonts/CMap/KSC-EUC-H
-share/ghostscript/fonts/CMap/KSC-EUC-V
-share/ghostscript/fonts/CMap/KSC-H
-share/ghostscript/fonts/CMap/KSC-Johab-H
-share/ghostscript/fonts/CMap/KSC-Johab-V
-share/ghostscript/fonts/CMap/KSC-V
-share/ghostscript/fonts/CMap/KSCms-UHC-H
-share/ghostscript/fonts/CMap/KSCms-UHC-HW-H
-share/ghostscript/fonts/CMap/KSCms-UHC-HW-V
-share/ghostscript/fonts/CMap/KSCms-UHC-V
-share/ghostscript/fonts/CMap/KSCpc-EUC-H
-share/ghostscript/fonts/CMap/KSCpc-EUC-V
-share/ghostscript/fonts/CMap/UniKS-UCS2-H
-share/ghostscript/fonts/CMap/UniKS-UCS2-V
-share/ghostscript/fonts/CMap/UniKS-UTF8-H
-share/ghostscript/fonts/CMap/UniKS-UTF8-V
-share/ghostscript/fonts/CMap/UniKS-UTF16-H
-share/ghostscript/fonts/CMap/UniKS-UTF16-V
-share/ghostscript/fonts/CMap/UniKS-UTF32-H
-share/ghostscript/fonts/CMap/UniKS-UTF32-V
-share/ghostscript/fonts/Munhwa-Bold
-share/ghostscript/fonts/Munhwa-Bold-KSC-EUC-H.gsf
-share/ghostscript/fonts/Munhwa-Regular
-share/ghostscript/fonts/Munhwa-Regular-KSC-EUC-H.gsf
-share/ghostscript/fonts/MunhwaGothic-Bold
-share/ghostscript/fonts/MunhwaGothic-Bold-KSC-EUC-H.gsf
-share/ghostscript/fonts/MunhwaGothic-Regular
-share/ghostscript/fonts/MunhwaGothic-Regular-KSC-EUC-H.gsf
-@dirrm share/ghostscript/fonts/CMap
-@dirrmtry share/ghostscript/fonts
-@dirrmtry share/ghostscript
+@comment $FreeBSD$
+%%FONTSDIR%%/Munhwa-Bold
+%%FONTSDIR%%/Munhwa-Bold-KSC-EUC-H.gsf
+%%FONTSDIR%%/Munhwa-Regular
+%%FONTSDIR%%/Munhwa-Regular-KSC-EUC-H.gsf
+%%FONTSDIR%%/MunhwaGothic-Bold
+%%FONTSDIR%%/MunhwaGothic-Bold-KSC-EUC-H.gsf
+%%FONTSDIR%%/MunhwaGothic-Regular
+%%FONTSDIR%%/MunhwaGothic-Regular-KSC-EUC-H.gsf
+@dirrmtry %%FONTSDIR%%