- Add fontconfig support.

- Clean up fonts.dir handling.
- Use $PORTDOCS.
- Take maintainership.

9 files changed, 189 insertions, 273 deletions

diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index 6dd53fd50f85..ac51a5023b9d 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -7,64 +7,58 @@
 
 PORTNAME=	kochi-ttfonts
 PORTVERSION=	20030809
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://downloads.sourceforge.jp/efont/5411/ \
 		${MASTER_SITE_PORTS_JP}
 DISTFILES=	kochi-substitute-${PORTVERSION}.tar.bz2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Free Japanese TrueType fonts named 'Kochi'
 
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-FONTSDIR=	lib/X11/fonts/TrueType
-MAKE_ENV=	FONTSDIR=${FONTSDIR}
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
+WRKSRC=		${WRKDIR}/kochi-substitute-${PORTVERSION}
+
+LOCAL_FONTSDIR=	share/fonts
+X_FONTSDIR=	lib/X11/fonts
 
-WRKSRC=	${WRKDIR}/kochi-substitute-${PORTVERSION}
+PORTDOCS=	README.ja COPYING docs
 
 do-install:
-.if !exists(${PREFIX}/${FONTSDIR})
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
-	@${ECHO} "and load 'xtt' module in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.endif
-	${INSTALL_DATA} ${WRKSRC}/*.ttf \
-			${FILESDIR}/fonts.dir.kochi \
-			${FILESDIR}/fonts.alias.kochi \
-			${PREFIX}/${FONTSDIR}
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+	${LN} -s -f \
+		${DATADIR}/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+	${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType
+	${LN} -s -f \
+		${DATADIR}/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TrueType/
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-kochittfonts.conf \
+		${FILESDIR}/62-fonts-kochittfonts.conf \
+		${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-kochittfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-kochittfonts.conf
+	${LN} -s -f ../conf.avail/62-fonts-kochittfonts.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-kochittfonts.conf
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/kochi-ttfonts
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${WRKSRC}/COPYING \
-		${PREFIX}/share/doc/ja/kochi-ttfonts
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/ayu20gothic
-	${INSTALL_DATA} ${WRKSRC}/docs/README \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs
-	${INSTALL_DATA} ${WRKSRC}/docs/ayu20gothic/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/ayu20gothic
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/k14goth
-	${INSTALL_DATA} ${WRKSRC}/docs/k14goth/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/k14goth
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/kappa20
-	${INSTALL_DATA} ${WRKSRC}/docs/kappa20/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/kappa20
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/naga10
-	${INSTALL_DATA} ${WRKSRC}/docs/naga10/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/naga10
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome12
-	${INSTALL_DATA} ${WRKSRC}/docs/shinonome12/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome12
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome16
-	${INSTALL_DATA} ${WRKSRC}/docs/shinonome16/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/shinonome16
-	${MKDIR} -p ${PREFIX}/share/doc/ja/kochi-ttfonts/docs/wadalab
-	${INSTALL_DATA} ${WRKSRC}/docs/wadalab/* \
-		${PREFIX}/share/doc/ja/kochi-ttfonts/docs/wadalab
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}
 .endif
+
+post-install:
+	${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/font-kochi/files/20-unhint-kochittfonts.conf b/japanese/font-kochi/files/20-unhint-kochittfonts.conf
new file mode 100644
index 000000000000..262064b7132d
--- /dev/null
+++ b/japanese/font-kochi/files/20-unhint-kochittfonts.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>Kochi Mincho</string>
+			<string>Kochi Gothic</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-kochi/files/62-fonts-kochittfonts.conf b/japanese/font-kochi/files/62-fonts-kochittfonts.conf
new file mode 100644
index 000000000000..99f3ff0746bc
--- /dev/null
+++ b/japanese/font-kochi/files/62-fonts-kochittfonts.conf
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Kochi Mincho</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Kochi Gothic</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>Kochi Mincho</family>
+			<family>Kochi Gothic</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/japanese/font-kochi/files/fonts.alias.kochi b/japanese/font-kochi/files/fonts.alias.kochi
deleted file mode 100644
index c76b99f58331..000000000000
--- a/japanese/font-kochi/files/fonts.alias.kochi
+++ /dev/null
@@ -1,100 +0,0 @@
--kochi-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--kochi-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--kochi-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-medium-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-mincho-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-mincho-bold-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-medium-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0208.1983-0 -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-jisx0201.1976-0 -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
--aliastt-gothic-bold-ro-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-o-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-ri-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-i-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
--aliastt-gothic-bold-r-normal--0-0-0-0-p-0-iso8859-1 -kochi-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-kochi/files/fonts.dir.kochi b/japanese/font-kochi/files/fonts.dir.kochi
deleted file mode 100644
index 2219573f503b..000000000000
--- a/japanese/font-kochi/files/fonts.dir.kochi
+++ /dev/null
@@ -1,61 +0,0 @@
-60
-kochi-mincho-subst.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:kochi-mincho-subst.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:kochi-mincho-subst.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:kochi-mincho-subst.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:kochi-mincho-subst.ttf -kochi-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:kochi-mincho-subst.ttf -kochi-mincho-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-mincho-subst.ttf -kochi-mincho-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-mincho-subst.ttf -kochi-mincho-bold-ro-normal--0-0-0-0-c-0-iso8859-1
-kochi-gothic-subst.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:kochi-gothic-subst.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0208.1983-0
-ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0208.1983-0
-bw=0.5:kochi-gothic-subst.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:kochi-gothic-subst.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-jisx0201.1976-0
-bw=0.5:kochi-gothic-subst.ttf -kochi-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-medium-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-medium-ro-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:kochi-gothic-subst.ttf -kochi-gothic-bold-r-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-i-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.15:kochi-gothic-subst.ttf -kochi-gothic-bold-o-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ri-normal--0-0-0-0-c-0-iso8859-1
-bw=0.5:ds=y:ai=0.08:kochi-gothic-subst.ttf -kochi-gothic-bold-ro-normal--0-0-0-0-c-0-iso8859-1
diff --git a/japanese/font-kochi/files/pkg-install.in b/japanese/font-kochi/files/pkg-install.in
new file mode 100644
index 000000000000..fd308536c8bd
--- /dev/null
+++ b/japanese/font-kochi/files/pkg-install.in
@@ -0,0 +1,94 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%/TrueType
+
+catfontsdir ()
+{
+    while read _IN
+    do
+      case "${_IN}" in
+      *-kochi-*|[0-9]*|"") ;;
+      *-aliastt-*|[0-9]*|"") ;;
+      *)       echo ${_IN} ;;
+      esac
+    done
+}
+
+ROMA=""
+BOLD="ds=y"
+ITAL="ai=0.15"
+OBLI="ai=0.15"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+	_enc=$1
+	_file=$2
+	_vendor=$3
+	_fname=$4
+	_poc=$5
+
+	case "${_poc}:${_enc}" in
+	p:jisx0201.1976-*)	PFIX="fp=y:bw=0.5" ;;
+	c:jisx0201.1976-*)	PFIX="fp=n:bw=0.5" ;;
+	p:*)			PFIX="fp=y" ;;
+	c:*)			PFIX="fp=n" ;;
+	esac
+
+	set --	"${ROMA}"	medium-r \
+		${BOLD}		bold-r \
+		${ITAL}		medium-i \
+		${ITAL}:${BOLD} bold-i \
+		${OBLI}		medium-o \
+		${OBLI}:${BOLD}	bold-o \
+		${RITA}		medium-ri \
+		${RITA}:${BOLD}	bold-ri \
+		${ROBL}		medium-ro \
+		${ROBL}:${BOLD}	bold-ro
+	while [ $# != 0 ]; do
+		_prefix="${PFIX}:$1"; shift
+		_variant=$1; shift
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+			$_prefix $_file $_vendor $_fname $_variant $_poc $_enc
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries ()
+{
+	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0
+	do
+		make_xlfd $ENC kochi-mincho-subst.ttf kochi mincho c
+		make_xlfd $ENC kochi-mincho-subst.ttf kochi mincho p
+		make_xlfd $ENC kochi-mincho-subst.ttf aliastt mincho c
+		make_xlfd $ENC kochi-mincho-subst.ttf aliastt mincho p
+		make_xlfd $ENC kochi-gothic-subst.ttf kochi gothic c
+		make_xlfd $ENC kochi-gothic-subst.ttf kochi gothic p
+		make_xlfd $ENC kochi-gothic-subst.ttf aliastt gothic c
+		make_xlfd $ENC kochi-gothic-subst.ttf aliastt gothic p
+	done
+}
+
+nfonts ()
+{
+    _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+case "$2" in
+POST-INSTALL)
+	cd ${X_FONTSDIR}
+	touch fonts.dir
+	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+	;;
+DEINSTALL)
+	cd ${X_FONTSDIR}
+	catfontsdir < fonts.dir > fonts.dir.tmp
+	nfonts < fonts.dir.tmp > fonts.dir
+	cat fonts.dir.tmp >> fonts.dir
+	rm -f fonts.dir.tmp
+	;;
+esac
diff --git a/japanese/font-kochi/pkg-deinstall b/japanese/font-kochi/pkg-deinstall
deleted file mode 100644
index 99d635d3157d..000000000000
--- a/japanese/font-kochi/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-cd ${FONTDIR}
-sed -e '/-kochi-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e '/^-kochi-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-rm -f fonts.dir.tmp
diff --git a/japanese/font-kochi/pkg-install b/japanese/font-kochi/pkg-install
deleted file mode 100644
index 538c16f26a35..000000000000
--- a/japanese/font-kochi/pkg-install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
-if [ "$2" = "PRE-INSTALL" ]; then
-  echo "Please add ${FONTDIR} to your /etc/XF86Config file"
-  exit 0
-fi
-cd ${FONTDIR}
-touch fonts.dir
-sed -e '/-kochi-/d' fonts.dir > fonts.dir.tmp
-numfonts=$(echo $(cat fonts.dir.tmp fonts.dir.kochi | wc -l) - 2 | bc)
-echo ${numfonts} > fonts.dir
-sed -e 1d fonts.dir.tmp >> fonts.dir
-sed -e 1d fonts.dir.kochi >> fonts.dir
-touch fonts.alias
-sed -e '/^-kochi-/d' -e '/^-aliastt-/d' fonts.alias > fonts.alias.tmp
-mv -f fonts.alias.tmp fonts.alias
-cat fonts.alias.kochi >> fonts.alias
-rm -f fonts.dir.tmp fonts.alias.tmp
diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist
index 4aea6e636dc1..ec6904176ab6 100644
--- a/japanese/font-kochi/pkg-plist
+++ b/japanese/font-kochi/pkg-plist
@@ -1,38 +1,20 @@
-%%FONTSDIR%%/fonts.alias.kochi
-%%FONTSDIR%%/fonts.dir.kochi
-%%FONTSDIR%%/kochi-mincho-subst.ttf
-%%FONTSDIR%%/kochi-gothic-subst.ttf
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/README.ja
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/COPYING
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/ayu20gothic/README.txt
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/BUGS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/Changelog
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/INSTALL
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/k14goth/THANKS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/kappa20/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/naga10/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/AUTHORS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/BUGS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/Changelog
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/THANKS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome12/TODO
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/AUTHORS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/BUGS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/Changelog
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/THANKS
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/shinonome16/TODO
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/wadalab/README
-%%PORTDOCS%%share/doc/ja/kochi-ttfonts/docs/wadalab/README.ja
-@dirrm share/doc/ja/kochi-ttfonts/docs/ayu20gothic
-@dirrm share/doc/ja/kochi-ttfonts/docs/k14goth
-@dirrm share/doc/ja/kochi-ttfonts/docs/kappa20
-@dirrm share/doc/ja/kochi-ttfonts/docs/naga10
-@dirrm share/doc/ja/kochi-ttfonts/docs/shinonome12
-@dirrm share/doc/ja/kochi-ttfonts/docs/shinonome16
-@dirrm share/doc/ja/kochi-ttfonts/docs/wadalab
-@dirrm share/doc/ja/kochi-ttfonts/docs
-@dirrm share/doc/ja/kochi-ttfonts
+@comment $FreeBSD$
+%%DATADIR%%/kochi-mincho-subst.ttf
+%%DATADIR%%/kochi-gothic-subst.ttf
+%%LOCAL_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
+%%LOCAL_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
+@dirrmtry %%LOCAL_FONTSDIR%%/TrueType
+@dirrmtry %%LOCAL_FONTSDIR%%
+etc/fonts/conf.avail/20-unhint-kochittfonts.conf
+etc/fonts/conf.avail/62-fonts-kochittfonts.conf
+@exec ln -s -f ../conf.avail/20-unhint-kochittfonts.conf %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
+@exec ln -s -f ../conf.avail/62-fonts-kochittfonts.conf %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/20-unhint-kochittfonts.conf
+@unexec rm -f %D/etc/fonts/conf.d/62-fonts-kochittfonts.conf
+%%X_FONTSDIR%%/TrueType/kochi-mincho-subst.ttf
+%%X_FONTSDIR%%/TrueType/kochi-gothic-subst.ttf
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true
+@unexec %%LOCALBASE%%/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 %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi