Make fonts repecting XDG

Xorg is now looking in ${LOCALBASE}/share/fonts by default
Xorg now accepts symlinks in etc/X11/fontpath.d (as decribed in Xserver(1))
Large cleanup on lots of font ports
All fonts are now properly dynamically generating fonts.dir and fonts.scale
instead of sometime overwriting existing ones)
All fonts are generating fontconfig's cache
Improve consistency in fonts ports

3 files changed, 13 insertions, 36 deletions

diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index 06c53237919f..1fc684fd1d30 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=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.geocities.jp/ipa_mona/
 PKGNAMEPREFIX=	ja-font-
@@ -11,34 +11,22 @@ DISTNAME=	opfc-ModuleHP-1.1.1_withIPAMonaFonts-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPA Japanese TrueType fonts with Mona font
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
+USES=		fonts
 NO_BUILD=	yes
 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=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	COPYING.font.ja README_ipamona.txt
 
-LOCAL_FONTSDIR=	share/fonts
-X_FONTSDIR=	lib/X11/fonts
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/ipa*-mona.ttf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/ipa*-mona.ttf .
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/fonts/ipa*-mona.ttf .
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -48,11 +36,7 @@ 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
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/font-mona-ipa/files/pkg-install.in b/japanese/font-mona-ipa/files/pkg-install.in
index 5f102b6d383a..e59d67675c5c 100644
--- a/japanese/font-mona-ipa/files/pkg-install.in
+++ b/japanese/font-mona-ipa/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
 
 catfontsdir ()
 {
@@ -75,7 +75,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -83,7 +83,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
@@ -91,6 +91,5 @@ POST-DEINSTALL)
 	if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
 		rm -f fonts.dir
 	fi
-	rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
 	;;
 esac
diff --git a/japanese/font-mona-ipa/pkg-plist b/japanese/font-mona-ipa/pkg-plist
index 00284b2cfedf..06b92e07901d 100644
--- a/japanese/font-mona-ipa/pkg-plist
+++ b/japanese/font-mona-ipa/pkg-plist
@@ -67,18 +67,12 @@
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/COPYING
 %%DATADIR%%/AUTHORS
-%%LOCAL_FONTSDIR%%/TTF/ipag-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipagp-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipagui-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipam-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipamp-mona.ttf
 etc/fonts/conf.avail/20-unhint-mona-ipa.conf
 etc/fonts/conf.avail/62-fonts-mona-ipa.conf
 etc/fonts/conf.d/20-unhint-mona-ipa.conf
 etc/fonts/conf.d/62-fonts-mona-ipa.conf
-%%X_FONTSDIR%%/TTF/ipag-mona.ttf
-%%X_FONTSDIR%%/TTF/ipagp-mona.ttf
-%%X_FONTSDIR%%/TTF/ipagui-mona.ttf
-%%X_FONTSDIR%%/TTF/ipam-mona.ttf
-%%X_FONTSDIR%%/TTF/ipamp-mona.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/ipag-mona.ttf
+%%FONTSDIR%%/ipagp-mona.ttf
+%%FONTSDIR%%/ipagui-mona.ttf
+%%FONTSDIR%%/ipam-mona.ttf
+%%FONTSDIR%%/ipamp-mona.ttf