4 files changed, 6 insertions, 36 deletions

diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile
index 60e38ceedd96..df5b7addb8a7 100644
--- a/chinese/moefonts-cid/Makefile
+++ b/chinese/moefonts-cid/Makefile
@@ -7,11 +7,12 @@
 
 PORTNAME=	moefonts-cid
 PORTVERSION=	1.0
+PORTREVISION=	1
 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 ag14.tar.Z
+DISTFILES=	MOEKai-Regular MOESung-Regular ac14.tar.Z
 
 MAINTAINER=	keith@FreeBSD.org
 
@@ -22,8 +23,7 @@ NO_BUILD=	YES
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(cd ${WRKDIR} && \
-	  ${TAR} xzf ${DISTDIR}/ac14.tar.Z && \
-	  ${TAR} xzf ${DISTDIR}/ag14.tar.Z )
+	  ${TAR} xzf ${DISTDIR}/ac14.tar.Z )
 
 do-install:
 	@${INSTALL_DATA} ${DISTDIR}/MOEKai-Regular \
@@ -36,8 +36,6 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript/fonts/CMap
 	@${INSTALL_DATA} ${WRKDIR}/ac14/CMap/* \
 		${PREFIX}/share/ghostscript/fonts/CMap
-	@${INSTALL_DATA} ${WRKDIR}/ag14/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 90f914ae7826..85ac29802d90 100644
--- a/chinese/moefonts-cid/distinfo
+++ b/chinese/moefonts-cid/distinfo
@@ -1,4 +1,3 @@
 MD5 (MOEKai-Regular) = f8a94515e3058321c78149e862005459
 MD5 (MOESung-Regular) = 42a8801fb18a4b851a7ce1224b3b5bc3
 MD5 (ac14.tar.Z) = b85e49bdc25ff2f82f4ee9ef833a5ce0
-MD5 (ag14.tar.Z) = cd56108da56558135821402edda7f10d
diff --git a/chinese/moefonts-cid/pkg-plist b/chinese/moefonts-cid/pkg-plist
index 9870e76e1c8b..2d370d8d25aa 100644
--- a/chinese/moefonts-cid/pkg-plist
+++ b/chinese/moefonts-cid/pkg-plist
@@ -3,11 +3,6 @@ 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/Adobe-GB1-0
-share/ghostscript/fonts/CMap/Adobe-GB1-1
-share/ghostscript/fonts/CMap/Adobe-GB1-2
-share/ghostscript/fonts/CMap/Adobe-GB1-3
-share/ghostscript/fonts/CMap/Adobe-GB1-4
 share/ghostscript/fonts/CMap/B5-H
 share/ghostscript/fonts/CMap/B5-V
 share/ghostscript/fonts/CMap/B5pc-H
@@ -22,24 +17,6 @@ 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/GB-EUC-H
-share/ghostscript/fonts/CMap/GB-EUC-V
-share/ghostscript/fonts/CMap/GB-H
-share/ghostscript/fonts/CMap/GB-V
-share/ghostscript/fonts/CMap/GBK-EUC-H
-share/ghostscript/fonts/CMap/GBK-EUC-V
-share/ghostscript/fonts/CMap/GBK2K-H
-share/ghostscript/fonts/CMap/GBK2K-V
-share/ghostscript/fonts/CMap/GBKp-EUC-H
-share/ghostscript/fonts/CMap/GBKp-EUC-V
-share/ghostscript/fonts/CMap/GBT-EUC-H
-share/ghostscript/fonts/CMap/GBT-EUC-V
-share/ghostscript/fonts/CMap/GBT-H
-share/ghostscript/fonts/CMap/GBT-V
-share/ghostscript/fonts/CMap/GBTpc-EUC-H
-share/ghostscript/fonts/CMap/GBTpc-EUC-V
-share/ghostscript/fonts/CMap/GBpc-EUC-H
-share/ghostscript/fonts/CMap/GBpc-EUC-V
 share/ghostscript/fonts/CMap/HKdla-B5-H
 share/ghostscript/fonts/CMap/HKdla-B5-V
 share/ghostscript/fonts/CMap/HKdlb-B5-H
@@ -60,10 +37,6 @@ 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/CMap/UniGB-UCS2-H
-share/ghostscript/fonts/CMap/UniGB-UCS2-V
-share/ghostscript/fonts/CMap/UniGB-UTF8-H
-share/ghostscript/fonts/CMap/UniGB-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
diff --git a/chinese/moefonts-cid/pkg-req b/chinese/moefonts-cid/pkg-req
index 3c1fbafc4907..2acc12385190 100644
--- a/chinese/moefonts-cid/pkg-req
+++ b/chinese/moefonts-cid/pkg-req
@@ -4,11 +4,11 @@ if [ "$2" != "INSTALL" ]; then
   exit 0
 fi
 
-if [ ! -f /usr/local/share/ghostscript/6.01/lib/Fontmap.GS ]; then
+if [ ! -f /usr/local/share/ghostscript/7.05/lib/Fontmap.GS ]; then
   echo ===
-  echo You do not have Ghostscript 6.01 installed!
+  echo You do not have Ghostscript 7.05 installed!
   echo
-  echo This port is specifically for version 6.01 or later, for
+  echo This port is specifically for version 7.05 or later, for
   echo it fixes many bugs wrt. CIDFonts.
   echo ===
 fi