5 files changed, 59 insertions, 10 deletions

diff --git a/japanese/kanji26/files/DEINSTALL.tmpl b/japanese/kanji26/files/DEINSTALL.tmpl
index 5acdd065022e..e31f7ece328d 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 77be2d3b8f9e..c10a3d81cef2 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 000000000000..85875d85ee39
--- /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 edfcc8662d30..4b143799589f 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 de3f17c15102..fd4faa7996ea 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"