1 files changed, 29 insertions, 27 deletions
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index 06347bbbd399..65819fa03c92 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -68,33 +68,35 @@
 @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
+@dirrm %%DATADIR%%
+%%LOCAL_FONTSDIR%%/TrueType/ipag.ttf
+%%LOCAL_FONTSDIR%%/TrueType/ipagp.ttf
+%%LOCAL_FONTSDIR%%/TrueType/ipagui.ttf
+%%LOCAL_FONTSDIR%%/TrueType/ipam.ttf
+%%LOCAL_FONTSDIR%%/TrueType/ipamp.ttf
+%%LOCAL_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
+%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
+%%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
 @dirrmtry %%LOCAL_FONTSDIR%%
 @cwd %%X11BASE%%
 etc/fonts/conf.d/2.ipa-ttfonts.conf
-%%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
+%%X_FONTSDIR%%/TrueType/ipag.ttf
+%%X_FONTSDIR%%/TrueType/ipagp.ttf
+%%X_FONTSDIR%%/TrueType/ipagui.ttf
+%%X_FONTSDIR%%/TrueType/ipam.ttf
+%%X_FONTSDIR%%/TrueType/ipamp.ttf
+%%X_FONTSDIR%%/TrueType/M+2VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/TrueType/M+2P+IPAG.ttf
+%%X_FONTSDIR%%/TrueType/M+2P+IPAG-circle.ttf
+%%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf
+%%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf
+%%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
+@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1
+@dirrmtry %%X_FONTSDIR%%/TrueType
+@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi