Add bold|italic style using mkbold|mkitalic scripts (x11-fonts/mkbold|mkitalic)

Submitted by:	KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp> [ports-jp 12152]

24 files changed, 338 insertions, 101 deletions

diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
index 7a46665b014..450cd379bc0 100644
--- a/japanese/jisx0213-fonts/Makefile
+++ b/japanese/jisx0213-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jisx0213-fonts
 PORTVERSION=	1.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.mars.sphere.ne.jp/imamura/
 DISTFILES=	jiskan16-2000-1.bdf.gz jiskan16-2000-2.bdf.gz \
@@ -15,6 +15,9 @@ DISTFILES=	jiskan16-2000-1.bdf.gz jiskan16-2000-2.bdf.gz \
 
 MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
 
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold \
+		mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 FONTSDIR=	lib/X11/fonts/local
@@ -26,29 +29,22 @@ BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
-FONTNAMES=	jiskan16-2000-1 jiskan16-2000-2 \
-		K14-1 K14-2 K12-1 K12-2
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
-
-do-extract:
-	@${MKDIR} ${WRKDIR}
+EXTRACT_CMD=		${CP}
+EXTRACT_BEFORE_ARGS=	-p
+EXTRACT_AFTER_ARGS=	${WRKDIR}
 
-do-build:
-.for i in ${FONTNAMES}
-	(cd ${WRKSRC} ; \
-	${GZCAT} ${DISTDIR}/${i}.bdf.gz | bdftopcf -o ${i}.pcf ; \
-	${GZIP_CMD} ${i}.pcf)
-.endfor
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.for i in ${FONTNAMES}
-	(cd ${WRKSRC} ; ${INSTALL_DATA} ${i}.pcf.gz ${PREFIX}/${FONTSDIR})
-.endfor
-	mkfontdir ${PREFIX}/${FONTSDIR}
+post-extract:
+	@${CP} ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
+	@(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz)
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
+post-install:
+	@(cd ${PREFIX}/${FONTSDIR}; mkfontdir)
+
 .include <bsd.port.post.mk>
diff --git a/japanese/jisx0213-fonts/files/Makefile.in b/japanese/jisx0213-fonts/files/Makefile.in
new file mode 100644
index 00000000000..18115641b1b
--- /dev/null
+++ b/japanese/jisx0213-fonts/files/Makefile.in
@@ -0,0 +1,33 @@
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	K12-1.bdf K12-2.bdf K14-1.bdf K14-2.bdf \
+		jiskan16-2000-1.bdf jiskan16-2000-2.bdf
+
+DIST_NOBOLD=	${DIST_ALL}
+MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
+
+all: ${PCF_ALL}
+
+${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
+	${MKBOLD_CMD} $> > $@
+
+${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+	${MKITALIC_CMD} $> > $@
+
+${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
+	bdftopcf $> | ${GZIP_CMD} -c > $@
+
+install:
+	mkdir -p ${PREFIX}/${FONTSDIR}
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR}
+
+clean::
+	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/jisx0213-fonts/pkg-plist b/japanese/jisx0213-fonts/pkg-plist
index 60eef16658d..b0d2a725d23 100644
--- a/japanese/jisx0213-fonts/pkg-plist
+++ b/japanese/jisx0213-fonts/pkg-plist
@@ -1,9 +1,27 @@
-%%FONTSDIR%%/jiskan16-2000-1.pcf.gz
-%%FONTSDIR%%/jiskan16-2000-2.pcf.gz
-%%FONTSDIR%%/K14-1.pcf.gz
-%%FONTSDIR%%/K14-2.pcf.gz
 %%FONTSDIR%%/K12-1.pcf.gz
+%%FONTSDIR%%/K12-1b.pcf.gz
+%%FONTSDIR%%/K12-1bi.pcf.gz
+%%FONTSDIR%%/K12-1i.pcf.gz
 %%FONTSDIR%%/K12-2.pcf.gz
+%%FONTSDIR%%/K12-2b.pcf.gz
+%%FONTSDIR%%/K12-2bi.pcf.gz
+%%FONTSDIR%%/K12-2i.pcf.gz
+%%FONTSDIR%%/K14-1.pcf.gz
+%%FONTSDIR%%/K14-1b.pcf.gz
+%%FONTSDIR%%/K14-1bi.pcf.gz
+%%FONTSDIR%%/K14-1i.pcf.gz
+%%FONTSDIR%%/K14-2.pcf.gz
+%%FONTSDIR%%/K14-2b.pcf.gz
+%%FONTSDIR%%/K14-2bi.pcf.gz
+%%FONTSDIR%%/K14-2i.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1b.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1i.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2b.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2i.pcf.gz
 @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/jisx0213-fonts/pkg-req b/japanese/jisx0213-fonts/pkg-req
index ab31d6979d7..c27be5ed829 100644
--- a/japanese/jisx0213-fonts/pkg-req
+++ b/japanese/jisx0213-fonts/pkg-req
@@ -19,23 +19,23 @@ if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
 	mkdir ${FONTDIR}
 fi
 
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
--netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0212.1990-0 -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0213.2000-1
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-if [ "$2" = "INSTALL" ] ; then
-	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
-	 cat ${TMPFILE}) > fonts.alias
-elif [ "$2" = "DEINSTALL" ] ; then
-	grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
-fi
-rm -f fonts.alias.orig ${TMPFILE}
+## font alias entry here!
+#TMPFILE=/tmp/install-fonts-alias-$$
+#cat << EOF > ${TMPFILE}
+#-netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0212.1990-0 -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0213.2000-1
+#EOF
+#
+#echo "Updating ${FONTDIR}/fonts.alias"
+#cd ${FONTDIR}
+#touch fonts.alias
+#cp fonts.alias fonts.alias.orig
+#if [ "$2" = "INSTALL" ] ; then
+#	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
+#	 cat ${TMPFILE}) > fonts.alias
+#elif [ "$2" = "DEINSTALL" ] ; then
+#	grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+#fi
+#rm -f fonts.alias.orig ${TMPFILE}
 
 echo "**********************************************************"
 echo "You should restart X server or do 'xset fp rehash' command"
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 417dc480892..28768270b1b 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -7,18 +7,22 @@
 
 PORTNAME=	naga10
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
 DISTNAME=	knj10-${PORTVERSION}
 
 MAINTAINER=	usagi@clave.gr.jp
 
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold \
+		mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
@@ -26,6 +30,9 @@ FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
+post-extract:
+	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
diff --git a/japanese/k10/files/Makefile.in b/japanese/k10/files/Makefile.in
new file mode 100644
index 00000000000..c5d32ecf30b
--- /dev/null
+++ b/japanese/k10/files/Makefile.in
@@ -0,0 +1,32 @@
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	5x10B.bdf 5x10a.bdf 5x10rk.bdf knj10.bdf knj10B.bdf
+
+DIST_NOBOLD=	5x10rk.bdf
+MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
+
+all: ${PCF_ALL}
+
+${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
+	${MKBOLD_CMD} $> > $@
+
+${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+	${MKITALIC_CMD} $> > $@
+
+${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
+	bdftopcf $> | ${GZIP_CMD} -c > $@
+
+install:
+	mkdir -p ${PREFIX}/${FONTSDIR}
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR}
+
+clean::
+	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/k10/files/patch-aa b/japanese/k10/files/patch-aa
deleted file mode 100644
index c11e4993979..00000000000
--- a/japanese/k10/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- /dev/null	Fri Jan  7 00:00:00 2000
-+++ Makefile	Fri Jan  7 00:00:00 2000
-@@ -0,0 +1,14 @@
-+all:
-+	bdftopcf 5x10B.bdf  | gzip -c > 5x10B.pcf.gz
-+	bdftopcf 5x10a.bdf  | gzip -c > 5x10a.pcf.gz
-+	bdftopcf 5x10rk.bdf | gzip -c > 5x10rk.pcf.gz
-+	bdftopcf knj10.bdf  | gzip -c > knj10.pcf.gz
-+	bdftopcf knj10B.bdf | gzip -c > knj10B.pcf.gz
-+
-+install:
-+	mkdir -p ${PREFIX}/lib/X11/fonts/misc
-+	${BSD_INSTALL_DATA} 5x10B.pcf.gz  ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} 5x10a.pcf.gz  ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} 5x10rk.pcf.gz ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knj10.pcf.gz  ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knj10B.pcf.gz ${PREFIX}/${FONTSDIR}
diff --git a/japanese/k10/files/patch-ab b/japanese/k10/files/patch-ab
deleted file mode 100644
index 9dd2d4a044c..00000000000
--- a/japanese/k10/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- /dev/null	Wed Feb 25 11:48:19 1998
-+++ fonts.alias.naga10	Wed Feb 25 11:48:16 1998
-@@ -0,0 +1,5 @@
-+k10    -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
-+k10b   -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
-+a10    -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
-+a10b   -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
-+r10    -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
index 1e08bfe96a3..939cbc0c4d3 100644
--- a/japanese/k10/pkg-plist
+++ b/japanese/k10/pkg-plist
@@ -3,9 +3,16 @@
 %%FONTSDIR%%/5x10rk.pcf.gz
 %%FONTSDIR%%/knj10.pcf.gz
 %%FONTSDIR%%/knj10B.pcf.gz
-share/doc/naga10/README
+%%FONTSDIR%%/5x10rkb.pcf.gz
+%%FONTSDIR%%/5x10Bi.pcf.gz
+%%FONTSDIR%%/5x10ai.pcf.gz
+%%FONTSDIR%%/5x10rki.pcf.gz
+%%FONTSDIR%%/knj10i.pcf.gz
+%%FONTSDIR%%/knj10Bi.pcf.gz
+%%FONTSDIR%%/5x10rkbi.pcf.gz
+%%PORTDOCS%%share/doc/naga10/README
+%%PORTDOCS%%@dirrm share/doc/naga10
 @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
 @unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
-@dirrm share/doc/naga10
diff --git a/japanese/k10/pkg-req b/japanese/k10/pkg-req
index 74130b3ca77..d94579b83c5 100644
--- a/japanese/k10/pkg-req
+++ b/japanese/k10/pkg-req
@@ -23,10 +23,17 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 k10  -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10i -misc-fixed-medium-i-normal--10-90-75-75-c-100-jisx0208.1983-0
 k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10bi -misc-fixed-bold-i-normal--10-90-75-75-c-100-jisx0208.1983-0
 a10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
+a10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-iso8859-1
 a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
+a10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-iso8859-1
 r10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-jisx0201.1976-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index 400f1da8772..1cf2281c6f7 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -7,16 +7,19 @@
 
 PORTNAME=	kanji
 PORTVERSION?=	1.0
-PKGNAMESUFFIX?=	18
+PORTREVISION?=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=   ${MASTER_SITE_PORTS_JP}
 MASTER_SITE_SUBDIR=	${DISTNAME}
+PKGNAMESUFFIX?=	18
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 DISTFILES?=	573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
 
 MAINTAINER=	sanpei@FreeBSD.org
 
-BUILD_DEPENDS=	gunshar:${PORTSDIR}/archivers/gshar+gunshar
+BUILD_DEPENDS=	gunshar:${PORTSDIR}/archivers/gshar+gunshar \
+		mkbold:${PORTSDIR}/x11-fonts/mkbold \
+		mkitalic:${PORTSDIR}/x11-fonts/mkitalic
 
 DIST_SUBDIR=	${DISTNAME}
 FONTSDIR=	lib/X11/fonts/local
@@ -35,6 +38,7 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| gunshar -d $(WRKDIR)
 PKGINSTALL=	${WRKSRC}/INSTALL
 PKGDEINSTALL=	${WRKSRC}/DEINSTALL
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 README_FILE?=	573.z
 RESIZESED_FILE?=	18to16.sed
@@ -42,27 +46,24 @@ RESIZED_ALIAS_FILE?=	kanji16.alias
 
 post-extract:
 	@(cd $(WRKSRC); ${CAT} ${DISTNAME}.?? | uudecode)
+	@${CP} -p ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
+	@${GUNZIP_CMD} ${WRKDIR}/*.Z
 
 post-patch:
-	@(cd $(WRKSRC); zcat ${DISTNAME}.bdf.Z \
-		| bdftopcf -i | ${GZIP_CMD} > ${DISTNAME}.pcf.gz )
 	@(${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${README_FILE} \
 		| ${AWK} '/^#! \/bin\/sh/{i=1} i==0{print}' \
 		> ${WRKSRC}/README.${DISTNAME})
 
-do-build:
+pre-install:
 	@for file in INSTALL DEINSTALL; do \
 		${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \
+		       -e 's,%%X11BASE%%,${X11BASE},g' \
 			< ${FILESDIR}/$${file}.tmpl > ${WRKSRC}/$${file}; \
 	done
-
-pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
-do-install:
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.pcf.gz ${PREFIX}/lib/X11/fonts/local/
-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/${DISTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/${RESIZESED_FILE} ${PREFIX}/share/doc/${DISTNAME}/
@@ -70,8 +71,6 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${RESIZED_ALIAS_FILE} ${PREFIX}/share/doc/${DISTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.alias ${PREFIX}/share/doc/${DISTNAME}/
 .endif
-
-post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/japanese/kanji18/files/DEINSTALL.tmpl b/japanese/kanji18/files/DEINSTALL.tmpl
index 5acdd065022..e31f7ece328 100644
--- a/japanese/kanji18/files/DEINSTALL.tmpl
+++ b/japanese/kanji18/files/DEINSTALL.tmpl
@@ -1,13 +1,15 @@
 #!/bin/sh
 
 if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
-	${PKG_PREFIX}/bin/xset fp rehash ||
+	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir
+	%%X11BASE%%/bin/xset fp rehash ||
 	(
 	 echo "**********************************************************"
 	 echo "You should restart X server or do 'xset fp rehash' command"
 	 echo "to enable this update."
 	 echo "**********************************************************"
 	)
-	[ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
+	if [ "`wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'`" = 2 ]; then 
+		rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
+	fi
 fi
diff --git a/japanese/kanji18/files/INSTALL.tmpl b/japanese/kanji18/files/INSTALL.tmpl
index 77be2d3b8f9..c10a3d81cef 100644
--- a/japanese/kanji18/files/INSTALL.tmpl
+++ b/japanese/kanji18/files/INSTALL.tmpl
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ "x$2" = "xPOST-INSTALL" ]; then
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
-	${PKG_PREFIX}/bin/xset fp rehash ||
+	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir
+	%%X11BASE%%/bin/xset fp rehash ||
 	(
 	 echo "**********************************************************"
 	 echo "You should restart X server or do 'xset fp rehash' command"
diff --git a/japanese/kanji18/files/Makefile.in b/japanese/kanji18/files/Makefile.in
new file mode 100644
index 00000000000..c030bc549f1
--- /dev/null
+++ b/japanese/kanji18/files/Makefile.in
@@ -0,0 +1,32 @@
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	kanji18.bdf
+
+DIST_NOBOLD=	${DIST_ALL}
+MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
+
+all: ${PCF_ALL}
+
+${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
+	${MKBOLD_CMD} $> > $@
+
+${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+	${MKITALIC_CMD} $> > $@
+
+${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
+	bdftopcf $> | ${GZIP_CMD} -c > $@
+
+install:
+	mkdir -p ${PREFIX}/${FONTSDIR}
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR}
+
+clean::
+	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/kanji18/pkg-plist b/japanese/kanji18/pkg-plist
index cb2db49e39f..41f4a7053f2 100644
--- a/japanese/kanji18/pkg-plist
+++ b/japanese/kanji18/pkg-plist
@@ -1,7 +1,10 @@
 %%FONTSDIR%%/kanji18.pcf.gz
-share/doc/kanji18/18to16.sed
-share/doc/kanji18/README.kanji18
-share/doc/kanji18/kanji16.alias
-share/doc/kanji18/kanji18.alias
+%%FONTSDIR%%/kanji18b.pcf.gz
+%%FONTSDIR%%/kanji18bi.pcf.gz
+%%FONTSDIR%%/kanji18i.pcf.gz
+%%PORTDOCS%%share/doc/kanji18/18to16.sed
+%%PORTDOCS%%share/doc/kanji18/README.kanji18
+%%PORTDOCS%%share/doc/kanji18/kanji16.alias
+%%PORTDOCS%%share/doc/kanji18/kanji18.alias
+%%PORTDOCS%%@dirrm share/doc/kanji18
 @unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
-@dirrm share/doc/kanji18
diff --git a/japanese/kanji18/pkg-req b/japanese/kanji18/pkg-req
index 42c523b1696..c9dab0d38cb 100644
--- a/japanese/kanji18/pkg-req
+++ b/japanese/kanji18/pkg-req
@@ -23,9 +23,21 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 kanji18  -jis-gothic-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0
+kanji18b  -jis-gothic-bold-r-normal--18-170-75-75-c-180-jisx0208.1983-0
+kanji18i  -jis-gothic-medium-i-normal--18-170-75-75-c-180-jisx0208.1983-0
+kanji18bi  -jis-gothic-bold-i-normal--18-170-75-75-c-180-jisx0208.1983-0
 -jis-fixed-medium-r-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-medium-r-normal--18-130-100-100-c-180-jisx0208.1983-0
+-jis-fixed-bold-r-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-bold-r-normal--18-130-100-100-c-180-jisx0208.1983-0
+-jis-fixed-medium-i-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-medium-i-normal--18-130-100-100-c-180-jisx0208.1983-0
+-jis-fixed-bold-i-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-bold-i-normal--18-130-100-100-c-180-jisx0208.1983-0
 -jis-fixed-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0 -jis-gothic-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0
+-jis-fixed-bold-r-normal--18-170-75-75-c-180-jisx0208.1983-0 -jis-gothic-bold-r-normal--18-170-75-75-c-180-jisx0208.1983-0
+-jis-fixed-medium-i-normal--18-170-75-75-c-180-jisx0208.1983-0 -jis-gothic-medium-i-normal--18-170-75-75-c-180-jisx0208.1983-0
+-jis-fixed-bold-i-normal--18-170-75-75-c-180-jisx0208.1983-0 -jis-gothic-bold-i-normal--18-170-75-75-c-180-jisx0208.1983-0
 -jis-gothic-medium-r-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0
+-jis-gothic-bold-r-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-bold-r-normal--18-170-75-75-c-180-jisx0208.1983-0
+-jis-gothic-medium-i-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-medium-i-normal--18-170-75-75-c-180-jisx0208.1983-0
+-jis-gothic-bold-i-normal--18-130-100-100-c-180-jisx0208.1983-0 -jis-gothic-bold-i-normal--18-170-75-75-c-180-jisx0208.1983-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"
diff --git a/japanese/kanji26/files/DEINSTALL.tmpl b/japanese/kanji26/files/DEINSTALL.tmpl
index 5acdd065022..e31f7ece328 100644
--- a/japanese/kanji26/files/DEINSTALL.tmpl
+++ b/japanese/kanji26/files/DEINSTALL.tmpl
@@ -1,13 +1,15 @@
 #!/bin/sh
 
 if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
-	${PKG_PREFIX}/bin/xset fp rehash ||
+	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir
+	%%X11BASE%%/bin/xset fp rehash ||
 	(
 	 echo "**********************************************************"
 	 echo "You should restart X server or do 'xset fp rehash' command"
 	 echo "to enable this update."
 	 echo "**********************************************************"
 	)
-	[ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
+	if [ "`wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'`" = 2 ]; then 
+		rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
+	fi
 fi
diff --git a/japanese/kanji26/files/INSTALL.tmpl b/japanese/kanji26/files/INSTALL.tmpl
index 77be2d3b8f9..c10a3d81cef 100644
--- a/japanese/kanji26/files/INSTALL.tmpl
+++ b/japanese/kanji26/files/INSTALL.tmpl
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ "x$2" = "xPOST-INSTALL" ]; then
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
-	${PKG_PREFIX}/bin/xset fp rehash ||
+	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir
+	%%X11BASE%%/bin/xset fp rehash ||
 	(
 	 echo "**********************************************************"
 	 echo "You should restart X server or do 'xset fp rehash' command"
diff --git a/japanese/kanji26/files/Makefile.in b/japanese/kanji26/files/Makefile.in
new file mode 100644
index 00000000000..85875d85ee3
--- /dev/null
+++ b/japanese/kanji26/files/Makefile.in
@@ -0,0 +1,32 @@
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	kanji26.bdf
+
+DIST_NOBOLD=	${DIST_ALL}
+MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
+
+all: ${PCF_ALL}
+
+${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
+	${MKBOLD_CMD} $> > $@
+
+${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+	${MKITALIC_CMD} $> > $@
+
+${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
+	bdftopcf $> | ${GZIP_CMD} -c > $@
+
+install:
+	mkdir -p ${PREFIX}/${FONTSDIR}
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR}
+
+clean::
+	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/kanji26/pkg-plist b/japanese/kanji26/pkg-plist
index edfcc8662d3..4b143799589 100644
--- a/japanese/kanji26/pkg-plist
+++ b/japanese/kanji26/pkg-plist
@@ -1,7 +1,10 @@
 %%FONTSDIR%%/kanji26.pcf.gz
-share/doc/kanji26/26to24.sed
-share/doc/kanji26/README.kanji26
-share/doc/kanji26/kanji24.alias
-share/doc/kanji26/kanji26.alias
+%%FONTSDIR%%/kanji26b.pcf.gz
+%%FONTSDIR%%/kanji26bi.pcf.gz
+%%FONTSDIR%%/kanji26i.pcf.gz
+%%PORTDOCS%%share/doc/kanji26/26to24.sed
+%%PORTDOCS%%share/doc/kanji26/README.kanji26
+%%PORTDOCS%%share/doc/kanji26/kanji24.alias
+%%PORTDOCS%%share/doc/kanji26/kanji26.alias
+%%PORTDOCS%%@dirrm share/doc/kanji26
 @unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
-@dirrm share/doc/kanji26
diff --git a/japanese/kanji26/pkg-req b/japanese/kanji26/pkg-req
index de3f17c1510..fd4faa7996e 100644
--- a/japanese/kanji26/pkg-req
+++ b/japanese/kanji26/pkg-req
@@ -23,9 +23,21 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 kanji26  -jis-mincho-medium-r-normal--26-250-75-75-c-260-jisx0208.1983-0
+kanji26b  -jis-mincho-bold-r-normal--26-250-75-75-c-260-jisx0208.1983-0
+kanji26i  -jis-mincho-medium-i-normal--26-250-75-75-c-260-jisx0208.1983-0
+kanji26bi  -jis-mincho-bold-i-normal--26-250-75-75-c-260-jisx0208.1983-0
 -jis-fixed-medium-r-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-medium-r-normal--26-190-100-100-c-260-jisx0208.1983-0
+-jis-fixed-bold-r-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-bold-r-normal--26-190-100-100-c-260-jisx0208.1983-0
+-jis-fixed-medium-i-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-medium-i-normal--26-190-100-100-c-260-jisx0208.1983-0
+-jis-fixed-bold-i-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-bold-i-normal--26-190-100-100-c-260-jisx0208.1983-0
 -jis-fixed-medium-r-normal--26-250-75-75-c-260-jisx0208.1983-0 -jis-mincho-medium-r-normal--26-250-75-75-c-260-jisx0208.1983-0
+-jis-fixed-bold-r-normal--26-250-75-75-c-260-jisx0208.1983-0 -jis-mincho-bold-r-normal--26-250-75-75-c-260-jisx0208.1983-0
+-jis-fixed-medium-i-normal--26-250-75-75-c-260-jisx0208.1983-0 -jis-mincho-medium-i-normal--26-250-75-75-c-260-jisx0208.1983-0
+-jis-fixed-bold-i-normal--26-250-75-75-c-260-jisx0208.1983-0 -jis-mincho-bold-i-normal--26-250-75-75-c-260-jisx0208.1983-0
 -jis-mincho-medium-r-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-medium-r-normal--26-250-75-75-c-260-jisx0208.1983-0
+-jis-mincho-bold-r-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-bold-r-normal--26-250-75-75-c-260-jisx0208.1983-0
+-jis-mincho-medium-i-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-medium-i-normal--26-250-75-75-c-260-jisx0208.1983-0
+-jis-mincho-bold-i-normal--26-190-100-100-c-260-jisx0208.1983-0 -jis-mincho-bold-i-normal--26-250-75-75-c-260-jisx0208.1983-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 8b3bd05f583..483a2e2ff93 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kappa20
 PORTVERSION=	0.394
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://kappa.allnet.ne.jp/20dot.fonts/
 DISTNAME=	Kappa20-${PORTVERSION}
@@ -16,17 +17,24 @@ MAINTAINER=	ginga@athena.club.ne.jp
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
+BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ARGS=	TARGETDIR="${PREFIX}/${FONTSDIR}"
+MAKE_ARGS=	FONTSDIR="${FONTSDIR}"
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
+post-extract:
+	(cd ${WRKSRC} ; ${MV} Makefile Makefile.dist)
+	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index f309df974a7..567e6131bb4 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -1,20 +1,37 @@
 %%FONTSDIR%%/10x20L2b.pcf.gz
+%%FONTSDIR%%/10x20L2bi.pcf.gz
 %%FONTSDIR%%/10x20L2m.pcf.gz
+%%FONTSDIR%%/10x20L2mi.pcf.gz
 %%FONTSDIR%%/10x20L3b.pcf.gz
+%%FONTSDIR%%/10x20L3bi.pcf.gz
 %%FONTSDIR%%/10x20L3m.pcf.gz
+%%FONTSDIR%%/10x20L3mi.pcf.gz
 %%FONTSDIR%%/10x20L9b.pcf.gz
+%%FONTSDIR%%/10x20L9bi.pcf.gz
 %%FONTSDIR%%/10x20L9m.pcf.gz
+%%FONTSDIR%%/10x20L9mi.pcf.gz
 %%FONTSDIR%%/10x20b.pcf.gz
+%%FONTSDIR%%/10x20bi.pcf.gz
 %%FONTSDIR%%/10x20m.pcf.gz
+%%FONTSDIR%%/10x20mi.pcf.gz
 %%FONTSDIR%%/10x20rkb.pcf.gz
+%%FONTSDIR%%/10x20rkbi.pcf.gz
 %%FONTSDIR%%/10x20rkm.pcf.gz
+%%FONTSDIR%%/10x20rkmi.pcf.gz
 %%FONTSDIR%%/ipa-10x20b.pcf.gz
+%%FONTSDIR%%/ipa-10x20bi.pcf.gz
 %%FONTSDIR%%/ipa-10x20m.pcf.gz
+%%FONTSDIR%%/ipa-10x20mi.pcf.gz
 %%FONTSDIR%%/k20b.pcf.gz
+%%FONTSDIR%%/k20bi.pcf.gz
 %%FONTSDIR%%/k20m.pcf.gz
+%%FONTSDIR%%/k20mi.pcf.gz
 %%FONTSDIR%%/nk20b-1.pcf.gz
+%%FONTSDIR%%/nk20bi-1.pcf.gz
 %%FONTSDIR%%/vk20b.pcf.gz
+%%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
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req
index 6d154393351..9b2e106e373 100644
--- a/japanese/kappa20/pkg-req
+++ b/japanese/kappa20/pkg-req
@@ -23,45 +23,85 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 -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
 -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
 -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-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
 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
 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
 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
+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
+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
+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
+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
+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
+vk20mi -kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"