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, 17 insertions, 41 deletions

diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index 6baac0add243..c3525e3b79fd 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	migu
 PORTVERSION=	1.0.20130617
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	mix-mplus-ipa/59022
@@ -15,27 +15,18 @@ DISTFILES=	${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Another Japanese font set based on MigMix
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		zip
+USES=		fonts zip
 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=	IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
 		migu-README.txt
 
-LOCAL_FONTSDIR=	share/fonts
-X_FONTSDIR=	lib/X11/fonts
-
+FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	cd ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/ && \
 	    ${INSTALL_DATA} ipag00303/*.txt \
@@ -48,12 +39,9 @@ do-install:
 	    ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \
 	    ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \
 	    ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migu*.ttf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migu*.ttf .
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/migu*.ttf .
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -63,9 +51,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}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/font-migu/files/pkg-install.in b/japanese/font-migu/files/pkg-install.in
index 7477afe172fd..ae869ef1ae90 100644
--- a/japanese/font-migu/files/pkg-install.in
+++ b/japanese/font-migu/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
 
 catfontsdir ()
 {
@@ -91,7 +91,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
@@ -99,7 +99,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
@@ -107,6 +107,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-migu/pkg-plist b/japanese/font-migu/pkg-plist
index 748413ae2f57..03844e27533f 100644
--- a/japanese/font-migu/pkg-plist
+++ b/japanese/font-migu/pkg-plist
@@ -6,24 +6,15 @@
 %%DATADIR%%/migu-1m-regular.ttf
 %%DATADIR%%/migu-2m-bold.ttf
 %%DATADIR%%/migu-2m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1c-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1c-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1p-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1p-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1m-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-2m-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-2m-regular.ttf
 etc/fonts/conf.avail/20-unhint-migu.conf
 etc/fonts/conf.avail/62-fonts-migu.conf
 etc/fonts/conf.d/20-unhint-migu.conf
 etc/fonts/conf.d/62-fonts-migu.conf
-%%X_FONTSDIR%%/TTF/migu-1c-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1c-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-1p-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1p-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-1m-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1m-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-2m-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-2m-regular.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/migu-1c-bold.ttf
+%%FONTSDIR%%/migu-1c-regular.ttf
+%%FONTSDIR%%/migu-1p-bold.ttf
+%%FONTSDIR%%/migu-1p-regular.ttf
+%%FONTSDIR%%/migu-1m-bold.ttf
+%%FONTSDIR%%/migu-1m-regular.ttf
+%%FONTSDIR%%/migu-2m-bold.ttf
+%%FONTSDIR%%/migu-2m-regular.ttf