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

4 files changed, 130 insertions, 133 deletions

diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile
index a8cdcd0799c6..3e2e2261b0df 100644
--- a/hebrew/culmus/Makefile
+++ b/hebrew/culmus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	culmus
 PORTVERSION=	0.130
+PORTREVISION=	1
 CATEGORIES=	hebrew
 MASTER_SITES=	SF
 
@@ -12,24 +13,20 @@ COMMENT=	Free Hebrew Type1 fonts
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
+USES=	fonts
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique YehudaCLM-Bold YehudaCLM-Light
-		${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
-		${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
+		${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${STAGEDIR}${FONTSDIR}
+		${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${STAGEDIR}${FONTSDIR}
 .endfor
 .for filename in DavidCLM-Bold DavidCLM-BoldItalic DavidCLM-Medium DavidCLM-MediumItalic FrankRuehlCLM-Bold FrankRuehlCLM-BoldOblique FrankRuehlCLM-Medium FrankRuehlCLM-MediumOblique HadasimCLM-Bold HadasimCLM-BoldOblique HadasimCLM-Regular HadasimCLM-RegularOblique KeterYG-Bold KeterYG-BoldOblique KeterYG-Medium KeterYG-MediumOblique MiriamCLM-Bold MiriamCLM-Book MiriamMonoCLM-Bold MiriamMonoCLM-BoldOblique MiriamMonoCLM-Book MiriamMonoCLM-BookOblique ShofarDemi-Bold ShofarDemi-BoldOblique ShofarRegular ShofarRegularOblique SimpleCLM-Bold SimpleCLM-BoldOblique SimpleCLM-Medium SimpleCLM-MediumOblique StamAshkenazCLM StamSefaradCLM
-		${INSTALL_DATA} ${WRKSRC}/${filename}.ttf ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
+		${INSTALL_DATA} ${WRKSRC}/${filename}.ttf ${STAGEDIR}${FONTSDIR}
 .endfor
 
-	@cd ${WRKSRC}; ${PREFIX}/bin/mkfontscale; ${PREFIX}/bin/mkfontdir
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale-* ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
-
 .include <bsd.port.mk>
diff --git a/hebrew/culmus/pkg-plist b/hebrew/culmus/pkg-plist
index 3564c0c4f98c..c145c931d6ec 100644
--- a/hebrew/culmus/pkg-plist
+++ b/hebrew/culmus/pkg-plist
@@ -1,68 +1,66 @@
-lib/X11/fonts/culmus/AharoniCLM-Bold.pfa
-lib/X11/fonts/culmus/AharoniCLM-Bold.afm
-lib/X11/fonts/culmus/AharoniCLM-BoldOblique.pfa
-lib/X11/fonts/culmus/AharoniCLM-BoldOblique.afm
-lib/X11/fonts/culmus/AharoniCLM-Book.pfa
-lib/X11/fonts/culmus/AharoniCLM-Book.afm
-lib/X11/fonts/culmus/AharoniCLM-BookOblique.pfa
-lib/X11/fonts/culmus/AharoniCLM-BookOblique.afm
-lib/X11/fonts/culmus/CaladingsCLM.pfa
-lib/X11/fonts/culmus/CaladingsCLM.afm
-lib/X11/fonts/culmus/DavidCLM-Bold.ttf
-lib/X11/fonts/culmus/DavidCLM-BoldItalic.ttf
-lib/X11/fonts/culmus/DavidCLM-Medium.ttf
-lib/X11/fonts/culmus/DavidCLM-MediumItalic.ttf
-lib/X11/fonts/culmus/DrugulinCLM-Bold.pfa
-lib/X11/fonts/culmus/DrugulinCLM-Bold.afm
-lib/X11/fonts/culmus/DrugulinCLM-BoldItalic.pfa
-lib/X11/fonts/culmus/DrugulinCLM-BoldItalic.afm
-lib/X11/fonts/culmus/ElliniaCLM-Bold.pfa
-lib/X11/fonts/culmus/ElliniaCLM-Bold.afm
-lib/X11/fonts/culmus/ElliniaCLM-BoldItalic.pfa
-lib/X11/fonts/culmus/ElliniaCLM-BoldItalic.afm
-lib/X11/fonts/culmus/ElliniaCLM-Light.pfa
-lib/X11/fonts/culmus/ElliniaCLM-Light.afm
-lib/X11/fonts/culmus/ElliniaCLM-LightItalic.pfa
-lib/X11/fonts/culmus/ElliniaCLM-LightItalic.afm
-lib/X11/fonts/culmus/FrankRuehlCLM-Bold.ttf
-lib/X11/fonts/culmus/FrankRuehlCLM-BoldOblique.ttf
-lib/X11/fonts/culmus/FrankRuehlCLM-Medium.ttf
-lib/X11/fonts/culmus/FrankRuehlCLM-MediumOblique.ttf
-lib/X11/fonts/culmus/HadasimCLM-Bold.ttf
-lib/X11/fonts/culmus/HadasimCLM-BoldOblique.ttf
-lib/X11/fonts/culmus/HadasimCLM-Regular.ttf
-lib/X11/fonts/culmus/HadasimCLM-RegularOblique.ttf
-lib/X11/fonts/culmus/KeterYG-Bold.ttf
-lib/X11/fonts/culmus/KeterYG-BoldOblique.ttf
-lib/X11/fonts/culmus/KeterYG-Medium.ttf
-lib/X11/fonts/culmus/KeterYG-MediumOblique.ttf
-lib/X11/fonts/culmus/MiriamCLM-Bold.ttf
-lib/X11/fonts/culmus/MiriamCLM-Book.ttf
-lib/X11/fonts/culmus/MiriamMonoCLM-Bold.ttf
-lib/X11/fonts/culmus/MiriamMonoCLM-BoldOblique.ttf
-lib/X11/fonts/culmus/MiriamMonoCLM-Book.ttf
-lib/X11/fonts/culmus/MiriamMonoCLM-BookOblique.ttf
-lib/X11/fonts/culmus/NachlieliCLM-Bold.pfa
-lib/X11/fonts/culmus/NachlieliCLM-Bold.afm
-lib/X11/fonts/culmus/NachlieliCLM-BoldOblique.pfa
-lib/X11/fonts/culmus/NachlieliCLM-BoldOblique.afm
-lib/X11/fonts/culmus/NachlieliCLM-Light.pfa
-lib/X11/fonts/culmus/NachlieliCLM-Light.afm
-lib/X11/fonts/culmus/NachlieliCLM-LightOblique.pfa
-lib/X11/fonts/culmus/NachlieliCLM-LightOblique.afm
-lib/X11/fonts/culmus/ShofarDemi-Bold.ttf
-lib/X11/fonts/culmus/ShofarDemi-BoldOblique.ttf
-lib/X11/fonts/culmus/ShofarRegular.ttf
-lib/X11/fonts/culmus/ShofarRegularOblique.ttf
-lib/X11/fonts/culmus/SimpleCLM-Bold.ttf
-lib/X11/fonts/culmus/SimpleCLM-BoldOblique.ttf
-lib/X11/fonts/culmus/SimpleCLM-Medium.ttf
-lib/X11/fonts/culmus/SimpleCLM-MediumOblique.ttf
-lib/X11/fonts/culmus/StamAshkenazCLM.ttf
-lib/X11/fonts/culmus/StamSefaradCLM.ttf
-lib/X11/fonts/culmus/YehudaCLM-Bold.pfa
-lib/X11/fonts/culmus/YehudaCLM-Bold.afm
-lib/X11/fonts/culmus/YehudaCLM-Light.pfa
-lib/X11/fonts/culmus/YehudaCLM-Light.afm
-lib/X11/fonts/culmus/fonts.scale-ttf
-lib/X11/fonts/culmus/fonts.scale-type1
+%%FONTSDIR%%/AharoniCLM-Bold.pfa
+%%FONTSDIR%%/AharoniCLM-Bold.afm
+%%FONTSDIR%%/AharoniCLM-BoldOblique.pfa
+%%FONTSDIR%%/AharoniCLM-BoldOblique.afm
+%%FONTSDIR%%/AharoniCLM-Book.pfa
+%%FONTSDIR%%/AharoniCLM-Book.afm
+%%FONTSDIR%%/AharoniCLM-BookOblique.pfa
+%%FONTSDIR%%/AharoniCLM-BookOblique.afm
+%%FONTSDIR%%/CaladingsCLM.pfa
+%%FONTSDIR%%/CaladingsCLM.afm
+%%FONTSDIR%%/DavidCLM-Bold.ttf
+%%FONTSDIR%%/DavidCLM-BoldItalic.ttf
+%%FONTSDIR%%/DavidCLM-Medium.ttf
+%%FONTSDIR%%/DavidCLM-MediumItalic.ttf
+%%FONTSDIR%%/DrugulinCLM-Bold.pfa
+%%FONTSDIR%%/DrugulinCLM-Bold.afm
+%%FONTSDIR%%/DrugulinCLM-BoldItalic.pfa
+%%FONTSDIR%%/DrugulinCLM-BoldItalic.afm
+%%FONTSDIR%%/ElliniaCLM-Bold.pfa
+%%FONTSDIR%%/ElliniaCLM-Bold.afm
+%%FONTSDIR%%/ElliniaCLM-BoldItalic.pfa
+%%FONTSDIR%%/ElliniaCLM-BoldItalic.afm
+%%FONTSDIR%%/ElliniaCLM-Light.pfa
+%%FONTSDIR%%/ElliniaCLM-Light.afm
+%%FONTSDIR%%/ElliniaCLM-LightItalic.pfa
+%%FONTSDIR%%/ElliniaCLM-LightItalic.afm
+%%FONTSDIR%%/FrankRuehlCLM-Bold.ttf
+%%FONTSDIR%%/FrankRuehlCLM-BoldOblique.ttf
+%%FONTSDIR%%/FrankRuehlCLM-Medium.ttf
+%%FONTSDIR%%/FrankRuehlCLM-MediumOblique.ttf
+%%FONTSDIR%%/HadasimCLM-Bold.ttf
+%%FONTSDIR%%/HadasimCLM-BoldOblique.ttf
+%%FONTSDIR%%/HadasimCLM-Regular.ttf
+%%FONTSDIR%%/HadasimCLM-RegularOblique.ttf
+%%FONTSDIR%%/KeterYG-Bold.ttf
+%%FONTSDIR%%/KeterYG-BoldOblique.ttf
+%%FONTSDIR%%/KeterYG-Medium.ttf
+%%FONTSDIR%%/KeterYG-MediumOblique.ttf
+%%FONTSDIR%%/MiriamCLM-Bold.ttf
+%%FONTSDIR%%/MiriamCLM-Book.ttf
+%%FONTSDIR%%/MiriamMonoCLM-Bold.ttf
+%%FONTSDIR%%/MiriamMonoCLM-BoldOblique.ttf
+%%FONTSDIR%%/MiriamMonoCLM-Book.ttf
+%%FONTSDIR%%/MiriamMonoCLM-BookOblique.ttf
+%%FONTSDIR%%/NachlieliCLM-Bold.pfa
+%%FONTSDIR%%/NachlieliCLM-Bold.afm
+%%FONTSDIR%%/NachlieliCLM-BoldOblique.pfa
+%%FONTSDIR%%/NachlieliCLM-BoldOblique.afm
+%%FONTSDIR%%/NachlieliCLM-Light.pfa
+%%FONTSDIR%%/NachlieliCLM-Light.afm
+%%FONTSDIR%%/NachlieliCLM-LightOblique.pfa
+%%FONTSDIR%%/NachlieliCLM-LightOblique.afm
+%%FONTSDIR%%/ShofarDemi-Bold.ttf
+%%FONTSDIR%%/ShofarDemi-BoldOblique.ttf
+%%FONTSDIR%%/ShofarRegular.ttf
+%%FONTSDIR%%/ShofarRegularOblique.ttf
+%%FONTSDIR%%/SimpleCLM-Bold.ttf
+%%FONTSDIR%%/SimpleCLM-BoldOblique.ttf
+%%FONTSDIR%%/SimpleCLM-Medium.ttf
+%%FONTSDIR%%/SimpleCLM-MediumOblique.ttf
+%%FONTSDIR%%/StamAshkenazCLM.ttf
+%%FONTSDIR%%/StamSefaradCLM.ttf
+%%FONTSDIR%%/YehudaCLM-Bold.pfa
+%%FONTSDIR%%/YehudaCLM-Bold.afm
+%%FONTSDIR%%/YehudaCLM-Light.pfa
+%%FONTSDIR%%/YehudaCLM-Light.afm
diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile
index f19d2c6c048b..3bfcc7fa0dc2 100644
--- a/hebrew/elmar-fonts/Makefile
+++ b/hebrew/elmar-fonts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elmar-fonts
 PORTVERSION=	3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	hebrew x11-fonts
 DISTNAME=	H.fonts
 EXTRACT_SUFX=	.tar.Z
@@ -11,12 +11,14 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	cpm@fbsd.es
 COMMENT=	Collection of Hebrew fonts from El-Mar software Ltd
 
+USES=		fonts
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+FONTNAME=	hebrew
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/hebrew
-	${TAR} -C ${STAGEDIR}${PREFIX}/lib/X11/fonts/hebrew -xZpf \
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${TAR} -C ${STAGEDIR}${FONTSDIR} -xZpf \
 		${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 .include <bsd.port.mk>
diff --git a/hebrew/elmar-fonts/pkg-plist b/hebrew/elmar-fonts/pkg-plist
index 3bea78d303e4..e97a0ebdc585 100644
--- a/hebrew/elmar-fonts/pkg-plist
+++ b/hebrew/elmar-fonts/pkg-plist
@@ -1,52 +1,52 @@
-lib/X11/fonts/hebrew/10x20h.pcf
-lib/X11/fonts/hebrew/12x24h.pcf
-lib/X11/fonts/hebrew/6x13h.pcf
-lib/X11/fonts/hebrew/7x14h.pcf
-lib/X11/fonts/hebrew/8x13Bh.pcf
-lib/X11/fonts/hebrew/8x13h.pcf
-lib/X11/fonts/hebrew/8x16h.pcf
-lib/X11/fonts/hebrew/COPYRIGHT
-lib/X11/fonts/hebrew/H.fonts.lsm
-lib/X11/fonts/hebrew/bible7x8Ph.pcf
-lib/X11/fonts/hebrew/bible8x14h.pcf
-lib/X11/fonts/hebrew/bible8x16h.pcf
-lib/X11/fonts/hebrew/bible8x8h.pcf
-lib/X11/fonts/hebrew/bibleB18h.pcf
-lib/X11/fonts/hebrew/bibleB28h.pcf
-lib/X11/fonts/hebrew/bibleB45h.pcf
-lib/X11/fonts/hebrew/bibleBP18h.pcf
-lib/X11/fonts/hebrew/bibleO28h.pcf
-lib/X11/fonts/hebrew/bibleO45h.pcf
-lib/X11/fonts/hebrew/config
-lib/X11/fonts/hebrew/courh___.pfa
-lib/X11/fonts/hebrew/courhb__.pfa
-lib/X11/fonts/hebrew/courhbo_.pfa
-lib/X11/fonts/hebrew/courho__.pfa
-lib/X11/fonts/hebrew/fonts.alias
-lib/X11/fonts/hebrew/fonts.dir
-lib/X11/fonts/hebrew/maarivB40h.pcf
-lib/X11/fonts/hebrew/maarivBPh.pcf
-lib/X11/fonts/hebrew/maarivO40h.pcf
-lib/X11/fonts/hebrew/maarivOPh.pcf
-lib/X11/fonts/hebrew/maarivS40h.pcf
-lib/X11/fonts/hebrew/maarivSPh.pcf
-lib/X11/fonts/hebrew/menu10h.pcf
-lib/X11/fonts/hebrew/menu12h.pcf
-lib/X11/fonts/hebrew/new8x14h.pcf
-lib/X11/fonts/hebrew/new8x16h.pcf
-lib/X11/fonts/hebrew/ortic___.pfa
-lib/X11/fonts/hebrew/orticb__.pfa
-lib/X11/fonts/hebrew/orticbi_.pfa
-lib/X11/fonts/hebrew/ortici__.pfa
-lib/X11/fonts/hebrew/rashiBh.pcf
-lib/X11/fonts/hebrew/rashih.pcf
-lib/X11/fonts/hebrew/script14h.pcf
-lib/X11/fonts/hebrew/scriptB24h.pcf
-lib/X11/fonts/hebrew/termB36h.pcf
-lib/X11/fonts/hebrew/termC36h.pcf
-lib/X11/fonts/hebrew/termO36h.pcf
-lib/X11/fonts/hebrew/termS36h.pcf
-lib/X11/fonts/hebrew/timehb__.pfa
-lib/X11/fonts/hebrew/timehbi_.pfa
-lib/X11/fonts/hebrew/timehi__.pfa
-lib/X11/fonts/hebrew/timehr__.pfa
+%%FONTSDIR%%/10x20h.pcf
+%%FONTSDIR%%/12x24h.pcf
+%%FONTSDIR%%/6x13h.pcf
+%%FONTSDIR%%/7x14h.pcf
+%%FONTSDIR%%/8x13Bh.pcf
+%%FONTSDIR%%/8x13h.pcf
+%%FONTSDIR%%/8x16h.pcf
+%%FONTSDIR%%/COPYRIGHT
+%%FONTSDIR%%/H.fonts.lsm
+%%FONTSDIR%%/bible7x8Ph.pcf
+%%FONTSDIR%%/bible8x14h.pcf
+%%FONTSDIR%%/bible8x16h.pcf
+%%FONTSDIR%%/bible8x8h.pcf
+%%FONTSDIR%%/bibleB18h.pcf
+%%FONTSDIR%%/bibleB28h.pcf
+%%FONTSDIR%%/bibleB45h.pcf
+%%FONTSDIR%%/bibleBP18h.pcf
+%%FONTSDIR%%/bibleO28h.pcf
+%%FONTSDIR%%/bibleO45h.pcf
+%%FONTSDIR%%/config
+%%FONTSDIR%%/courh___.pfa
+%%FONTSDIR%%/courhb__.pfa
+%%FONTSDIR%%/courhbo_.pfa
+%%FONTSDIR%%/courho__.pfa
+%%FONTSDIR%%/fonts.alias
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/maarivB40h.pcf
+%%FONTSDIR%%/maarivBPh.pcf
+%%FONTSDIR%%/maarivO40h.pcf
+%%FONTSDIR%%/maarivOPh.pcf
+%%FONTSDIR%%/maarivS40h.pcf
+%%FONTSDIR%%/maarivSPh.pcf
+%%FONTSDIR%%/menu10h.pcf
+%%FONTSDIR%%/menu12h.pcf
+%%FONTSDIR%%/new8x14h.pcf
+%%FONTSDIR%%/new8x16h.pcf
+%%FONTSDIR%%/ortic___.pfa
+%%FONTSDIR%%/orticb__.pfa
+%%FONTSDIR%%/orticbi_.pfa
+%%FONTSDIR%%/ortici__.pfa
+%%FONTSDIR%%/rashiBh.pcf
+%%FONTSDIR%%/rashih.pcf
+%%FONTSDIR%%/script14h.pcf
+%%FONTSDIR%%/scriptB24h.pcf
+%%FONTSDIR%%/termB36h.pcf
+%%FONTSDIR%%/termC36h.pcf
+%%FONTSDIR%%/termO36h.pcf
+%%FONTSDIR%%/termS36h.pcf
+%%FONTSDIR%%/timehb__.pfa
+%%FONTSDIR%%/timehbi_.pfa
+%%FONTSDIR%%/timehi__.pfa
+%%FONTSDIR%%/timehr__.pfa