3 files changed, 39 insertions, 5 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}