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

2 files changed, 57 insertions, 55 deletions

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