- Nuke old IPAUIGothic.

- Fix <test> in files/20-unhint-mplus-ipa.conf.

5 files changed, 11 insertions, 16 deletions

diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 5ffe0034af8c..42884f26b47f 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	font-mplus-ipa
 PORTVERSION=	1.0.20060520.p1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
@@ -37,10 +38,10 @@ do-install:
 	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
 		${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
-	${LN} -s -f ${DATADIR}/fonts/M+*.ttf ${DATADIR}/fonts/ipagui.ttf \
+	${LN} -s -f ${DATADIR}/fonts/M+*.ttf \
 		${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
 	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
-	${LN} -s -f ${DATADIR}/fonts/M+*.ttf ${DATADIR}/fonts/ipagui.ttf \
+	${LN} -s -f ${DATADIR}/fonts/M+*.ttf \
 			${LOCALBASE}/${X_FONTSDIR}/TTF/
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus-ipa.conf \
 		${FILESDIR}/62-fonts-mplus-ipa.conf \
diff --git a/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
index 1a1142a6f107..26a7fa4c3fe2 100644
--- a/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
+++ b/japanese/font-mplus-ipa/files/20-unhint-mplus-ipa.conf
@@ -4,13 +4,12 @@
 <fontconfig>
 	<match target="font">
 		<test name="family">
-			<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>
+			<string>M+1P+IPAG</string>
+			<string>M+2P+IPAG</string>
+			<string>M+1P+IPAG circle</string>
+			<string>M+2P+IPAG circle</string>
+			<string>M+1VM+IPAG circle</string>
+			<string>M+2VM+IPAG circle</string>
 		</test>
 		<edit name="autohint">
 			<bool>false</bool>
diff --git a/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
index 1c0bb82ef3d8..1b6acb06068f 100644
--- a/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
+++ b/japanese/font-mplus-ipa/files/62-fonts-mplus-ipa.conf
@@ -5,7 +5,6 @@
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>IPAUIGothic</family>
 			<family>M+1P+IPAG</family>
 			<family>M+2P+IPAG</family>
 			<family>M+1P+IPAG circle</family>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 553ab957fe82..0675dc5dbca4 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -8,7 +8,7 @@ catfontsdir ()
     while read _IN
     do
       case "${_IN}" in
-      *-ipa-[MU]*|*-ipa-IPAUI*|[0-9]*|"") ;;
+      *-ipa-M*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
     done
@@ -58,8 +58,6 @@ addentries ()
 {
 	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
 	do
-		make_xlfd $ENC ipagui.ttf ipa IPAUIGothic c
-		make_xlfd $ENC ipagui.ttf ipa UIGothic c
 		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
@@ -83,7 +81,7 @@ POST-INSTALL)
 	cat fonts.dir.tmp >> fonts.dir
 	rm -f fonts.dir.tmp
 	;;
-DEINSTALL)
+POST-DEINSTALL)
 	cd ${X_FONTSDIR}
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index e11428640188..9e960cc0637b 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -68,7 +68,6 @@
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
-%%LOCAL_FONTSDIR%%/TTF/ipagui.ttf
 %%LOCAL_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
 %%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG.ttf
 %%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
@@ -83,7 +82,6 @@ etc/fonts/conf.avail/62-fonts-mplus-ipa.conf
 @exec ln -s -f ../conf.avail/62-fonts-mplus-ipa.conf %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
 @unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus-ipa.conf
 @unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus-ipa.conf
-%%X_FONTSDIR%%/TTF/ipagui.ttf
 %%X_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
 %%X_FONTSDIR%%/TTF/M+2P+IPAG.ttf
 %%X_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf