4 files changed, 127 insertions, 85 deletions

diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index dc3f0eee637b..d704732ce0eb 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	kochi-ttfonts
-PORTVERSION=	20030118
+PORTVERSION=	20030628
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://www.on.cs.keio.ac.jp/~yasu/linux/fonts/ \
+MASTER_SITES=	http://downloads.sourceforge.jp/efont/4845/ \
 		${MASTER_SITE_PORTS_JP}
-DISTFILES=	kochi-mincho-0.2.${MINCHO_VER}.tar.bz2 \
-		kochi-gothic-0.2.${GOTHIC_VER}.tar.bz2
+DISTFILES=	kochi-substitute-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	kanou@khdd.net
 COMMENT=	Free Japanese TrueType fonts named 'Kochi'
@@ -20,15 +19,11 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-MINCHO_VER=	20020727
-GOTHIC_VER=	${PORTVERSION}
 FONTSDIR=	lib/X11/fonts/TrueType
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-post-extract:
-	(cd ${WRKDIR}/kochi-mincho/examples; \
-	 ${MV} fonts.dir.xtt fonts.dir.kochi )
+WRKSRC=	${WRKDIR}/kochi-substitute-${PORTVERSION}
 
 do-install:
 .if !exists(${PREFIX}/${FONTSDIR})
@@ -38,18 +33,37 @@ do-install:
 	@${ECHO} "*********************************************************"
 	${MKDIR} ${PREFIX}/${FONTSDIR}
 .endif
-	${INSTALL_DATA} ${WRKDIR}/kochi-gothic/fonts/kochi-gothic.ttf \
-			${WRKDIR}/kochi-mincho/fonts/kochi-mincho.ttf \
+	${INSTALL_DATA} ${WRKSRC}/*.ttf \
 			${FILESDIR}/fonts.dir.kochi \
 			${FILESDIR}/fonts.alias.kochi \
 			${PREFIX}/${FONTSDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/kochi-ttfonts/mincho
-	${INSTALL_DATA} ${WRKDIR}/kochi-mincho/README \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/mincho
-	${MKDIR} ${PREFIX}/share/doc/ja/kochi-ttfonts/gothic
-	${INSTALL_DATA} ${WRKDIR}/kochi-gothic/README \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/gothic
+	${MKDIR} ${PREFIX}/share/doc/ja/kochi-ttfonts
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${WRKSRC}/COPYING \
+		${PREFIX}/share/doc/ja/kochi-ttfonts
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/ayu20gothic
+	${INSTALL_DATA} ${WRKSRC}/docs/README \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs
+	${INSTALL_DATA} ${WRKSRC}/docs/ayu20gothic/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/ayu20gothic
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/k14goth
+	${INSTALL_DATA} ${WRKSRC}/docs/k14goth/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/k14goth
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/kappa20
+	${INSTALL_DATA} ${WRKSRC}/docs/kappa20/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/kappa20
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/naga10
+	${INSTALL_DATA} ${WRKSRC}/docs/naga10/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/naga10
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome12
+	${INSTALL_DATA} ${WRKSRC}/docs/shinonome12/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome12
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome16
+	${INSTALL_DATA} ${WRKSRC}/docs/shinonome16/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome16
+	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/wadalab
+	${INSTALL_DATA} ${WRKSRC}/docs/wadalab/* \
+		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/wadalab
 .endif
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/japanese/font-kochi/distinfo b/japanese/font-kochi/distinfo
index 5a97801d504f..13f12f85ffce 100644
--- a/japanese/font-kochi/distinfo
+++ b/japanese/font-kochi/distinfo
@@ -1,2 +1 @@
-MD5 (kochi-mincho-0.2.20020727.tar.bz2) = 5c936d0739bd5db93d66d4530436ca8c
-MD5 (kochi-gothic-0.2.20030118.tar.bz2) = 4ef8e25a8bb483d59719df6201dc88a8
+MD5 (kochi-substitute-20030628.tar.bz2) = 719d52e40fe0571915c40abfc75b2d94
diff --git a/japanese/font-kochi/files/fonts.dir.kochi b/japanese/font-kochi/files/fonts.dir.kochi
index 7d0af94e7a9a..2219573f503b 100644
--- a/japanese/font-kochi/files/fonts.dir.kochi
+++ b/japanese/font-kochi/files/fonts.dir.kochi
@@ -1,61 +1,61 @@
 60
-kochi-mincho.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:kochi-mincho.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-mincho.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-mincho.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-mincho.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-mincho.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-mincho.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-mincho.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-mincho.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-mincho.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:kochi-mincho.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:kochi-mincho.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-mincho.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-mincho.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-mincho.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-mincho.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-mincho.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-mincho.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-mincho.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-mincho.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:kochi-mincho.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-mincho.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-mincho.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-mincho.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-mincho.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:kochi-mincho.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-mincho.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-mincho.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-mincho.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-mincho.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
-kochi-gothic.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:kochi-gothic.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-gothic.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-gothic.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-gothic.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-gothic.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-gothic.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-gothic.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-gothic.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-gothic.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:kochi-gothic.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:kochi-gothic.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-gothic.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-gothic.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-gothic.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-gothic.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-gothic.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-gothic.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-gothic.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-gothic.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:kochi-gothic.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-gothic.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-gothic.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-gothic.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-gothic.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:kochi-gothic.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-gothic.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-gothic.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-gothic.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-gothic.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+kochi-mincho-subst.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:kochi-mincho-subst.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:kochi-mincho-subst.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:kochi-mincho-subst.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:kochi-mincho-subst.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:kochi-mincho-subst.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+kochi-gothic-subst.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:kochi-gothic-subst.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:kochi-gothic-subst.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:kochi-gothic-subst.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:kochi-gothic-subst.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:kochi-gothic-subst.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist
index db6d6f68ec3a..4aea6e636dc1 100644
--- a/japanese/font-kochi/pkg-plist
+++ b/japanese/font-kochi/pkg-plist
@@ -1,9 +1,38 @@
 %%FONTSDIR%%/fonts.alias.kochi
 %%FONTSDIR%%/fonts.dir.kochi
-%%FONTSDIR%%/kochi-mincho.ttf
-%%FONTSDIR%%/kochi-gothic.ttf
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/mincho/README
-@dirrm share/doc/ja/kochi-ttfonts/mincho
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/gothic/README
-@dirrm share/doc/ja/kochi-ttfonts/gothic
+%%FONTSDIR%%/kochi-mincho-subst.ttf
+%%FONTSDIR%%/kochi-gothic-subst.ttf
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/README.ja
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/COPYING
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/ayu20gothic/README.txt
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/BUGS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/Changelog
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/INSTALL
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/THANKS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/kappa20/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/naga10/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/AUTHORS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/BUGS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/Changelog
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/THANKS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/TODO
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/AUTHORS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/BUGS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/Changelog
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/THANKS
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/TODO
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/wadalab/README
+%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/wadalab/README.ja
+@dirrm share/doc/ja/kochi-ttfonts/docs/ayu20gothic
+@dirrm share/doc/ja/kochi-ttfonts/docs/k14goth
+@dirrm share/doc/ja/kochi-ttfonts/docs/kappa20
+@dirrm share/doc/ja/kochi-ttfonts/docs/naga10
+@dirrm share/doc/ja/kochi-ttfonts/docs/shinonome12
+@dirrm share/doc/ja/kochi-ttfonts/docs/shinonome16
+@dirrm share/doc/ja/kochi-ttfonts/docs/wadalab
+@dirrm share/doc/ja/kochi-ttfonts/docs
 @dirrm share/doc/ja/kochi-ttfonts