- Create symlinks to CMap files instead of installing them.

- Use SUB_FILES for CIDFnmap.*.
- Some style fixes.
- Reset maintainership.

Approved by:	maintainer timeout (3 months)

14 files changed, 476 insertions, 90 deletions

diff --git a/print/ghostscript-gnu-commfont/Makefile b/print/ghostscript-gnu-commfont/Makefile
index a242f67..d14d45f 100644
--- a/print/ghostscript-gnu-commfont/Makefile
+++ b/print/ghostscript-gnu-commfont/Makefile
@@ -6,6 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}
+PORTREVISION=	1
 
 COMMFONT=	yes
 
diff --git a/print/ghostscript-gnu-commfont/Makefile.common b/print/ghostscript-gnu-commfont/Makefile.common
index 8b58ec2..30999ec 100644
--- a/print/ghostscript-gnu-commfont/Makefile.common
+++ b/print/ghostscript-gnu-commfont/Makefile.common
@@ -6,21 +6,24 @@ PKGNAMESUFFIX=	-gnu
 DISTNAME=	# nonexistent
 DISTFILES=	# empty
 
-MAINTAINER?=	mita@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU ghostscript with CJK font support
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu \
-		${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+		${CMAPDIR}/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-GSLIB_DIR=	${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+GSLIB_DIR=	share/ghostscript/${PORTVERSION}/lib
+GSRES_DIR=	share/ghostscript/Resource
+CMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 PLIST_SUB=	GS_VERSION=${PORTVERSION} SHAREMODE=${SHAREMODE}
 
 .if defined(COMMFONT)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-commfont
 PLIST=		${PKGDIR}/pkg-plist.common
+PLIST_SUB+=	GSRES_DIR=${GSRES_DIR}
 .else
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/${PORTVERSION}/lib/gs_init.ps.pre_sed:${PORTSDIR}/print/ghostscript-gnu-commfont
 PLIST_SUB+=	CIDFNMAP="${CIDFNMAP}"
@@ -29,46 +32,47 @@ CATEGORIES:=	japanese ${CATEGORIES}
 COMMENT=	GNU ghostscript with Japanese font support
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-jpnfont
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
 CIDFNMAP=	CIDFnmap.jp
 .elif defined(KORFONT)
 CATEGORIES:=	korean ${CATEGORIES}
 COMMENT=	GNU ghostscript with Korean font support
 PKGNAMEPREFIX=	ko-
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-korfont
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/fonts/Munhwa-Bold:${PORTSDIR}/korean/munhwafonts-cid
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/CIDFont/Munhwa-Bold:${PORTSDIR}/korean/munhwafonts-cid
 CIDFNMAP=	CIDFnmap.ko
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
-do-configure:
 .if !defined(COMMFONT)
-	${SED} -e 's:%%LOCALBASE%%:${LOCALBASE}:g' \
-	       -e 's:%%X11BASE%%:${X11BASE}:g' \
-		${FILESDIR}/${CIDFNMAP} > ${WRKSRC}/${CIDFNMAP}
+SUB_FILES+=	${CIDFNMAP}
 .endif
 
 do-install:
 .if defined(COMMFONT)
-	${MV} ${GSLIB_DIR}/gs_init.ps  ${GSLIB_DIR}/gs_init.ps.pre_sed
-	${SED} -e "s:^%.*(a4):(a4):" ${GSLIB_DIR}/gs_init.ps.pre_sed > \
-		${GSLIB_DIR}/gs_init.ps
+	${MKDIR} -p ${PREFIX}/${GSRES_DIR}/CMap
+	cd ${PREFIX}/${GSRES_DIR}/CMap && \
+		${LN} -s -f `${FIND} ${CMAPDIR} -type f -a \! -name \*.txt` .
+	${MV} ${PREFIX}/${GSLIB_DIR}/gs_init.ps  ${PREFIX}/${GSLIB_DIR}/gs_init.ps.pre_sed
+	${SED} -e "s:^%.*(a4):(a4):" ${PREFIX}/${GSLIB_DIR}/gs_init.ps.pre_sed > \
+		${PREFIX}/${GSLIB_DIR}/gs_init.ps
 .else
-	${INSTALL_DATA} ${WRKSRC}/${CIDFNMAP} ${GSLIB_DIR}
-	${MV} ${GSLIB_DIR}/CIDFnmap  ${GSLIB_DIR}/CIDFnmap.orig
-	${GREP} -v -e "${CIDFNMAP}" ${GSLIB_DIR}/CIDFnmap.orig > \
-		${GSLIB_DIR}/CIDFnmap
-	${ECHO_CMD} '(${CIDFNMAP}) .runlibfile' >> ${GSLIB_DIR}/CIDFnmap
-	${CHMOD} ${SHAREMODE} ${GSLIB_DIR}/CIDFnmap
+	${INSTALL_DATA} ${WRKSRC}/${CIDFNMAP} ${PREFIX}/${GSLIB_DIR}
+	${CP} ${PREFIX}/${GSLIB_DIR}/CIDFnmap  ${PREFIX}/${GSLIB_DIR}/CIDFnmap.orig
+	(	${GREP} -v -e "${CIDFNMAP}" ${PREFIX}/${GSLIB_DIR}/CIDFnmap.orig;\
+		${ECHO_CMD} '(${CIDFNMAP}) .runlibfile'; \
+	) > ${PREFIX}/${GSLIB_DIR}/CIDFnmap
 .endif
 
-post-install:
 .if defined(KORFONT)
+post-install:
+	${MKDIR} ${LOCALBASE}/share/ghostscript/Resource/CIDFont
 .for i in Munhwa-Bold Munhwa-Regular MunhwaGothic-Bold MunhwaGothic-Regular
-	${LN} -sf ${PREFIX}/share/ghostscript/fonts/${i} \
-		${PREFIX}/share/ghostscript/Resource/CIDFont/${i}
+	${LN} -sf ${LOCALBASE}/share/fonts/CIDFont/${i} \
+		${LOCALBASE}/share/ghostscript/Resource/CIDFont/${i}
 	${ECHO_CMD} "share/ghostscript/Resource/CIDFont/${i}" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir %D/share/ghostscript/Resource/CIDFont 2> /dev/null || true" >> ${TMPPLIST}
 .endfor
 .endif
 
diff --git a/print/ghostscript-gnu-commfont/files/CIDFnmap.jp b/print/ghostscript-gnu-commfont/files/CIDFnmap.jp
deleted file mode 100644
index dd70213..0000000
--- a/print/ghostscript-gnu-commfont/files/CIDFnmap.jp
+++ /dev/null
@@ -1,22 +0,0 @@
-% Japanese Truetype Fonts (Sazanami)
-/Sazanami-Mincho	(%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf) 1 ;
-/Sazanami-Gothic	(%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf) 1 ;
-
-%
-% Convenient aliases for PS files on Japanese PostScript printer
-%
-/Adobe-Japan1		/Sazanami-Mincho	;
-/Ryumin-Light		/Sazanami-Mincho	;
-/Ryumin-Light-H		/Sazanami-Mincho	;
-/Ryumin-Light-V		/Sazanami-Mincho	;
-/GothicBBB-Medium	/Sazanami-Gothic	;
-/GothicBBB-Medium-H	/Sazanami-Gothic	;
-/GothicBBB-Medium-V	/Sazanami-Gothic	;
-/HeiseiMin-W3H		/Sazanami-Mincho	;
-/HeiseiKakuGo-W5H	/Sazanami-Gothic	;
-/FutoMinA101-Bold	/Sazanami-Mincho	;
-/FutoMinA101-Bold-H	/Sazanami-Mincho	;
-/FutoMinA101-Bold-V	/Sazanami-Mincho	;
-/FutoGoB101-Bold	/Sazanami-Gothic	;
-/FutoGoB101-Bold-H	/Sazanami-Gothic	;
-/FutoGoB101-Bold-V	/Sazanami-Gothic	;
diff --git a/print/ghostscript-gnu-commfont/files/CIDFnmap.jp.in b/print/ghostscript-gnu-commfont/files/CIDFnmap.jp.in
new file mode 100644
index 0000000..c658fc3
--- /dev/null
+++ b/print/ghostscript-gnu-commfont/files/CIDFnmap.jp.in
@@ -0,0 +1,23 @@
+% $FreeBSD$
+% Japanese Truetype Fonts
+/Default-Mincho	(%%LOCALBASE%%/share/fonts/TrueType/ipam.ttf) 1 ;
+/Default-Gothic	(%%LOCALBASE%%/share/fonts/TrueType/ipag.ttf) 1 ;
+
+%
+% Convenient aliases for PS files on Japanese PostScript printer
+%
+/Adobe-Japan1		/Default-Mincho	;
+/Ryumin-Light		/Default-Mincho	;
+/Ryumin-Light-H		/Default-Mincho	;
+/Ryumin-Light-V		/Default-Mincho	;
+/GothicBBB-Medium	/Default-Gothic	;
+/GothicBBB-Medium-H	/Default-Gothic	;
+/GothicBBB-Medium-V	/Default-Gothic	;
+/HeiseiMin-W3H		/Default-Mincho	;
+/HeiseiKakuGo-W5H	/Default-Gothic	;
+/FutoMinA101-Bold	/Default-Mincho	;
+/FutoMinA101-Bold-H	/Default-Mincho	;
+/FutoMinA101-Bold-V	/Default-Mincho	;
+/FutoGoB101-Bold	/Default-Gothic	;
+/FutoGoB101-Bold-H	/Default-Gothic	;
+/FutoGoB101-Bold-V	/Default-Gothic	;
diff --git a/print/ghostscript-gnu-commfont/files/CIDFnmap.ko b/print/ghostscript-gnu-commfont/files/CIDFnmap.ko.in
index 5f72b70..699de17 100644
--- a/print/ghostscript-gnu-commfont/files/CIDFnmap.ko
+++ b/print/ghostscript-gnu-commfont/files/CIDFnmap.ko.in
@@ -1,8 +1,9 @@
-/Adobe-Korea1	/Munhwa-Regular ;
+% $FreeBSD$
+/Adobe-Korea1		/Munhwa-Regular		;
 
 %
 % Convenient aliases for PS files on Korean PostScript printer
 %
 /HYGoThic-Medium	/MunhwaGothic-Regular	;
 /HYSMyeongJo-Medium	/Munhwa-Regular		;
-/HYRGoThic-Medium	/MunhwaGothic-Bold		;
+/HYRGoThic-Medium	/MunhwaGothic-Bold	;
diff --git a/print/ghostscript-gnu-commfont/pkg-plist b/print/ghostscript-gnu-commfont/pkg-plist
index 3cb5de7..ba6dfa4 100644
--- a/print/ghostscript-gnu-commfont/pkg-plist
+++ b/print/ghostscript-gnu-commfont/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 share/ghostscript/%%GS_VERSION%%/lib/%%CIDFNMAP%%
 @exec /bin/mv %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap  %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.orig
 @exec /usr/bin/grep -v -e '%%CIDFNMAP%%' %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.orig > %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap
diff --git a/print/ghostscript-gnu-commfont/pkg-plist.common b/print/ghostscript-gnu-commfont/pkg-plist.common
index 155e6b3..7c612b3 100644
--- a/print/ghostscript-gnu-commfont/pkg-plist.common
+++ b/print/ghostscript-gnu-commfont/pkg-plist.common
@@ -1,3 +1,188 @@
+@comment $FreeBSD$
+%%GSRES_DIR%%/CMap/Adobe-CNS1-0
+%%GSRES_DIR%%/CMap/Adobe-CNS1-1
+%%GSRES_DIR%%/CMap/Adobe-CNS1-2
+%%GSRES_DIR%%/CMap/Adobe-CNS1-3
+%%GSRES_DIR%%/CMap/Adobe-CNS1-4
+%%GSRES_DIR%%/CMap/Adobe-CNS1-5
+%%GSRES_DIR%%/CMap/B5-H
+%%GSRES_DIR%%/CMap/B5-V
+%%GSRES_DIR%%/CMap/B5pc-H
+%%GSRES_DIR%%/CMap/B5pc-V
+%%GSRES_DIR%%/CMap/CNS-EUC-H
+%%GSRES_DIR%%/CMap/CNS-EUC-V
+%%GSRES_DIR%%/CMap/CNS1-H
+%%GSRES_DIR%%/CMap/CNS1-V
+%%GSRES_DIR%%/CMap/CNS2-H
+%%GSRES_DIR%%/CMap/CNS2-V
+%%GSRES_DIR%%/CMap/ETen-B5-H
+%%GSRES_DIR%%/CMap/ETen-B5-V
+%%GSRES_DIR%%/CMap/ETHK-B5-H
+%%GSRES_DIR%%/CMap/ETHK-B5-V
+%%GSRES_DIR%%/CMap/HKdla-B5-H
+%%GSRES_DIR%%/CMap/HKdla-B5-V
+%%GSRES_DIR%%/CMap/HKdlb-B5-H
+%%GSRES_DIR%%/CMap/HKdlb-B5-V
+%%GSRES_DIR%%/CMap/GB-H
+%%GSRES_DIR%%/CMap/HKgccs-B5-H
+%%GSRES_DIR%%/CMap/HKgccs-B5-V
+%%GSRES_DIR%%/CMap/HKm314-B5-H
+%%GSRES_DIR%%/CMap/HKm314-B5-V
+%%GSRES_DIR%%/CMap/HKm471-B5-H
+%%GSRES_DIR%%/CMap/HKm471-B5-V
+%%GSRES_DIR%%/CMap/HKscs-B5-H
+%%GSRES_DIR%%/CMap/HKscs-B5-V
+%%GSRES_DIR%%/CMap/UniCNS-UCS2-H
+%%GSRES_DIR%%/CMap/UniCNS-UCS2-V
+%%GSRES_DIR%%/CMap/UniCNS-UTF16-H
+%%GSRES_DIR%%/CMap/UniCNS-UTF16-V
+%%GSRES_DIR%%/CMap/UniCNS-UTF32-H
+%%GSRES_DIR%%/CMap/UniCNS-UTF32-V
+%%GSRES_DIR%%/CMap/UniCNS-UTF8-H
+%%GSRES_DIR%%/CMap/UniCNS-UTF8-V
+%%GSRES_DIR%%/CMap/Adobe-GB1-0
+%%GSRES_DIR%%/CMap/Adobe-GB1-1
+%%GSRES_DIR%%/CMap/Adobe-GB1-2
+%%GSRES_DIR%%/CMap/Adobe-GB1-3
+%%GSRES_DIR%%/CMap/Adobe-GB1-4
+%%GSRES_DIR%%/CMap/Adobe-GB1-5
+%%GSRES_DIR%%/CMap/GB-EUC-H
+%%GSRES_DIR%%/CMap/GB-EUC-V
+%%GSRES_DIR%%/CMap/GB-V
+%%GSRES_DIR%%/CMap/GBK-EUC-H
+%%GSRES_DIR%%/CMap/GBK-EUC-V
+%%GSRES_DIR%%/CMap/GBK2K-H
+%%GSRES_DIR%%/CMap/GBK2K-V
+%%GSRES_DIR%%/CMap/GBKp-EUC-H
+%%GSRES_DIR%%/CMap/GBKp-EUC-V
+%%GSRES_DIR%%/CMap/GBpc-EUC-H
+%%GSRES_DIR%%/CMap/GBpc-EUC-V
+%%GSRES_DIR%%/CMap/GBT-EUC-H
+%%GSRES_DIR%%/CMap/GBT-EUC-V
+%%GSRES_DIR%%/CMap/GBT-H
+%%GSRES_DIR%%/CMap/GBT-V
+%%GSRES_DIR%%/CMap/GBTpc-EUC-H
+%%GSRES_DIR%%/CMap/GBTpc-EUC-V
+%%GSRES_DIR%%/CMap/UniGB-UCS2-H
+%%GSRES_DIR%%/CMap/UniGB-UCS2-V
+%%GSRES_DIR%%/CMap/UniGB-UTF16-H
+%%GSRES_DIR%%/CMap/UniGB-UTF16-V
+%%GSRES_DIR%%/CMap/UniGB-UTF32-H
+%%GSRES_DIR%%/CMap/UniGB-UTF32-V
+%%GSRES_DIR%%/CMap/UniGB-UTF8-H
+%%GSRES_DIR%%/CMap/UniGB-UTF8-V
+%%GSRES_DIR%%/CMap/Identity-H
+%%GSRES_DIR%%/CMap/78-H
+%%GSRES_DIR%%/CMap/Identity-V
+%%GSRES_DIR%%/CMap/78-EUC-H
+%%GSRES_DIR%%/CMap/78-EUC-V
+%%GSRES_DIR%%/CMap/78-RKSJ-H
+%%GSRES_DIR%%/CMap/78-RKSJ-V
+%%GSRES_DIR%%/CMap/78-V
+%%GSRES_DIR%%/CMap/78ms-RKSJ-H
+%%GSRES_DIR%%/CMap/78ms-RKSJ-V
+%%GSRES_DIR%%/CMap/83pv-RKSJ-H
+%%GSRES_DIR%%/CMap/90ms-RKSJ-H
+%%GSRES_DIR%%/CMap/90ms-RKSJ-V
+%%GSRES_DIR%%/CMap/90msp-RKSJ-H
+%%GSRES_DIR%%/CMap/90msp-RKSJ-V
+%%GSRES_DIR%%/CMap/90pv-RKSJ-H
+%%GSRES_DIR%%/CMap/90pv-RKSJ-V
+%%GSRES_DIR%%/CMap/Add-H
+%%GSRES_DIR%%/CMap/Add-RKSJ-H
+%%GSRES_DIR%%/CMap/Add-RKSJ-V
+%%GSRES_DIR%%/CMap/Add-V
+%%GSRES_DIR%%/CMap/Adobe-Japan1-0
+%%GSRES_DIR%%/CMap/Adobe-Japan1-1
+%%GSRES_DIR%%/CMap/Adobe-Japan1-2
+%%GSRES_DIR%%/CMap/Adobe-Japan1-3
+%%GSRES_DIR%%/CMap/EUC-H
+%%GSRES_DIR%%/CMap/Adobe-Japan1-4
+%%GSRES_DIR%%/CMap/Adobe-Japan1-5
+%%GSRES_DIR%%/CMap/Adobe-Japan1-6
+%%GSRES_DIR%%/CMap/EUC-V
+%%GSRES_DIR%%/CMap/Ext-H
+%%GSRES_DIR%%/CMap/Ext-RKSJ-H
+%%GSRES_DIR%%/CMap/Ext-RKSJ-V
+%%GSRES_DIR%%/CMap/Ext-V
+%%GSRES_DIR%%/CMap/H
+%%GSRES_DIR%%/CMap/Hankaku
+%%GSRES_DIR%%/CMap/Hiragana
+%%GSRES_DIR%%/CMap/Katakana
+%%GSRES_DIR%%/CMap/NWP-H
+%%GSRES_DIR%%/CMap/NWP-V
+%%GSRES_DIR%%/CMap/RKSJ-H
+%%GSRES_DIR%%/CMap/RKSJ-V
+%%GSRES_DIR%%/CMap/Roman
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-H
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-HW-H
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-HW-V
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-V
+%%GSRES_DIR%%/CMap/UniJIS-UTF16-H
+%%GSRES_DIR%%/CMap/UniJIS-UTF16-V
+%%GSRES_DIR%%/CMap/UniJIS-UTF32-H
+%%GSRES_DIR%%/CMap/UniJIS-UTF32-V
+%%GSRES_DIR%%/CMap/UniJIS-UTF8-H
+%%GSRES_DIR%%/CMap/UniJIS-UTF8-V
+%%GSRES_DIR%%/CMap/UniJISPro-UCS2-HW-V
+%%GSRES_DIR%%/CMap/UniJISPro-UCS2-V
+%%GSRES_DIR%%/CMap/UniJISPro-UTF8-V
+%%GSRES_DIR%%/CMap/UniJISX0213-UTF32-H
+%%GSRES_DIR%%/CMap/UniJISX0213-UTF32-V
+%%GSRES_DIR%%/CMap/V
+%%GSRES_DIR%%/CMap/WP-Symbol
+%%GSRES_DIR%%/CMap/Adobe-Japan2-0
+%%GSRES_DIR%%/CMap/Hojo-EUC-H
+%%GSRES_DIR%%/CMap/Hojo-EUC-V
+%%GSRES_DIR%%/CMap/Hojo-H
+%%GSRES_DIR%%/CMap/Hojo-V
+%%GSRES_DIR%%/CMap/UniHojo-UCS2-H
+%%GSRES_DIR%%/CMap/UniHojo-UCS2-V
+%%GSRES_DIR%%/CMap/UniHojo-UTF8-H
+%%GSRES_DIR%%/CMap/UniHojo-UTF8-V
+%%GSRES_DIR%%/CMap/UniHojo-UTF16-H
+%%GSRES_DIR%%/CMap/UniHojo-UTF16-V
+%%GSRES_DIR%%/CMap/UniHojo-UTF32-H
+%%GSRES_DIR%%/CMap/UniHojo-UTF32-V
+%%GSRES_DIR%%/CMap/Adobe-Korea1-0
+%%GSRES_DIR%%/CMap/Adobe-Korea1-1
+%%GSRES_DIR%%/CMap/Adobe-Korea1-2
+%%GSRES_DIR%%/CMap/KSC-EUC-H
+%%GSRES_DIR%%/CMap/KSC-EUC-V
+%%GSRES_DIR%%/CMap/KSC-H
+%%GSRES_DIR%%/CMap/KSC-Johab-H
+%%GSRES_DIR%%/CMap/KSC-Johab-V
+%%GSRES_DIR%%/CMap/KSC-V
+%%GSRES_DIR%%/CMap/KSCms-UHC-H
+%%GSRES_DIR%%/CMap/KSCms-UHC-HW-H
+%%GSRES_DIR%%/CMap/KSCms-UHC-HW-V
+%%GSRES_DIR%%/CMap/KSCms-UHC-V
+%%GSRES_DIR%%/CMap/KSCpc-EUC-H
+%%GSRES_DIR%%/CMap/KSCpc-EUC-V
+%%GSRES_DIR%%/CMap/UniKS-UCS2-H
+%%GSRES_DIR%%/CMap/UniKS-UCS2-V
+%%GSRES_DIR%%/CMap/UniKS-UTF16-H
+%%GSRES_DIR%%/CMap/UniKS-UTF16-V
+%%GSRES_DIR%%/CMap/UniKS-UTF32-H
+%%GSRES_DIR%%/CMap/UniKS-UTF32-V
+%%GSRES_DIR%%/CMap/UniKS-UTF8-H
+%%GSRES_DIR%%/CMap/UniKS-UTF8-V
+%%GSRES_DIR%%/CMap/GB-RKSJ-H
+%%GSRES_DIR%%/CMap/GBT-RKSJ-H
+%%GSRES_DIR%%/CMap/Hojo-RKSJ-H
+%%GSRES_DIR%%/CMap/KSC-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS01-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS02-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS03-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS04-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS05-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS06-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS07-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS15-RKSJ-H
+%%GSRES_DIR%%/CMap/HK-RKSJ-H
+%%GSRES_DIR%%/CMap/KSC2-RKSJ-H
+%%GSRES_DIR%%/CMap/TCVN-RKSJ-H
+@dirrm %%GSRES_DIR%%/CMap
 @exec /bin/mv %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed
 @exec /usr/bin/sed -e 's:^%.*(a4):(a4):g' %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed > %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
 @unexec /bin/rm %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile
index a242f67..d14d45f 100644
--- a/print/ghostscript7-commfont/Makefile
+++ b/print/ghostscript7-commfont/Makefile
@@ -6,6 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}
+PORTREVISION=	1
 
 COMMFONT=	yes
 
diff --git a/print/ghostscript7-commfont/Makefile.common b/print/ghostscript7-commfont/Makefile.common
index 8b58ec2..30999ec 100644
--- a/print/ghostscript7-commfont/Makefile.common
+++ b/print/ghostscript7-commfont/Makefile.common
@@ -6,21 +6,24 @@ PKGNAMESUFFIX=	-gnu
 DISTNAME=	# nonexistent
 DISTFILES=	# empty
 
-MAINTAINER?=	mita@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	GNU ghostscript with CJK font support
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu \
-		${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+		${CMAPDIR}/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-GSLIB_DIR=	${PREFIX}/share/ghostscript/${PORTVERSION}/lib
+GSLIB_DIR=	share/ghostscript/${PORTVERSION}/lib
+GSRES_DIR=	share/ghostscript/Resource
+CMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 PLIST_SUB=	GS_VERSION=${PORTVERSION} SHAREMODE=${SHAREMODE}
 
 .if defined(COMMFONT)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-commfont
 PLIST=		${PKGDIR}/pkg-plist.common
+PLIST_SUB+=	GSRES_DIR=${GSRES_DIR}
 .else
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/${PORTVERSION}/lib/gs_init.ps.pre_sed:${PORTSDIR}/print/ghostscript-gnu-commfont
 PLIST_SUB+=	CIDFNMAP="${CIDFNMAP}"
@@ -29,46 +32,47 @@ CATEGORIES:=	japanese ${CATEGORIES}
 COMMENT=	GNU ghostscript with Japanese font support
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-jpnfont
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
 CIDFNMAP=	CIDFnmap.jp
 .elif defined(KORFONT)
 CATEGORIES:=	korean ${CATEGORIES}
 COMMENT=	GNU ghostscript with Korean font support
 PKGNAMEPREFIX=	ko-
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-korfont
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/fonts/Munhwa-Bold:${PORTSDIR}/korean/munhwafonts-cid
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/CIDFont/Munhwa-Bold:${PORTSDIR}/korean/munhwafonts-cid
 CIDFNMAP=	CIDFnmap.ko
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
-do-configure:
 .if !defined(COMMFONT)
-	${SED} -e 's:%%LOCALBASE%%:${LOCALBASE}:g' \
-	       -e 's:%%X11BASE%%:${X11BASE}:g' \
-		${FILESDIR}/${CIDFNMAP} > ${WRKSRC}/${CIDFNMAP}
+SUB_FILES+=	${CIDFNMAP}
 .endif
 
 do-install:
 .if defined(COMMFONT)
-	${MV} ${GSLIB_DIR}/gs_init.ps  ${GSLIB_DIR}/gs_init.ps.pre_sed
-	${SED} -e "s:^%.*(a4):(a4):" ${GSLIB_DIR}/gs_init.ps.pre_sed > \
-		${GSLIB_DIR}/gs_init.ps
+	${MKDIR} -p ${PREFIX}/${GSRES_DIR}/CMap
+	cd ${PREFIX}/${GSRES_DIR}/CMap && \
+		${LN} -s -f `${FIND} ${CMAPDIR} -type f -a \! -name \*.txt` .
+	${MV} ${PREFIX}/${GSLIB_DIR}/gs_init.ps  ${PREFIX}/${GSLIB_DIR}/gs_init.ps.pre_sed
+	${SED} -e "s:^%.*(a4):(a4):" ${PREFIX}/${GSLIB_DIR}/gs_init.ps.pre_sed > \
+		${PREFIX}/${GSLIB_DIR}/gs_init.ps
 .else
-	${INSTALL_DATA} ${WRKSRC}/${CIDFNMAP} ${GSLIB_DIR}
-	${MV} ${GSLIB_DIR}/CIDFnmap  ${GSLIB_DIR}/CIDFnmap.orig
-	${GREP} -v -e "${CIDFNMAP}" ${GSLIB_DIR}/CIDFnmap.orig > \
-		${GSLIB_DIR}/CIDFnmap
-	${ECHO_CMD} '(${CIDFNMAP}) .runlibfile' >> ${GSLIB_DIR}/CIDFnmap
-	${CHMOD} ${SHAREMODE} ${GSLIB_DIR}/CIDFnmap
+	${INSTALL_DATA} ${WRKSRC}/${CIDFNMAP} ${PREFIX}/${GSLIB_DIR}
+	${CP} ${PREFIX}/${GSLIB_DIR}/CIDFnmap  ${PREFIX}/${GSLIB_DIR}/CIDFnmap.orig
+	(	${GREP} -v -e "${CIDFNMAP}" ${PREFIX}/${GSLIB_DIR}/CIDFnmap.orig;\
+		${ECHO_CMD} '(${CIDFNMAP}) .runlibfile'; \
+	) > ${PREFIX}/${GSLIB_DIR}/CIDFnmap
 .endif
 
-post-install:
 .if defined(KORFONT)
+post-install:
+	${MKDIR} ${LOCALBASE}/share/ghostscript/Resource/CIDFont
 .for i in Munhwa-Bold Munhwa-Regular MunhwaGothic-Bold MunhwaGothic-Regular
-	${LN} -sf ${PREFIX}/share/ghostscript/fonts/${i} \
-		${PREFIX}/share/ghostscript/Resource/CIDFont/${i}
+	${LN} -sf ${LOCALBASE}/share/fonts/CIDFont/${i} \
+		${LOCALBASE}/share/ghostscript/Resource/CIDFont/${i}
 	${ECHO_CMD} "share/ghostscript/Resource/CIDFont/${i}" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir %D/share/ghostscript/Resource/CIDFont 2> /dev/null || true" >> ${TMPPLIST}
 .endfor
 .endif
 
diff --git a/print/ghostscript7-commfont/files/CIDFnmap.jp b/print/ghostscript7-commfont/files/CIDFnmap.jp
deleted file mode 100644
index dd70213..0000000
--- a/print/ghostscript7-commfont/files/CIDFnmap.jp
+++ /dev/null
@@ -1,22 +0,0 @@
-% Japanese Truetype Fonts (Sazanami)
-/Sazanami-Mincho	(%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-mincho.ttf) 1 ;
-/Sazanami-Gothic	(%%X11BASE%%/lib/X11/fonts/TrueType/sazanami-gothic.ttf) 1 ;
-
-%
-% Convenient aliases for PS files on Japanese PostScript printer
-%
-/Adobe-Japan1		/Sazanami-Mincho	;
-/Ryumin-Light		/Sazanami-Mincho	;
-/Ryumin-Light-H		/Sazanami-Mincho	;
-/Ryumin-Light-V		/Sazanami-Mincho	;
-/GothicBBB-Medium	/Sazanami-Gothic	;
-/GothicBBB-Medium-H	/Sazanami-Gothic	;
-/GothicBBB-Medium-V	/Sazanami-Gothic	;
-/HeiseiMin-W3H		/Sazanami-Mincho	;
-/HeiseiKakuGo-W5H	/Sazanami-Gothic	;
-/FutoMinA101-Bold	/Sazanami-Mincho	;
-/FutoMinA101-Bold-H	/Sazanami-Mincho	;
-/FutoMinA101-Bold-V	/Sazanami-Mincho	;
-/FutoGoB101-Bold	/Sazanami-Gothic	;
-/FutoGoB101-Bold-H	/Sazanami-Gothic	;
-/FutoGoB101-Bold-V	/Sazanami-Gothic	;
diff --git a/print/ghostscript7-commfont/files/CIDFnmap.jp.in b/print/ghostscript7-commfont/files/CIDFnmap.jp.in
new file mode 100644
index 0000000..c658fc3
--- /dev/null
+++ b/print/ghostscript7-commfont/files/CIDFnmap.jp.in
@@ -0,0 +1,23 @@
+% $FreeBSD$
+% Japanese Truetype Fonts
+/Default-Mincho	(%%LOCALBASE%%/share/fonts/TrueType/ipam.ttf) 1 ;
+/Default-Gothic	(%%LOCALBASE%%/share/fonts/TrueType/ipag.ttf) 1 ;
+
+%
+% Convenient aliases for PS files on Japanese PostScript printer
+%
+/Adobe-Japan1		/Default-Mincho	;
+/Ryumin-Light		/Default-Mincho	;
+/Ryumin-Light-H		/Default-Mincho	;
+/Ryumin-Light-V		/Default-Mincho	;
+/GothicBBB-Medium	/Default-Gothic	;
+/GothicBBB-Medium-H	/Default-Gothic	;
+/GothicBBB-Medium-V	/Default-Gothic	;
+/HeiseiMin-W3H		/Default-Mincho	;
+/HeiseiKakuGo-W5H	/Default-Gothic	;
+/FutoMinA101-Bold	/Default-Mincho	;
+/FutoMinA101-Bold-H	/Default-Mincho	;
+/FutoMinA101-Bold-V	/Default-Mincho	;
+/FutoGoB101-Bold	/Default-Gothic	;
+/FutoGoB101-Bold-H	/Default-Gothic	;
+/FutoGoB101-Bold-V	/Default-Gothic	;
diff --git a/print/ghostscript7-commfont/files/CIDFnmap.ko b/print/ghostscript7-commfont/files/CIDFnmap.ko.in
index 5f72b70..699de17 100644
--- a/print/ghostscript7-commfont/files/CIDFnmap.ko
+++ b/print/ghostscript7-commfont/files/CIDFnmap.ko.in
@@ -1,8 +1,9 @@
-/Adobe-Korea1	/Munhwa-Regular ;
+% $FreeBSD$
+/Adobe-Korea1		/Munhwa-Regular		;
 
 %
 % Convenient aliases for PS files on Korean PostScript printer
 %
 /HYGoThic-Medium	/MunhwaGothic-Regular	;
 /HYSMyeongJo-Medium	/Munhwa-Regular		;
-/HYRGoThic-Medium	/MunhwaGothic-Bold		;
+/HYRGoThic-Medium	/MunhwaGothic-Bold	;
diff --git a/print/ghostscript7-commfont/pkg-plist b/print/ghostscript7-commfont/pkg-plist
index 3cb5de7..ba6dfa4 100644
--- a/print/ghostscript7-commfont/pkg-plist
+++ b/print/ghostscript7-commfont/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 share/ghostscript/%%GS_VERSION%%/lib/%%CIDFNMAP%%
 @exec /bin/mv %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap  %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.orig
 @exec /usr/bin/grep -v -e '%%CIDFNMAP%%' %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.orig > %D/share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap
diff --git a/print/ghostscript7-commfont/pkg-plist.common b/print/ghostscript7-commfont/pkg-plist.common
index 155e6b3..7c612b3 100644
--- a/print/ghostscript7-commfont/pkg-plist.common
+++ b/print/ghostscript7-commfont/pkg-plist.common
@@ -1,3 +1,188 @@
+@comment $FreeBSD$
+%%GSRES_DIR%%/CMap/Adobe-CNS1-0
+%%GSRES_DIR%%/CMap/Adobe-CNS1-1
+%%GSRES_DIR%%/CMap/Adobe-CNS1-2
+%%GSRES_DIR%%/CMap/Adobe-CNS1-3
+%%GSRES_DIR%%/CMap/Adobe-CNS1-4
+%%GSRES_DIR%%/CMap/Adobe-CNS1-5
+%%GSRES_DIR%%/CMap/B5-H
+%%GSRES_DIR%%/CMap/B5-V
+%%GSRES_DIR%%/CMap/B5pc-H
+%%GSRES_DIR%%/CMap/B5pc-V
+%%GSRES_DIR%%/CMap/CNS-EUC-H
+%%GSRES_DIR%%/CMap/CNS-EUC-V
+%%GSRES_DIR%%/CMap/CNS1-H
+%%GSRES_DIR%%/CMap/CNS1-V
+%%GSRES_DIR%%/CMap/CNS2-H
+%%GSRES_DIR%%/CMap/CNS2-V
+%%GSRES_DIR%%/CMap/ETen-B5-H
+%%GSRES_DIR%%/CMap/ETen-B5-V
+%%GSRES_DIR%%/CMap/ETHK-B5-H
+%%GSRES_DIR%%/CMap/ETHK-B5-V
+%%GSRES_DIR%%/CMap/HKdla-B5-H
+%%GSRES_DIR%%/CMap/HKdla-B5-V
+%%GSRES_DIR%%/CMap/HKdlb-B5-H
+%%GSRES_DIR%%/CMap/HKdlb-B5-V
+%%GSRES_DIR%%/CMap/GB-H
+%%GSRES_DIR%%/CMap/HKgccs-B5-H
+%%GSRES_DIR%%/CMap/HKgccs-B5-V
+%%GSRES_DIR%%/CMap/HKm314-B5-H
+%%GSRES_DIR%%/CMap/HKm314-B5-V
+%%GSRES_DIR%%/CMap/HKm471-B5-H
+%%GSRES_DIR%%/CMap/HKm471-B5-V
+%%GSRES_DIR%%/CMap/HKscs-B5-H
+%%GSRES_DIR%%/CMap/HKscs-B5-V
+%%GSRES_DIR%%/CMap/UniCNS-UCS2-H
+%%GSRES_DIR%%/CMap/UniCNS-UCS2-V
+%%GSRES_DIR%%/CMap/UniCNS-UTF16-H
+%%GSRES_DIR%%/CMap/UniCNS-UTF16-V
+%%GSRES_DIR%%/CMap/UniCNS-UTF32-H
+%%GSRES_DIR%%/CMap/UniCNS-UTF32-V
+%%GSRES_DIR%%/CMap/UniCNS-UTF8-H
+%%GSRES_DIR%%/CMap/UniCNS-UTF8-V
+%%GSRES_DIR%%/CMap/Adobe-GB1-0
+%%GSRES_DIR%%/CMap/Adobe-GB1-1
+%%GSRES_DIR%%/CMap/Adobe-GB1-2
+%%GSRES_DIR%%/CMap/Adobe-GB1-3
+%%GSRES_DIR%%/CMap/Adobe-GB1-4
+%%GSRES_DIR%%/CMap/Adobe-GB1-5
+%%GSRES_DIR%%/CMap/GB-EUC-H
+%%GSRES_DIR%%/CMap/GB-EUC-V
+%%GSRES_DIR%%/CMap/GB-V
+%%GSRES_DIR%%/CMap/GBK-EUC-H
+%%GSRES_DIR%%/CMap/GBK-EUC-V
+%%GSRES_DIR%%/CMap/GBK2K-H
+%%GSRES_DIR%%/CMap/GBK2K-V
+%%GSRES_DIR%%/CMap/GBKp-EUC-H
+%%GSRES_DIR%%/CMap/GBKp-EUC-V
+%%GSRES_DIR%%/CMap/GBpc-EUC-H
+%%GSRES_DIR%%/CMap/GBpc-EUC-V
+%%GSRES_DIR%%/CMap/GBT-EUC-H
+%%GSRES_DIR%%/CMap/GBT-EUC-V
+%%GSRES_DIR%%/CMap/GBT-H
+%%GSRES_DIR%%/CMap/GBT-V
+%%GSRES_DIR%%/CMap/GBTpc-EUC-H
+%%GSRES_DIR%%/CMap/GBTpc-EUC-V
+%%GSRES_DIR%%/CMap/UniGB-UCS2-H
+%%GSRES_DIR%%/CMap/UniGB-UCS2-V
+%%GSRES_DIR%%/CMap/UniGB-UTF16-H
+%%GSRES_DIR%%/CMap/UniGB-UTF16-V
+%%GSRES_DIR%%/CMap/UniGB-UTF32-H
+%%GSRES_DIR%%/CMap/UniGB-UTF32-V
+%%GSRES_DIR%%/CMap/UniGB-UTF8-H
+%%GSRES_DIR%%/CMap/UniGB-UTF8-V
+%%GSRES_DIR%%/CMap/Identity-H
+%%GSRES_DIR%%/CMap/78-H
+%%GSRES_DIR%%/CMap/Identity-V
+%%GSRES_DIR%%/CMap/78-EUC-H
+%%GSRES_DIR%%/CMap/78-EUC-V
+%%GSRES_DIR%%/CMap/78-RKSJ-H
+%%GSRES_DIR%%/CMap/78-RKSJ-V
+%%GSRES_DIR%%/CMap/78-V
+%%GSRES_DIR%%/CMap/78ms-RKSJ-H
+%%GSRES_DIR%%/CMap/78ms-RKSJ-V
+%%GSRES_DIR%%/CMap/83pv-RKSJ-H
+%%GSRES_DIR%%/CMap/90ms-RKSJ-H
+%%GSRES_DIR%%/CMap/90ms-RKSJ-V
+%%GSRES_DIR%%/CMap/90msp-RKSJ-H
+%%GSRES_DIR%%/CMap/90msp-RKSJ-V
+%%GSRES_DIR%%/CMap/90pv-RKSJ-H
+%%GSRES_DIR%%/CMap/90pv-RKSJ-V
+%%GSRES_DIR%%/CMap/Add-H
+%%GSRES_DIR%%/CMap/Add-RKSJ-H
+%%GSRES_DIR%%/CMap/Add-RKSJ-V
+%%GSRES_DIR%%/CMap/Add-V
+%%GSRES_DIR%%/CMap/Adobe-Japan1-0
+%%GSRES_DIR%%/CMap/Adobe-Japan1-1
+%%GSRES_DIR%%/CMap/Adobe-Japan1-2
+%%GSRES_DIR%%/CMap/Adobe-Japan1-3
+%%GSRES_DIR%%/CMap/EUC-H
+%%GSRES_DIR%%/CMap/Adobe-Japan1-4
+%%GSRES_DIR%%/CMap/Adobe-Japan1-5
+%%GSRES_DIR%%/CMap/Adobe-Japan1-6
+%%GSRES_DIR%%/CMap/EUC-V
+%%GSRES_DIR%%/CMap/Ext-H
+%%GSRES_DIR%%/CMap/Ext-RKSJ-H
+%%GSRES_DIR%%/CMap/Ext-RKSJ-V
+%%GSRES_DIR%%/CMap/Ext-V
+%%GSRES_DIR%%/CMap/H
+%%GSRES_DIR%%/CMap/Hankaku
+%%GSRES_DIR%%/CMap/Hiragana
+%%GSRES_DIR%%/CMap/Katakana
+%%GSRES_DIR%%/CMap/NWP-H
+%%GSRES_DIR%%/CMap/NWP-V
+%%GSRES_DIR%%/CMap/RKSJ-H
+%%GSRES_DIR%%/CMap/RKSJ-V
+%%GSRES_DIR%%/CMap/Roman
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-H
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-HW-H
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-HW-V
+%%GSRES_DIR%%/CMap/UniJIS-UCS2-V
+%%GSRES_DIR%%/CMap/UniJIS-UTF16-H
+%%GSRES_DIR%%/CMap/UniJIS-UTF16-V
+%%GSRES_DIR%%/CMap/UniJIS-UTF32-H
+%%GSRES_DIR%%/CMap/UniJIS-UTF32-V
+%%GSRES_DIR%%/CMap/UniJIS-UTF8-H
+%%GSRES_DIR%%/CMap/UniJIS-UTF8-V
+%%GSRES_DIR%%/CMap/UniJISPro-UCS2-HW-V
+%%GSRES_DIR%%/CMap/UniJISPro-UCS2-V
+%%GSRES_DIR%%/CMap/UniJISPro-UTF8-V
+%%GSRES_DIR%%/CMap/UniJISX0213-UTF32-H
+%%GSRES_DIR%%/CMap/UniJISX0213-UTF32-V
+%%GSRES_DIR%%/CMap/V
+%%GSRES_DIR%%/CMap/WP-Symbol
+%%GSRES_DIR%%/CMap/Adobe-Japan2-0
+%%GSRES_DIR%%/CMap/Hojo-EUC-H
+%%GSRES_DIR%%/CMap/Hojo-EUC-V
+%%GSRES_DIR%%/CMap/Hojo-H
+%%GSRES_DIR%%/CMap/Hojo-V
+%%GSRES_DIR%%/CMap/UniHojo-UCS2-H
+%%GSRES_DIR%%/CMap/UniHojo-UCS2-V
+%%GSRES_DIR%%/CMap/UniHojo-UTF8-H
+%%GSRES_DIR%%/CMap/UniHojo-UTF8-V
+%%GSRES_DIR%%/CMap/UniHojo-UTF16-H
+%%GSRES_DIR%%/CMap/UniHojo-UTF16-V
+%%GSRES_DIR%%/CMap/UniHojo-UTF32-H
+%%GSRES_DIR%%/CMap/UniHojo-UTF32-V
+%%GSRES_DIR%%/CMap/Adobe-Korea1-0
+%%GSRES_DIR%%/CMap/Adobe-Korea1-1
+%%GSRES_DIR%%/CMap/Adobe-Korea1-2
+%%GSRES_DIR%%/CMap/KSC-EUC-H
+%%GSRES_DIR%%/CMap/KSC-EUC-V
+%%GSRES_DIR%%/CMap/KSC-H
+%%GSRES_DIR%%/CMap/KSC-Johab-H
+%%GSRES_DIR%%/CMap/KSC-Johab-V
+%%GSRES_DIR%%/CMap/KSC-V
+%%GSRES_DIR%%/CMap/KSCms-UHC-H
+%%GSRES_DIR%%/CMap/KSCms-UHC-HW-H
+%%GSRES_DIR%%/CMap/KSCms-UHC-HW-V
+%%GSRES_DIR%%/CMap/KSCms-UHC-V
+%%GSRES_DIR%%/CMap/KSCpc-EUC-H
+%%GSRES_DIR%%/CMap/KSCpc-EUC-V
+%%GSRES_DIR%%/CMap/UniKS-UCS2-H
+%%GSRES_DIR%%/CMap/UniKS-UCS2-V
+%%GSRES_DIR%%/CMap/UniKS-UTF16-H
+%%GSRES_DIR%%/CMap/UniKS-UTF16-V
+%%GSRES_DIR%%/CMap/UniKS-UTF32-H
+%%GSRES_DIR%%/CMap/UniKS-UTF32-V
+%%GSRES_DIR%%/CMap/UniKS-UTF8-H
+%%GSRES_DIR%%/CMap/UniKS-UTF8-V
+%%GSRES_DIR%%/CMap/GB-RKSJ-H
+%%GSRES_DIR%%/CMap/GBT-RKSJ-H
+%%GSRES_DIR%%/CMap/Hojo-RKSJ-H
+%%GSRES_DIR%%/CMap/KSC-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS01-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS02-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS03-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS04-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS05-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS06-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS07-RKSJ-H
+%%GSRES_DIR%%/CMap/CNS15-RKSJ-H
+%%GSRES_DIR%%/CMap/HK-RKSJ-H
+%%GSRES_DIR%%/CMap/KSC2-RKSJ-H
+%%GSRES_DIR%%/CMap/TCVN-RKSJ-H
+@dirrm %%GSRES_DIR%%/CMap
 @exec /bin/mv %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed
 @exec /usr/bin/sed -e 's:^%.*(a4):(a4):g' %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps.pre_sed > %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
 @unexec /bin/rm %D/share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps