6 files changed, 36 insertions, 12 deletions

diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 2617ef488a75..7de7e150539d 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520.p1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -47,10 +48,13 @@ do-install:
 	${LN} -s -f \
 		${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
 		${LOCALBASE}/${X_FONTSDIR}/TrueType/
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
 		${FILESDIR}/62-fonts-ipattfonts.conf \
-		${PREFIX}/etc/fonts/conf.d
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+	${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index ec83895db07b..c759c2934668 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -81,8 +81,12 @@
 %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
 @dirrmtry %%LOCAL_FONTSDIR%%/TrueType
 @dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.d/20-unhint-ipattfonts.conf
-etc/fonts/conf.d/62-fonts-ipattfonts.conf
+etc/fonts/conf.avail/20-unhint-ipattfonts.conf
+etc/fonts/conf.avail/62-fonts-ipattfonts.conf
+@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
 %%X_FONTSDIR%%/TrueType/ipag.ttf
 %%X_FONTSDIR%%/TrueType/ipagp.ttf
 %%X_FONTSDIR%%/TrueType/ipagui.ttf
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 2617ef488a75..7de7e150539d 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520.p1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -47,10 +48,13 @@ do-install:
 	${LN} -s -f \
 		${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
 		${LOCALBASE}/${X_FONTSDIR}/TrueType/
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
 		${FILESDIR}/62-fonts-ipattfonts.conf \
-		${PREFIX}/etc/fonts/conf.d
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+	${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index ec83895db07b..c759c2934668 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -81,8 +81,12 @@
 %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
 @dirrmtry %%LOCAL_FONTSDIR%%/TrueType
 @dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.d/20-unhint-ipattfonts.conf
-etc/fonts/conf.d/62-fonts-ipattfonts.conf
+etc/fonts/conf.avail/20-unhint-ipattfonts.conf
+etc/fonts/conf.avail/62-fonts-ipattfonts.conf
+@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
 %%X_FONTSDIR%%/TrueType/ipag.ttf
 %%X_FONTSDIR%%/TrueType/ipagp.ttf
 %%X_FONTSDIR%%/TrueType/ipagui.ttf
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
index 2617ef488a75..7de7e150539d 100644
--- a/japanese/ipa-ttfonts/Makefile
+++ b/japanese/ipa-ttfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520.p1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -47,10 +48,13 @@ do-install:
 	${LN} -s -f \
 		${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \
 		${LOCALBASE}/${X_FONTSDIR}/TrueType/
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \
 		${FILESDIR}/62-fonts-ipattfonts.conf \
-		${PREFIX}/etc/fonts/conf.d
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-ipattfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+	${LN} -s -f ../conf.avail/62-fonts-ipattfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-ipattfonts.conf
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist
index ec83895db07b..c759c2934668 100644
--- a/japanese/ipa-ttfonts/pkg-plist
+++ b/japanese/ipa-ttfonts/pkg-plist
@@ -81,8 +81,12 @@
 %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf
 @dirrmtry %%LOCAL_FONTSDIR%%/TrueType
 @dirrmtry %%LOCAL_FONTSDIR%%
-etc/fonts/conf.d/20-unhint-ipattfonts.conf
-etc/fonts/conf.d/62-fonts-ipattfonts.conf
+etc/fonts/conf.avail/20-unhint-ipattfonts.conf
+etc/fonts/conf.avail/62-fonts-ipattfonts.conf
+@exec ln -s -f ../conf.avail/20-unhint-ipattfonts.conf %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+@exec ln -s -f ../conf.avail/62-fonts-ipattfonts.conf %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-ipattfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-ipattfonts.conf
 %%X_FONTSDIR%%/TrueType/ipag.ttf
 %%X_FONTSDIR%%/TrueType/ipagp.ttf
 %%X_FONTSDIR%%/TrueType/ipagui.ttf