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

diff --git a/japanese/font-mona/Makefile b/japanese/font-mona/Makefile
new file mode 100644
index 000000000000..20a1f065310d
--- /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/font-mona/distinfo b/japanese/font-mona/distinfo
new file mode 100644
index 000000000000..a9251da437af
--- /dev/null
+++ b/japanese/font-mona/distinfo
@@ -0,0 +1,2 @@
+SHA256 (monafont-2.90.tar.bz2) = 26e608598edb2c9f1a662acd8bf4e06dc75910a69fc76698e4e062113a401978
+SIZE (monafont-2.90.tar.bz2) = 808897
diff --git a/japanese/font-mona/files/fonts.alias b/japanese/font-mona/files/fonts.alias
new file mode 100644
index 000000000000..42a0c584901e
--- /dev/null
+++ b/japanese/font-mona/files/fonts.alias
@@ -0,0 +1,56 @@
+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
diff --git a/japanese/font-mona/files/patch-Makefile b/japanese/font-mona/files/patch-Makefile
new file mode 100644
index 000000000000..088cb2ee229e
--- /dev/null
+++ b/japanese/font-mona/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- Makefile.orig	2003-09-10 02:54:10 UTC
++++ Makefile
+@@ -18,11 +18,10 @@ GZIP_SUFFIX	= gz
+ #GZIP_SUFFIX	= Z
+ 
+ DESTDIR		=
+-X11BINDIR	= /usr/X11R6/bin
+-X11FONTDIR	= $(DESTDIR)/usr/X11R6/lib/X11/fonts/local
+-BDFTOPCF	= $(X11BINDIR)/bdftopcf
+-MKDIRHIER	= $(X11BINDIR)/mkdirhier	# 'mkdir -p' may also work.
+-MKFONTDIR	= $(X11BINDIR)/mkfontdir
++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 @@ install: bdf
+ 		$(BDFTOPCF) dist/$$i.bdf | \
+ 		$(GZIP_CMD) -c > $(X11FONTDIR)/$$i.pcf.$(GZIP_SUFFIX); \
+ 	done
+-	$(MKFONTDIR) $(X11FONTDIR)
+ 
+ # append fonts.alias
+ install-alias:
diff --git a/japanese/font-mona/files/pkg-install.in b/japanese/font-mona/files/pkg-install.in
new file mode 100644
index 000000000000..742953077013
--- /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 000000000000..7c724d8a16bf
--- /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/font-mona/pkg-plist b/japanese/font-mona/pkg-plist
new file mode 100644
index 000000000000..ba14e6b76647
--- /dev/null
+++ b/japanese/font-mona/pkg-plist
@@ -0,0 +1,97 @@
+%%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
+%%FONTSDIR%%/mona6x12aI.pcf.gz
+%%FONTSDIR%%/mona6x12r.pcf.gz
+%%FONTSDIR%%/mona6x12rB.pcf.gz
+%%FONTSDIR%%/mona6x12rBI.pcf.gz
+%%FONTSDIR%%/mona6x12rI.pcf.gz
+%%FONTSDIR%%/mona7x14a.pcf.gz
+%%FONTSDIR%%/mona7x14aB.pcf.gz
+%%FONTSDIR%%/mona7x14aBI.pcf.gz
+%%FONTSDIR%%/mona7x14aI.pcf.gz
+%%FONTSDIR%%/mona7x14r.pcf.gz
+%%FONTSDIR%%/mona7x14rB.pcf.gz
+%%FONTSDIR%%/mona7x14rBI.pcf.gz
+%%FONTSDIR%%/mona7x14rI.pcf.gz
+%%FONTSDIR%%/mona8x16a.pcf.gz
+%%FONTSDIR%%/mona8x16aB.pcf.gz
+%%FONTSDIR%%/mona8x16aBI.pcf.gz
+%%FONTSDIR%%/mona8x16aI.pcf.gz
+%%FONTSDIR%%/mona8x16r.pcf.gz
+%%FONTSDIR%%/mona8x16rB.pcf.gz
+%%FONTSDIR%%/mona8x16rBI.pcf.gz
+%%FONTSDIR%%/mona8x16rI.pcf.gz
+%%FONTSDIR%%/monak12.pcf.gz
+%%FONTSDIR%%/monak12B.pcf.gz
+%%FONTSDIR%%/monak12BI.pcf.gz
+%%FONTSDIR%%/monak12I.pcf.gz
+%%FONTSDIR%%/monak14.pcf.gz
+%%FONTSDIR%%/monak14B.pcf.gz
+%%FONTSDIR%%/monak14BI.pcf.gz
+%%FONTSDIR%%/monak14I.pcf.gz
+%%FONTSDIR%%/monak16.pcf.gz
+%%FONTSDIR%%/monak16B.pcf.gz
+%%FONTSDIR%%/monak16BI.pcf.gz
+%%FONTSDIR%%/monak16I.pcf.gz
+%%FONTSDIR%%/monau12.pcf.gz
+%%FONTSDIR%%/monau12B.pcf.gz
+%%FONTSDIR%%/monau12BI.pcf.gz
+%%FONTSDIR%%/monau12I.pcf.gz
+%%FONTSDIR%%/monau14.pcf.gz
+%%FONTSDIR%%/monau14B.pcf.gz
+%%FONTSDIR%%/monau14BI.pcf.gz
+%%FONTSDIR%%/monau14I.pcf.gz
+%%FONTSDIR%%/monau16.pcf.gz
+%%FONTSDIR%%/monau16B.pcf.gz
+%%FONTSDIR%%/monau16BI.pcf.gz
+%%FONTSDIR%%/monau16I.pcf.gz