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

6 files changed, 270 insertions, 0 deletions

diff --git a/japanese/font-kappa20/Makefile b/japanese/font-kappa20/Makefile
new file mode 100644
index 000000000000..ea0a563a2bc8
--- /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/font-kappa20/distinfo b/japanese/font-kappa20/distinfo
new file mode 100644
index 000000000000..e05e6a977339
--- /dev/null
+++ b/japanese/font-kappa20/distinfo
@@ -0,0 +1,4 @@
+SHA256 (Kappa20-0.396.tar.bz2) = 16fc483669da34d94fa7c6cff35b6843e284fa7d96d9b9286349af1124f1f970
+SIZE (Kappa20-0.396.tar.bz2) = 713000
+SHA256 (ayu20gothic-1.6.tar.gz) = 52e3d356bdaea40ef6270f33b7d02be39f2642c9a8b526c6c1c777d9e879e88b
+SIZE (ayu20gothic-1.6.tar.gz) = 319205
diff --git a/japanese/font-kappa20/files/Makefile.in b/japanese/font-kappa20/files/Makefile.in
new file mode 100644
index 000000000000..d33b15809a21
--- /dev/null
+++ b/japanese/font-kappa20/files/Makefile.in
@@ -0,0 +1,62 @@
+# $FreeBSD$
+
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+CAT?=		/bin/cat
+CP?=		/bin/cp
+PATCH?=		/usr/bin/patch
+SED?=		/usr/bin/sed
+
+DIST_ALL=	10x20L2b.bdf 10x20L2m.bdf 10x20L3b.bdf 10x20L3m.bdf \
+		10x20L4b.bdf 10x20L4m.bdf 10x20L5b.bdf 10x20L5m.bdf \
+		10x20L6b.bdf 10x20L6m.bdf 10x20L7b.bdf 10x20L7m.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
+
+MADE_BDF=	vk20b.bdf vk20m.bdf nk20b-1.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} fonts.alias
+
+${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 > $@
+
+vk20m.bdf: k20m.bdf tategaki.diff
+	${SED} '/vk20b.bdf/,$$d' tategaki.diff | ${PATCH} -o $@ k20m.bdf
+
+vk20b.bdf: k20b.bdf tategaki.diff
+	${SED} -n '/vk20b.bdf/,$$p' tategaki.diff | ${PATCH} -o $@ k20b.bdf
+
+nk20b-1.bdf: k20b.bdf newjis.diff
+	${PATCH} -o $@ k20b.bdf < newjis.diff
+
+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}%%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 000000000000..7c1d22761134
--- /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/font-kappa20/pkg-descr b/japanese/font-kappa20/pkg-descr
new file mode 100644
index 000000000000..76e49c3a323d
--- /dev/null
+++ b/japanese/font-kappa20/pkg-descr
@@ -0,0 +1,20 @@
+Japanese 20 dot fonts(`Kappa20dot').
+
+You can use:
+	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
+
+	Italic(slanted) fonts are available with 'i' postfix.
+
+An example usage:
+  % kterm -fn a20m -fb a20b -fr r10m -frb a20b -fk k20m -fkb k20b -lsp 3
+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://kappa.allnet.ne.jp/20dot.fonts/
diff --git a/japanese/font-kappa20/pkg-plist b/japanese/font-kappa20/pkg-plist
new file mode 100644
index 000000000000..e9c6572223a9
--- /dev/null
+++ b/japanese/font-kappa20/pkg-plist
@@ -0,0 +1,117 @@
+%%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
+%%FONTSDIR%%/10x20L10mi.pcf.gz
+%%FONTSDIR%%/10x20L2b.pcf.gz
+%%FONTSDIR%%/10x20L2bi.pcf.gz
+%%FONTSDIR%%/10x20L2m.pcf.gz
+%%FONTSDIR%%/10x20L2mi.pcf.gz
+%%FONTSDIR%%/10x20L3b.pcf.gz
+%%FONTSDIR%%/10x20L3bi.pcf.gz
+%%FONTSDIR%%/10x20L3m.pcf.gz
+%%FONTSDIR%%/10x20L3mi.pcf.gz
+%%FONTSDIR%%/10x20L4b.pcf.gz
+%%FONTSDIR%%/10x20L4bi.pcf.gz
+%%FONTSDIR%%/10x20L4m.pcf.gz
+%%FONTSDIR%%/10x20L4mi.pcf.gz
+%%FONTSDIR%%/10x20L5b.pcf.gz
+%%FONTSDIR%%/10x20L5bi.pcf.gz
+%%FONTSDIR%%/10x20L5m.pcf.gz
+%%FONTSDIR%%/10x20L5mi.pcf.gz
+%%FONTSDIR%%/10x20L6b.pcf.gz
+%%FONTSDIR%%/10x20L6bi.pcf.gz
+%%FONTSDIR%%/10x20L6m.pcf.gz
+%%FONTSDIR%%/10x20L6mi.pcf.gz
+%%FONTSDIR%%/10x20L7b.pcf.gz
+%%FONTSDIR%%/10x20L7bi.pcf.gz
+%%FONTSDIR%%/10x20L7m.pcf.gz
+%%FONTSDIR%%/10x20L7mi.pcf.gz
+%%FONTSDIR%%/10x20L8b.pcf.gz
+%%FONTSDIR%%/10x20L8bi.pcf.gz
+%%FONTSDIR%%/10x20L8m.pcf.gz
+%%FONTSDIR%%/10x20L8mi.pcf.gz
+%%FONTSDIR%%/10x20L9b.pcf.gz
+%%FONTSDIR%%/10x20L9bi.pcf.gz
+%%FONTSDIR%%/10x20L9m.pcf.gz
+%%FONTSDIR%%/10x20L9mi.pcf.gz
+%%FONTSDIR%%/10x20b.pcf.gz
+%%FONTSDIR%%/10x20bi.pcf.gz
+%%FONTSDIR%%/10x20m.pcf.gz
+%%FONTSDIR%%/10x20mi.pcf.gz
+%%FONTSDIR%%/10x20rkb.pcf.gz
+%%FONTSDIR%%/10x20rkbi.pcf.gz
+%%FONTSDIR%%/10x20rkm.pcf.gz
+%%FONTSDIR%%/10x20rkmi.pcf.gz
+%%FONTSDIR%%/ipa-10x20b.pcf.gz
+%%FONTSDIR%%/ipa-10x20bi.pcf.gz
+%%FONTSDIR%%/ipa-10x20m.pcf.gz
+%%FONTSDIR%%/ipa-10x20mi.pcf.gz
+%%FONTSDIR%%/k20b.pcf.gz
+%%FONTSDIR%%/k20bi.pcf.gz
+%%FONTSDIR%%/k20m.pcf.gz
+%%FONTSDIR%%/k20mi.pcf.gz
+%%FONTSDIR%%/nk20b-1.pcf.gz
+%%FONTSDIR%%/nk20bi-1.pcf.gz
+%%FONTSDIR%%/vk20b.pcf.gz
+%%FONTSDIR%%/vk20bi.pcf.gz
+%%FONTSDIR%%/vk20m.pcf.gz
+%%FONTSDIR%%/vk20mi.pcf.gz