9 files changed, 529 insertions, 143 deletions

diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index 607f4b443bd3..66d46acdb312 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -5,51 +5,84 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mplusfonts
-PORTVERSION=	2.2.4
-PORTREVISION=	2
+PORTNAME=	font-mplus
+PORTVERSION=	2.2.4.023
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/5030/ \
+MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/5030/:bitmap \
+		http://downloads.sourceforge.jp/mplus-fonts/6650/:outline \
 		http://wids.net/archive/mplusfonts/distfiles/
-DISTNAME=	mplus_bitmap_fonts-${PORTVERSION}
+DISTFILES=	mplus_bitmap_fonts-2.2.4${EXTRACT_SUFX}:bitmap \
+		mplus-TESTFLIGHT-023${EXTRACT_SUFX}:outline
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	12x13 dots X11 kanji fonts with simple and readable design
+COMMENT=	M+ Bitmap and Outline Fonts
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDES=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 NO_BUILD=	yes
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+		FONTSALIAS=${DATADIR}/bitmap/fonts.alias
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
+PATCH_WRKSRC=	${WRKDIR}/mplus_bitmap_fonts-2.2.4
 
-.include <bsd.port.pre.mk>
-
-DOCS=		INSTALL_E LICENSE_E README_E \
-		INSTALL_J LICENSE_J README_J
-
-FONTSDIR=	${PREFIX}/lib/X11/fonts/local
-PLIST_SUB=	FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
-
-pre-install:
-	@${MKDIR} ${DOCSDIR}
-.for i in e j
-	@${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \
-		${DOCSDIR}/fonts.alias.${i}
-	@${CAT} ${DOCSDIR}/fonts.alias.${i} >> ${DOCSDIR}/fonts.alias
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \
-		${DOCSDIR}/fonts.alias.euro
-	@${CAT} ${DOCSDIR}/fonts.alias.euro >> ${DOCSDIR}/fonts.alias
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-do-install:
-	cd ${WRKSRC} && \
-		DESTDIR="${FONTSDIR}" ${WRKSRC}/install_mplus_fonts
+PORTDOCS=	INSTALL_E.bitmap LICENSE_E.bitmap README_E.bitmap \
+		INSTALL_J.bitmap LICENSE_J.bitmap README_J.bitmap \
+		LICENSE_E.outline README_E.outline \
+		LICENSE_J.outline README_J.outline
+
+LOCAL_FONTSDIR=	share/fonts
+X_FONTSDIR=	lib/X11/fonts
+
+post-extract:
+	cd ${WRKDIR}/mplus_bitmap_fonts-2.2.4 && \
+		${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \
+		fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias
+
+pre-su-install:
+	${MKDIR} ${DATADIR}/TTF ${DATADIR}/bitmap
+
+do-install: do-install-bitmap do-install-outline
+
+do-install-bitmap:
+	cd ${WRKDIR}/mplus_bitmap_fonts-2.2.4 && \
+		${SETENV} DESTDIR="${DATADIR}/bitmap" \
+		${SH} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/install_mplus_fonts
+	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${DATADIR}/bitmap
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/mplus
+	${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/mplus/
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
+	${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+
+do-install-outline:
+	${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-023/*.ttf ${DATADIR}/TTF
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
+	${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
+	${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus.conf \
+		${FILESDIR}/62-fonts-mplus.conf \
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-mplus.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-mplus.conf
+	${LN} -s -f ../conf.avail/62-fonts-mplus.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-mplus.conf
+
+post-install:
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${MKDIR} ${DOCSDIR}
+	for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \
+		${INSTALL_DATA} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/$${F} ${DOCSDIR}/$${F}.bitmap; \
+	done
+	for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \
+		${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-023/$${F} ${DOCSDIR}/$${F}.outline; \
+	done
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/font-mplus/distinfo b/japanese/font-mplus/distinfo
index c7690848d811..7a5e9329b1ef 100644
--- a/japanese/font-mplus/distinfo
+++ b/japanese/font-mplus/distinfo
@@ -1,3 +1,6 @@
 MD5 (mplus_bitmap_fonts-2.2.4.tar.gz) = a97a99acbee54976407dec828d03850c
 SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
 SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
+MD5 (mplus-TESTFLIGHT-023.tar.gz) = 5f76cea2fb1800ca3a7f3f6ec5f28131
+SHA256 (mplus-TESTFLIGHT-023.tar.gz) = b7f5e02b0a8ff2d16be25e7c35c0a3b90e025594c34d4b7b3c8e68f66616750b
+SIZE (mplus-TESTFLIGHT-023.tar.gz) = 12769898
diff --git a/japanese/font-mplus/files/20-unhint-mplus.conf b/japanese/font-mplus/files/20-unhint-mplus.conf
new file mode 100644
index 000000000000..790a4e756b5f
--- /dev/null
+++ b/japanese/font-mplus/files/20-unhint-mplus.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>M+ 1c</string>
+			<string>M+ 1m</string>
+			<string>M+ 1mn</string>
+			<string>M+ 1p</string>
+			<string>M+ 2c</string>
+			<string>M+ 2m</string>
+			<string>M+ 2p</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-mplus/files/62-fonts-mplus.conf b/japanese/font-mplus/files/62-fonts-mplus.conf
new file mode 100644
index 000000000000..29a6b0b14cdc
--- /dev/null
+++ b/japanese/font-mplus/files/62-fonts-mplus.conf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>M+ 1c</family>
+			<family>M+ 1p</family>
+			<family>M+ 2c</family>
+			<family>M+ 2p</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>M+ 1m</family>
+			<family>M+ 2m</family>
+			<family>M+ 1mn</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/japanese/font-mplus/files/patch-install_mplus_fonts b/japanese/font-mplus/files/patch-install_mplus_fonts
index 481050c7277b..99d35f7ed5fd 100644
--- a/japanese/font-mplus/files/patch-install_mplus_fonts
+++ b/japanese/font-mplus/files/patch-install_mplus_fonts
@@ -1,5 +1,5 @@
---- install_mplus_fonts.orig	Mon Aug 18 13:26:45 2003
-+++ install_mplus_fonts	Mon Aug 18 13:32:03 2003
+--- install_mplus_fonts.orig	2005-03-19 23:45:12.000000000 +0900
++++ install_mplus_fonts	2009-05-14 11:07:01.000000000 +0900
 @@ -29,18 +29,6 @@
  
  
@@ -19,12 +19,43 @@
  # Install M+ BITMAP FONTS E
  echo -e "\nInstall M+ BITMAP FONTS E (iso8859-1)..."
  cd fonts_e
-@@ -55,7 +43,7 @@
+@@ -54,8 +42,6 @@
+ 	echo "create: $b.pcf.gz"
  	bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
  done
- echo "create: fonts.alias for M+ BITMAP FONTS E"
+-echo "create: fonts.alias for M+ BITMAP FONTS E"
 -cat fonts.alias > $PREFIX/fonts.alias
-+cat fonts.alias >> $PREFIX/fonts.alias
  cd -
  
  # Install M+ BITMAP FONTS EURO
+@@ -79,8 +65,6 @@
+ 	| 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 @@
+ 	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 @@
+ 		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/files/pkg-install.in b/japanese/font-mplus/files/pkg-install.in
new file mode 100644
index 000000000000..0db369db75c4
--- /dev/null
+++ b/japanese/font-mplus/files/pkg-install.in
@@ -0,0 +1,123 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+catfontsdir ()
+{
+    while read _IN
+    do
+      case "${_IN}" in
+      *-mplus-*|[0-9]*|"") ;;
+      *)       echo ${_IN} ;;
+      esac
+    done
+}
+
+ROMA=""
+ITAL="ai=0.15"
+OBLI="ai=0.15"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+	_enc=$1
+	_file=$2
+	_vendor=$3
+	_weight=$4
+	_fname=$5
+	_poc=$6
+
+	case "${_poc}:${_enc}" in
+	p:jisx0201.1976-*)	PFIX="bw=0.5" ;;
+	c:jisx0201.1976-*)	PFIX="bw=0.5" ;;
+	p:*)			PFIX="" ;;
+	c:*)			PFIX="" ;;
+	esac
+
+	set --	"${ROMA}"	r \
+		${ITAL}		i \
+		${OBLI}		o \
+		${RITA}		ri \
+		${ROBL}		ro;
+	while [ $# != 0 ]; do
+		_prefix="${PFIX}:$1"; shift
+		_variant=$1; shift
+		printf "%s:%s -%s-%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+			$_prefix $_file $_vendor $_fname $_weight $_variant $_poc $_enc
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries ()
+{
+	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
+	do
+		for W in black bold heavy light medium regular thin
+		do
+			make_xlfd $ENC mplus-1c-${W}.ttf mplus $W  1c p
+			make_xlfd $ENC mplus-2c-${W}.ttf mplus $W  2c p
+			make_xlfd $ENC mplus-1p-${W}.ttf mplus $W  1p p
+			make_xlfd $ENC mplus-2p-${W}.ttf mplus $W  2p p
+			make_xlfd $ENC mplus-1m-${W}.ttf mplus $W  1m c
+			make_xlfd $ENC mplus-1mn-${W}.ttf mplus $W 1mn c
+			make_xlfd $ENC mplus-2m-${W}.ttf mplus $W  2m c
+		done
+	done
+}
+
+nfonts ()
+{
+    _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+case "$2" in
+POST-INSTALL)
+	%%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/TTF ${X_FONTSDIR}/misc
+
+	cd ${X_FONTSDIR}/TTF
+	touch fonts.dir
+	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+
+	cd ${X_FONTSDIR}/misc
+	%%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+	touch fonts.alias
+	grep -v -- "mplus[_-]" fonts.alias > fonts.alias.tmp
+	cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
+	rm -f fonts.alias.tmp
+	;;
+DEINSTALL)
+	%%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/TTF ${X_FONTSDIR}/misc
+	rm -f ${X_FONTSDIR}/TTF/fonts.cache-1 ${X_FONTSDIR}/misc/fonts.cache-1
+
+	cd ${X_FONTSDIR}/TTF
+	catfontsdir < fonts.dir > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+
+	cd ${X_FONTSDIR}/misc
+	%%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+	if [ -r ${X_FONTSDIR}/misc/fonts.dir -a `/usr/bin/wc -l < ${X_FONTSDIR}/misc/fonts.dir` = 1 ]; then
+		rm -f ${X_FONTSDIR}/misc/fonts.dir
+	fi
+	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
+
+	for D in TTF misc
+	do
+		rmdir ${X_FONTSDIR}/${D} > /dev/null 2>&1 || true
+		if [ -d ${X_FONTSDIR}/${D} ]; then
+			%%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/${D} || true
+		fi
+	done
+	;;
+esac
diff --git a/japanese/font-mplus/pkg-descr b/japanese/font-mplus/pkg-descr
index e230ac6bb8ea..612008f0e232 100644
--- a/japanese/font-mplus/pkg-descr
+++ b/japanese/font-mplus/pkg-descr
@@ -1,7 +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.sourceforge.jp/
-
---
-H.Miyamoto <Ys@PixyGarden.net>
+WWW:	http://mplus-fonts.sourceforge.jp/
diff --git a/japanese/font-mplus/pkg-plist b/japanese/font-mplus/pkg-plist
index 3b704b874050..5ce6bde6fda6 100644
--- a/japanese/font-mplus/pkg-plist
+++ b/japanese/font-mplus/pkg-plist
@@ -1,54 +1,257 @@
-%%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
-%%DOCSDIR%%/fonts.alias
-%%DOCSDIR%%/fonts.alias.e
-%%DOCSDIR%%/fonts.alias.j
-%%DOCSDIR%%/fonts.alias.euro
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_E
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL_J
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_E
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
-%%PORTDOCS%%%%DOCSDIR%%/README_E
-%%PORTDOCS%%%%DOCSDIR%%/README_J
-@dirrm %%DOCSDIR%%
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@exec cat  %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
+@comment $FreeBSD$
+%%DATADIR%%/bitmap/mplus_f10b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_f10r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f10r.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12b.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_f12r.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h10r.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12b.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12r.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12rw-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_h12rw.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10b-iso.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10b-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10r-iso.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10r-jisx0201.pcf.gz
+%%DATADIR%%/bitmap/mplus_j10r.pcf.gz
+%%DATADIR%%/bitmap/mplus_j12b.pcf.gz
+%%DATADIR%%/bitmap/mplus_j12r.pcf.gz
+%%DATADIR%%/bitmap/mplus_q06r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_q06r.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10b-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10b.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10r-euro.pcf.gz
+%%DATADIR%%/bitmap/mplus_s10r.pcf.gz
+%%DATADIR%%/bitmap/fonts.alias
+%%DATADIR%%/TTF/mplus-1c-black.ttf
+%%DATADIR%%/TTF/mplus-1c-bold.ttf
+%%DATADIR%%/TTF/mplus-1c-heavy.ttf
+%%DATADIR%%/TTF/mplus-1c-light.ttf
+%%DATADIR%%/TTF/mplus-1c-medium.ttf
+%%DATADIR%%/TTF/mplus-1c-regular.ttf
+%%DATADIR%%/TTF/mplus-1c-thin.ttf
+%%DATADIR%%/TTF/mplus-1m-bold.ttf
+%%DATADIR%%/TTF/mplus-1m-light.ttf
+%%DATADIR%%/TTF/mplus-1m-medium.ttf
+%%DATADIR%%/TTF/mplus-1m-regular.ttf
+%%DATADIR%%/TTF/mplus-1m-thin.ttf
+%%DATADIR%%/TTF/mplus-1mn-bold.ttf
+%%DATADIR%%/TTF/mplus-1mn-light.ttf
+%%DATADIR%%/TTF/mplus-1mn-medium.ttf
+%%DATADIR%%/TTF/mplus-1mn-regular.ttf
+%%DATADIR%%/TTF/mplus-1mn-thin.ttf
+%%DATADIR%%/TTF/mplus-1p-black.ttf
+%%DATADIR%%/TTF/mplus-1p-bold.ttf
+%%DATADIR%%/TTF/mplus-1p-heavy.ttf
+%%DATADIR%%/TTF/mplus-1p-light.ttf
+%%DATADIR%%/TTF/mplus-1p-medium.ttf
+%%DATADIR%%/TTF/mplus-1p-regular.ttf
+%%DATADIR%%/TTF/mplus-1p-thin.ttf
+%%DATADIR%%/TTF/mplus-2c-black.ttf
+%%DATADIR%%/TTF/mplus-2c-bold.ttf
+%%DATADIR%%/TTF/mplus-2c-heavy.ttf
+%%DATADIR%%/TTF/mplus-2c-light.ttf
+%%DATADIR%%/TTF/mplus-2c-medium.ttf
+%%DATADIR%%/TTF/mplus-2c-regular.ttf
+%%DATADIR%%/TTF/mplus-2c-thin.ttf
+%%DATADIR%%/TTF/mplus-2m-bold.ttf
+%%DATADIR%%/TTF/mplus-2m-light.ttf
+%%DATADIR%%/TTF/mplus-2m-medium.ttf
+%%DATADIR%%/TTF/mplus-2m-regular.ttf
+%%DATADIR%%/TTF/mplus-2m-thin.ttf
+%%DATADIR%%/TTF/mplus-2p-black.ttf
+%%DATADIR%%/TTF/mplus-2p-bold.ttf
+%%DATADIR%%/TTF/mplus-2p-heavy.ttf
+%%DATADIR%%/TTF/mplus-2p-light.ttf
+%%DATADIR%%/TTF/mplus-2p-medium.ttf
+%%DATADIR%%/TTF/mplus-2p-regular.ttf
+%%DATADIR%%/TTF/mplus-2p-thin.ttf
+@dirrm %%DATADIR%%/bitmap
+@dirrm %%DATADIR%%/TTF
+@dirrm %%DATADIR%%
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f10r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_f12r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h10r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12rw-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_h12rw.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10b-iso.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10b-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10r-iso.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10r-jisx0201.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j10r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j12b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_j12r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_q06r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_q06r.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10b-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10b.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10r-euro.pcf.gz
+%%LOCAL_FONTSDIR%%/mplus/mplus_s10r.pcf.gz
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1c-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1m-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1mn-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-1p-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2c-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2m-thin.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-black.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-bold.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-heavy.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-light.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-medium.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-regular.ttf
+%%LOCAL_FONTSDIR%%/TTF/mplus-2p-thin.ttf
+@dirrm %%LOCAL_FONTSDIR%%/mplus
+@dirrmtry %%LOCAL_FONTSDIR%%/TTF
+@dirrmtry %%LOCAL_FONTSDIR%%
+etc/fonts/conf.avail/20-unhint-mplus.conf
+etc/fonts/conf.avail/62-fonts-mplus.conf
+@exec ln -s -f ../conf.avail/20-unhint-mplus.conf %D/etc/fonts/conf.d/20-unhint-mplust.conf
+@exec ln -s -f ../conf.avail/62-fonts-mplus.conf %D/etc/fonts/conf.d/62-fonts-mplus.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus.conf
+%%X_FONTSDIR%%/misc/mplus_f10b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f10r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f10r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_f12r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h10r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12rw-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_h12rw.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10b-iso.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10b-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10r-iso.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10r-jisx0201.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j10r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j12b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_j12r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_q06r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_q06r.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10b-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10b.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10r-euro.pcf.gz
+%%X_FONTSDIR%%/misc/mplus_s10r.pcf.gz
+%%X_FONTSDIR%%/TTF/mplus-1c-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1c-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1m-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1mn-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-1p-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-2c-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-2m-thin.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-black.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-bold.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-heavy.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-light.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-medium.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-regular.ttf
+%%X_FONTSDIR%%/TTF/mplus-2p-thin.ttf
diff --git a/japanese/font-mplus/pkg-req b/japanese/font-mplus/pkg-req
deleted file mode 100644
index db7c015cbf8b..000000000000
--- a/japanese/font-mplus/pkg-req
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
-	echo '**********************************************************************'
-	echo "****** ${FONTDIR}/ doesn't exist."
-	echo "****** Creating ${FONTDIR}/"
-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
-	echo '**********************************************************************'
-	mkdir ${FONTDIR}
-fi
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "$2" = "DEINSTALL" ] ; then
-	# font alias entry here!
-	TMPFILE=/tmp/install-fonts-alias-$$
-	for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
-		cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
-	done
-	echo "Updating ${FONTDIR}/fonts.alias"
-	cd ${FONTDIR}
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-	rm -f fonts.alias.orig ${TMPFILE}
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;