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

5 files changed, 104 insertions, 0 deletions

diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile
new file mode 100644
index 000000000000..78be5980f06e
--- /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 000000000000..10cf9a1e9123
--- /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 000000000000..6df6cdee4bae
--- /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 000000000000..5b20265dc2bd
--- /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 000000000000..c85c1f504196
--- /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