This PR is basically a "japanese/kappa20 X11 bitmap font" port update.

Since gothic-style font(ayu20) fonts are also included with
the below patch, I prefer this port's PORTNAME to be modified
to "k20fonts", if possible.

PR:		54811
Submitted by:	MAINTAINER

7 files changed, 143 insertions, 81 deletions

diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index aa66f63526fe..16c3aa924860 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -5,18 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=	kappa20
-PORTVERSION=	0.394
-PORTREVISION=	1
+PORTNAME=	k20fonts
+PORTVERSION=	0.395
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://kappa.allnet.ne.jp/20dot.fonts/
+MASTER_SITES=	http://khdd.net/20dot.fonts/:kappa20 \
+		http://downloads.sourceforge.jp/x-tt/5194/:ayu20
 DISTNAME=	Kappa20-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kappa20 \
+		${AYUDISTNAME}${AYU_SUFFIX}:ayu20
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	X11 20-dot kanji font 'kappa font'
+MAINTAINER=	ginga-freebsd@ginganet.org
+COMMENT=	X11 20-dot kanji font 'Kappa20dot + ayu font'
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
+AYUDISTNAME=	ayu20gothic-1.4
+AYU_SUFFIX=	.tar.gz
 
 BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkitalic
 
@@ -33,16 +37,19 @@ MAKE_ARGS=	FONTSDIR="${FONTSDIR}"
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 post-extract:
+	(cd ${WRKSRC} ; ${TAR} xpzf ${DISTDIR}/${AYUDISTNAME}${AYU_SUFFIX})
 	(cd ${WRKSRC} ; ${MV} Makefile Makefile.dist)
 	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/fonts.alias.ayu ${WRKSRC}/
+
+pre-build:
+	(cd ${WRKSRC} ; ${SH} makebdf.sh)
 
 post-install:
 	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/ja/${PORTNAME}/README.euc-jp
-#	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-#	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/pcf/fonts.alias.kappa ${PREFIX}/share/doc/${PORTNAME}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/kappa20/distinfo b/japanese/kappa20/distinfo
index 05ebfca216b1..f77e7dde24de 100644
--- a/japanese/kappa20/distinfo
+++ b/japanese/kappa20/distinfo
@@ -1 +1,2 @@
-MD5 (Kappa20-0.394.tar.bz2) = cfd3e479ab14489cb84dd2aff0a71c54
+MD5 (Kappa20-0.395.tar.bz2) = 063f54d6dc9ecc838d51fa7c4435713a
+MD5 (ayu20gothic-1.4.tar.gz) = f9c59ccb42cc666076537a235aa4ded9
diff --git a/japanese/kappa20/files/Makefile.in b/japanese/kappa20/files/Makefile.in
index 97a7ae9da5dd..9ec2be7330ad 100644
--- a/japanese/kappa20/files/Makefile.in
+++ b/japanese/kappa20/files/Makefile.in
@@ -4,14 +4,19 @@ GZIP_CMD?=	gzip
 MKBOLD_CMD?=	mkbold
 MKITALIC_CMD?=	mkitalic
 
+CAT?=		/bin/cat
 CP?=		/bin/cp
 PATCH?=		/usr/bin/patch
 SED?=		/usr/bin/sed
 
 DIST_ALL=	10x20L2b.bdf 10x20L2m.bdf 10x20L3b.bdf 10x20L3m.bdf \
-		10x20L9b.bdf 10x20L9m.bdf 10x20b.bdf 10x20m.bdf \
+		10x20L4b.bdf 10x20L4m.bdf 10x20L5b.bdf 10x20L5m.bdf \
+		10x20L6b.bdf 10x20L6m.bdf 10x20L7b.bdf 10x20L7m.bdf \
+		10x20L8b.bdf 10x20L8m.bdf 10x20L9b.bdf 10x20L9m.bdf \
+		10x20L10b.bdf 10x20L10m.bdf 10x20b.bdf 10x20m.bdf \
 		10x20rkb.bdf 10x20rkm.bdf ipa-10x20b.bdf ipa-10x20m.bdf \
-		k20b.bdf k20m.bdf
+		k20b.bdf k20m.bdf \
+		10x20gm.bdf 10x20grkm.bdf k20gm.bdf
 
 MADE_BDF=	vk20b.bdf vk20m.bdf nk20b-1.bdf
 
@@ -47,7 +52,8 @@ nk20b-1.bdf: k20b.bdf newjis.diff
 fonts.alias: Makefile.dist
 	${SED} -n '/^.*echo \(.*\) >>.*$$/ s//\1/p' $> > $@
 	${SED} -n '/^.*echo \(.*\) >>.*$$/ s//\1/p' $> | ${SED} 's/-r-/-i-/g;s/\(^[^-][^ 	]*\) /\1i /' >> $@
-	egrep -iv '^(-kappa-[^ 	]*--20-|(v?k|a|r)20[mb]i?[ 	]|(ipa-)?10x20[mb]i?[ 	]|10x20(rk|L[2-9])[mb]i?[ 	])' ${PREFIX}/${FONTSDIR}/fonts.alias >> fonts.alias || true
+	${CAT} fonts.alias.ayu >> $@
+	egrep -iv '^(-(kappa|ayu)-[^ 	]*--20-|(v?k|a|r)20g?[mb]i?[ 	]*|(ipa-)?10x20g?(rk|L[1-9]0?)?[mb]i?[ 	]*)' ${PREFIX}/${FONTSDIR}/fonts.alias >> fonts.alias || true
 
 install:
 	mkdir -p ${PREFIX}/${FONTSDIR}
diff --git a/japanese/kappa20/files/fonts.alias.ayu b/japanese/kappa20/files/fonts.alias.ayu
new file mode 100644
index 000000000000..9b8cccbb9d78
--- /dev/null
+++ b/japanese/kappa20/files/fonts.alias.ayu
@@ -0,0 +1,6 @@
+10x20gm		-ayu-gothic-medium-r-normal--20-190-75-75-c-100-iso8859-1
+10x20gmi	-ayu-gothic-medium-i-normal--20-190-75-75-c-100-iso8859-1
+10x20grkm	-ayu-gothic-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20grkmi	-ayu-gothic-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
+k20gm		-ayu-gothic-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20gmi		-ayu-gothic-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
diff --git a/japanese/kappa20/pkg-descr b/japanese/kappa20/pkg-descr
index ad5432e3dc31..bac7334dfc24 100644
--- a/japanese/kappa20/pkg-descr
+++ b/japanese/kappa20/pkg-descr
@@ -1,16 +1,22 @@
-Japanese 20 dot mincho font named `kappa font'.
+Japanese 20 dot fonts(`Kappa20dot + ayu font').
 
-You can use 
-	k20[mb]		mincho	(JIS X 0208)
-			('m' for medium mincho, 'b' for bold mincho)
-	10x20[mb]	ascii		(ISO-8859-1(Latin 1))
-	10x20rk[mb]	kana		(JIS X 0201)
+You can use:
+	k20(g)[mb]	mincho/gothic	(JIS X 0208)
+			('m' for medium mincho, 'b' for bold mincho,
+			 'g' for gothic style)
+	10x20(g)[mb]	ascii		(ISO-8859-1(Latin 1))
+	10x20(g)rk[mb]	kana		(JIS X 0201)
 	10x20L[239][mb]	ISO 8859-[239]	(Latin [239])
 	ipa-10x20[mb]	Mule IPA fonts
 	vk20[mb]	k20[mb] modified for vertical writings
 
+	Italic(slanted) fonts are available with 'i' postfix.
+
 An example usage:
   % kterm -fn a20m -fb a20b -fr r10m -frb a20b -fk k20m -fkb k20b -lsp 3
 or in your Xresources file:
   KTerm*VT100*fontList:		-kappa-fixed-medium-r-normal--20-*
   KTerm*VT100*boldFontList:	-kappa-fixed-bold-r-normal--20-*
+
+WWW:	http://khdd.net/20dot.fonts/
+	http://x-tt.sourceforge.jp/ayu.html
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index 567e6131bb41..39e26234766a 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -12,6 +12,10 @@
 %%FONTSDIR%%/10x20L9mi.pcf.gz
 %%FONTSDIR%%/10x20b.pcf.gz
 %%FONTSDIR%%/10x20bi.pcf.gz
+%%FONTSDIR%%/10x20gm.pcf.gz
+%%FONTSDIR%%/10x20gmi.pcf.gz
+%%FONTSDIR%%/10x20grkm.pcf.gz
+%%FONTSDIR%%/10x20grkmi.pcf.gz
 %%FONTSDIR%%/10x20m.pcf.gz
 %%FONTSDIR%%/10x20mi.pcf.gz
 %%FONTSDIR%%/10x20rkb.pcf.gz
@@ -24,6 +28,8 @@
 %%FONTSDIR%%/ipa-10x20mi.pcf.gz
 %%FONTSDIR%%/k20b.pcf.gz
 %%FONTSDIR%%/k20bi.pcf.gz
+%%FONTSDIR%%/k20gm.pcf.gz
+%%FONTSDIR%%/k20gmi.pcf.gz
 %%FONTSDIR%%/k20m.pcf.gz
 %%FONTSDIR%%/k20mi.pcf.gz
 %%FONTSDIR%%/nk20b-1.pcf.gz
@@ -32,8 +38,8 @@
 %%FONTSDIR%%/vk20bi.pcf.gz
 %%FONTSDIR%%/vk20m.pcf.gz
 %%FONTSDIR%%/vk20mi.pcf.gz
-%%PORTDOCS%%share/doc/ja/kappa20/README.euc-jp
-%%PORTDOCS%%@dirrm share/doc/ja/kappa20
+%%PORTDOCS%%share/doc/ja/k20fonts/README.euc-jp
+%%PORTDOCS%%@dirrm share/doc/ja/k20fonts
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req
index 9b2e106e3734..6593231a8fbf 100644
--- a/japanese/kappa20/pkg-req
+++ b/japanese/kappa20/pkg-req
@@ -22,86 +22,116 @@ fi
 # font alias entry here!
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
+-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
+a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
+10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
+a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
+10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
--kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
-10x20L2b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-2
-10x20L2bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-2
+-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+ipa-10x20m  -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1
+ipa-10x20b  -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1
 10x20L2m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-2
-10x20L2mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-2
-10x20L3b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-3
-10x20L3bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-3
+10x20L2b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-2
 10x20L3m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-3
-10x20L3mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-3
-10x20L9b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-15
-10x20L9bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-15
+10x20L3b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-3
+10x20L4m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-4
+10x20L4b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-4
+10x20L5m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-9
+10x20L5b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-9
+10x20L6m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-10
+10x20L6b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-10
+10x20L7m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-13
+10x20L7b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-13
+10x20L8m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-14
+10x20L8b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-14
 10x20L9m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-15
-10x20L9mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-15
-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
+10x20L9b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-15
+10x20L10m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-16
+10x20L10b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-16
+-kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 10x20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-1
-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
-10x20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
-10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-10x20rkbi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
-10x20rkmi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
 a20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-1
-a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
+10x20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
 a20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
-ipa-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1
-ipa-10x20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-muleipa-1
-ipa-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1
-ipa-10x20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-muleipa-1
-k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-k20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
-r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20rkbi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
 r20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20rkmi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
 r20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
-vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 vk20bi -kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
-vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 vk20mi -kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
+ipa-10x20mi  -kappa-fixed-medium-i-normal--20-190-75-75-c-100-muleipa-1
+ipa-10x20bi  -kappa-fixed-bold-i-normal--20-190-75-75-c-100-muleipa-1
+10x20L2mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-2
+10x20L2bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-2
+10x20L3mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-3
+10x20L3bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-3
+10x20L4mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-4
+10x20L4bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-4
+10x20L5mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-9
+10x20L5bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-9
+10x20L6mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-10
+10x20L6bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-10
+10x20L7mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-13
+10x20L7bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-13
+10x20L8mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-14
+10x20L8bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-14
+10x20L9mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-15
+10x20L9bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-15
+10x20L10mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-16
+10x20L10bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-16
+10x20gm		-ayu-gothic-medium-r-normal--20-190-75-75-c-100-iso8859-1
+10x20gmi	-ayu-gothic-medium-i-normal--20-190-75-75-c-100-iso8859-1
+10x20grkm	-ayu-gothic-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20grkmi	-ayu-gothic-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
+k20gm		-ayu-gothic-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20gmi		-ayu-gothic-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"