Fix fonts.dir by using fonts:fc and style consistency.

30 files changed, 91 insertions, 103 deletions

diff --git a/japanese/font-ipa-uigothic/Makefile b/japanese/font-ipa-uigothic/Makefile
index cb424ebce4f7..ceb45a37a0f9 100644
--- a/japanese/font-ipa-uigothic/Makefile
+++ b/japanese/font-ipa-uigothic/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ipa-uigothic
 PORTVERSION=	00203
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/old/
 PKGNAMEPREFIX=	ja-font-
@@ -15,7 +15,8 @@ COMMENT=	IPA Japanese fonts, UIGothic
 CONFLICTS=	ja-font-mplus-ipa-1.0.20060520.p1 \
 		ja-ipa-ttfonts-[0-9]*
 
-USES=		fonts zip
+USES=		fonts:fc zip
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -24,7 +25,6 @@ DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	enduser_license.txt \
 		Readme${PORTVERSION}.txt
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 00ff2a0c6bad..8348f3b1ae31 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ipa
 PORTVERSION=	00303
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/
 PKGNAMEPREFIX=	ja-font-
@@ -13,7 +13,8 @@ COMMENT=	IPA Japanese fonts
 
 CONFLICTS=	ja-ipa-ttfonts-[0-9]*
 
-USES=		fonts zip
+USES=		fonts:fc zip
+FONTNAME=	OTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -22,7 +23,6 @@ DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt \
 		Readme_IPAfont${PORTVERSION}.txt
 
-FONTNAME=	OTF
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
diff --git a/japanese/font-ipaex/Makefile b/japanese/font-ipaex/Makefile
index 0bf6991d6cc2..0fff65192c20 100644
--- a/japanese/font-ipaex/Makefile
+++ b/japanese/font-ipaex/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ipaex
 PORTVERSION=	00201
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/7bf84182a04a9632268dbcb03f100d05/
 PKGNAMEPREFIX=	ja-font-
@@ -11,9 +11,8 @@ DISTNAME=	IPAexfont${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPAex Japanese fonts
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		fonts zip
+USES=		fonts:fc zip
+FONTNAME=	OTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -22,7 +21,6 @@ PLIST_SUB=	FONTSDIR=${FONTSDIR}
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt \
 		Readme_IPAexfont${PORTVERSION}.txt
-FONTNAME=	OTF
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/japanese/font-ipaex/files/pkg-install.in b/japanese/font-ipaex/files/pkg-install.in
index 051a9a370f04..b8b4ba47d894 100644
--- a/japanese/font-ipaex/files/pkg-install.in
+++ b/japanese/font-ipaex/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 catfontsdir ()
 {
     while read _IN
diff --git a/japanese/font-ipamjm/Makefile b/japanese/font-ipamjm/Makefile
index abdbdda8186b..57d0dc470261 100644
--- a/japanese/font-ipamjm/Makefile
+++ b/japanese/font-ipamjm/Makefile
@@ -16,14 +16,14 @@ LICENSE_NAME=	IPA Font License Agreement v1.0
 LICENSE_FILE=	${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		fonts zip
+USES=		fonts:fc zip
+FONTNAME=	OTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	Readme_${PORTNAME}003.01.txt
-FONTNAME=	OTF
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index 9cb66f31532c..50e7bb0bbeaf 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kochi
 PORTVERSION=	20030809
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/efont/5411/
 PKGNAMEPREFIX=	ja-font-
@@ -12,16 +12,14 @@ DISTNAME=	${PORTNAME}-substitute-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Kochi Japanese TrueType font
 
-USES=		fonts tar:bzip2
+USES=		fonts:fc tar:bzip2
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PLIST_SUB=	DATADIR=share/font-${PORTNAME}
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-FONTNAME=	TTF
 PORTDOCS=	README.ja COPYING docs
 
 OPTIONS_DEFINE=	DOCS
diff --git a/japanese/font-kochi/files/pkg-install.in b/japanese/font-kochi/files/pkg-install.in
index c4d37ceb0aff..65e12153c75a 100644
--- a/japanese/font-kochi/files/pkg-install.in
+++ b/japanese/font-kochi/files/pkg-install.in
@@ -6,7 +6,7 @@ catfontsdir ()
     while read _IN
     do
       case "${_IN}" in
-      *-kochi-*|[0-9]*|"") ;;
+      kochi-*|*-kochi-*|[0-9]*|"") ;;
       *-aliastt-*|[0-9]*|"") ;;
       *)       echo ${_IN} ;;
       esac
diff --git a/japanese/font-koruri/Makefile b/japanese/font-koruri/Makefile
index 6ba6e3661159..e59260231ed2 100644
--- a/japanese/font-koruri/Makefile
+++ b/japanese/font-koruri/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	koruri
 PORTVERSION=	20150701
 DISTVERSIONPREFIX=	Koruri-
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	Koruri-${PORTVERSION}
@@ -14,7 +14,8 @@ COMMENT=	Koruri Japanese TrueType fonts
 
 LICENSE=	APACHE20
 
-USES=		fonts tar:xz
+USES=		fonts:fc tar:xz
+FONTNAME=	TTF
 USE_GITHUB=	yes
 GH_ACCOUNT=	Koruri
 GH_PROJECT=	Koruri
@@ -26,7 +27,6 @@ SUB_FILES=	pkg-install
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	README.md
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -44,6 +44,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
diff --git a/japanese/font-koruri/files/pkg-install.in b/japanese/font-koruri/files/pkg-install.in
index c0d4bb5b18aa..e33b77fd2bc8 100644
--- a/japanese/font-koruri/files/pkg-install.in
+++ b/japanese/font-koruri/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 catfontsdir ()
 {
     while read _IN
@@ -78,7 +76,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -86,7 +84,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-marumoji/Makefile b/japanese/font-marumoji/Makefile
index 97d0081d87ba..58a2b27ab3c7 100644
--- a/japanese/font-marumoji/Makefile
+++ b/japanese/font-marumoji/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	marumoji
 PORTVERSION=	1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs/${PORTNAME}
 PKGNAMEPREFIX=	ja-font-
@@ -17,7 +17,7 @@ LICENSE_FILES=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
 		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
-USES=		fonts
+USES=		fonts:fc
 FONTNAME=	marumoji
 MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
 SUB_FILES=	Makefile pkg-install
diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 3f596e533c2d..088827581f61 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	migmix
 PORTVERSION=	1.0.20130617
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/mix-mplus-ipa/59021
 PKGNAMEPREFIX=	ja-font-
@@ -14,7 +14,8 @@ DISTFILES=	${PORTNAME}-1m-${PORTVERSION:E}${EXTRACT_SUFX} \
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mixed Japanese font with IPA Gothic and M-plus outline
 
-USES=		fonts zip
+USES=		fonts:fc zip
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -23,7 +24,6 @@ DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
 		migmix-README.txt
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -50,6 +50,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-migmix/files/pkg-install.in b/japanese/font-migmix/files/pkg-install.in
index 48de6510ecfd..1ab8ce905b8f 100644
--- a/japanese/font-migmix/files/pkg-install.in
+++ b/japanese/font-migmix/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/TTF
-
 catfontsdir ()
 {
     while read _IN
@@ -89,7 +87,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -97,7 +95,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index 82cda56a26e6..911ce8cc7f09 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	migu
 PORTVERSION=	1.0.20130617
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/mix-mplus-ipa/59022
 PKGNAMEPREFIX=	ja-font-
@@ -14,7 +14,8 @@ DISTFILES=	${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Another Japanese font set based on MigMix
 
-USES=		fonts zip
+USES=		fonts:fc zip
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -23,7 +24,6 @@ DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
 		migu-README.txt
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -50,6 +50,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-migu/files/pkg-install.in b/japanese/font-migu/files/pkg-install.in
index ae869ef1ae90..c3302578de9c 100644
--- a/japanese/font-migu/files/pkg-install.in
+++ b/japanese/font-migu/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/TTF
-
 catfontsdir ()
 {
     while read _IN
@@ -91,7 +89,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -99,7 +97,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index 0ffbd9952d8e..dc40d70ca78d 100644
--- a/japanese/font-mona-ipa/Makefile
+++ b/japanese/font-mona-ipa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mona-ipa
 PORTVERSION=	1.0.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.geocities.jp/ipa_mona/
 PKGNAMEPREFIX=	ja-font-
@@ -11,7 +11,8 @@ DISTNAME=	opfc-ModuleHP-1.1.1_withIPAMonaFonts-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPA Japanese TrueType fonts with Mona font
 
-USES=		fonts
+USES=		fonts:fc
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
diff --git a/japanese/font-mona-ipa/files/pkg-install.in b/japanese/font-mona-ipa/files/pkg-install.in
index a0d647a5cc16..3b692cd8e3ec 100644
--- a/japanese/font-mona-ipa/files/pkg-install.in
+++ b/japanese/font-mona-ipa/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 catfontsdir ()
 {
     while read _IN
@@ -75,7 +73,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -83,7 +81,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-motoya-al/Makefile b/japanese/font-motoya-al/Makefile
index 32d9a6cdf929..b589777ad962 100644
--- a/japanese/font-motoya-al/Makefile
+++ b/japanese/font-motoya-al/Makefile
@@ -1,23 +1,24 @@
 # $FreeBSD$
 
-PORTNAME=	font-motoya-al
+PORTNAME=	motoya-al
 PORTVERSION=	0.0.20100921
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
-DISTNAME=	motoya-al-fonts-${PORTVERSION:S,^0.0.,,}
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	${PORTNAME}-fonts-${PORTVERSION:S,^0.0.,,}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Free Japanese fonts by MOTOYA
 
-USES=	fonts tar:bzip2
+USES=		fonts:fc tar:bzip2
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 PORTDOCS=	newsrelease20100921.pdf
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -35,6 +36,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf
 	${LN} -s -f ../conf.avail/62-fonts-motoya-al.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-motoya-al/files/pkg-install.in b/japanese/font-motoya-al/files/pkg-install.in
index a4e47a941d82..139f89f8583e 100644
--- a/japanese/font-motoya-al/files/pkg-install.in
+++ b/japanese/font-motoya-al/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 catfontsdir ()
 {
     while read _IN
@@ -76,7 +74,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +82,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 6b4b9e927cb8..36ca5fc9c75f 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mplus-ipa
 PORTVERSION=	1.0.20060520.p1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
@@ -13,7 +13,8 @@ COMMENT=	Mixed Japanese font with IPA, M-plus outline, and Bitstream Vera
 
 CONFLICTS=	ja-ipa-ttfonts-[0-9]*
 
-USES=	fonts tar:bzip2
+USES=		fonts:fc tar:bzip2
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -22,7 +23,6 @@ DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
 		Mplus-LICENSE_J.txt README.txt
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -41,6 +41,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index 55787236c51a..f3e90598333f 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/
-
 catfontsdir ()
 {
     while read _IN
@@ -74,7 +72,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -82,7 +80,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-ricty/Makefile b/japanese/font-ricty/Makefile
index d000ed842014..700e3e6fcab8 100644
--- a/japanese/font-ricty/Makefile
+++ b/japanese/font-ricty/Makefile
@@ -3,20 +3,19 @@
 
 PORTNAME=	ricty
 PORTVERSION=	3.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER?=	meta+ports@vmeta.jp
 COMMENT?=	Ricty - fonts for programming
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/inconsolata/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \
 		${LOCALBASE}/share/fonts/TTF/migu-1m-regular.ttf:${PORTSDIR}/japanese/font-migu \
 		${LOCALBASE}/share/fonts/TTF/migu-1m-bold.ttf:${PORTSDIR}/japanese/font-migu \
 		fontforge:${PORTSDIR}/print/fontforge
 
-USES=		fonts
+USES=		fonts:fc
 USE_GITHUB=	yes
 GH_ACCOUNT=	yascentur
 GH_PROJECT=	Ricty
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index f20e71263545..7b962468edf1 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sazanami
 PORTVERSION=	20040629
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/efont/10087
 PKGNAMEPREFIX=	ja-font-
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	ja-font-
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Sazanami Japanese TrueType fonts
 
-USES=		fonts tar:bzip2
+USES=		fonts:fc tar:bzip2
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -18,7 +19,6 @@ SUB_FILES=	pkg-install
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	README doc
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -36,7 +36,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-post-install:
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-sazanami/files/pkg-install.in b/japanese/font-sazanami/files/pkg-install.in
index cfc2a9f0ab0f..5d3a7c2b3be0 100644
--- a/japanese/font-sazanami/files/pkg-install.in
+++ b/japanese/font-sazanami/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/
-
 catfontsdir ()
 {
     while read _IN
@@ -73,7 +71,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -81,7 +79,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index cc3140fd2c70..7bf463c3ee75 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Shinonome Japanese fonts, 12/14/16 dots
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
 USES=		fonts tar:bzip2
+FONTNAME=	misc
 WRKSRC=		${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 SUB_FILES=	pkg-install
@@ -44,7 +45,6 @@ FONTNAMES=\
 	shnmk16      shnmk16b     shnmk16i     shnmk16bi     \
 	shnmk16min   shnmk16minb  shnmk16mini  shnmk16minbi
 
-FONTNAME=	misc
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index 7b41d540028d..8bcb8968d9bf 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	takao
 PORTVERSION=	003.02.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://launchpadlibrarian.net/40218948/
 PKGNAMEPREFIX=	ja-font-
@@ -11,7 +11,8 @@ DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Improved IPA Japanese fonts
 
-USES=		fonts
+USES=		fonts:fc
+FONTNAME=	OTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -22,11 +23,8 @@ PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt \
 		README.ja \
 		ChangeLog
 
-FONTNAME=	OTF
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
 
@@ -45,6 +43,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-takao/files/pkg-install.in b/japanese/font-takao/files/pkg-install.in
index bd7c7c5d592b..e0136dd8b480 100644
--- a/japanese/font-takao/files/pkg-install.in
+++ b/japanese/font-takao/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 catfontsdir ()
 {
     while read _IN
@@ -76,7 +74,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +82,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index ce17b469591f..deb82db93c59 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ume
 PORTVERSION=	0.0.470
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SOURCEFORGE_JP/${PORTNAME}-font/22212
 PKGNAMEPREFIX=	ja-font-
@@ -11,7 +11,8 @@ DISTNAME=	umefont_${PORTVERSION:E}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Ume Japanese TrueType fonts
 
-USES=		fonts tar:xz
+USES=		fonts:fc tar:xz
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -19,11 +20,8 @@ SUB_FILES=	pkg-install
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	license.html
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
@@ -39,6 +37,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-ume/files/pkg-install.in b/japanese/font-ume/files/pkg-install.in
index b3c4b942061e..24562c0807fc 100644
--- a/japanese/font-ume/files/pkg-install.in
+++ b/japanese/font-ume/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/
-
 catfontsdir ()
 {
     while read _IN
@@ -80,7 +78,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	exec < fonts.dir; rm -f fonts.dir
 	(catfontsdir; addentries) > fonts.dir
@@ -90,7 +88,7 @@ POST-INSTALL)
 	chmod 0444 fonts.dir
 	;;
 DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	exec < fonts.dir; rm -f fonts.dir
 	catfontsdir > fonts.dir
 	_num=`nfonts fonts.dir`
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index 32b027d21ab0..106e214dff2a 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlgothic
 PORTVERSION=	20141206
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/vlgothic/62375
 PKGNAMEPREFIX=	ja-font-
@@ -12,7 +12,8 @@ DISTNAME=	VLGothic-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	VLGothic Japanese TrueType fonts
 
-USES=		fonts tar:xz
+USES=		fonts:fc tar:xz
+FONTNAME=	TTF
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -22,7 +23,6 @@ PORTDOCS=	Changelog LICENSE LICENSE.en LICENSE_E.mplus LICENSE_J.mplus \
 		README README.sazanami README_J.mplus
 WRKSRC=		${WRKDIR}/VLGothic
 
-FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 do-install:
@@ -40,6 +40,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/japanese/font-vlgothic/files/pkg-install.in b/japanese/font-vlgothic/files/pkg-install.in
index e7903675a690..ac9b43e5532a 100644
--- a/japanese/font-vlgothic/files/pkg-install.in
+++ b/japanese/font-vlgothic/files/pkg-install.in
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/TTF
-
 catfontsdir ()
 {
     while read _IN
@@ -72,7 +70,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -80,7 +78,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir