Update to 1.0.20060520.

This port is based on mixfont-mplus-ipa-TrueType-20060520 now.

18 files changed, 1002 insertions, 147 deletions

diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index dcd6e74f142d..9266b5598dbc 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -6,50 +6,68 @@
 #
 
 PORTNAME=	ipa-ttfonts
-PORTVERSION=	1.0.20040814
-PORTREVISION=	1
+PORTVERSION=	1.0.20060520
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/20216
+DISTNAME=	mixfont-mplus-ipa-TrueType-20060520
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Japanese TrueType fonts distributed by IPA
+COMMENT=	IPA Japanese TrueType fonts with M-plus outline font
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+USE_BZIP2=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/mixfont-mplus-ipa-TrueType-20060520
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 
-LOCAL_FONTSDIR=	share/fonts
+LOCAL_FONTSDIR=	share/fonts/TrueType
 X_FONTSDIR=	lib/X11/fonts/TrueType
-GRASS_FONTSDIR=	grass5/fonts
+DATADIR=	${LOCALBASE}/share/${PORTNAME}
 
 USE_X_PREFIX=	yes
 
-PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
-		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
+
+PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
+		Mplus-LICENSE_J.txt README.txt
 
 do-install:
-	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
+		${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/ipa*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/M+*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+		${DATADIR}/fonts/ipa*.ttf \
+		${PREFIX}/${X_FONTSDIR}/
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+		${DATADIR}/fonts/M+*.ttf \
 		${PREFIX}/${X_FONTSDIR}/
 	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
 		${PREFIX}/etc/fonts/conf.d
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 post-install:
 	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
diff --git a/japanese/font-ipa/distinfo b/japanese/font-ipa/distinfo
new file mode 100644
index 000000000000..a23c0850bc5c
--- /dev/null
+++ b/japanese/font-ipa/distinfo
@@ -0,0 +1,3 @@
+MD5 (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = b409b9763fa8ed20d5c76c77f4d313b9
+SHA256 (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = 6024dae5768229060c80615333e582498d0bad38ad9522e67051ed939fc1badd
+SIZE (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = 16732595
diff --git a/japanese/font-ipa/files/2.ipa-ttfonts.conf b/japanese/font-ipa/files/2.ipa-ttfonts.conf
index d5eb606ae7cf..88bcb42d4b9e 100644
--- a/japanese/font-ipa/files/2.ipa-ttfonts.conf
+++ b/japanese/font-ipa/files/2.ipa-ttfonts.conf
@@ -13,6 +13,10 @@
 		<prefer>
 			<family>IPAPGothic</family>
 			<family>IPAUIGothic</family>
+			<family>M+1P+IPAG</family>
+			<family>M+2P+IPAG</family>
+			<family>M+1P+IPAG circle</family>
+			<family>M+2P+IPAG circle</family>
 		</prefer>
 	</alias>
 	<alias>
@@ -20,6 +24,8 @@
 		<prefer>
 			<family>IPAGothic</family>
 			<family>IPAMincho</family>
+			<family>M+1VM+IPAG circle</family>
+			<family>M+2VM+IPAG circle</family>
 		</prefer>
 	</alias>
 	<match target="font">
@@ -29,6 +35,12 @@
 			<string>IPAPMincho</string>
 			<string>IPAPGothic</string>
 			<string>IPAUIGothic</string>
+			<family>M+1P+IPAG</family>
+			<family>M+2P+IPAG</family>
+			<family>M+1P+IPAG circle</family>
+			<family>M+2P+IPAG circle</family>
+			<family>M+1VM+IPAG circle</family>
+			<family>M+2VM+IPAG circle</family>
 		</test>
 		<edit name="hintstyle">
 			<const>hintslight</const>
diff --git a/japanese/font-ipa/files/pkg-install.in b/japanese/font-ipa/files/pkg-install.in
index 5c33ba4d34c0..89333b5f81c8 100644
--- a/japanese/font-ipa/files/pkg-install.in
+++ b/japanese/font-ipa/files/pkg-install.in
@@ -29,8 +29,7 @@ ai=0.08:ipag.ttf -ipa-IPAGothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
 ds=y:ai=0.08:ipag.ttf -ipa-IPAGothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
 bw=0.5:ipag.ttf -ipa-IPAGothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ds=y:ipag.ttf -ipa-IPAGothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0 bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ai=0.08:ipag.ttf -ipa-IPAGothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
@@ -167,6 +166,186 @@ bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859
 bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
 EOT
 }
 
diff --git a/japanese/font-ipa/pkg-descr b/japanese/font-ipa/pkg-descr
index d1f17977e37c..6a4e55edc148 100644
--- a/japanese/font-ipa/pkg-descr
+++ b/japanese/font-ipa/pkg-descr
@@ -1,2 +1,5 @@
 Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA).
+Agency (IPA) Japan.  M+ outline font and Bitstream Vera Sans Mono font
+composite versions included.
+
+WWW: http://mix-mplus-ipa.sourceforge.jp/
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index b83f91bc784a..06347bbbd399 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -1,30 +1,100 @@
 @comment $FreeBSD$
+@cwd %%LOCALBASE%%
+%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd
+%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd
+%%DATADIR%%/ppd/Makefile.in
+%%DATADIR%%/ppd/Makefile.am
+%%DATADIR%%/opvp/Makefile.in
+%%DATADIR%%/opvp/Makefile.am
+%%DATADIR%%/opvp/HPPageColor.c
+%%DATADIR%%/opfc-ModuleHP.spec
+%%DATADIR%%/mkinstalldirs
+%%DATADIR%%/missing
+%%DATADIR%%/ltmain.sh
+%%DATADIR%%/libopvp/pdapi.h
+%%DATADIR%%/libopvp/opvp_rpc_server.h
+%%DATADIR%%/libopvp/opvp_rpc_server.c
+%%DATADIR%%/libopvp/opvp_rpc_reqno.h
+%%DATADIR%%/libopvp/opvp_rpc_core.h
+%%DATADIR%%/libopvp/opvp_rpc_core.c
+%%DATADIR%%/libopvp/opvp_driver.h
+%%DATADIR%%/libopvp/opvp_common.h
+%%DATADIR%%/libopvp/doc/rpc040223.pdf
+%%DATADIR%%/libopvp/doc/Makefile.in
+%%DATADIR%%/libopvp/doc/Makefile.am
+%%DATADIR%%/libopvp/README.jp
+%%DATADIR%%/libopvp/Makefile.in
+%%DATADIR%%/libopvp/Makefile.am
+%%DATADIR%%/libopvp/COPYING
+%%DATADIR%%/install-sh
+%%DATADIR%%/fonts/ipamp.ttf
+%%DATADIR%%/fonts/ipam.ttf
+%%DATADIR%%/fonts/ipagui.ttf
+%%DATADIR%%/fonts/ipagp.ttf
+%%DATADIR%%/fonts/ipag.ttf
+%%DATADIR%%/fonts/Makefile.in
+%%DATADIR%%/fonts/Makefile.am
+%%DATADIR%%/fonts/M+2VM+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+2P+IPAG.ttf
+%%DATADIR%%/fonts/M+2P+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+1VM+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+1P+IPAG.ttf
+%%DATADIR%%/fonts/M+1P+IPAG-circle.ttf
+%%DATADIR%%/fonts/COPYING.font.ja
+%%DATADIR%%/doc/ProjectOverview.pdf
+%%DATADIR%%/doc/Makefile.in
+%%DATADIR%%/doc/Makefile.am
+%%DATADIR%%/depcomp
+%%DATADIR%%/configure.in
+%%DATADIR%%/configure
+%%DATADIR%%/config.sub
+%%DATADIR%%/config.h.in
+%%DATADIR%%/config.guess
+%%DATADIR%%/compile
+%%DATADIR%%/aclocal.m4
+%%DATADIR%%/VERSION
+%%DATADIR%%/README.jp
+%%DATADIR%%/README
+%%DATADIR%%/NEWS
+%%DATADIR%%/Makefile.in
+%%DATADIR%%/Makefile.am
+%%DATADIR%%/INSTALL
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/COPYING
+%%DATADIR%%/AUTHORS
+@dirrm %%DATADIR%%/ppd
+@dirrm %%DATADIR%%/opvp
+@dirrm %%DATADIR%%/libopvp/doc
+@dirrm %%DATADIR%%/libopvp
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/doc
+%%LOCAL_FONTSDIR%%/ipag.ttf
+%%LOCAL_FONTSDIR%%/ipagp.ttf
+%%LOCAL_FONTSDIR%%/ipagui.ttf
+%%LOCAL_FONTSDIR%%/ipam.ttf
+%%LOCAL_FONTSDIR%%/ipamp.ttf
+%%LOCAL_FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+2P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+1P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/M+1P+IPAG-circle.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%
+@cwd %%X11BASE%%
 etc/fonts/conf.d/2.ipa-ttfonts.conf
-@exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-@exec mkdir -p %%X_FONTSDIR%%
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-@unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
-@unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
-@unexec rm -f %%X_FONTSDIR%%/ipag.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipam.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
-@unexec if [ -s %%X_FONTSDIR%%/fonts.cache-1 ]; then rm -f %%X_FONTSDIR%%/fonts.cache-1; fi
-@unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true
+%%X_FONTSDIR%%/ipag.ttf
+%%X_FONTSDIR%%/ipagp.ttf
+%%X_FONTSDIR%%/ipagui.ttf
+%%X_FONTSDIR%%/ipam.ttf
+%%X_FONTSDIR%%/ipamp.ttf
+%%X_FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+2P+IPAG.ttf
+%%X_FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+1P+IPAG.ttf
+%%X_FONTSDIR%%/M+1P+IPAG-circle.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true
+@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true
+@unexec rm -f %D/%%X_FONTSDIR%%/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%
+@unexec if [ -d %D/%%X_FONTSDIR%% ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true; fi
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index dcd6e74f142d..9266b5598dbc 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -6,50 +6,68 @@
 #
 
 PORTNAME=	ipa-ttfonts
-PORTVERSION=	1.0.20040814
-PORTREVISION=	1
+PORTVERSION=	1.0.20060520
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/20216
+DISTNAME=	mixfont-mplus-ipa-TrueType-20060520
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Japanese TrueType fonts distributed by IPA
+COMMENT=	IPA Japanese TrueType fonts with M-plus outline font
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+USE_BZIP2=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/mixfont-mplus-ipa-TrueType-20060520
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 
-LOCAL_FONTSDIR=	share/fonts
+LOCAL_FONTSDIR=	share/fonts/TrueType
 X_FONTSDIR=	lib/X11/fonts/TrueType
-GRASS_FONTSDIR=	grass5/fonts
+DATADIR=	${LOCALBASE}/share/${PORTNAME}
 
 USE_X_PREFIX=	yes
 
-PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
-		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
+
+PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
+		Mplus-LICENSE_J.txt README.txt
 
 do-install:
-	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
+		${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/ipa*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/M+*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+		${DATADIR}/fonts/ipa*.ttf \
+		${PREFIX}/${X_FONTSDIR}/
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+		${DATADIR}/fonts/M+*.ttf \
 		${PREFIX}/${X_FONTSDIR}/
 	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
 		${PREFIX}/etc/fonts/conf.d
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 post-install:
 	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
diff --git a/japanese/font-mplus-ipa/distinfo b/japanese/font-mplus-ipa/distinfo
new file mode 100644
index 000000000000..a23c0850bc5c
--- /dev/null
+++ b/japanese/font-mplus-ipa/distinfo
@@ -0,0 +1,3 @@
+MD5 (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = b409b9763fa8ed20d5c76c77f4d313b9
+SHA256 (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = 6024dae5768229060c80615333e582498d0bad38ad9522e67051ed939fc1badd
+SIZE (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = 16732595
diff --git a/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf b/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
index d5eb606ae7cf..88bcb42d4b9e 100644
--- a/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
+++ b/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
@@ -13,6 +13,10 @@
 		<prefer>
 			<family>IPAPGothic</family>
 			<family>IPAUIGothic</family>
+			<family>M+1P+IPAG</family>
+			<family>M+2P+IPAG</family>
+			<family>M+1P+IPAG circle</family>
+			<family>M+2P+IPAG circle</family>
 		</prefer>
 	</alias>
 	<alias>
@@ -20,6 +24,8 @@
 		<prefer>
 			<family>IPAGothic</family>
 			<family>IPAMincho</family>
+			<family>M+1VM+IPAG circle</family>
+			<family>M+2VM+IPAG circle</family>
 		</prefer>
 	</alias>
 	<match target="font">
@@ -29,6 +35,12 @@
 			<string>IPAPMincho</string>
 			<string>IPAPGothic</string>
 			<string>IPAUIGothic</string>
+			<family>M+1P+IPAG</family>
+			<family>M+2P+IPAG</family>
+			<family>M+1P+IPAG circle</family>
+			<family>M+2P+IPAG circle</family>
+			<family>M+1VM+IPAG circle</family>
+			<family>M+2VM+IPAG circle</family>
 		</test>
 		<edit name="hintstyle">
 			<const>hintslight</const>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 5c33ba4d34c0..89333b5f81c8 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -29,8 +29,7 @@ ai=0.08:ipag.ttf -ipa-IPAGothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
 ds=y:ai=0.08:ipag.ttf -ipa-IPAGothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
 bw=0.5:ipag.ttf -ipa-IPAGothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ds=y:ipag.ttf -ipa-IPAGothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0 bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ai=0.08:ipag.ttf -ipa-IPAGothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
@@ -167,6 +166,186 @@ bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859
 bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
 EOT
 }
 
diff --git a/japanese/font-mplus-ipa/pkg-descr b/japanese/font-mplus-ipa/pkg-descr
index d1f17977e37c..6a4e55edc148 100644
--- a/japanese/font-mplus-ipa/pkg-descr
+++ b/japanese/font-mplus-ipa/pkg-descr
@@ -1,2 +1,5 @@
 Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA).
+Agency (IPA) Japan.  M+ outline font and Bitstream Vera Sans Mono font
+composite versions included.
+
+WWW: http://mix-mplus-ipa.sourceforge.jp/
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index b83f91bc784a..06347bbbd399 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -1,30 +1,100 @@
 @comment $FreeBSD$
+@cwd %%LOCALBASE%%
+%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd
+%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd
+%%DATADIR%%/ppd/Makefile.in
+%%DATADIR%%/ppd/Makefile.am
+%%DATADIR%%/opvp/Makefile.in
+%%DATADIR%%/opvp/Makefile.am
+%%DATADIR%%/opvp/HPPageColor.c
+%%DATADIR%%/opfc-ModuleHP.spec
+%%DATADIR%%/mkinstalldirs
+%%DATADIR%%/missing
+%%DATADIR%%/ltmain.sh
+%%DATADIR%%/libopvp/pdapi.h
+%%DATADIR%%/libopvp/opvp_rpc_server.h
+%%DATADIR%%/libopvp/opvp_rpc_server.c
+%%DATADIR%%/libopvp/opvp_rpc_reqno.h
+%%DATADIR%%/libopvp/opvp_rpc_core.h
+%%DATADIR%%/libopvp/opvp_rpc_core.c
+%%DATADIR%%/libopvp/opvp_driver.h
+%%DATADIR%%/libopvp/opvp_common.h
+%%DATADIR%%/libopvp/doc/rpc040223.pdf
+%%DATADIR%%/libopvp/doc/Makefile.in
+%%DATADIR%%/libopvp/doc/Makefile.am
+%%DATADIR%%/libopvp/README.jp
+%%DATADIR%%/libopvp/Makefile.in
+%%DATADIR%%/libopvp/Makefile.am
+%%DATADIR%%/libopvp/COPYING
+%%DATADIR%%/install-sh
+%%DATADIR%%/fonts/ipamp.ttf
+%%DATADIR%%/fonts/ipam.ttf
+%%DATADIR%%/fonts/ipagui.ttf
+%%DATADIR%%/fonts/ipagp.ttf
+%%DATADIR%%/fonts/ipag.ttf
+%%DATADIR%%/fonts/Makefile.in
+%%DATADIR%%/fonts/Makefile.am
+%%DATADIR%%/fonts/M+2VM+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+2P+IPAG.ttf
+%%DATADIR%%/fonts/M+2P+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+1VM+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+1P+IPAG.ttf
+%%DATADIR%%/fonts/M+1P+IPAG-circle.ttf
+%%DATADIR%%/fonts/COPYING.font.ja
+%%DATADIR%%/doc/ProjectOverview.pdf
+%%DATADIR%%/doc/Makefile.in
+%%DATADIR%%/doc/Makefile.am
+%%DATADIR%%/depcomp
+%%DATADIR%%/configure.in
+%%DATADIR%%/configure
+%%DATADIR%%/config.sub
+%%DATADIR%%/config.h.in
+%%DATADIR%%/config.guess
+%%DATADIR%%/compile
+%%DATADIR%%/aclocal.m4
+%%DATADIR%%/VERSION
+%%DATADIR%%/README.jp
+%%DATADIR%%/README
+%%DATADIR%%/NEWS
+%%DATADIR%%/Makefile.in
+%%DATADIR%%/Makefile.am
+%%DATADIR%%/INSTALL
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/COPYING
+%%DATADIR%%/AUTHORS
+@dirrm %%DATADIR%%/ppd
+@dirrm %%DATADIR%%/opvp
+@dirrm %%DATADIR%%/libopvp/doc
+@dirrm %%DATADIR%%/libopvp
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/doc
+%%LOCAL_FONTSDIR%%/ipag.ttf
+%%LOCAL_FONTSDIR%%/ipagp.ttf
+%%LOCAL_FONTSDIR%%/ipagui.ttf
+%%LOCAL_FONTSDIR%%/ipam.ttf
+%%LOCAL_FONTSDIR%%/ipamp.ttf
+%%LOCAL_FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+2P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+1P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/M+1P+IPAG-circle.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%
+@cwd %%X11BASE%%
 etc/fonts/conf.d/2.ipa-ttfonts.conf
-@exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-@exec mkdir -p %%X_FONTSDIR%%
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-@unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
-@unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
-@unexec rm -f %%X_FONTSDIR%%/ipag.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipam.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
-@unexec if [ -s %%X_FONTSDIR%%/fonts.cache-1 ]; then rm -f %%X_FONTSDIR%%/fonts.cache-1; fi
-@unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true
+%%X_FONTSDIR%%/ipag.ttf
+%%X_FONTSDIR%%/ipagp.ttf
+%%X_FONTSDIR%%/ipagui.ttf
+%%X_FONTSDIR%%/ipam.ttf
+%%X_FONTSDIR%%/ipamp.ttf
+%%X_FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+2P+IPAG.ttf
+%%X_FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+1P+IPAG.ttf
+%%X_FONTSDIR%%/M+1P+IPAG-circle.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true
+@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true
+@unexec rm -f %D/%%X_FONTSDIR%%/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%
+@unexec if [ -d %D/%%X_FONTSDIR%% ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true; fi
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
index dcd6e74f142d..9266b5598dbc 100644
--- a/japanese/ipa-ttfonts/Makefile
+++ b/japanese/ipa-ttfonts/Makefile
@@ -6,50 +6,68 @@
 #
 
 PORTNAME=	ipa-ttfonts
-PORTVERSION=	1.0.20040814
-PORTREVISION=	1
+PORTVERSION=	1.0.20060520
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/20216
+DISTNAME=	mixfont-mplus-ipa-TrueType-20060520
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Japanese TrueType fonts distributed by IPA
+COMMENT=	IPA Japanese TrueType fonts with M-plus outline font
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+USE_BZIP2=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/mixfont-mplus-ipa-TrueType-20060520
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 
-LOCAL_FONTSDIR=	share/fonts
+LOCAL_FONTSDIR=	share/fonts/TrueType
 X_FONTSDIR=	lib/X11/fonts/TrueType
-GRASS_FONTSDIR=	grass5/fonts
+DATADIR=	${LOCALBASE}/share/${PORTNAME}
 
 USE_X_PREFIX=	yes
 
-PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
-		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
+
+PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
+		Mplus-LICENSE_J.txt README.txt
 
 do-install:
-	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
+		${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/ipa*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/M+*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+		${DATADIR}/fonts/ipa*.ttf \
+		${PREFIX}/${X_FONTSDIR}/
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+		${DATADIR}/fonts/M+*.ttf \
 		${PREFIX}/${X_FONTSDIR}/
 	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
 		${PREFIX}/etc/fonts/conf.d
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 post-install:
 	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
diff --git a/japanese/ipa-ttfonts/distinfo b/japanese/ipa-ttfonts/distinfo
new file mode 100644
index 000000000000..a23c0850bc5c
--- /dev/null
+++ b/japanese/ipa-ttfonts/distinfo
@@ -0,0 +1,3 @@
+MD5 (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = b409b9763fa8ed20d5c76c77f4d313b9
+SHA256 (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = 6024dae5768229060c80615333e582498d0bad38ad9522e67051ed939fc1badd
+SIZE (mixfont-mplus-ipa-TrueType-20060520.tar.bz2) = 16732595
diff --git a/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf b/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf
index d5eb606ae7cf..88bcb42d4b9e 100644
--- a/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf
+++ b/japanese/ipa-ttfonts/files/2.ipa-ttfonts.conf
@@ -13,6 +13,10 @@
 		<prefer>
 			<family>IPAPGothic</family>
 			<family>IPAUIGothic</family>
+			<family>M+1P+IPAG</family>
+			<family>M+2P+IPAG</family>
+			<family>M+1P+IPAG circle</family>
+			<family>M+2P+IPAG circle</family>
 		</prefer>
 	</alias>
 	<alias>
@@ -20,6 +24,8 @@
 		<prefer>
 			<family>IPAGothic</family>
 			<family>IPAMincho</family>
+			<family>M+1VM+IPAG circle</family>
+			<family>M+2VM+IPAG circle</family>
 		</prefer>
 	</alias>
 	<match target="font">
@@ -29,6 +35,12 @@
 			<string>IPAPMincho</string>
 			<string>IPAPGothic</string>
 			<string>IPAUIGothic</string>
+			<family>M+1P+IPAG</family>
+			<family>M+2P+IPAG</family>
+			<family>M+1P+IPAG circle</family>
+			<family>M+2P+IPAG circle</family>
+			<family>M+1VM+IPAG circle</family>
+			<family>M+2VM+IPAG circle</family>
 		</test>
 		<edit name="hintstyle">
 			<const>hintslight</const>
diff --git a/japanese/ipa-ttfonts/files/pkg-install.in b/japanese/ipa-ttfonts/files/pkg-install.in
index 5c33ba4d34c0..89333b5f81c8 100644
--- a/japanese/ipa-ttfonts/files/pkg-install.in
+++ b/japanese/ipa-ttfonts/files/pkg-install.in
@@ -29,8 +29,7 @@ ai=0.08:ipag.ttf -ipa-IPAGothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
 ds=y:ai=0.08:ipag.ttf -ipa-IPAGothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
 bw=0.5:ipag.ttf -ipa-IPAGothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ds=y:ipag.ttf -ipa-IPAGothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0 bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ai=0.15:ipag.ttf -ipa-IPAGothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ds=y:ai=0.15:ipag.ttf -ipa-IPAGothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
 bw=0.5:ai=0.08:ipag.ttf -ipa-IPAGothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
@@ -167,6 +166,186 @@ bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-i-normal--0-0-0-0-c-0-iso8859
 bw=0.5:ds=y:ai=0.15:ipamp.ttf -ipa-IPAPMincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
 bw=0.5:ds=y:ai=0.08:ipamp.ttf -ipa-IPAPMincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2VM+IPAG-circle.ttf -ipa-M+2VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG.ttf -ipa-M+2P+IPAG-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+2P+IPAG-circle.ttf -ipa-M+2P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1VM+IPAG-circle.ttf -ipa-M+1VM+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG.ttf -ipa-M+1P+IPAG-bold-ro-normal--0-0-0-0-c-0-iso8859-1
+M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
+ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
+bw=0.5:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
+bw=0.5:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-medium-ro-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-r-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-i-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.15:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-o-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ri-normal--0-0-0-0-c-0-iso8859-1
+bw=0.5:ds=y:ai=0.08:M+1P+IPAG-circle.ttf -ipa-M+1P+IPAG_circle-bold-ro-normal--0-0-0-0-c-0-iso8859-1
 EOT
 }
 
diff --git a/japanese/ipa-ttfonts/pkg-descr b/japanese/ipa-ttfonts/pkg-descr
index d1f17977e37c..6a4e55edc148 100644
--- a/japanese/ipa-ttfonts/pkg-descr
+++ b/japanese/ipa-ttfonts/pkg-descr
@@ -1,2 +1,5 @@
 Japanese TrueType fonts distributed by Infomation-technology Promotion
-Agency (IPA).
+Agency (IPA) Japan.  M+ outline font and Bitstream Vera Sans Mono font
+composite versions included.
+
+WWW: http://mix-mplus-ipa.sourceforge.jp/
diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist
index b83f91bc784a..06347bbbd399 100644
--- a/japanese/ipa-ttfonts/pkg-plist
+++ b/japanese/ipa-ttfonts/pkg-plist
@@ -1,30 +1,100 @@
 @comment $FreeBSD$
+@cwd %%LOCALBASE%%
+%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd
+%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd
+%%DATADIR%%/ppd/Makefile.in
+%%DATADIR%%/ppd/Makefile.am
+%%DATADIR%%/opvp/Makefile.in
+%%DATADIR%%/opvp/Makefile.am
+%%DATADIR%%/opvp/HPPageColor.c
+%%DATADIR%%/opfc-ModuleHP.spec
+%%DATADIR%%/mkinstalldirs
+%%DATADIR%%/missing
+%%DATADIR%%/ltmain.sh
+%%DATADIR%%/libopvp/pdapi.h
+%%DATADIR%%/libopvp/opvp_rpc_server.h
+%%DATADIR%%/libopvp/opvp_rpc_server.c
+%%DATADIR%%/libopvp/opvp_rpc_reqno.h
+%%DATADIR%%/libopvp/opvp_rpc_core.h
+%%DATADIR%%/libopvp/opvp_rpc_core.c
+%%DATADIR%%/libopvp/opvp_driver.h
+%%DATADIR%%/libopvp/opvp_common.h
+%%DATADIR%%/libopvp/doc/rpc040223.pdf
+%%DATADIR%%/libopvp/doc/Makefile.in
+%%DATADIR%%/libopvp/doc/Makefile.am
+%%DATADIR%%/libopvp/README.jp
+%%DATADIR%%/libopvp/Makefile.in
+%%DATADIR%%/libopvp/Makefile.am
+%%DATADIR%%/libopvp/COPYING
+%%DATADIR%%/install-sh
+%%DATADIR%%/fonts/ipamp.ttf
+%%DATADIR%%/fonts/ipam.ttf
+%%DATADIR%%/fonts/ipagui.ttf
+%%DATADIR%%/fonts/ipagp.ttf
+%%DATADIR%%/fonts/ipag.ttf
+%%DATADIR%%/fonts/Makefile.in
+%%DATADIR%%/fonts/Makefile.am
+%%DATADIR%%/fonts/M+2VM+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+2P+IPAG.ttf
+%%DATADIR%%/fonts/M+2P+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+1VM+IPAG-circle.ttf
+%%DATADIR%%/fonts/M+1P+IPAG.ttf
+%%DATADIR%%/fonts/M+1P+IPAG-circle.ttf
+%%DATADIR%%/fonts/COPYING.font.ja
+%%DATADIR%%/doc/ProjectOverview.pdf
+%%DATADIR%%/doc/Makefile.in
+%%DATADIR%%/doc/Makefile.am
+%%DATADIR%%/depcomp
+%%DATADIR%%/configure.in
+%%DATADIR%%/configure
+%%DATADIR%%/config.sub
+%%DATADIR%%/config.h.in
+%%DATADIR%%/config.guess
+%%DATADIR%%/compile
+%%DATADIR%%/aclocal.m4
+%%DATADIR%%/VERSION
+%%DATADIR%%/README.jp
+%%DATADIR%%/README
+%%DATADIR%%/NEWS
+%%DATADIR%%/Makefile.in
+%%DATADIR%%/Makefile.am
+%%DATADIR%%/INSTALL
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/COPYING
+%%DATADIR%%/AUTHORS
+@dirrm %%DATADIR%%/ppd
+@dirrm %%DATADIR%%/opvp
+@dirrm %%DATADIR%%/libopvp/doc
+@dirrm %%DATADIR%%/libopvp
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/doc
+%%LOCAL_FONTSDIR%%/ipag.ttf
+%%LOCAL_FONTSDIR%%/ipagp.ttf
+%%LOCAL_FONTSDIR%%/ipagui.ttf
+%%LOCAL_FONTSDIR%%/ipam.ttf
+%%LOCAL_FONTSDIR%%/ipamp.ttf
+%%LOCAL_FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+2P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/M+1P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/M+1P+IPAG-circle.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%
+@cwd %%X11BASE%%
 etc/fonts/conf.d/2.ipa-ttfonts.conf
-@exec mkdir -p %%LOCAL_FONTSDIR%%/TrueType
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-@exec mkdir -p %%X_FONTSDIR%%
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipag.ttf   %%X_FONTSDIR%%/ipag.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagp.ttf  %%X_FONTSDIR%%/ipagp.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipagui.ttf %%X_FONTSDIR%%/ipagui.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipam.ttf   %%X_FONTSDIR%%/ipam.ttf
-@exec ln -s -f %%GRASS_FONTSDIR%%/ipamp.ttf  %%X_FONTSDIR%%/ipamp.ttf
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
-@unexec rm -f %%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
-@unexec rmdir %%LOCAL_FONTSDIR%%/TrueType 2> /dev/null || true
-@unexec rmdir %%LOCAL_FONTSDIR%% 2> /dev/null || true
-@unexec rm -f %%X_FONTSDIR%%/ipag.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipagp.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipagui.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipam.ttf
-@unexec rm -f %%X_FONTSDIR%%/ipamp.ttf
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X_FONTSDIR%% || true
-@unexec if [ -s %%X_FONTSDIR%%/fonts.cache-1 ]; then rm -f %%X_FONTSDIR%%/fonts.cache-1; fi
-@unexec rmdir %%X_FONTSDIR%% 2> /dev/null || true
+%%X_FONTSDIR%%/ipag.ttf
+%%X_FONTSDIR%%/ipagp.ttf
+%%X_FONTSDIR%%/ipagui.ttf
+%%X_FONTSDIR%%/ipam.ttf
+%%X_FONTSDIR%%/ipamp.ttf
+%%X_FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+2P+IPAG.ttf
+%%X_FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/M+1P+IPAG.ttf
+%%X_FONTSDIR%%/M+1P+IPAG-circle.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true
+@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true
+@unexec rm -f %D/%%X_FONTSDIR%%/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%
+@unexec if [ -d %D/%%X_FONTSDIR%% ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%% || true; fi