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, 27 insertions, 57 deletions

diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index ecd42f9e5a4f..fdf30f7a2618 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ume
 PORTVERSION=	0.0.470
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}-font/22212
@@ -11,22 +12,15 @@ DISTNAME=	umefont_${PORTVERSION:E}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Ume Japanese TrueType fonts
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		tar:xz
+USES=		fonts tar:xz
 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=	license.html
 
-LOCAL_FONTSDIR=	share/fonts
-X_FONTSDIR=	lib/X11/fonts
-
+FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
@@ -34,12 +28,9 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/*.ttf .
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -49,8 +40,6 @@ 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:
 	${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 56994519c7b0..b3c4b942061e 100644
--- a/japanese/font-ume/files/pkg-install.in
+++ b/japanese/font-ume/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/
 
 catfontsdir ()
 {
@@ -80,7 +80,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	touch fonts.dir
 	exec < fonts.dir; rm -f fonts.dir
 	(catfontsdir; addentries) > fonts.dir
@@ -90,7 +90,7 @@ POST-INSTALL)
 	chmod 0444 fonts.dir
 	;;
 DEINSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	exec < fonts.dir; rm -f fonts.dir
 	catfontsdir > fonts.dir
 	_num=`nfonts fonts.dir`
diff --git a/japanese/font-ume/pkg-plist b/japanese/font-ume/pkg-plist
index 49402940a565..63b4c42074fa 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -16,44 +16,25 @@
 %%DATADIR%%/ume-tms3.ttf
 %%DATADIR%%/ume-ugo4.ttf
 %%DATADIR%%/ume-ugo5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgc4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgc5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgo4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgo5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgs4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgs5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pmo3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pms3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgc4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgc5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgo4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgo5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgs4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgs5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tmo3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tms3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-ugo4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-ugo5.ttf
 etc/fonts/conf.avail/20-unhint-ume.conf
 etc/fonts/conf.avail/62-fonts-ume.conf
 etc/fonts/conf.d/20-unhint-ume.conf
 etc/fonts/conf.d/62-fonts-ume.conf
-%%X_FONTSDIR%%/TTF/ume-pgc4.ttf
-%%X_FONTSDIR%%/TTF/ume-pgc5.ttf
-%%X_FONTSDIR%%/TTF/ume-pgo4.ttf
-%%X_FONTSDIR%%/TTF/ume-pgo5.ttf
-%%X_FONTSDIR%%/TTF/ume-pgs4.ttf
-%%X_FONTSDIR%%/TTF/ume-pgs5.ttf
-%%X_FONTSDIR%%/TTF/ume-pmo3.ttf
-%%X_FONTSDIR%%/TTF/ume-pms3.ttf
-%%X_FONTSDIR%%/TTF/ume-tgc4.ttf
-%%X_FONTSDIR%%/TTF/ume-tgc5.ttf
-%%X_FONTSDIR%%/TTF/ume-tgo4.ttf
-%%X_FONTSDIR%%/TTF/ume-tgo5.ttf
-%%X_FONTSDIR%%/TTF/ume-tgs4.ttf
-%%X_FONTSDIR%%/TTF/ume-tgs5.ttf
-%%X_FONTSDIR%%/TTF/ume-tmo3.ttf
-%%X_FONTSDIR%%/TTF/ume-tms3.ttf
-%%X_FONTSDIR%%/TTF/ume-ugo4.ttf
-%%X_FONTSDIR%%/TTF/ume-ugo5.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/ume-pgc4.ttf
+%%FONTSDIR%%/ume-pgc5.ttf
+%%FONTSDIR%%/ume-pgo4.ttf
+%%FONTSDIR%%/ume-pgo5.ttf
+%%FONTSDIR%%/ume-pgs4.ttf
+%%FONTSDIR%%/ume-pgs5.ttf
+%%FONTSDIR%%/ume-pmo3.ttf
+%%FONTSDIR%%/ume-pms3.ttf
+%%FONTSDIR%%/ume-tgc4.ttf
+%%FONTSDIR%%/ume-tgc5.ttf
+%%FONTSDIR%%/ume-tgo4.ttf
+%%FONTSDIR%%/ume-tgo5.ttf
+%%FONTSDIR%%/ume-tgs4.ttf
+%%FONTSDIR%%/ume-tgs5.ttf
+%%FONTSDIR%%/ume-tmo3.ttf
+%%FONTSDIR%%/ume-tms3.ttf
+%%FONTSDIR%%/ume-ugo4.ttf
+%%FONTSDIR%%/ume-ugo5.ttf