Fix inconsistent installation directories of Japanese fonts and

reorganize the package names: (new) -> font-ayu18 (new) -> font-ayu20 k10 -> font-naga10 (also builds "marunaga" variant now) k12 -> font-kaname12 (new) -> font-elisa10 (resurrected) elisa8x8 -> font-elisa8 kanji18 -> font-kanji18 (also builds 16-dot variant now) kanji26 -> font-kanji26 (also builds 24-dot variant now) kappa20 -> font-kappa20 (Ayu fonts is separated into font-ayu20) mikachan-ttfonts -> font-mikachan monafonts-ttf -> font-mona-ttf monafonts -> font-mona All of bitmap fonts are now installed into misc/, and the TrueType fonts go into TTF/. No objection from: maintainers
author: hrs <hrs@FreeBSD.org> 2015-09-25 21:48:09 +0000
committer: hrs <hrs@FreeBSD.org> 2015-09-25 21:48:09 +0000
commit: 6cc4595d07513b672559284ddd014b293ced624b (patch)
tree: deebe3467f37b732e1acbd189727420d1d5cbd99
parent: 36fc2c6e73d8cc118c2443beeb92e5bae985ace3 (diff)
download: FreeBSD-ports-6cc4595d07513b672559284ddd014b293ced624b.zip
FreeBSD-ports-6cc4595d07513b672559284ddd014b293ced624b.tar.gz
113 files changed, 1186 insertions, 974 deletions
diff --git a/MOVED b/MOVED
index 7666e2f..509de46 100644
--- a/MOVED
+++ b/MOVED
@@ -7875,3 +7875,12 @@ x11-toolkits/wxgtk28-unicode-contrib|x11-toolkits/wxgtk28-contrib|2015-09-16|Mak
 x11-toolkits/py-wxPython28-unicode|x11-toolkits/py-wxPython28|2015-09-16|Make wxGTK now only unicode
 japanese/font-mplus|japanese/font-mplus-outline|2015-09-21|Renamed
 www/iojs|www/node|2015-09-23|io.js has been merged back to Node.js
+japanese/k10|japanese/font-naga10|2015-09-25|Renamed
+japanese/k12|japanese/font-kaname12|2015-09-25|Renamed
+japanese/elisa8x8|japanese/font-elisa8|2015-09-25|Renamed
+japanese/kanji18|japanese/font-kanji18|2015-09-25|Renamed
+japanese/kanji26|japanese/font-kanji26|2015-09-25|Renamed
+japanese/kappa20|japanese/font-kappa20|2015-09-25|Renamed
+japanese/mikachan-ttfonts|japanese/font-mikachan|2015-09-25|Renamed
+japanese/monafonts-ttf|japanese/font-mona-ttf|2015-09-25|Renamed
+japanese/monafonts|japanese/font-mona|2015-09-25|Renamed
diff --git a/japanese/Makefile b/japanese/Makefile
index ac4f917..ccccbca 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -49,7 +49,6 @@
     SUBDIR += edyvalue
     SUBDIR += egg-canna
     SUBDIR += eijiro-fpw
-    SUBDIR += elisa8x8
     SUBDIR += epwutil
     SUBDIR += esecanna
     SUBDIR += esecanna-module-vje25
@@ -61,21 +60,33 @@
     SUBDIR += fcitx-skk
     SUBDIR += flower-fpw
     SUBDIR += foldoc-fpw
+    SUBDIR += font-ayu18
+    SUBDIR += font-ayu20
+    SUBDIR += font-elisa10
+    SUBDIR += font-elisa8
     SUBDIR += font-ipa
     SUBDIR += font-ipa-uigothic
     SUBDIR += font-ipaex
     SUBDIR += font-ipamjm
     SUBDIR += font-jisx0213
+    SUBDIR += font-kaname12
+    SUBDIR += font-kanji18
+    SUBDIR += font-kanji26
+    SUBDIR += font-kappa20
     SUBDIR += font-kochi
     SUBDIR += font-koruri
     SUBDIR += font-marumoji
     SUBDIR += font-migmix
     SUBDIR += font-migu
+    SUBDIR += font-mikachan
+    SUBDIR += font-mona
     SUBDIR += font-mona-ipa
+    SUBDIR += font-mona-ttf
     SUBDIR += font-motoya-al
     SUBDIR += font-mplus-bitmap
     SUBDIR += font-mplus-ipa
     SUBDIR += font-mplus-outline
+    SUBDIR += font-naga10
     SUBDIR += font-ricty
     SUBDIR += font-ricty-discord
     SUBDIR += font-sazanami
@@ -117,14 +128,9 @@
     SUBDIR += jstrings
     SUBDIR += jvim3
     SUBDIR += jyuroku
-    SUBDIR += k10
-    SUBDIR += k12
     SUBDIR += kakasi
     SUBDIR += kana-no-quiz
-    SUBDIR += kanji18
-    SUBDIR += kanji26
     SUBDIR += kanjipad
-    SUBDIR += kappa20
     SUBDIR += kasumi
     SUBDIR += kbanner
     SUBDIR += kcc
@@ -159,11 +165,8 @@
     SUBDIR += migemo
     SUBDIR += migemo-emacs23
     SUBDIR += migemo.el
-    SUBDIR += mikachan-ttfonts
     SUBDIR += mime_pls
     SUBDIR += ming
-    SUBDIR += monafonts
-    SUBDIR += monafonts-ttf
     SUBDIR += mozc-el
     SUBDIR += mozc-server
     SUBDIR += mozc-tool
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 6868544..73770af 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	alias-fonts
 PORTVERSION=	1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,12 +11,12 @@ DISTFILES=	# empty
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Meta-port which setups Japanese fonts
 
-RUN_DEPENDS=	ja-elisa8x8>0:${PORTSDIR}/japanese/elisa8x8 \
-		ja-naga10>0:${PORTSDIR}/japanese/k10 \
+RUN_DEPENDS=	ja-font-elisa8>0:${PORTSDIR}/japanese/font-elisa8 \
+		ja-font-naga10>0:${PORTSDIR}/japanese/font-naga10 \
 		ja-font-shinonome>0:${PORTSDIR}/japanese/font-shinonome \
-		ja-kanji18>0:${PORTSDIR}/japanese/kanji18 \
-		ja-k20fonts>0:${PORTSDIR}/japanese/kappa20 \
-		ja-kanji26>0:${PORTSDIR}/japanese/kanji26 \
+		ja-font-kanji18>0:${PORTSDIR}/japanese/font-kanji18 \
+		ja-font-kappa20>0:${PORTSDIR}/japanese/font-kappa20 \
+		ja-font-kanji26>0:${PORTSDIR}/japanese/font-kanji26 \
 		ja-font-jisx0213>0:${PORTSDIR}/japanese/font-jisx0213
 
 NO_BUILD=	yes
diff --git a/japanese/alias-fonts/files/pkg-message.in b/japanese/alias-fonts/files/pkg-message.in
index 07b19aa..d0a96bd 100644
--- a/japanese/alias-fonts/files/pkg-message.in
+++ b/japanese/alias-fonts/files/pkg-message.in
@@ -20,11 +20,4 @@ Font Path setting:
 whether the following directories are listed:
 
     %%PREFIX%%/share/fonts/alias-fonts/	(This port)
-    %%PREFIX%%/share/fonts/elisa8x8/	(8 dot fonts)
-    %%PREFIX%%/share/fonts/naga10/	(10 dot fonts)
-    %%PREFIX%%/share/fonts/shinonome/	(12, 14 and 16 dots)
-    %%PREFIX%%/share/fonts/kanji/	(18 and 24 dot fonts)
-    %%PREFIX%%/share/fonts/k20fonts/	(20 dot fonts)
-    %%PREFIX%%/share/fonts/jisx0213/	(12, 14, 16 and 24 dots
-                                         JISX0213 fonts)
 ********************************************************************
diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile
deleted file mode 100644
index 82bb136..0000000
--- a/japanese/elisa8x8/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project
-# $FreeBSD$
-
-PORTNAME=	elisa8x8
-PORTVERSION=	1.0
-PORTREVISION=	5
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://www.bsdbbq.org/~toshi/distfiles/
-DISTNAME=	elisat10
-
-MAINTAINER=	toshi@tea.forus.or.jp
-COMMENT=	X11 8-dot Kanji font 'elisa font'
-
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-
-USES=		fonts
-NO_WRKSUBDIR=	yes
-
-BDFTOPCF_CMD=	${PREFIX}/bin/bdftopcf
-MYPORTDOCS=	elisa100.doc elisat10.doc elisat10.html
-
-OPTIONS_DEFINE=	DOCS
-
-do-build:
-	@(cd ${WRKDIR}; \
-	${BDFTOPCF_CMD} elisat10.bdf   | ${GZIP_CMD} -c > elisat10.pcf.gz ;\
-	${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -c > jpnhn4-jis.pcf.gz ;\
-	${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -c > jpnhn4-iso.pcf.gz ;\
-	)
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	(cd ${WRKSRC} ;\
-	${INSTALL_DATA} elisat10.pcf.gz ${STAGEDIR}${FONTSDIR} ; \
-	${INSTALL_DATA} jpnhn4-jis.pcf.gz ${STAGEDIR}${FONTSDIR} ; \
-	${INSTALL_DATA} jpnhn4-iso.pcf.gz ${STAGEDIR}${FONTSDIR} ; \
-	)
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/japanese/elisa8x8/files/pkg-deinstall.in b/japanese/elisa8x8/files/pkg-deinstall.in
deleted file mode 100644
index b9e4cc9..0000000
--- a/japanese/elisa8x8/files/pkg-deinstall.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=%%FONTSDIR%%
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
-k8  -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
-r8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
-a8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
-4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/elisa8x8/files/pkg-install.in b/japanese/elisa8x8/files/pkg-install.in
deleted file mode 100644
index bf9a925..0000000
--- a/japanese/elisa8x8/files/pkg-install.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=%%FONTSDIR%%
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
-k8  -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
-r8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
-a8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
-4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/elisa8x8/pkg-plist b/japanese/elisa8x8/pkg-plist
deleted file mode 100644
index 4a9d543..0000000
--- a/japanese/elisa8x8/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%FONTSDIR%%/elisat10.pcf.gz
-%%FONTSDIR%%/jpnhn4-jis.pcf.gz
-%%FONTSDIR%%/jpnhn4-iso.pcf.gz
-%%PORTDOCS%%%%DOCSDIR%%/elisa100.doc
-%%PORTDOCS%%%%DOCSDIR%%/elisat10.doc
-%%PORTDOCS%%%%DOCSDIR%%/elisat10.html
diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile
new file mode 100644
index 0000000..78be598
--- /dev/null
+++ b/japanese/font-ayu18/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+PORTNAME=	ayu18
+PORTVERSION=	1.3.1.1
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	SFJP/x-tt/8535/:goth \
+		SFJP/x-tt/8494/:min
+PKGNAMEPREFIX=	ja-font-
+DISTFILES=	ayu18gothic-1.3a${EXTRACT_SUFX}:goth \
+		ayu18mincho-1.1${EXTRACT_SUFX}:min
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Ayu 18-dot Kanji font
+
+BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts
+FONTNAME=	misc
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
+SUB_FILES=	Makefile
+PORTDOCS=	README.txt
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/font-ayu18/distinfo b/japanese/font-ayu18/distinfo
new file mode 100644
index 0000000..10cf9a1
--- /dev/null
+++ b/japanese/font-ayu18/distinfo
@@ -0,0 +1,4 @@
+SHA256 (ayu18gothic-1.3a.tar.gz) = 116063516bb0758c0369ca3035d65e394ab6c1bad4cf258309adbc9e3e50d11c
+SIZE (ayu18gothic-1.3a.tar.gz) = 288546
+SHA256 (ayu18mincho-1.1.tar.gz) = 5ebbde4193d5cdca94e3d67513dc4da98fa3d62eb96f9834900ef7219051ecbe
+SIZE (ayu18mincho-1.1.tar.gz) = 290092
diff --git a/japanese/font-ayu18/files/Makefile.in b/japanese/font-ayu18/files/Makefile.in
new file mode 100644
index 0000000..6df6cde
--- /dev/null
+++ b/japanese/font-ayu18/files/Makefile.in
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	9x18gm.bdf 9x18grkm.bdf 9x18m.bdf 9x18rkm.bdf \
+		k18gm.bdf k18m.bdf
+
+DIST_NOBOLD=	# empty
+MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BDF} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/m/mi/g:S/b./bi./g:S/b-/bi-/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BDF} ${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/mi/m/:S/bi./b./:S/bi-/b-/}
+	${MKITALIC_CMD} $> > $@
+
+${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
+	bdftopcf $> | ${GZIP_CMD} -c > $@
+
+install:
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%%
+
+clean::
+	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/font-ayu18/pkg-descr b/japanese/font-ayu18/pkg-descr
new file mode 100644
index 0000000..5b20265
--- /dev/null
+++ b/japanese/font-ayu18/pkg-descr
@@ -0,0 +1,3 @@
+Ayu Bitmap Japanese font, 18-dot version.
+
+WWW: http://x-tt.osdn.jp/ayu.html
diff --git a/japanese/font-ayu18/pkg-plist b/japanese/font-ayu18/pkg-plist
new file mode 100644
index 0000000..c85c1f5
--- /dev/null
+++ b/japanese/font-ayu18/pkg-plist
@@ -0,0 +1,24 @@
+%%DATADIR%%/9x18gm.pcf.gz
+%%DATADIR%%/9x18gmi.pcf.gz
+%%DATADIR%%/9x18grkm.pcf.gz
+%%DATADIR%%/9x18grkmi.pcf.gz
+%%DATADIR%%/9x18m.pcf.gz
+%%DATADIR%%/9x18mi.pcf.gz
+%%DATADIR%%/9x18rkm.pcf.gz
+%%DATADIR%%/9x18rkmi.pcf.gz
+%%DATADIR%%/k18gm.pcf.gz
+%%DATADIR%%/k18gmi.pcf.gz
+%%DATADIR%%/k18m.pcf.gz
+%%DATADIR%%/k18mi.pcf.gz
+%%FONTSDIR%%/9x18gm.pcf.gz
+%%FONTSDIR%%/9x18gmi.pcf.gz
+%%FONTSDIR%%/9x18grkm.pcf.gz
+%%FONTSDIR%%/9x18grkmi.pcf.gz
+%%FONTSDIR%%/9x18m.pcf.gz
+%%FONTSDIR%%/9x18mi.pcf.gz
+%%FONTSDIR%%/9x18rkm.pcf.gz
+%%FONTSDIR%%/9x18rkmi.pcf.gz
+%%FONTSDIR%%/k18gm.pcf.gz
+%%FONTSDIR%%/k18gmi.pcf.gz
+%%FONTSDIR%%/k18m.pcf.gz
+%%FONTSDIR%%/k18mi.pcf.gz
diff --git a/japanese/font-ayu20/Makefile b/japanese/font-ayu20/Makefile
new file mode 100644
index 0000000..6b4dfd0
--- /dev/null
+++ b/japanese/font-ayu20/Makefile
@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+PORTNAME=	ayu20
+PORTVERSION=	1.7.a
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	SFJP/x-tt/8536/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	ayu20gothic-1.7a
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Ayu 20-dot Kanji font
+
+BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+CONFLICS=	ja-kappa20-[0-9]*
+
+USES=		fonts
+FONTNAME=	misc
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+PORTDOCS=	README.txt
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
+	    ${STAGEDIR}${DATADIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/font-ayu20/distinfo b/japanese/font-ayu20/distinfo
new file mode 100644
index 0000000..e69606e
--- /dev/null
+++ b/japanese/font-ayu20/distinfo
@@ -0,0 +1,2 @@
+SHA256 (ayu20gothic-1.7a.tar.gz) = b1747196de69ef45ab37f1a40a0fc32bccc7b3acc229a21c932ab38874436833
+SIZE (ayu20gothic-1.7a.tar.gz) = 319226
diff --git a/japanese/kanji26/files/Makefile.in b/japanese/font-ayu20/files/Makefile.in
index 75258bc..4fc2b44 100644
--- a/japanese/kanji26/files/Makefile.in
+++ b/japanese/font-ayu20/files/Makefile.in
@@ -4,15 +4,15 @@ GZIP_CMD?=	gzip
 MKBOLD_CMD?=	mkbold
 MKITALIC_CMD?=	mkitalic
 
-DIST_ALL=	kanji26.bdf
+DIST_ALL=	10x20gm.bdf 10x20grkm.bdf k20gm.bdf
 
-DIST_NOBOLD=	${DIST_ALL}
+DIST_NOBOLD=	# empty
 MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
 
-DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
-MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BDF} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/m/mi/g:S/b./bi./g:S/b-/bi-/g}
 
-BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+BDF_ALL=	${DIST_ALL} ${MADE_BDF} ${MADE_BOLD} ${MADE_ITALIC}
 PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
 
 all: ${PCF_ALL}
@@ -20,15 +20,15 @@ all: ${PCF_ALL}
 ${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
 	${MKBOLD_CMD} $> > $@
 
-${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+${MADE_ITALIC}: ${.TARGET:S/mi/m/:S/bi./b./:S/bi-/b-/}
 	${MKITALIC_CMD} $> > $@
 
 ${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
 	bdftopcf $> | ${GZIP_CMD} -c > $@
 
 install:
-	mkdir -p ${DESTDIR}${PREFIX}/${FONTSDIR}
-	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}${PREFIX}/${FONTSDIR}
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%%
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/kappa20/files/fonts.alias.ayu b/japanese/font-ayu20/files/fonts.alias
index 9b8cccb..9b8cccb 100644
--- a/japanese/kappa20/files/fonts.alias.ayu
+++ b/japanese/font-ayu20/files/fonts.alias
diff --git a/japanese/font-ayu20/files/pkg-install.in b/japanese/font-ayu20/files/pkg-install.in
new file mode 100644
index 0000000..7c1d227
--- /dev/null
+++ b/japanese/font-ayu20/files/pkg-install.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+	if [ ! -s fonts.alias ]; then
+		rm -f fonts.alias
+	fi
+;;
+esac
diff --git a/japanese/font-ayu20/pkg-descr b/japanese/font-ayu20/pkg-descr
new file mode 100644
index 0000000..22181db
--- /dev/null
+++ b/japanese/font-ayu20/pkg-descr
@@ -0,0 +1,3 @@
+Ayu Bitmap Japanese font, 20-dot version.
+
+WWW: http://x-tt.osdn.jp/ayu.html
diff --git a/japanese/font-ayu20/pkg-plist b/japanese/font-ayu20/pkg-plist
new file mode 100644
index 0000000..8944f2b
--- /dev/null
+++ b/japanese/font-ayu20/pkg-plist
@@ -0,0 +1,13 @@
+%%DATADIR%%/10x20gm.pcf.gz
+%%DATADIR%%/10x20gmi.pcf.gz
+%%DATADIR%%/10x20grkm.pcf.gz
+%%DATADIR%%/10x20grkmi.pcf.gz
+%%DATADIR%%/k20gm.pcf.gz
+%%DATADIR%%/k20gmi.pcf.gz
+%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/10x20gm.pcf.gz
+%%FONTSDIR%%/10x20gmi.pcf.gz
+%%FONTSDIR%%/10x20grkm.pcf.gz
+%%FONTSDIR%%/10x20grkmi.pcf.gz
+%%FONTSDIR%%/k20gm.pcf.gz
+%%FONTSDIR%%/k20gmi.pcf.gz
diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile
new file mode 100644
index 0000000..4e6f87b
--- /dev/null
+++ b/japanese/font-elisa10/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+PORTNAME=	elisa10
+PORTVERSION=	1.0
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	http://www.wheel.gr.jp/~dai/software/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	elisau10
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Elisa 10-dot Kanji font
+
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts tar:tgz
+FONTNAME=	misc
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
+		GZIP_CMD="${GZIP_CMD}" \
+		FONTSALIAS="${DATADIR}/fonts.alias"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+PORTDOCS=	elisau10.doc hosoku.txt
+PLIST_FILES=	%%DATADIR%%/elisau10.pcf.gz \
+		%%DATADIR%%/fonts.alias \
+		%%FONTSDIR%%/elisau10.pcf.gz
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/font-elisa10/distinfo b/japanese/font-elisa10/distinfo
new file mode 100644
index 0000000..2127c0d
--- /dev/null
+++ b/japanese/font-elisa10/distinfo
@@ -0,0 +1,2 @@
+SHA256 (elisau10.tgz) = bb62d48db7a26339313947b623376bb18d92196424ee1545ef54ed8b0200dfba
+SIZE (elisau10.tgz) = 125292
diff --git a/japanese/font-elisa10/files/Makefile.in b/japanese/font-elisa10/files/Makefile.in
new file mode 100644
index 0000000..1151fa6
--- /dev/null
+++ b/japanese/font-elisa10/files/Makefile.in
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+BDFTOPCF_CMD=	%%BDFTOPCF_CMD%%
+GZIP_CMD=	%%GZIP_CMD%%
+
+SRCS=	elisau10.bdf
+
+.for F in ${SRCS:R}
+${F}.pcf.gz: ${F}.bdf
+	${BDFTOPCF_CMD} ${.ALLSRC} | ${GZIP_CMD} -c > ${.TARGET}
+
+all: ${F}.pcf.gz
+.endfor
+
+.for F in ${SRCS:R}
+${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.bdf
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
+
+install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz
+.endfor
+
+all install:
+	@true
diff --git a/japanese/font-elisa10/files/pkg-install.in b/japanese/font-elisa10/files/pkg-install.in
new file mode 100644
index 0000000..7429530
--- /dev/null
+++ b/japanese/font-elisa10/files/pkg-install.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+;;
+esac
diff --git a/japanese/font-elisa10/pkg-descr b/japanese/font-elisa10/pkg-descr
new file mode 100644
index 0000000..1abd851
--- /dev/null
+++ b/japanese/font-elisa10/pkg-descr
@@ -0,0 +1,3 @@
+Elisa10 is Japanese 10 dot font based on Elisa 8-dot font.
+
+WWW: http://www.wheel.gr.jp/~dai/software/elisau10-doc.html
diff --git a/japanese/font-elisa8/Makefile b/japanese/font-elisa8/Makefile
new file mode 100644
index 0000000..1365741
--- /dev/null
+++ b/japanese/font-elisa8/Makefile
@@ -0,0 +1,42 @@
+# Created by: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project
+# $FreeBSD$
+
+PORTNAME=	elisa8
+PORTVERSION=	1.0
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	http://www.bsdbbq.org/~toshi/distfiles/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	elisat10
+
+MAINTAINER=	toshi@tea.forus.or.jp
+COMMENT=	8-dot Kanji font 'elisa'
+
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts
+FONTNAME=	misc
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
+		GZIP_CMD="${GZIP_CMD}" \
+		FONTSALIAS="${DATADIR}/fonts.alias"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+PORTDOCS=	elisa100.doc elisat10.doc elisat10.html
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/elisa8x8/distinfo b/japanese/font-elisa8/distinfo
index 6753250..6753250 100644
--- a/japanese/elisa8x8/distinfo
+++ b/japanese/font-elisa8/distinfo
diff --git a/japanese/font-elisa8/files/Makefile.in b/japanese/font-elisa8/files/Makefile.in
new file mode 100644
index 0000000..783c94e
--- /dev/null
+++ b/japanese/font-elisa8/files/Makefile.in
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+BDFTOPCF_CMD=	%%BDFTOPCF_CMD%%
+GZIP_CMD=	%%GZIP_CMD%%
+
+SRCS=	elisat10.bdf jpnhn4-jis.bdf jpnhn4-iso.bdf
+
+.for F in ${SRCS:R}
+${F}.pcf.gz: ${F}.bdf
+	${BDFTOPCF_CMD} ${.ALLSRC} | ${GZIP_CMD} -c > ${.TARGET}
+
+all: ${F}.pcf.gz
+.endfor
+
+.for F in ${SRCS:R}
+${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.bdf
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
+
+install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz
+.endfor
+
+all install:
+	@true
diff --git a/japanese/font-elisa8/files/fonts.alias b/japanese/font-elisa8/files/fonts.alias
new file mode 100644
index 0000000..b6c6e3e
--- /dev/null
+++ b/japanese/font-elisa8/files/fonts.alias
@@ -0,0 +1,4 @@
+k8  -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
+r8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
+a8  -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
diff --git a/japanese/font-elisa8/files/pkg-install.in b/japanese/font-elisa8/files/pkg-install.in
new file mode 100644
index 0000000..7429530
--- /dev/null
+++ b/japanese/font-elisa8/files/pkg-install.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+;;
+esac
diff --git a/japanese/elisa8x8/pkg-descr b/japanese/font-elisa8/pkg-descr
index b4a1037..0e5aa32 100644
--- a/japanese/elisa8x8/pkg-descr
+++ b/japanese/font-elisa8/pkg-descr
@@ -5,3 +5,5 @@ jis.x0201 font, 4x8 dots iso8859-1 font.
 
 A simple usage:
 	% kterm -fn a8 -fr r8 -fk k8
+
+WWW: http://hp.vector.co.jp/authors/VA002310/family.htm
diff --git a/japanese/font-elisa8/pkg-plist b/japanese/font-elisa8/pkg-plist
new file mode 100644
index 0000000..0cdca3e
--- /dev/null
+++ b/japanese/font-elisa8/pkg-plist
@@ -0,0 +1,7 @@
+%%DATADIR%%/elisat10.pcf.gz
+%%DATADIR%%/jpnhn4-jis.pcf.gz
+%%DATADIR%%/jpnhn4-iso.pcf.gz
+%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/elisat10.pcf.gz
+%%FONTSDIR%%/jpnhn4-jis.pcf.gz
+%%FONTSDIR%%/jpnhn4-iso.pcf.gz
diff --git a/japanese/font-kaname12/Makefile b/japanese/font-kaname12/Makefile
new file mode 100644
index 0000000..6602b8d
--- /dev/null
+++ b/japanese/font-kaname12/Makefile
@@ -0,0 +1,44 @@
+# Created by: Mita Yoshio <mita@jp.FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	kaname12
+PORTVERSION=	1.1
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	LOCAL/hrs
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	kaname_k12_bdf
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		knm_new_linux${EXTRACT_SUFX}
+
+MAINTAINER=	CQG00620@nifty.ne.jp
+COMMENT=	12-dot Kanji font
+
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts
+FONTNAME=	misc
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+MAKEFILE=	${WRKDIR}/Makefile
+PORTDOCS=	readme readme.kaname_bdf kaname.doc \
+		readme.knm gijutsu-siryou.doc
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+
+post-install-DOCS-on:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install-doc
+
+.include <bsd.port.mk>
diff --git a/japanese/k12/distinfo b/japanese/font-kaname12/distinfo
index b1f5a61..b1f5a61 100644
--- a/japanese/k12/distinfo
+++ b/japanese/font-kaname12/distinfo
diff --git a/japanese/font-kaname12/files/Makefile.in b/japanese/font-kaname12/files/Makefile.in
new file mode 100644
index 0000000..80ff06f
--- /dev/null
+++ b/japanese/font-kaname12/files/Makefile.in
@@ -0,0 +1,30 @@
+PCF=	kaname-latin1.pcf.gz knm12p.pcf.gz knm12pb.pcf.gz \
+	knmhn12x.pcf.gz knmzn12x.pcf.gz knmzn12xb.pcf.gz
+
+DOCS=	readme readme.kaname_bdf kaname.doc readme.knm \
+	gijutsu-siryou.doc
+
+.PATH: fonts doc.orig
+
+knmhn12x.pcf.gz: knmhn12x.bdf
+	bdftopcf ${.ALLSRC} | gzip -9 > ${.TARGET}
+
+.for F in ${PCF}
+${DESTDIR}%%DATADIR%%/$F: $F
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
+
+install: ${DESTDIR}%%DATADIR%%/$F
+all: ${F}
+.endfor
+
+.for F in ${DOCS}
+${DESTDIR}%%DOCSDIR%%/$F: $F
+	mkdir -p ${DESTDIR}%%DOCSDIR%%
+	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
+
+install-doc: ${DESTDIR}%%DOCSDIR%%/$F
+.endfor
+
+all install install-doc:
+	@true
diff --git a/japanese/k12/files/fonts.alias b/japanese/font-kaname12/files/fonts.alias
index 3c007c4..3c007c4 100644
--- a/japanese/k12/files/fonts.alias
+++ b/japanese/font-kaname12/files/fonts.alias
diff --git a/japanese/font-kaname12/files/patch-readme.kaname_bdf b/japanese/font-kaname12/files/patch-readme.kaname_bdf
new file mode 100644
index 0000000..c6d70d5
--- /dev/null
+++ b/japanese/font-kaname12/files/patch-readme.kaname_bdf
@@ -0,0 +1,11 @@
+--- readme.kaname_bdf.orig	1994-01-25 03:44:09 UTC
++++ readme.kaname_bdf
+@@ -2,7 +2,7 @@
+ 
+ readme.kaname_bdf $@$3$N%U%!%$%k(J
+ knmhn12x.bdf      X11$@MQ$N(J6x12$@%I%C%H$N(JJISX0201.1976$@%U%)%s%H(J
+-knmhz12x.bdf      X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J
++knmzn12x.bdf      X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J
+ doc.orig/*        $@85$N%"!<%+%$%V$K4^$^$l$F$$$?%I%-%e%a%s%H(J
+ $@$3$N(J12$@%I%C%H4A;z%U%)%s%H$O!"K~3+@=:n=j(J($@"((J)$@$N3$O786M&;N;a$K(J
+ $@$h$C$F:n$i$l$?(J X68000 SX-Windows $@MQ$N%U%j!<$N%U%)%s%H$r(J
diff --git a/japanese/font-kaname12/files/pkg-install.in b/japanese/font-kaname12/files/pkg-install.in
new file mode 100644
index 0000000..7429530
--- /dev/null
+++ b/japanese/font-kaname12/files/pkg-install.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+;;
+esac
diff --git a/japanese/k12/pkg-descr b/japanese/font-kaname12/pkg-descr
index 48984fd..48984fd 100644
--- a/japanese/k12/pkg-descr
+++ b/japanese/font-kaname12/pkg-descr
diff --git a/japanese/font-kaname12/pkg-plist b/japanese/font-kaname12/pkg-plist
new file mode 100644
index 0000000..1bb40b8
--- /dev/null
+++ b/japanese/font-kaname12/pkg-plist
@@ -0,0 +1,13 @@
+%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/kaname-latin1.pcf.gz
+%%FONTSDIR%%/knm12p.pcf.gz
+%%FONTSDIR%%/knm12pb.pcf.gz
+%%FONTSDIR%%/knmhn12x.pcf.gz
+%%FONTSDIR%%/knmzn12x.pcf.gz
+%%FONTSDIR%%/knmzn12xb.pcf.gz
+%%DATADIR%%/kaname-latin1.pcf.gz
+%%DATADIR%%/knm12p.pcf.gz
+%%DATADIR%%/knm12pb.pcf.gz
+%%DATADIR%%/knmhn12x.pcf.gz
+%%DATADIR%%/knmzn12x.pcf.gz
+%%DATADIR%%/knmzn12xb.pcf.gz
diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile
new file mode 100644
index 0000000..2ec3dd8
--- /dev/null
+++ b/japanese/font-kanji18/Makefile
@@ -0,0 +1,65 @@
+# Created by: Yoshiro MIHIRA <sanpei@sanpei.org>
+# $FreeBSD$
+
+PORTNAME=	kanji
+PORTVERSION=	1.0
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=   PORTS_JP/${DISTNAME}
+PKGNAMEPREFIX=	ja-font-
+PKGNAMESUFFIX?=	18
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
+DISTFILES?=	573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
+DIST_SUBDIR=	${DISTNAME}
+
+MAINTAINER=	sanpei@FreeBSD.org
+COMMENT=	${PKGNAMESUFFIX}-dot Kanji font
+
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts
+FONTNAME=	misc
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
+EXTRACT_CMD=		${GZCAT}
+EXTRACT_BEFORE_ARGS=
+EXTRACT_AFTER_ARGS=	| ${SED} '/bin\/sh/,/exit 0/!d' \
+			| (cd ${WRKDIR} && ${SH})
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias.${PKGNAMESUFFIX}" \
+		SRCS="${SRCS}"
+PORTDOCS=	README.${PORTNAME}${PKGNAMESUFFIX}
+
+SRCS?=		kanji18.bdf kanji16.bdf
+README_FILE?=	573.z
+RESIZESED_FILE?=18to16.sed
+
+OPTIONS_DEFINE=	DOCS
+
+post-extract:
+	cd ${WRKSRC} && ${CAT} ${DISTNAME}.?? | uudecode
+	${GUNZIP_CMD} ${WRKDIR}/*.Z
+	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${README_FILE} \
+	    | ${SED} '/bin\/sh/,/exit 0/d' \
+	    > ${WRKSRC}/README.${DISTNAME}
+	cd ${WRKSRC} && \
+	    ${SED} -f ${RESIZESED_FILE} < ${PORTNAME}${PKGNAMESUFFIX}.bdf \
+	    > ${PORTNAME}${RESIZESED_FILE:R:C/^[0-9][0-9]to//}.bdf
+
+pre-build: apply-slist
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias.${PKGNAMESUFFIX} \
+	    ${STAGEDIR}${DATADIR}/fonts.alias.${PKGNAMESUFFIX}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && \
+	    ${INSTALL_DATA} README.${DISTNAME} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/kanji18/distinfo b/japanese/font-kanji18/distinfo
index ee14462..ee14462 100644
--- a/japanese/kanji18/distinfo
+++ b/japanese/font-kanji18/distinfo
diff --git a/japanese/kanji18/files/Makefile.in b/japanese/font-kanji18/files/Makefile.in
index a50cdbb..fff83d9 100644
--- a/japanese/kanji18/files/Makefile.in
+++ b/japanese/font-kanji18/files/Makefile.in
@@ -4,7 +4,7 @@ GZIP_CMD?=	gzip
 MKBOLD_CMD?=	mkbold
 MKITALIC_CMD?=	mkitalic
 
-DIST_ALL=	kanji18.bdf
+DIST_ALL=	%%SRCS%%
 
 DIST_NOBOLD=	${DIST_ALL}
 MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
@@ -27,8 +27,8 @@ ${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
 	bdftopcf $> | ${GZIP_CMD} -c > $@
 
 install:
-	mkdir -p ${DESTDIR}${PREFIX}/${FONTSDIR}
-	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}${PREFIX}/${FONTSDIR}
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%%
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/font-kanji18/files/fonts.alias.18 b/japanese/font-kanji18/files/fonts.alias.18
new file mode 100644
index 0000000..369f874
--- /dev/null
+++ b/japanese/font-kanji18/files/fonts.alias.18
@@ -0,0 +1,20 @@
+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
+kanji16  -jis-gothic-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
+-jis-fixed-medium-r-normal--16-120-100-100-c-160-jisx0208.1983-0 -jis-gothic-medium-r-normal--16-120-100-100-c-160-jisx0208.1983-0
+-jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 -jis-gothic-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
+-jis-gothic-medium-r-normal--16-120-100-100-c-160-jisx0208.1983-0 -jis-gothic-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
diff --git a/japanese/font-kanji18/files/fonts.alias.26 b/japanese/font-kanji18/files/fonts.alias.26
new file mode 100644
index 0000000..910e7ca
--- /dev/null
+++ b/japanese/font-kanji18/files/fonts.alias.26
@@ -0,0 +1,20 @@
+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
+kanji24  -jis-mincho-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+-jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-mincho-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0
+-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0 -jis-mincho-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+-jis-mincho-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-mincho-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
diff --git a/japanese/font-kanji18/files/pkg-install.in b/japanese/font-kanji18/files/pkg-install.in
new file mode 100644
index 0000000..7429530
--- /dev/null
+++ b/japanese/font-kanji18/files/pkg-install.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+;;
+esac
diff --git a/japanese/font-kanji18/pkg-descr b/japanese/font-kanji18/pkg-descr
new file mode 100644
index 0000000..a84c6f3
--- /dev/null
+++ b/japanese/font-kanji18/pkg-descr
@@ -0,0 +1 @@
+Japanese 18 dot gothic font.
diff --git a/japanese/font-kanji18/pkg-plist b/japanese/font-kanji18/pkg-plist
new file mode 100644
index 0000000..b7208f0
--- /dev/null
+++ b/japanese/font-kanji18/pkg-plist
@@ -0,0 +1,17 @@
+%%DATADIR%%/fonts.alias.18
+%%DATADIR%%/kanji18.pcf.gz
+%%DATADIR%%/kanji18b.pcf.gz
+%%DATADIR%%/kanji18bi.pcf.gz
+%%DATADIR%%/kanji18i.pcf.gz
+%%DATADIR%%/kanji16.pcf.gz
+%%DATADIR%%/kanji16b.pcf.gz
+%%DATADIR%%/kanji16bi.pcf.gz
+%%DATADIR%%/kanji16i.pcf.gz
+%%FONTSDIR%%/kanji18.pcf.gz
+%%FONTSDIR%%/kanji18b.pcf.gz
+%%FONTSDIR%%/kanji18bi.pcf.gz
+%%FONTSDIR%%/kanji18i.pcf.gz
+%%FONTSDIR%%/kanji16.pcf.gz
+%%FONTSDIR%%/kanji16b.pcf.gz
+%%FONTSDIR%%/kanji16bi.pcf.gz
+%%FONTSDIR%%/kanji16i.pcf.gz
diff --git a/japanese/kanji26/Makefile b/japanese/font-kanji26/Makefile
index 367c699..585b67b 100644
--- a/japanese/kanji26/Makefile
+++ b/japanese/font-kanji26/Makefile
@@ -5,12 +5,13 @@ PKGNAMESUFFIX=	26
 DISTFILES?=	793.gz 794.gz 795.gz 796.gz 797.gz 798.gz 799.gz \
 		800.gz 802.gz 816.gz 817.gz 818.gz 819.gz 820.gz 821.gz
 
-FILESDIR=	${.CURDIR}/files
-PKGDIR=		${.CURDIR}
-MASTERDIR=	${.CURDIR}/../kanji18
+MASTERDIR=	${.CURDIR}/../font-kanji18
 DISTINFO_FILE=	${.CURDIR}/distinfo
+PLIST=		${.CURDIR}/pkg-plist
+DESCR=		${.CURDIR}/pkg-descr
+
 README_FILE?=	793.gz
-RESIZESED_FILE?=	26to24.sed
-RESIZED_ALIAS_FILE?=	kanji24.alias
+RESIZESED_FILE?=26to24.sed
+SRCS=		kanji26.bdf kanji24.bdf
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/kanji26/distinfo b/japanese/font-kanji26/distinfo
index 34ea505..34ea505 100644
--- a/japanese/kanji26/distinfo
+++ b/japanese/font-kanji26/distinfo
diff --git a/japanese/font-kanji26/pkg-descr b/japanese/font-kanji26/pkg-descr
new file mode 100644
index 0000000..0963569
--- /dev/null
+++ b/japanese/font-kanji26/pkg-descr
@@ -0,0 +1 @@
+Japanese 26 dot mincho font.
diff --git a/japanese/font-kanji26/pkg-plist b/japanese/font-kanji26/pkg-plist
new file mode 100644
index 0000000..724ce57
--- /dev/null
+++ b/japanese/font-kanji26/pkg-plist
@@ -0,0 +1,17 @@
+%%DATADIR%%/fonts.alias.26
+%%DATADIR%%/kanji26.pcf.gz
+%%DATADIR%%/kanji26b.pcf.gz
+%%DATADIR%%/kanji26bi.pcf.gz
+%%DATADIR%%/kanji26i.pcf.gz
+%%DATADIR%%/kanji24.pcf.gz
+%%DATADIR%%/kanji24b.pcf.gz
+%%DATADIR%%/kanji24bi.pcf.gz
+%%DATADIR%%/kanji24i.pcf.gz
+%%FONTSDIR%%/kanji26.pcf.gz
+%%FONTSDIR%%/kanji26b.pcf.gz
+%%FONTSDIR%%/kanji26bi.pcf.gz
+%%FONTSDIR%%/kanji26i.pcf.gz
+%%FONTSDIR%%/kanji24.pcf.gz
+%%FONTSDIR%%/kanji24b.pcf.gz
+%%FONTSDIR%%/kanji24bi.pcf.gz
+%%FONTSDIR%%/kanji24i.pcf.gz
diff --git a/japanese/font-kappa20/Makefile b/japanese/font-kappa20/Makefile
new file mode 100644
index 0000000..ea0a563
--- /dev/null
+++ b/japanese/font-kappa20/Makefile
@@ -0,0 +1,41 @@
+# Created by: Kawaguti Ginga <ginga@athena.club.ne.jp>
+# $FreeBSD$
+
+PORTNAME=	kappa20
+PORTVERSION=	0.396
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	LOCAL/hrs
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	Kappa20-${PORTVERSION}
+
+MAINTAINER=	ginga-freebsd@ginganet.org
+COMMENT=	20-dot Kanji font Kappa20
+
+BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts tar:bzip2
+FONTNAME=	misc
+MAKE_ARGS=	FONTSDIR="${FONTSDIR:S,${PREFIX},,}"
+MAKEFILE=	${WRKDIR}/Makefile
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+	cd ${WRKSRC} && ${SH} makebdf.sh
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/kappa20/distinfo b/japanese/font-kappa20/distinfo
index e05e6a9..e05e6a9 100644
--- a/japanese/kappa20/distinfo
+++ b/japanese/font-kappa20/distinfo
diff --git a/japanese/kappa20/files/Makefile.in b/japanese/font-kappa20/files/Makefile.in
index 8aa3ce2..d33b158 100644
--- a/japanese/kappa20/files/Makefile.in
+++ b/japanese/font-kappa20/files/Makefile.in
@@ -15,8 +15,7 @@ DIST_ALL=	10x20L2b.bdf 10x20L2m.bdf 10x20L3b.bdf 10x20L3m.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 \
-		10x20gm.bdf 10x20grkm.bdf k20gm.bdf
+		k20b.bdf k20m.bdf
 
 MADE_BDF=	vk20b.bdf vk20m.bdf nk20b-1.bdf
 
@@ -49,14 +48,15 @@ vk20b.bdf: k20b.bdf tategaki.diff
 nk20b-1.bdf: k20b.bdf newjis.diff
 	${PATCH} -o $@ 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 /' >> $@
-	${CAT} fonts.alias.ayu >> $@
+fonts.alias: Makefile
+	(${SED} -n '/^.*echo \(.*\) >>.*$$/ s//\1/p' Makefile; \
+	 ${SED} -n '/^.*echo \(.*\) >>.*$$/ s//\1/p' Makefile | \
+	    ${SED} 's/-r-/-i-/g;s/\(^[^-][^ 	]*\) /\1i /'; \
+	) | sort > $@
 
 install:
-	mkdir -p ${DESTDIR}${PREFIX}/${FONTSDIR}
-	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}${PREFIX}/${FONTSDIR}
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} fonts.alias ${DESTDIR}%%DATADIR%%
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/font-kappa20/files/pkg-install.in b/japanese/font-kappa20/files/pkg-install.in
new file mode 100644
index 0000000..7c1d227
--- /dev/null
+++ b/japanese/font-kappa20/files/pkg-install.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+	if [ ! -s fonts.alias ]; then
+		rm -f fonts.alias
+	fi
+;;
+esac
diff --git a/japanese/kappa20/pkg-descr b/japanese/font-kappa20/pkg-descr
index bac7334..76e49c3 100644
--- a/japanese/kappa20/pkg-descr
+++ b/japanese/font-kappa20/pkg-descr
@@ -1,11 +1,10 @@
-Japanese 20 dot fonts(`Kappa20dot + ayu font').
+Japanese 20 dot fonts(`Kappa20dot').
 
 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)
+	k20[mb]		mincho/gothic	(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)
 	10x20L[239][mb]	ISO 8859-[239]	(Latin [239])
 	ipa-10x20[mb]	Mule IPA fonts
 	vk20[mb]	k20[mb] modified for vertical writings
@@ -18,5 +17,4 @@ 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
+WWW: http://kappa.allnet.ne.jp/20dot.fonts/
diff --git a/japanese/kappa20/pkg-plist b/japanese/font-kappa20/pkg-plist
index ec12c7b..e9c6572 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/font-kappa20/pkg-plist
@@ -1,3 +1,62 @@
+%%DATADIR%%/10x20L10b.pcf.gz
+%%DATADIR%%/10x20L10bi.pcf.gz
+%%DATADIR%%/10x20L10m.pcf.gz
+%%DATADIR%%/10x20L10mi.pcf.gz
+%%DATADIR%%/10x20L2b.pcf.gz
+%%DATADIR%%/10x20L2bi.pcf.gz
+%%DATADIR%%/10x20L2m.pcf.gz
+%%DATADIR%%/10x20L2mi.pcf.gz
+%%DATADIR%%/10x20L3b.pcf.gz
+%%DATADIR%%/10x20L3bi.pcf.gz
+%%DATADIR%%/10x20L3m.pcf.gz
+%%DATADIR%%/10x20L3mi.pcf.gz
+%%DATADIR%%/10x20L4b.pcf.gz
+%%DATADIR%%/10x20L4bi.pcf.gz
+%%DATADIR%%/10x20L4m.pcf.gz
+%%DATADIR%%/10x20L4mi.pcf.gz
+%%DATADIR%%/10x20L5b.pcf.gz
+%%DATADIR%%/10x20L5bi.pcf.gz
+%%DATADIR%%/10x20L5m.pcf.gz
+%%DATADIR%%/10x20L5mi.pcf.gz
+%%DATADIR%%/10x20L6b.pcf.gz
+%%DATADIR%%/10x20L6bi.pcf.gz
+%%DATADIR%%/10x20L6m.pcf.gz
+%%DATADIR%%/10x20L6mi.pcf.gz
+%%DATADIR%%/10x20L7b.pcf.gz
+%%DATADIR%%/10x20L7bi.pcf.gz
+%%DATADIR%%/10x20L7m.pcf.gz
+%%DATADIR%%/10x20L7mi.pcf.gz
+%%DATADIR%%/10x20L8b.pcf.gz
+%%DATADIR%%/10x20L8bi.pcf.gz
+%%DATADIR%%/10x20L8m.pcf.gz
+%%DATADIR%%/10x20L8mi.pcf.gz
+%%DATADIR%%/10x20L9b.pcf.gz
+%%DATADIR%%/10x20L9bi.pcf.gz
+%%DATADIR%%/10x20L9m.pcf.gz
+%%DATADIR%%/10x20L9mi.pcf.gz
+%%DATADIR%%/10x20b.pcf.gz
+%%DATADIR%%/10x20bi.pcf.gz
+%%DATADIR%%/10x20m.pcf.gz
+%%DATADIR%%/10x20mi.pcf.gz
+%%DATADIR%%/10x20rkb.pcf.gz
+%%DATADIR%%/10x20rkbi.pcf.gz
+%%DATADIR%%/10x20rkm.pcf.gz
+%%DATADIR%%/10x20rkmi.pcf.gz
+%%DATADIR%%/ipa-10x20b.pcf.gz
+%%DATADIR%%/ipa-10x20bi.pcf.gz
+%%DATADIR%%/ipa-10x20m.pcf.gz
+%%DATADIR%%/ipa-10x20mi.pcf.gz
+%%DATADIR%%/k20b.pcf.gz
+%%DATADIR%%/k20bi.pcf.gz
+%%DATADIR%%/k20m.pcf.gz
+%%DATADIR%%/k20mi.pcf.gz
+%%DATADIR%%/nk20b-1.pcf.gz
+%%DATADIR%%/nk20bi-1.pcf.gz
+%%DATADIR%%/vk20b.pcf.gz
+%%DATADIR%%/vk20bi.pcf.gz
+%%DATADIR%%/vk20m.pcf.gz
+%%DATADIR%%/vk20mi.pcf.gz
+%%DATADIR%%/fonts.alias
 %%FONTSDIR%%/10x20L10b.pcf.gz
 %%FONTSDIR%%/10x20L10bi.pcf.gz
 %%FONTSDIR%%/10x20L10m.pcf.gz
@@ -36,10 +95,6 @@
 %%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
@@ -52,8 +107,6 @@
 %%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
@@ -62,5 +115,3 @@
 %%FONTSDIR%%/vk20bi.pcf.gz
 %%FONTSDIR%%/vk20m.pcf.gz
 %%FONTSDIR%%/vk20mi.pcf.gz
-%%PORTDOCS%%%%DOCSDIR%%/README.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/fonts.alias
diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/font-mikachan/Makefile
index a92f50f..8891f31 100644
--- a/japanese/mikachan-ttfonts/Makefile
+++ b/japanese/font-mikachan/Makefile
@@ -1,35 +1,46 @@
 # Created by: sada
 # $FreeBSD$
 
-PORTNAME=	mikachan-ttfonts
+PORTNAME=	mikachan
 PORTVERSION=	9.1
-PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://mikachan.sourceforge.jp/
+PKGNAMEPREFIX=	ja-font-
 DISTNAME=	ver${PORTVERSION}
 EXTRACT_SUFX=	.lzh
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	turutani@scphys.kyoto-u.ac.jp
 COMMENT=	Handwritten Japanese TrueType fonts by Mika-chan
 
 EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
-USES=		fonts
-NO_CDROM=	Do not sell distfile
+USES=		fonts:fc
+FONTNAME=	TTF
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	pq
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/mika.ttf
-DIST_SUBDIR=	${PORTNAME}
+NO_CDROM=	Do not sell distfile
+NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-MAKE_ENV=	FONTSDIR=${FONTSDIR}
-
-FONTNAME=	TrueType
+SUB_FILES=	pkg-install
+SUB_LIST=	DIRFILE="${DATADIR}/fonts.dir"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+PLIST_FILES=	%%DATADIR%%/fonts.dir \
+		%%DATADIR%%/mika.ttf \
+		%%FONTSDIR%%/mika.ttf
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} \
-		${WRKDIR}/mika.ttf ${FILESDIR}/fonts.dir.mika \
-		${STAGEDIR}${FONTSDIR}
+	    ${WRKSRC}/mika.ttf ${FILESDIR}/fonts.dir \
+	    ${STAGEDIR}${DATADIR}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.ttf .
 
 .include <bsd.port.mk>
diff --git a/japanese/font-mikachan/distinfo b/japanese/font-mikachan/distinfo
new file mode 100644
index 0000000..caea51a
--- /dev/null
+++ b/japanese/font-mikachan/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mikachan/ver9.1.lzh) = 86d6a32734f24b7ce7b3274dfa16dc7c66397ab862b2ce0344c5d73c738d8371
+SIZE (mikachan/ver9.1.lzh) = 2144373
diff --git a/japanese/mikachan-ttfonts/files/fonts.dir.mika b/japanese/font-mikachan/files/fonts.dir
index fc2d641..89093aa 100644
--- a/japanese/mikachan-ttfonts/files/fonts.dir.mika
+++ b/japanese/font-mikachan/files/fonts.dir
@@ -1,4 +1,3 @@
-4
 bw=0.5:mika.ttf -misc-mikachan-medium-r-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:mika.ttf -misc-mikachan-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
 mika.ttf -misc-mikachan-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
diff --git a/japanese/font-mikachan/files/pkg-install.in b/japanese/font-mikachan/files/pkg-install.in
new file mode 100644
index 0000000..cd69654
--- /dev/null
+++ b/japanese/font-mikachan/files/pkg-install.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.dir
+	sed -e '/-mikachan-/d' fonts.dir > fonts.dir.tmp
+	numfonts=$(echo $(cat fonts.dir.tmp %%DIRFILE%% | wc -l) - 2 | bc)
+	echo ${numfonts} > fonts.dir
+	sed -e 1d fonts.dir.tmp >> fonts.dir
+	sed -e 1d %%DIRFILE%% >> fonts.dir
+	rm -f fonts.dir.tmp fonts.alias.tmp
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.dir
+	sed -e '/-mikachan-/d' fonts.dir > fonts.dir.tmp
+	numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 2 | bc)
+	echo ${numfonts} > fonts.dir
+	sed -e 1d fonts.dir.tmp >> fonts.dir
+;;
+esac
diff --git a/japanese/mikachan-ttfonts/pkg-descr b/japanese/font-mikachan/pkg-descr
index f272534..f272534 100644
--- a/japanese/mikachan-ttfonts/pkg-descr
+++ b/japanese/font-mikachan/pkg-descr
diff --git a/japanese/font-mona-ttf/Makefile b/japanese/font-mona-ttf/Makefile
new file mode 100644
index 0000000..1f9459e0
--- /dev/null
+++ b/japanese/font-mona-ttf/Makefile
@@ -0,0 +1,39 @@
+# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	mona
+PORTVERSION=	2.90
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
+PKGNAMEPREFIX=	ja-font-
+PKGNAMESUFFIX=	-ttf
+DISTNAME=	monafont-ttf-${PORTVERSION}
+
+MAINTAINER=	nobutaka@FreeBSD.org
+COMMENT=	TrueType Kanji fonts
+
+USES=		fonts:fc zip
+FONTNAME=	TTF
+NO_ARCH=	yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+SUB_FILES=	pkg-install
+SUB_LIST=	DIRFILE="${DATADIR}/fonts.dir"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
+PLIST_FILES=	%%DATADIR%%/fonts.dir \
+		%%DATADIR%%/mona.ttf \
+		%%FONTSDIR%%/mona.ttf
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir \
+	    ${STAGEDIR}${DATADIR}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.ttf .
+
+.include <bsd.port.mk>
diff --git a/japanese/monafonts-ttf/distinfo b/japanese/font-mona-ttf/distinfo
index d2f4402..d2f4402 100644
--- a/japanese/monafonts-ttf/distinfo
+++ b/japanese/font-mona-ttf/distinfo
diff --git a/japanese/monafonts-ttf/files/fonts.dir.mona b/japanese/font-mona-ttf/files/fonts.dir
index db7c16d..db7c16d 100644
--- a/japanese/monafonts-ttf/files/fonts.dir.mona
+++ b/japanese/font-mona-ttf/files/fonts.dir
diff --git a/japanese/font-mona-ttf/files/pkg-install.in b/japanese/font-mona-ttf/files/pkg-install.in
new file mode 100644
index 0000000..ae01688
--- /dev/null
+++ b/japanese/font-mona-ttf/files/pkg-install.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.dir
+	sed -e '/mona\.ttf/d' fonts.dir > fonts.dir.tmp
+	numfonts=$(echo $(cat fonts.dir.tmp %%DIRFILE%% | wc -l) - 2 | bc)
+	echo ${numfonts} > fonts.dir
+	sed -e 1d fonts.dir.tmp >> fonts.dir
+	sed -e 1d %%DIRFILE%% >> fonts.dir
+	rm -f fonts.dir.tmp fonts.alias.tmp
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.dir
+	sed -e '/mona\.ttf/d' fonts.dir > fonts.dir.tmp
+	numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 2 | bc)
+	echo ${numfonts} > fonts.dir
+	sed -e 1d fonts.dir.tmp >> fonts.dir
+;;
+esac
diff --git a/japanese/monafonts-ttf/pkg-descr b/japanese/font-mona-ttf/pkg-descr
index 259b0b9..beb1127 100644
--- a/japanese/monafonts-ttf/pkg-descr
+++ b/japanese/font-mona-ttf/pkg-descr
@@ -2,6 +2,4 @@ TrueType kanji proportional fonts that have same metric and order as
 Japanese Windows font. This is named after ASCII art 'mona' used in
 '2 channel', notorious huge Web BBS.
 
-This font is installed in {LOCALBASE}/share/fonts/TrueType.
-
 WWW: http://monafont.sourceforge.net/
diff --git a/japanese/font-mona/Makefile b/japanese/font-mona/Makefile
new file mode 100644
index 0000000..20a1f06
--- /dev/null
+++ b/japanese/font-mona/Makefile
@@ -0,0 +1,34 @@
+# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
+# $FreeBSD$
+
+PORTNAME=	mona
+PORTVERSION=	2.90
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	monafont-${PORTVERSION}
+
+MAINTAINER=	nobutaka@FreeBSD.org
+COMMENT=	12,14,16-dot Kanji fonts
+
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+
+USES=		fonts perl5 tar:bzip2
+FONTNAME=	misc
+USE_PERL5=	build
+NO_ARCH=	yes
+MAKE_ENV=	DATADIR="${DATADIR}"
+SUB_FILES=	pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+ALL_TARGET=	bdf
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/monafonts/distinfo b/japanese/font-mona/distinfo
index a9251da..a9251da 100644
--- a/japanese/monafonts/distinfo
+++ b/japanese/font-mona/distinfo
diff --git a/japanese/monafonts/pkg-deinstall b/japanese/font-mona/files/fonts.alias
index 1945794..42a0c58 100644
--- a/japanese/monafonts/pkg-deinstall
+++ b/japanese/font-mona/files/fonts.alias
@@ -1,18 +1,3 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=${PKG_PREFIX}/share/fonts/monafonts
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
 mona6x12a -mona-gothic-medium-r-normal--12-110-75-75-p-60-iso8859-1
 mona6x12aB -mona-gothic-bold-r-normal--12-110-75-75-p-60-iso8859-1
 mona6x12aBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-iso8859-1
@@ -69,19 +54,3 @@ monau16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-iso10646-1
 -mona-gothic-medium-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
 -mona-gothic-medium-r-normal--10-70-75-75-p-100-jisx0208.1983-0 -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
 -mona-gothic-bold-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/monafonts/files/patch-Makefile b/japanese/font-mona/files/patch-Makefile
index e62bad5..088cb2e 100644
--- a/japanese/monafonts/files/patch-Makefile
+++ b/japanese/font-mona/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2003-09-10 11:54:10.000000000 +0900
-+++ Makefile	2014-05-08 22:35:25.000000000 +0900
-@@ -18,11 +18,10 @@
+--- Makefile.orig	2003-09-10 02:54:10 UTC
++++ Makefile
+@@ -18,11 +18,10 @@ GZIP_SUFFIX	= gz
  #GZIP_SUFFIX	= Z
  
  DESTDIR		=
@@ -9,14 +9,14 @@
 -BDFTOPCF	= $(X11BINDIR)/bdftopcf
 -MKDIRHIER	= $(X11BINDIR)/mkdirhier	# 'mkdir -p' may also work.
 -MKFONTDIR	= $(X11BINDIR)/mkfontdir
-+X11FONTDIR	= $(DESTDIR)$(FONTSDIR)
++X11FONTDIR	= $(DESTDIR)$(DATADIR)
 +BDFTOPCF	= bdftopcf
 +MKDIRHIER	= mkdir -p	# 'mkdir -p' may also work.
 +MKFONTDIR	= mkfontdir
  
  MY_RPM_ROOT	= /tmp/rpm-root
  
-@@ -258,7 +257,6 @@
+@@ -258,7 +257,6 @@ install: bdf
  		$(BDFTOPCF) dist/$$i.bdf | \
  		$(GZIP_CMD) -c > $(X11FONTDIR)/$$i.pcf.$(GZIP_SUFFIX); \
  	done
diff --git a/japanese/font-mona/files/pkg-install.in b/japanese/font-mona/files/pkg-install.in
new file mode 100644
index 0000000..7429530
--- /dev/null
+++ b/japanese/font-mona/files/pkg-install.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+grepv() {
+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
+}
+
+case $2 in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
+	    > fonts.alias
+	rm -f fonts.alias.orig
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	cp fonts.alias fonts.alias.orig
+	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
+	rm -f fonts.alias.orig
+;;
+esac
diff --git a/japanese/font-mona/pkg-descr b/japanese/font-mona/pkg-descr
new file mode 100644
index 0000000..7c724d8
--- /dev/null
+++ b/japanese/font-mona/pkg-descr
@@ -0,0 +1,5 @@
+12,14,16-dot kanji proportional fonts that have same metric and order as
+Japanese Windows font. This is named after ASCII art 'mona' used in
+'2 channel', notorious huge Web BBS.
+
+WWW: http://monafont.sourceforge.net/
diff --git a/japanese/monafonts/pkg-plist b/japanese/font-mona/pkg-plist
index d33c685..ba14e6b7 100644
--- a/japanese/monafonts/pkg-plist
+++ b/japanese/font-mona/pkg-plist
@@ -1,4 +1,52 @@
-@mode 444
+%%DATADIR%%/fonts.alias
+%%DATADIR%%/mona6x12a.pcf.gz
+%%DATADIR%%/mona6x12aB.pcf.gz
+%%DATADIR%%/mona6x12aBI.pcf.gz
+%%DATADIR%%/mona6x12aI.pcf.gz
+%%DATADIR%%/mona6x12r.pcf.gz
+%%DATADIR%%/mona6x12rB.pcf.gz
+%%DATADIR%%/mona6x12rBI.pcf.gz
+%%DATADIR%%/mona6x12rI.pcf.gz
+%%DATADIR%%/mona7x14a.pcf.gz
+%%DATADIR%%/mona7x14aB.pcf.gz
+%%DATADIR%%/mona7x14aBI.pcf.gz
+%%DATADIR%%/mona7x14aI.pcf.gz
+%%DATADIR%%/mona7x14r.pcf.gz
+%%DATADIR%%/mona7x14rB.pcf.gz
+%%DATADIR%%/mona7x14rBI.pcf.gz
+%%DATADIR%%/mona7x14rI.pcf.gz
+%%DATADIR%%/mona8x16a.pcf.gz
+%%DATADIR%%/mona8x16aB.pcf.gz
+%%DATADIR%%/mona8x16aBI.pcf.gz
+%%DATADIR%%/mona8x16aI.pcf.gz
+%%DATADIR%%/mona8x16r.pcf.gz
+%%DATADIR%%/mona8x16rB.pcf.gz
+%%DATADIR%%/mona8x16rBI.pcf.gz
+%%DATADIR%%/mona8x16rI.pcf.gz
+%%DATADIR%%/monak12.pcf.gz
+%%DATADIR%%/monak12B.pcf.gz
+%%DATADIR%%/monak12BI.pcf.gz
+%%DATADIR%%/monak12I.pcf.gz
+%%DATADIR%%/monak14.pcf.gz
+%%DATADIR%%/monak14B.pcf.gz
+%%DATADIR%%/monak14BI.pcf.gz
+%%DATADIR%%/monak14I.pcf.gz
+%%DATADIR%%/monak16.pcf.gz
+%%DATADIR%%/monak16B.pcf.gz
+%%DATADIR%%/monak16BI.pcf.gz
+%%DATADIR%%/monak16I.pcf.gz
+%%DATADIR%%/monau12.pcf.gz
+%%DATADIR%%/monau12B.pcf.gz
+%%DATADIR%%/monau12BI.pcf.gz
+%%DATADIR%%/monau12I.pcf.gz
+%%DATADIR%%/monau14.pcf.gz
+%%DATADIR%%/monau14B.pcf.gz
+%%DATADIR%%/monau14BI.pcf.gz
+%%DATADIR%%/monau14I.pcf.gz
+%%DATADIR%%/monau16.pcf.gz
+%%DATADIR%%/monau16B.pcf.gz
+%%DATADIR%%/monau16BI.pcf.gz
+%%DATADIR%%/monau16I.pcf.gz
 %%FONTSDIR%%/mona6x12a.pcf.gz
 %%FONTSDIR%%/mona6x12aB.pcf.gz
 %%FONTSDIR%%/mona6x12aBI.pcf.gz
diff --git a/japanese/font-naga10/Makefile b/japanese/font-naga10/Makefile
new file mode 100644
index 0000000..fb41e97
--- /dev/null
+++ b/japanese/font-naga10/Makefile
@@ -0,0 +1,40 @@
+# Created by: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
+# $FreeBSD$
+
+PORTNAME=	naga10
+PORTVERSION=	1.1
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	knj10-${PORTVERSION}
+
+MAINTAINER=	CQG00620@nifty.ne.jp
+COMMENT=	10-dot Kanji font
+
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts
+FONTNAME=	misc
+SUB_FILES=	Makefile pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+MAKEFILE=	${WRKDIR}/Makefile
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
+
+pre-build: apply-slist
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/k10/distinfo b/japanese/font-naga10/distinfo
index 2cad92c..2cad92c 100644
--- a/japanese/k10/distinfo
+++ b/japanese/font-naga10/distinfo
diff --git a/japanese/k10/files/Makefile.in b/japanese/font-naga10/files/Makefile.in
index 95c43e4..1b388f4 100644
--- a/japanese/k10/files/Makefile.in
+++ b/japanese/font-naga10/files/Makefile.in
@@ -4,7 +4,8 @@ GZIP_CMD?=	gzip
 MKBOLD_CMD?=	mkbold
 MKITALIC_CMD?=	mkitalic
 
-DIST_ALL=	5x10B.bdf 5x10a.bdf 5x10rk.bdf knj10.bdf knj10B.bdf
+DIST_ALL=	5x10B.bdf 5x10a.bdf 5x10rk.bdf knj10.bdf knj10B.bdf \
+		maru10.bdf min10.bdf
 
 DIST_NOBOLD=	5x10rk.bdf
 MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
@@ -17,6 +18,12 @@ PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
 
 all: ${PCF_ALL}
 
+maru10.bdf: knj10.bdf maru10.bdf.diff
+	patch -o $@ < $@.diff
+
+min10.bdf: knj10.bdf min10.bdf.diff
+	patch -o $@ < $@.diff
+
 ${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
 	${MKBOLD_CMD} $> > $@
 
@@ -27,8 +34,8 @@ ${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
 	bdftopcf $> | ${GZIP_CMD} -c > $@
 
 install:
-	mkdir -p ${DESTDIR}${PREFIX}/${FONTSDIR}
-	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}${PREFIX}/${FONTSDIR}
+	mkdir -p ${DESTDIR}%%DATADIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%%
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/k10/files/fonts.alias b/japanese/font-naga10/files/fonts.alias
index e78f213..e78f213 100644
--- a/japanese/k10/files/fonts.alias
+++ b/japanese/font-naga10/files/fonts.alias
diff --git a/japanese/font-naga10/files/pkg-install.in b/japanese/font-naga10/files/pkg-install.in
new file mode 100644
index 0000000..432ba23
--- /dev/null
+++ b/japanese/font-naga10/files/pkg-install.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+
+case "$2" in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	grep -v -- "^k10\|^a10\|^r10" fonts.alias > fonts.alias.tmp
+	cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
+	rm -f fonts.alias.tmp
+;;
+DEINSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	grep -v -- "^k10\|^a10\|^r10" fonts.alias > fonts.alias.tmp
+	if [ -s fonts.alias.tmp ]; then
+		mv fonts.alias.tmp fonts.alias
+	else
+		rm -f fonts.alias.tmp fonts.alias
+	fi
+;;
+esac
diff --git a/japanese/k10/pkg-descr b/japanese/font-naga10/pkg-descr
index 0328874..0328874 100644
--- a/japanese/k10/pkg-descr
+++ b/japanese/font-naga10/pkg-descr
diff --git a/japanese/font-naga10/pkg-plist b/japanese/font-naga10/pkg-plist
new file mode 100644
index 0000000..02f887c
--- /dev/null
+++ b/japanese/font-naga10/pkg-plist
@@ -0,0 +1,33 @@
+%%DATADIR%%/fonts.alias
+%%DATADIR%%/5x10B.pcf.gz
+%%DATADIR%%/5x10a.pcf.gz
+%%DATADIR%%/5x10rk.pcf.gz
+%%DATADIR%%/knj10.pcf.gz
+%%DATADIR%%/knj10B.pcf.gz
+%%DATADIR%%/5x10rkb.pcf.gz
+%%DATADIR%%/5x10Bi.pcf.gz
+%%DATADIR%%/5x10ai.pcf.gz
+%%DATADIR%%/5x10rki.pcf.gz
+%%DATADIR%%/knj10i.pcf.gz
+%%DATADIR%%/knj10Bi.pcf.gz
+%%DATADIR%%/5x10rkbi.pcf.gz
+%%DATADIR%%/maru10.pcf.gz
+%%DATADIR%%/maru10i.pcf.gz
+%%DATADIR%%/min10.pcf.gz
+%%DATADIR%%/min10i.pcf.gz
+%%FONTSDIR%%/5x10B.pcf.gz
+%%FONTSDIR%%/5x10a.pcf.gz
+%%FONTSDIR%%/5x10rk.pcf.gz
+%%FONTSDIR%%/knj10.pcf.gz
+%%FONTSDIR%%/knj10B.pcf.gz
+%%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
+%%FONTSDIR%%/maru10.pcf.gz
+%%FONTSDIR%%/maru10i.pcf.gz
+%%FONTSDIR%%/min10.pcf.gz
+%%FONTSDIR%%/min10i.pcf.gz
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
deleted file mode 100644
index eda3b21..0000000
--- a/japanese/k10/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Created by: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
-# $FreeBSD$
-
-PORTNAME=	naga10
-PORTVERSION=	1.1
-PORTREVISION=	7
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
-DISTNAME=	knj10-${PORTVERSION}
-
-MAINTAINER=	CQG00620@nifty.ne.jp
-COMMENT=	X11 10-dot Kanji font 'naga10 font'
-
-BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-
-USES=		fonts
-
-MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE=	DOCS
-
-post-extract:
-	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
-
-.include <bsd.port.mk>
diff --git a/japanese/k10/files/pkg-message.in b/japanese/k10/files/pkg-message.in
deleted file mode 100644
index c5acde4..0000000
--- a/japanese/k10/files/pkg-message.in
+++ /dev/null
@@ -1,15 +0,0 @@
-*******************************************************************
-You can start using the font(s) by following these instructions:
-
-Eiter type the following in an X terminal:
-
-        xset fp+ %%FONTSDIR%%
-        xset fp rehash
-
-Or, more permanently, add the following line to the "Files" section
-of your X.Org configuration file (typically /etc/X11/xorg.conf):
-
-        FontPath "%%FONTSDIR%%/"
-
-then restart X.
-*******************************************************************
diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
deleted file mode 100644
index 190de39..0000000
--- a/japanese/k10/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-%%FONTSDIR%%/fonts.alias
-%%FONTSDIR%%/5x10B.pcf.gz
-%%FONTSDIR%%/5x10a.pcf.gz
-%%FONTSDIR%%/5x10rk.pcf.gz
-%%FONTSDIR%%/knj10.pcf.gz
-%%FONTSDIR%%/knj10B.pcf.gz
-%%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
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
deleted file mode 100644
index 3d281116..0000000
--- a/japanese/k12/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Mita Yoshio <mita@jp.FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	kaname12
-PORTVERSION=	1.1
-PORTREVISION=	5
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	PORTS_JP
-DISTNAME=	kaname_k12_bdf
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		knm_new_linux.tar.gz
-EXTRACT_ONLY=	knm_new_linux.tar.gz
-
-MAINTAINER=	CQG00620@nifty.ne.jp
-COMMENT=	X11 12-dot Kanji font
-
-USES=		fonts
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-
-WRKSRC=		${WRKDIR}/fonts
-
-MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,g} MKDIR="${MKDIR}"
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
-DOCSDIR=	${PREFIX}/share/doc/k12
-
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE=	DOCS
-
-post-extract:
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
-		${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme            ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/japanese/k12/files/patch-aa b/japanese/k12/files/patch-aa
deleted file mode 100644
index ee69ae4..0000000
--- a/japanese/k12/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2014-05-08 22:08:32.000000000 +0900
-+++ Makefile	2014-05-08 22:10:13.000000000 +0900
-@@ -0,0 +1,12 @@
-+all:
-+	bdftopcf knmhn12x.bdf > knmhn12x.pcf
-+	gzip -9 -nf knmhn12x.pcf
-+install:
-+	if [ ! -d ${DESTDIR}${PREFIX}/${FONTSDIR} ] ; then \
-+	${MKDIR} ${DESTDIR}${PREFIX}/${FONTSDIR} ; fi
-+	${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knm12p.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knm12pb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
diff --git a/japanese/k12/files/patch-ab b/japanese/k12/files/patch-ab
deleted file mode 100644
index a25d5bb..0000000
--- a/japanese/k12/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** readme.kaname_bdf.orig	Sat Jul  6 12:02:19 1996
---- readme.kaname_bdf	Sat Jul  6 12:02:25 1996
-***************
-*** 2,8 ****
-  
-  readme.kaname_bdf $@$3$N%U%!%$%k(J
-  knmhn12x.bdf      X11$@MQ$N(J6x12$@%I%C%H$N(JJISX0201.1976$@%U%)%s%H(J
-! knmhz12x.bdf      X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J
-  doc.orig/*        $@85$N%"!<%+%$%V$K4^$^$l$F$$$?%I%-%e%a%s%H(J
-  $@$3$N(J12$@%I%C%H4A;z%U%)%s%H$O!"K~3+@=:n=j(J($@"((J)$@$N3$O786M&;N;a$K(J
-  $@$h$C$F:n$i$l$?(J X68000 SX-Windows $@MQ$N%U%j!<$N%U%)%s%H$r(J
---- 2,8 ----
-  
-  readme.kaname_bdf $@$3$N%U%!%$%k(J
-  knmhn12x.bdf      X11$@MQ$N(J6x12$@%I%C%H$N(JJISX0201.1976$@%U%)%s%H(J
-! knmzn12x.bdf      X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J
-  doc.orig/*        $@85$N%"!<%+%$%V$K4^$^$l$F$$$?%I%-%e%a%s%H(J
-  $@$3$N(J12$@%I%C%H4A;z%U%)%s%H$O!"K~3+@=:n=j(J($@"((J)$@$N3$O786M&;N;a$K(J
-  $@$h$C$F:n$i$l$?(J X68000 SX-Windows $@MQ$N%U%j!<$N%U%)%s%H$r(J
diff --git a/japanese/k12/files/pkg-message.in b/japanese/k12/files/pkg-message.in
deleted file mode 100644
index c5acde4..0000000
--- a/japanese/k12/files/pkg-message.in
+++ /dev/null
@@ -1,15 +0,0 @@
-*******************************************************************
-You can start using the font(s) by following these instructions:
-
-Eiter type the following in an X terminal:
-
-        xset fp+ %%FONTSDIR%%
-        xset fp rehash
-
-Or, more permanently, add the following line to the "Files" section
-of your X.Org configuration file (typically /etc/X11/xorg.conf):
-
-        FontPath "%%FONTSDIR%%/"
-
-then restart X.
-*******************************************************************
diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist
deleted file mode 100644
index 947deb5..0000000
--- a/japanese/k12/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%FONTSDIR%%/fonts.alias
-%%FONTSDIR%%/kaname-latin1.pcf.gz
-%%FONTSDIR%%/knm12p.pcf.gz
-%%FONTSDIR%%/knm12pb.pcf.gz
-%%FONTSDIR%%/knmhn12x.pcf.gz
-%%FONTSDIR%%/knmzn12x.pcf.gz
-%%FONTSDIR%%/knmzn12xb.pcf.gz
-%%PORTDOCS%%%%DOCSDIR%%/gijutsu-siryou.doc
-%%PORTDOCS%%%%DOCSDIR%%/kaname.doc
-%%PORTDOCS%%%%DOCSDIR%%/readme
-%%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf
-%%PORTDOCS%%%%DOCSDIR%%/readme.knm
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
deleted file mode 100644
index 46bd3dd..0000000
--- a/japanese/kanji18/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: Yoshiro MIHIRA <sanpei@sanpei.org>
-# $FreeBSD$
-
-PORTNAME=	kanji
-PORTVERSION?=	1.0
-PORTREVISION?=	7
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=   PORTS_JP/${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
-COMMENT=	X11 ${PKGNAMESUFFIX}-dot Kanji font
-
-USES=		fonts
-EXTRACT_DEPENDS=	gunshar:${PORTSDIR}/archivers/sharutils
-BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-
-DIST_SUBDIR=	${DISTNAME}
-NO_WRKSUBDIR=	yes
-
-EXTRACT_CMD=		${GZCAT}
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	| ${AWK} '/bin\/sh/{P=1} {if (P==1) print;}' | \
-			${LOCALBASE}/bin/gunshar -d $(WRKDIR)
-PKGINSTALL=	${WRKSRC}/INSTALL
-PKGDEINSTALL=	${WRKSRC}/DEINSTALL
-MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
-README_FILE?=	573.z
-RESIZESED_FILE?=	18to16.sed
-RESIZED_ALIAS_FILE?=	kanji16.alias
-
-OPTIONS_DEFINE=	DOCS
-
-post-extract:
-	@(cd $(WRKSRC); ${CAT} ${DISTNAME}.?? | uudecode)
-	@${CP} -p ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
-	@${GUNZIP_CMD} ${WRKDIR}/*.Z
-
-post-patch:
-	@(${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${README_FILE} \
-		| ${AWK} '/^#! \/bin\/sh/{i=1} i==0{print}' \
-		> ${WRKSRC}/README.${DISTNAME})
-
-pre-install:
-	@for file in INSTALL DEINSTALL; do \
-		${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \
-		       -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-			< ${FILESDIR}/$${file}.tmpl > ${WRKSRC}/$${file}; \
-	done
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${RESIZESED_FILE} ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README.${DISTNAME} ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${RESIZED_ALIAS_FILE} ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.alias ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
-
-.include <bsd.port.mk>
diff --git a/japanese/kanji18/files/DEINSTALL.tmpl b/japanese/kanji18/files/DEINSTALL.tmpl
deleted file mode 100644
index 42902c4..0000000
--- a/japanese/kanji18/files/DEINSTALL.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	FONTDIR=%%FONTSDIR%%
-
-	# font alias entry here!
-	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"
-	cd ${FONTDIR}
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-	if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
-	rm -f fonts.alias.orig ${TMPFILE}
-
-	%%LOCALBASE%%/bin/xset fp rehash ||
-	(
-	 echo "**********************************************************"
-	 echo "You should restart X server or do 'xset fp rehash' command"
-	 echo "to enable this update."
-	 echo "**********************************************************"
-	)
-fi
-
-
diff --git a/japanese/kanji18/files/INSTALL.tmpl b/japanese/kanji18/files/INSTALL.tmpl
deleted file mode 100644
index c9c2cc4..0000000
--- a/japanese/kanji18/files/INSTALL.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "x$2" = "xPOST-INSTALL" ]; then
-	FONTDIR=%%FONTSDIR%%
-
-	# font alias entry here!
-	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"
-	cd ${FONTDIR}
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
-	rm -f fonts.alias.orig ${TMPFILE}
-
-	%%LOCALBASE%%/bin/xset fp rehash ||
-	(
-	 echo "**********************************************************"
-	 echo "You should restart X server or do 'xset fp rehash' command"
-	 echo "to enable this update."
-	 echo "**********************************************************"
-	)
-fi
-
diff --git a/japanese/kanji18/pkg-descr b/japanese/kanji18/pkg-descr
deleted file mode 100644
index 44d4bc6..0000000
--- a/japanese/kanji18/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Japanese 18 dot gothic font.
-
-  Bitmap font is installed the following directory tree:
-        ${LOCALBASE}/share/fonts/kanji/
-
-MIHIRA Yoshiro
diff --git a/japanese/kanji18/pkg-plist b/japanese/kanji18/pkg-plist
deleted file mode 100644
index 640face..0000000
--- a/japanese/kanji18/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%FONTSDIR%%/kanji18.pcf.gz
-%%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
diff --git a/japanese/kanji26/files/DEINSTALL.tmpl b/japanese/kanji26/files/DEINSTALL.tmpl
deleted file mode 100644
index 184086d..0000000
--- a/japanese/kanji26/files/DEINSTALL.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	FONTDIR=%%FONTSDIR%%
-
-	# font alias entry here!
-	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"
-	cd ${FONTDIR}
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-	if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
-	rm -f fonts.alias.orig ${TMPFILE}
-
-	%%LOCALBASE%%/bin/xset fp rehash ||
-	(
-	 echo "**********************************************************"
-	 echo "You should restart X server or do 'xset fp rehash' command"
-	 echo "to enable this update."
-	 echo "**********************************************************"
-	)
-fi
-
-
diff --git a/japanese/kanji26/files/INSTALL.tmpl b/japanese/kanji26/files/INSTALL.tmpl
deleted file mode 100644
index d78e355..0000000
--- a/japanese/kanji26/files/INSTALL.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "x$2" = "xPOST-INSTALL" ]; then
-	FONTDIR=%%FONTSDIR%%
-
-	# font alias entry here!
-	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"
-	cd ${FONTDIR}
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
-	rm -f fonts.alias.orig ${TMPFILE}
-
-	%%LOCALBASE%%/bin/xset fp rehash ||
-	(
-	 echo "**********************************************************"
-	 echo "You should restart X server or do 'xset fp rehash' command"
-	 echo "to enable this update."
-	 echo "**********************************************************"
-	)
-fi
-
diff --git a/japanese/kanji26/pkg-descr b/japanese/kanji26/pkg-descr
deleted file mode 100644
index 7fc761d..0000000
--- a/japanese/kanji26/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Japanese 26 dot mincho font.
-
-  Bitmap font is installed the following directory tree:
-        ${LOCALBASE}/share/fonts/kanji/
-
-MIHIRA Yoshiro
diff --git a/japanese/kanji26/pkg-plist b/japanese/kanji26/pkg-plist
deleted file mode 100644
index 9e02656..0000000
--- a/japanese/kanji26/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%FONTSDIR%%/kanji26.pcf.gz
-%%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
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
deleted file mode 100644
index 165c89f..0000000
--- a/japanese/kappa20/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: Kawaguti Ginga <ginga@athena.club.ne.jp>
-# $FreeBSD$
-
-PORTNAME=	k20fonts
-PORTVERSION=	0.396
-PORTREVISION=	7
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	NETBSD/LOCAL_PORTS:kappa20 \
-		SFJP/x-tt/8412/:ayu20
-DISTNAME=	Kappa20-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kappa20 \
-		${AYUDISTNAME}${AYU_SUFFIX}:ayu20
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	ginga-freebsd@ginganet.org
-COMMENT=	X11 20-dot Kanji font 'Kappa20dot + ayu font'
-
-USES=	fonts tar:bzip2
-AYUDISTNAME=	ayu20gothic-1.6
-AYU_SUFFIX=	.tar.gz
-
-BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-
-MAKE_ARGS=	FONTSDIR="${FONTSDIR:S,${PREFIX},,}"
-DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS
-
-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)
-
-pre-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README.euc-jp
-
-.include <bsd.port.mk>
diff --git a/japanese/kappa20/pkg-deinstall b/japanese/kappa20/pkg-deinstall
deleted file mode 100644
index 7ffa6a6..0000000
--- a/japanese/kappa20/pkg-deinstall
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=${PKG_PREFIX}/share/fonts/k20fonts
-FAFILE=${PKG_PREFIX}/share/doc/ja/k20fonts/fonts.alias
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-grepv ${FAFILE} fonts.alias.orig > fonts.alias
-if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
-rm -f fonts.alias.orig
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/kappa20/pkg-install b/japanese/kappa20/pkg-install
deleted file mode 100644
index 4c9317a..0000000
--- a/japanese/kappa20/pkg-install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=${PKG_PREFIX}/share/fonts/k20fonts
-FAFILE=${PKG_PREFIX}/share/doc/ja/k20fonts/fonts.alias
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-(grepv ${FAFILE} fonts.alias.orig ; cat ${FAFILE}) > fonts.alias
-rm -f fonts.alias.orig
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/mikachan-ttfonts/distinfo b/japanese/mikachan-ttfonts/distinfo
deleted file mode 100644
index ca88b96..0000000
--- a/japanese/mikachan-ttfonts/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mikachan-ttfonts/ver9.1.lzh) = 86d6a32734f24b7ce7b3274dfa16dc7c66397ab862b2ce0344c5d73c738d8371
-SIZE (mikachan-ttfonts/ver9.1.lzh) = 2144373
diff --git a/japanese/mikachan-ttfonts/pkg-deinstall b/japanese/mikachan-ttfonts/pkg-deinstall
deleted file mode 100644
index c5a978d..0000000
--- a/japanese/mikachan-ttfonts/pkg-deinstall
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-mikachan-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-rm -f fonts.dir.tmp
diff --git a/japanese/mikachan-ttfonts/pkg-install b/japanese/mikachan-ttfonts/pkg-install
deleted file mode 100644
index 30b86e5..0000000
--- a/japanese/mikachan-ttfonts/pkg-install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-mikachan-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.mika | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.mika >> fonts.dir
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/mikachan-ttfonts/pkg-plist b/japanese/mikachan-ttfonts/pkg-plist
deleted file mode 100644
index d609fc5..0000000
--- a/japanese/mikachan-ttfonts/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%FONTSDIR%%/fonts.dir.mika
-%%FONTSDIR%%/mika.ttf
diff --git a/japanese/monafonts-ttf/Makefile b/japanese/monafonts-ttf/Makefile
deleted file mode 100644
index 8cc98db..0000000
--- a/japanese/monafonts-ttf/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	monafonts-ttf
-PORTVERSION=	2.90
-PORTREVISION=	3
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
-DISTNAME=	monafont-ttf-${PORTVERSION}
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	X11 TrueType Kanji fonts
-
-USES=		fonts zip
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-FONTNAME=	TrueType
-MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
-
-do-install:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir.mona ${STAGEDIR}${FONTSDIR}
-
-.include <bsd.port.mk>
diff --git a/japanese/monafonts-ttf/pkg-deinstall b/japanese/monafonts-ttf/pkg-deinstall
deleted file mode 100644
index 91ff15d..0000000
--- a/japanese/monafonts-ttf/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-mona-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-if [ ${numfonts} != "0" ]; then
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-rm -f fonts.dir.tmp
-else
-rm -f fonts.dir fonts.dir.tmp
-fi
diff --git a/japanese/monafonts-ttf/pkg-install b/japanese/monafonts-ttf/pkg-install
deleted file mode 100644
index db9478a..0000000
--- a/japanese/monafonts-ttf/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
-  if [ ! -d ${FONTDIR} ]; then
-    echo "**************************************************************"
-    echo "Please add ${FONTDIR} to your font path"
-    echo "in /etc/X11/xorg.conf."
-    echo "**************************************************************"
-  fi
-  exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-monattf-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.mona | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.mona >> fonts.dir
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/monafonts-ttf/pkg-plist b/japanese/monafonts-ttf/pkg-plist
deleted file mode 100644
index 15d1941..0000000
--- a/japanese/monafonts-ttf/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%FONTSDIR%%/fonts.dir.mona
-%%FONTSDIR%%/mona.ttf
diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
deleted file mode 100644
index 8f0ba90..0000000
--- a/japanese/monafonts/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
-# $FreeBSD$
-
-PORTNAME=	monafonts
-PORTVERSION=	2.90
-PORTREVISION=	3
-PORTEPOCH=	2
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
-DISTNAME=	monafont-${PORTVERSION}
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	X11 12,14,16-dot Kanji fonts
-
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
-USES=		fonts perl5 tar:bzip2
-USE_PERL5=	build
-MAKE_ENV=	FONTSDIR=${FONTSDIR}
-
-ALL_TARGET=	bdf
-
-.include <bsd.port.mk>
diff --git a/japanese/monafonts/pkg-descr b/japanese/monafonts/pkg-descr
deleted file mode 100644
index 595b31d..0000000
--- a/japanese/monafonts/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-X11 12,14,16-dot kanji proportional fonts that have same metric and order as
-Japanese Windows font. This is named after ASCII art 'mona' used in
-'2 channel', notorious huge Web BBS.
-
-  Bitmap font is installed the following directory tree:
-        ${LOCALBASE}/share/fonts/monafonts/
-
-WWW: http://monafont.sourceforge.net/
diff --git a/japanese/monafonts/pkg-install b/japanese/monafonts/pkg-install
deleted file mode 100644
index cc365f4..0000000
--- a/japanese/monafonts/pkg-install
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=${PKG_PREFIX}/share/fonts/monafonts
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
-mona6x12a -mona-gothic-medium-r-normal--12-110-75-75-p-60-iso8859-1
-mona6x12aB -mona-gothic-bold-r-normal--12-110-75-75-p-60-iso8859-1
-mona6x12aBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-iso8859-1
-mona6x12aI -mona-gothic-medium-i-normal--12-110-75-75-p-60-iso8859-1
-mona6x12r -mona-gothic-medium-r-normal--12-110-75-75-p-60-jisx0201.1976-0
-mona6x12rB -mona-gothic-bold-r-normal--12-110-75-75-p-60-jisx0201.1976-0
-mona6x12rBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-jisx0201.1976-0
-mona6x12rI -mona-gothic-medium-i-normal--12-110-75-75-p-60-jisx0201.1976-0
-mona7x14a -mona-gothic-medium-r-normal--14-130-75-75-p-70-iso8859-1
-mona7x14aB -mona-gothic-bold-r-normal--14-130-75-75-p-70-iso8859-1
-mona7x14aBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-iso8859-1
-mona7x14aI -mona-gothic-medium-i-normal--14-130-75-75-p-70-iso8859-1
-mona7x14r -mona-gothic-medium-r-normal--14-130-75-75-p-70-jisx0201.1976-0
-mona7x14rB -mona-gothic-bold-r-normal--14-130-75-75-p-70-jisx0201.1976-0
-mona7x14rBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-jisx0201.1976-0
-mona7x14rI -mona-gothic-medium-i-normal--14-130-75-75-p-70-jisx0201.1976-0
-mona8x16a -mona-gothic-medium-r-normal--16-150-75-75-p-80-iso8859-1
-mona8x16aB -mona-gothic-bold-r-normal--16-150-75-75-p-80-iso8859-1
-mona8x16aBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-iso8859-1
-mona8x16aI -mona-gothic-medium-i-normal--16-150-75-75-p-80-iso8859-1
-mona8x16r -mona-gothic-medium-r-normal--16-150-75-75-p-80-jisx0201.1976-0
-mona8x16rB -mona-gothic-bold-r-normal--16-150-75-75-p-80-jisx0201.1976-0
-mona8x16rBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-jisx0201.1976-0
-mona8x16rI -mona-gothic-medium-i-normal--16-150-75-75-p-80-jisx0201.1976-0
-monak12 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
-monak12B -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
-monak12BI -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
-monak12I -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
-monak14 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
-monak14B -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
-monak14BI -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
-monak14I -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
-monak16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
-monak16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
-monak16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
-monak16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
-monau16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-iso10646-1
-monau16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-iso10646-1
-monau16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-iso10646-1
-monau16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-iso10646-1
--mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
--mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
--mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
--mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
--mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
--mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
--mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
--mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
--mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
--mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
--mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
--mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
--mona-gothic-medium-r-normal--24-230-75-75-p-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
--mona-gothic-medium-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
--mona-gothic-medium-r-normal--10-70-75-75-p-100-jisx0208.1983-0 -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
--mona-gothic-bold-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "Please add ${FONTDIR}"
-echo "to your font path in /etc/X11/xorg.conf."
-echo "You should restart X server to enable this update."
-echo "**********************************************************"
-
-exit 0
author	hrs <hrs@FreeBSD.org>	2015-09-25 21:48:09 +0000
committer	hrs <hrs@FreeBSD.org>	2015-09-25 21:48:09 +0000
commit	6cc4595d07513b672559284ddd014b293ced624b (patch)
tree	deebe3467f37b732e1acbd189727420d1d5cbd99
parent	36fc2c6e73d8cc118c2443beeb92e5bae985ace3 (diff)
download	FreeBSD-ports-6cc4595d07513b672559284ddd014b293ced624b.zip FreeBSD-ports-6cc4595d07513b672559284ddd014b293ced624b.tar.gz