4 files changed, 5 insertions, 66 deletions

diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile
index db0ebb6ae083..30d1ec509f8a 100644
--- a/chinese/moefonts-cid/Makefile
+++ b/chinese/moefonts-cid/Makefile
@@ -7,25 +7,22 @@
 
 PORTNAME=	moefonts-cid
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese print
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/moefonts-cid/ \
 		ftp://ftp.ora.com/pub/examples/nutshell/cjkv/adobe/ \
 		ftp://ftp.ora.com/pub/examples/nutshell/cjkv/adobe/samples/
-DISTFILES=	MOEKai-Regular MOESung-Regular ac14.tar.Z
+DISTFILES=	MOEKai-Regular MOESung-Regular
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	keith@FreeBSD.org
 COMMENT=	MOE CIDFonts converted by Adobe
 
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu \
+		${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 
 NO_BUILD=	YES
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR} && \
-	  ${TAR} xzf ${DISTDIR}/ac14.tar.Z )
-
 do-install:
 	@${INSTALL_DATA} ${DISTDIR}/MOEKai-Regular \
 		${DISTDIR}/MOESung-Regular \
@@ -34,9 +31,6 @@ do-install:
 		${FILESDIR}/MOESung-Regular-ETen-B5-H.gsf \
 		${FILESDIR}/MOESung-Regular-ETen-B5-V.gsf \
 		${PREFIX}/share/ghostscript/fonts
-	@${MKDIR} ${PREFIX}/share/ghostscript/fonts/CMap
-	@${INSTALL_DATA} ${WRKDIR}/ac14/CMap/* \
-		${PREFIX}/share/ghostscript/fonts/CMap
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/chinese/moefonts-cid/distinfo b/chinese/moefonts-cid/distinfo
index 85ac29802d90..19b9100fb7d7 100644
--- a/chinese/moefonts-cid/distinfo
+++ b/chinese/moefonts-cid/distinfo
@@ -1,3 +1,2 @@
 MD5 (MOEKai-Regular) = f8a94515e3058321c78149e862005459
 MD5 (MOESung-Regular) = 42a8801fb18a4b851a7ce1224b3b5bc3
-MD5 (ac14.tar.Z) = b85e49bdc25ff2f82f4ee9ef833a5ce0
diff --git a/chinese/moefonts-cid/pkg-plist b/chinese/moefonts-cid/pkg-plist
index 2d370d8d25aa..620c971983bd 100644
--- a/chinese/moefonts-cid/pkg-plist
+++ b/chinese/moefonts-cid/pkg-plist
@@ -1,46 +1,6 @@
-share/ghostscript/fonts/CMap/Adobe-CNS1-0
-share/ghostscript/fonts/CMap/Adobe-CNS1-1
-share/ghostscript/fonts/CMap/Adobe-CNS1-2
-share/ghostscript/fonts/CMap/Adobe-CNS1-3
-share/ghostscript/fonts/CMap/Adobe-CNS1-4
-share/ghostscript/fonts/CMap/B5-H
-share/ghostscript/fonts/CMap/B5-V
-share/ghostscript/fonts/CMap/B5pc-H
-share/ghostscript/fonts/CMap/B5pc-V
-share/ghostscript/fonts/CMap/CNS-EUC-H
-share/ghostscript/fonts/CMap/CNS-EUC-V
-share/ghostscript/fonts/CMap/CNS1-H
-share/ghostscript/fonts/CMap/CNS1-V
-share/ghostscript/fonts/CMap/CNS2-H
-share/ghostscript/fonts/CMap/CNS2-V
-share/ghostscript/fonts/CMap/ETHK-B5-H
-share/ghostscript/fonts/CMap/ETHK-B5-V
-share/ghostscript/fonts/CMap/ETen-B5-H
-share/ghostscript/fonts/CMap/ETen-B5-V
-share/ghostscript/fonts/CMap/HKdla-B5-H
-share/ghostscript/fonts/CMap/HKdla-B5-V
-share/ghostscript/fonts/CMap/HKdlb-B5-H
-share/ghostscript/fonts/CMap/HKdlb-B5-V
-share/ghostscript/fonts/CMap/HKgccs-B5-H
-share/ghostscript/fonts/CMap/HKgccs-B5-V
-share/ghostscript/fonts/CMap/HKm314-B5-H
-share/ghostscript/fonts/CMap/HKm314-B5-V
-share/ghostscript/fonts/CMap/HKm471-B5-H
-share/ghostscript/fonts/CMap/HKm471-B5-V
-share/ghostscript/fonts/CMap/HKscs-B5-H
-share/ghostscript/fonts/CMap/HKscs-B5-V
-share/ghostscript/fonts/CMap/UniCNS-UCS2-H
-share/ghostscript/fonts/CMap/UniCNS-UCS2-V
-share/ghostscript/fonts/CMap/UniCNS-UTF16-H
-share/ghostscript/fonts/CMap/UniCNS-UTF16-V
-share/ghostscript/fonts/CMap/UniCNS-UTF32-H
-share/ghostscript/fonts/CMap/UniCNS-UTF32-V
-share/ghostscript/fonts/CMap/UniCNS-UTF8-H
-share/ghostscript/fonts/CMap/UniCNS-UTF8-V
 share/ghostscript/fonts/MOEKai-Regular
 share/ghostscript/fonts/MOEKai-Regular-ETen-B5-H.gsf
 share/ghostscript/fonts/MOEKai-Regular-ETen-B5-V.gsf
 share/ghostscript/fonts/MOESung-Regular
 share/ghostscript/fonts/MOESung-Regular-ETen-B5-H.gsf
 share/ghostscript/fonts/MOESung-Regular-ETen-B5-V.gsf
-@dirrm share/ghostscript/fonts/CMap
diff --git a/chinese/moefonts-cid/pkg-req b/chinese/moefonts-cid/pkg-req
deleted file mode 100644
index 2acc12385190..000000000000
--- a/chinese/moefonts-cid/pkg-req
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "INSTALL" ]; then
-  exit 0
-fi
-
-if [ ! -f /usr/local/share/ghostscript/7.05/lib/Fontmap.GS ]; then
-  echo ===
-  echo You do not have Ghostscript 7.05 installed!
-  echo
-  echo This port is specifically for version 7.05 or later, for
-  echo it fixes many bugs wrt. CIDFonts.
-  echo ===
-fi