- Split japanese/font-mplus into font-mplus-outline and

  font-mplus-bitmap.  Currently mplus-bitmap and mplus-outline use
  share/fonts/misc and mplus-outline as the installation directory,
  respectively.

- Convert them to use Uses=fonts.

6 files changed, 217 insertions, 0 deletions

diff --git a/japanese/font-mplus-bitmap/Makefile b/japanese/font-mplus-bitmap/Makefile
new file mode 100644
index 000000000000..85b4699ba356
--- /dev/null
+++ b/japanese/font-mplus-bitmap/Makefile
@@ -0,0 +1,51 @@
+# Created by: The 244th namelessness at 2ch.net
+# $FreeBSD$
+
+PORTNAME=	mplus
+PORTVERSION=	2.2.4
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	SFJP/${PORTNAME}-fonts/5030/
+PKGNAMEPREFIX=	ja-font-
+PKGNAMESUFFIX=	-bitmap
+DISTNAME=	${PORTNAME}_bitmap_fonts-2.2.4
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	M+ Bitmap fonts
+
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USES=		fonts
+FONTNAME=	misc
+NO_BUILD=	yes
+NO_ARCH=	yes
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PORTDOCS=	INSTALL_E LICENSE_E README_E \
+		INSTALL_J LICENSE_J README_J
+
+OPTIONS_DEFINE=	DOCS
+
+post-extract:
+	cd ${WRKSRC} && \
+	    ${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \
+	    fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && \
+	    ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}" \
+	    ${SH} ${WRKSRC}/install_mplus_fonts
+	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && \
+	    ${LN} -s -f ../../../${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-mplus-bitmap/distinfo b/japanese/font-mplus-bitmap/distinfo
new file mode 100644
index 000000000000..3214cb476297
--- /dev/null
+++ b/japanese/font-mplus-bitmap/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
+SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
diff --git a/japanese/font-mplus-bitmap/files/patch-install_mplus_fonts b/japanese/font-mplus-bitmap/files/patch-install_mplus_fonts
new file mode 100644
index 000000000000..78fdb52e5ecd
--- /dev/null
+++ b/japanese/font-mplus-bitmap/files/patch-install_mplus_fonts
@@ -0,0 +1,61 @@
+--- install_mplus_fonts.orig	2005-03-19 14:45:12 UTC
++++ install_mplus_fonts
+@@ -29,18 +29,6 @@ CURPTH=/usr/X11R6/lib/X11/fonts/misc
+ 
+ 
+ 
+-# Backup/Create mplus directory
+-if [ -d ${PREFIX}.BAK ]; then
+-	echo "remove: '${PREFIX}.BAK' directory"
+-	rm -rf ${PREFIX}.BAK
+-fi
+-if [ -d $PREFIX ]; then
+-	echo "backup: present '${PREFIX##/*/}' directory to '${PREFIX##/*/}.BAK'"
+-	mv ${PREFIX} ${PREFIX}.BAK
+-fi
+-echo "create: new '$PREFIX' directory"
+-mkdir -p $PREFIX
+-
+ # Install M+ BITMAP FONTS E
+ echo -e "\nInstall M+ BITMAP FONTS E (iso8859-1)..."
+ cd fonts_e
+@@ -54,8 +42,6 @@ do
+ 	echo "create: $b.pcf.gz"
+ 	bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
+ done
+-echo "create: fonts.alias for M+ BITMAP FONTS E"
+-cat fonts.alias > $PREFIX/fonts.alias
+ cd -
+ 
+ # Install M+ BITMAP FONTS EURO
+@@ -79,8 +65,6 @@ if [ "$EURO15" != "NO" ]; then
+ 	| gzip > $PREFIX/mplus_h12rw-euro.pcf.gz
+ 
+ #	rm $b-euro.bdf
+-	echo "create: fonts.alias for M+ BITMAP FONTS EURO"
+-	cat fonts.alias >> $PREFIX/fonts.alias
+ 	cd -
+ fi
+ 
+@@ -145,8 +129,6 @@ if [ "$MPLUSJ" != "NO" ]; then
+ 	done
+ 
+ #	rm mplus_j1*b.bdf
+-	echo "create: fonts.alias for M+ BITMAP FONTS J"
+-	cat fonts.alias >> $PREFIX/fonts.alias
+ 	cd -
+ fi
+ 
+@@ -166,12 +148,3 @@ if [ "$CURSOR" != "NO" ]; then
+ 		echo "ERROR: No such file !"
+ 	fi
+ fi
+-
+-# Finish
+-echo -e "\ncreate: fonts.dir file"
+-mkfontdir $PREFIX
+-if [ -z $DESTDIR ]; then
+-    echo -n "xset fp rehash..."
+-    xset fp rehash &&
+-    echo " done"
+-fi
diff --git a/japanese/font-mplus-bitmap/files/pkg-install.in b/japanese/font-mplus-bitmap/files/pkg-install.in
new file mode 100644
index 000000000000..fcfacd78440f
--- /dev/null
+++ b/japanese/font-mplus-bitmap/files/pkg-install.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+
+case "$2" in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	touch fonts.alias
+	grep -v -- "mplus[_-]" 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 -- "mplus[_-]" 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-mplus-bitmap/pkg-descr b/japanese/font-mplus-bitmap/pkg-descr
new file mode 100644
index 000000000000..1191833b42e2
--- /dev/null
+++ b/japanese/font-mplus-bitmap/pkg-descr
@@ -0,0 +1,4 @@
+M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
+This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
+
+WWW: http://mplus-fonts.osdn.jp/mplus-bitmap-fonts/index.html
diff --git a/japanese/font-mplus-bitmap/pkg-plist b/japanese/font-mplus-bitmap/pkg-plist
new file mode 100644
index 000000000000..f1ed1dd80814
--- /dev/null
+++ b/japanese/font-mplus-bitmap/pkg-plist
@@ -0,0 +1,77 @@
+%%DATADIR%%/mplus_f10b-euro.pcf.gz
+%%DATADIR%%/mplus_f10b.pcf.gz
+%%DATADIR%%/mplus_f10r-euro.pcf.gz
+%%DATADIR%%/mplus_f10r.pcf.gz
+%%DATADIR%%/mplus_f12b-euro.pcf.gz
+%%DATADIR%%/mplus_f12b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_f12b.pcf.gz
+%%DATADIR%%/mplus_f12r-euro.pcf.gz
+%%DATADIR%%/mplus_f12r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_f12r.pcf.gz
+%%DATADIR%%/mplus_h10b-euro.pcf.gz
+%%DATADIR%%/mplus_h10b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h10b.pcf.gz
+%%DATADIR%%/mplus_h10r-euro.pcf.gz
+%%DATADIR%%/mplus_h10r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h10r.pcf.gz
+%%DATADIR%%/mplus_h12b-euro.pcf.gz
+%%DATADIR%%/mplus_h12b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h12b.pcf.gz
+%%DATADIR%%/mplus_h12r-euro.pcf.gz
+%%DATADIR%%/mplus_h12r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_h12r.pcf.gz
+%%DATADIR%%/mplus_h12rw-euro.pcf.gz
+%%DATADIR%%/mplus_h12rw.pcf.gz
+%%DATADIR%%/mplus_j10b-iso.pcf.gz
+%%DATADIR%%/mplus_j10b-jisx0201.pcf.gz
+%%DATADIR%%/mplus_j10b.pcf.gz
+%%DATADIR%%/mplus_j10r-iso.pcf.gz
+%%DATADIR%%/mplus_j10r-jisx0201.pcf.gz
+%%DATADIR%%/mplus_j10r.pcf.gz
+%%DATADIR%%/mplus_j12b.pcf.gz
+%%DATADIR%%/mplus_j12r.pcf.gz
+%%DATADIR%%/mplus_q06r-euro.pcf.gz
+%%DATADIR%%/mplus_q06r.pcf.gz
+%%DATADIR%%/mplus_s10b-euro.pcf.gz
+%%DATADIR%%/mplus_s10b.pcf.gz
+%%DATADIR%%/mplus_s10r-euro.pcf.gz
+%%DATADIR%%/mplus_s10r.pcf.gz
+%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/mplus_f10b-euro.pcf.gz
+%%FONTSDIR%%/mplus_f10b.pcf.gz
+%%FONTSDIR%%/mplus_f10r-euro.pcf.gz
+%%FONTSDIR%%/mplus_f10r.pcf.gz
+%%FONTSDIR%%/mplus_f12b-euro.pcf.gz
+%%FONTSDIR%%/mplus_f12b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_f12b.pcf.gz
+%%FONTSDIR%%/mplus_f12r-euro.pcf.gz
+%%FONTSDIR%%/mplus_f12r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_f12r.pcf.gz
+%%FONTSDIR%%/mplus_h10b-euro.pcf.gz
+%%FONTSDIR%%/mplus_h10b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h10b.pcf.gz
+%%FONTSDIR%%/mplus_h10r-euro.pcf.gz
+%%FONTSDIR%%/mplus_h10r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h10r.pcf.gz
+%%FONTSDIR%%/mplus_h12b-euro.pcf.gz
+%%FONTSDIR%%/mplus_h12b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h12b.pcf.gz
+%%FONTSDIR%%/mplus_h12r-euro.pcf.gz
+%%FONTSDIR%%/mplus_h12r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h12r.pcf.gz
+%%FONTSDIR%%/mplus_h12rw-euro.pcf.gz
+%%FONTSDIR%%/mplus_h12rw.pcf.gz
+%%FONTSDIR%%/mplus_j10b-iso.pcf.gz
+%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_j10b.pcf.gz
+%%FONTSDIR%%/mplus_j10r-iso.pcf.gz
+%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_j10r.pcf.gz
+%%FONTSDIR%%/mplus_j12b.pcf.gz
+%%FONTSDIR%%/mplus_j12r.pcf.gz
+%%FONTSDIR%%/mplus_q06r-euro.pcf.gz
+%%FONTSDIR%%/mplus_q06r.pcf.gz
+%%FONTSDIR%%/mplus_s10b-euro.pcf.gz
+%%FONTSDIR%%/mplus_s10b.pcf.gz
+%%FONTSDIR%%/mplus_s10r-euro.pcf.gz
+%%FONTSDIR%%/mplus_s10r.pcf.gz