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

7 files changed, 159 insertions, 0 deletions

diff --git a/japanese/font-naga10/Makefile b/japanese/font-naga10/Makefile
new file mode 100644
index 000000000000..fb41e97155fd
--- /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/font-naga10/distinfo b/japanese/font-naga10/distinfo
new file mode 100644
index 000000000000..2cad92c3a663
--- /dev/null
+++ b/japanese/font-naga10/distinfo
@@ -0,0 +1,2 @@
+SHA256 (knj10-1.1.tar.gz) = 6b656887d22533ac8c6356cc3fba4411e8ff42e2dbb508bb16c09f7e091e0da5
+SIZE (knj10-1.1.tar.gz) = 301108
diff --git a/japanese/font-naga10/files/Makefile.in b/japanese/font-naga10/files/Makefile.in
new file mode 100644
index 000000000000..1b388f4b15e8
--- /dev/null
+++ b/japanese/font-naga10/files/Makefile.in
@@ -0,0 +1,41 @@
+# $FreeBSD$
+
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+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}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
+
+all: ${PCF_ALL}
+
+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} $> > $@
+
+${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+	${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-naga10/files/fonts.alias b/japanese/font-naga10/files/fonts.alias
new file mode 100644
index 000000000000..e78f21383251
--- /dev/null
+++ b/japanese/font-naga10/files/fonts.alias
@@ -0,0 +1,12 @@
+k10  -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10i -misc-fixed-medium-i-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10bi -misc-fixed-bold-i-normal--10-90-75-75-c-100-jisx0208.1983-0
+a10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
+a10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-iso8859-1
+a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
+a10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-iso8859-1
+r10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-jisx0201.1976-0
diff --git a/japanese/font-naga10/files/pkg-install.in b/japanese/font-naga10/files/pkg-install.in
new file mode 100644
index 000000000000..432ba23ea918
--- /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/font-naga10/pkg-descr b/japanese/font-naga10/pkg-descr
new file mode 100644
index 000000000000..0328874b4bca
--- /dev/null
+++ b/japanese/font-naga10/pkg-descr
@@ -0,0 +1,9 @@
+Japanese 10 dot font named `naga10'.
+
+You can use 'k10' as an alias for knj10.pcf.gz, and 'a10' for 5x10a.pcf.gz.
+For detail description, please read the 'README'
+
+A simple usage:
+	% kterm -fn a10 -fr r10 -fk k10 -km euc
+
+WWW: http://hp.vector.co.jp/authors/VA013391/fonts/#naga10
diff --git a/japanese/font-naga10/pkg-plist b/japanese/font-naga10/pkg-plist
new file mode 100644
index 000000000000..02f887cd6ce7
--- /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