5 files changed, 29 insertions, 25 deletions

diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 97db34b95d31..62b81470db7d 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
@@ -62,7 +62,8 @@ do-install:
 		${DATADIR}/fonts/M+*.ttf \
 		${PREFIX}/${X_FONTSDIR}/TrueType/
 	${MKDIR} ${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
+		${FILESDIR}/62-fonts-ipattfonts.conf \
 		${PREFIX}/etc/fonts/conf.d
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf b/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf
new file mode 100644
index 000000000000..d5d14d634b35
--- /dev/null
+++ b/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>IPAMincho</string>
+			<string>IPAGothic</string>
+			<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="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf b/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf
index 88bcb42d4b9e..6f433bc8d232 100644
--- a/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
+++ b/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf
@@ -28,25 +28,4 @@
 			<family>M+2VM+IPAG circle</family>
 		</prefer>
 	</alias>
-	<match target="font">
-		<test name="family">
-			<string>IPAMincho</string>
-			<string>IPAGothic</string>
-			<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>
-		</edit>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-	</match>
 </fontconfig>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 89333b5f81c8..2d0b746d890e 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%
+X_FONTSDIR=%%X_FONTSDIR%%/TrueType
 
 catfontsdir ()
 {
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index 65819fa03c92..6c8fbac6bca4 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -83,7 +83,8 @@
 @dirrmtry %%LOCAL_FONTSDIR%%/TrueType
 @dirrmtry %%LOCAL_FONTSDIR%%
 @cwd %%X11BASE%%
-etc/fonts/conf.d/2.ipa-ttfonts.conf
+etc/fonts/conf.d/20-unhint-ipattfonts.conf
+etc/fonts/conf.d/62-fonts-ipattfonts.conf
 %%X_FONTSDIR%%/TrueType/ipag.ttf
 %%X_FONTSDIR%%/TrueType/ipagp.ttf
 %%X_FONTSDIR%%/TrueType/ipagui.ttf