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, 81 insertions, 0 deletions

diff --git a/japanese/font-mona-ttf/Makefile b/japanese/font-mona-ttf/Makefile
new file mode 100644
index 000000000000..1f9459e004aa
--- /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/font-mona-ttf/distinfo b/japanese/font-mona-ttf/distinfo
new file mode 100644
index 000000000000..d2f44029d2cc
--- /dev/null
+++ b/japanese/font-mona-ttf/distinfo
@@ -0,0 +1,2 @@
+SHA256 (monafont-ttf-2.90.zip) = 06b324342ad13ea06a7e74811e1334a28cc52a1a16f9a326a919249622daeed6
+SIZE (monafont-ttf-2.90.zip) = 1712768
diff --git a/japanese/font-mona-ttf/files/fonts.dir b/japanese/font-mona-ttf/files/fonts.dir
new file mode 100644
index 000000000000..db7c16d43ecc
--- /dev/null
+++ b/japanese/font-mona-ttf/files/fonts.dir
@@ -0,0 +1,13 @@
+12
+bw=0.5:mona.ttf -mona-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1
+bw=0.5:ab=y:mona.ttf -mona-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1
+bw=0.5:ai=0.3:mona.ttf -mona-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1
+bw=0.5:ab=y:ai=0.3:mona.ttf -mona-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1
+bw=0.5:mona.ttf -mona-gothic-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0
+bw=0.5:ab=y:mona.ttf -mona-gothic-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0
+bw=0.5:ai=0.3:mona.ttf -mona-gothic-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0
+bw=0.5:ab=y:ai=0.3:mona.ttf -mona-gothic-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0
+mona.ttf -mona-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0
+ab=y:mona.ttf -mona-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0
+ai=0.3:mona.ttf -mona-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0
+ab=y:ai=0.3:mona.ttf -mona-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0
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 000000000000..ae01688e7b99
--- /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/font-mona-ttf/pkg-descr b/japanese/font-mona-ttf/pkg-descr
new file mode 100644
index 000000000000..beb1127e0d79
--- /dev/null
+++ b/japanese/font-mona-ttf/pkg-descr
@@ -0,0 +1,5 @@
+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.
+
+WWW: http://monafont.sourceforge.net/