- Add a dependency on fc-cache(1) and invoke it when install/deinstall[1]

- Add conf.d/2.ipa-ttfonts.conf configuration file[1]
- Some style changes.

PR:		ports/88878[1]
Submitted by:	NIIMI Satoshi (sa2c at sa2c dot net)[1]

3 files changed, 63 insertions, 15 deletions

diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 8ca31e1a0f3d..dcd6e74f142d 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20040814
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
@@ -15,40 +16,43 @@ DISTFILES=	# empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese TrueType fonts distributed by IPA
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n
+RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts/TrueType
 GRASS_FONTSDIR=	grass5/fonts
 
-PKGINSTALL_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X11BASE}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${X11BASE}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${PREFIX}/${LOCAL_FONTSDIR} \
-		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+USE_X_PREFIX=	yes
 
-pre-install:
-	@${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/pkg-install.in \
-		> ${WRKDIR}/pkg-install
-	${CHMOD} +x ${WRKDIR}/pkg-install
+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}
 
 do-install:
-	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TrueType
-	${MKDIR} ${X11BASE}/${X_FONTSDIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${PREFIX}/${LOCAL_FONTSDIR}/TrueType/
+		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
 	${LN} -s -f \
 		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${X11BASE}/${X_FONTSDIR}/
+		${PREFIX}/${X_FONTSDIR}/
+	${MKDIR} ${PREFIX}/etc/fonts/conf.d
+	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
+		${PREFIX}/etc/fonts/conf.d
 
 post-install:
+	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf b/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
new file mode 100644
index 000000000000..d5eb606ae7cf
--- /dev/null
+++ b/japanese/font-mplus-ipa/files/2.ipa-ttfonts.conf
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>IPAPMincho</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>IPAPGothic</family>
+			<family>IPAUIGothic</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>IPAGothic</family>
+			<family>IPAMincho</family>
+		</prefer>
+	</alias>
+	<match target="font">
+		<test name="family">
+			<string>IPAMincho</string>
+			<string>IPAGothic</string>
+			<string>IPAPMincho</string>
+			<string>IPAPGothic</string>
+			<string>IPAUIGothic</string>
+		</test>
+		<edit name="hintstyle">
+			<const>hintslight</const>
+		</edit>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index 7571cf34c224..b83f91bc784a 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+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
@@ -11,6 +12,7 @@
 @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
@@ -23,4 +25,6 @@
 @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