Index: head/japanese/font-mplus-bitmap/Makefile
===================================================================
--- head/japanese/font-mplus-bitmap/Makefile	(revision 467392)
+++ head/japanese/font-mplus-bitmap/Makefile	(revision 467393)
@@ -1,51 +1,45 @@
 # Created by: The 244th namelessness at 2ch.net
 # $FreeBSD$
 
 PORTNAME=	mplus
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/${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: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}
+SUB_FILES=	pkg-message
+FONTSDIR=	${PREFIX}/share/fonts/${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}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${WRKSRC} && \
-	    ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}" \
+	    ${SETENV} DESTDIR="${STAGEDIR}${FONTSDIR}" \
 	    ${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 .
+	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/japanese/font-mplus-bitmap/files/pkg-install.in
===================================================================
--- head/japanese/font-mplus-bitmap/files/pkg-install.in	(revision 467392)
+++ head/japanese/font-mplus-bitmap/files/pkg-install.in	(nonexistent)
@@ -1,22 +0,0 @@
-#!/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

Property changes on: head/japanese/font-mplus-bitmap/files/pkg-install.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/japanese/font-mplus-bitmap/files/pkg-message.in
===================================================================
--- head/japanese/font-mplus-bitmap/files/pkg-message.in	(nonexistent)
+++ head/japanese/font-mplus-bitmap/files/pkg-message.in	(revision 467393)
@@ -0,0 +1,15 @@
+*******************************************************************
+You can start using the font(s) by following these instructions:
+
+Either type the following in an X terminal:
+
+        xset fp+ %%FONTSDIR%%
+        xset fp rehash
+
+Or, more permanently, add the following line to the "Files" section
+of your X.Org configuration file (typically /etc/X11/xorg.conf):
+
+        FontPath "%%FONTSDIR%%/"
+
+then restart X.
+*******************************************************************

Property changes on: head/japanese/font-mplus-bitmap/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/japanese/font-mplus-bitmap/pkg-plist
===================================================================
--- head/japanese/font-mplus-bitmap/pkg-plist	(revision 467392)
+++ head/japanese/font-mplus-bitmap/pkg-plist	(revision 467393)
@@ -1,77 +1,39 @@
-%%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%%/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