3 files changed, 2 insertions, 23 deletions

diff --git a/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
index d5d14d634b35..1a1142a6f107 100644
--- a/japanese/font-mplus-ipa/files/20-unhint-ipattfonts.conf
+++ b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
@@ -4,10 +4,6 @@
 <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>
diff --git a/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
index 6f433bc8d232..1c0bb82ef3d8 100644
--- a/japanese/font-mplus-ipa/files/62-fonts-ipattfonts.conf
+++ b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
@@ -3,15 +3,8 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>IPAPMincho</family>
-		</prefer>
-	</alias>
-	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>IPAPGothic</family>
 			<family>IPAUIGothic</family>
 			<family>M+1P+IPAG</family>
 			<family>M+2P+IPAG</family>
@@ -22,8 +15,6 @@
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>IPAGothic</family>
-			<family>IPAMincho</family>
 			<family>M+1VM+IPAG circle</family>
 			<family>M+2VM+IPAG circle</family>
 		</prefer>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 6a1cdc6f8554..2f9a85233b1f 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,14 +1,14 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+X_FONTSDIR=%%X_FONTSDIR%%/TTF
 
 catfontsdir ()
 {
     while read _IN
     do
       case "${_IN}" in
-      *-ipa-*|[0-9]*|"") ;;
+      *-ipa-[MU]*|*-ipa-IPAUI*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
@@ -58,16 +58,8 @@ addentries ()
 {
 	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
 	do
-		make_xlfd $ENC ipag.ttf ipa IPAGothic c
-		make_xlfd $ENC ipag.ttf ipa gothic c
-		make_xlfd $ENC ipagp.ttf ipa IPAPGothic p
-		make_xlfd $ENC ipagp.ttf ipa gothic p
 		make_xlfd $ENC ipagui.ttf ipa IPAUIGothic c
 		make_xlfd $ENC ipagui.ttf ipa UIGothic c
-		make_xlfd $ENC ipam.ttf ipa IPAMincho c
-		make_xlfd $ENC ipam.ttf ipa mincho c
-		make_xlfd $ENC ipamp.ttf ipa IPAPMincho p
-		make_xlfd $ENC ipamp.ttf ipa mincho p
 		make_xlfd $ENC M+2VM+IPAG-circle.ttf ipa M+2VM+IPAG_circle c
 		make_xlfd $ENC M+1VM+IPAG-circle.ttf ipa M+1VM+IPAG_circle c
 		make_xlfd $ENC M+1P+IPAG.ttf ipa M+1P+IPAG p