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

5 files changed, 25 insertions, 24 deletions

diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 783759eedadf..442ecdffd7ac 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS?=	dconf-editor:${PORTSDIR}/devel/dconf-editor \
 		gnome-tweak-tool:${PORTSDIR}/deskutils/gnome-tweak-tool \
 		sushi>=0:${PORTSDIR}/x11-fm/sushi \
 		nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus \
-		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
 		yelp>=3.0.0:${PORTSDIR}/x11/yelp \
 		zenity>=3.0.0:${PORTSDIR}/x11/zenity \
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index 1f188ee06d76..65d5f2b34a27 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	"meta-port" for the MATE base integrated X11 desktop
 
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu \
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu \
 		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
 		${LOCALBASE}/share/mate-background-properties/mate-desktop.xml:${PORTSDIR}/x11-themes/mate-backgrounds \
 		${LOCALBASE}/bin/mate-session:${PORTSDIR}/x11/mate-session-manager \
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index ad04188d9986..34fdf42b69b3 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metisse
 PORTVERSION=	0.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/metisse/
 
@@ -34,7 +34,7 @@ SHEBANG_FILES=	${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \
 		${WRKSRC}/fvwm-insitu/modules/FvwmWindowMenu/FvwmWindowMenu.in
 perl_OLD_CMD=	@PERL@
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fontdir=${LOCALBASE}/lib/X11/fonts
+CONFIGURE_ARGS=	--with-fontdir=${LOCALBASE}/share/fonts
 USE_LDCONFIG=	yes
 USE_XORG=	xcursor xft xinerama xpm xrender xt xtst
 WANT_GNOME=	yes
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index a244c140c843..15285bf3b628 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	x3270
 PORTVERSION=	3.3.15
+PORTREVISION=	1
 CATEGORIES=	x11 net
 MASTER_SITES=	http://x3270.bgp.nu/download/current/
 EXTRACT_SUFX=	ga7-src.tgz
@@ -17,10 +18,10 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 # Conflict due to x3270if
 CONFLICTS=	c3270-*
 
-USES=		iconv imake:env
+USES=		iconv fonts imake:env
 USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/lib/X11/fonts/${PORTNAME} \
+CONFIGURE_ARGS+=	--with-fontdir=${FONTSDIR} \
 			--disable-dbcs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist
index 04d3eee84a9e..d0d420e271c8 100644
--- a/x11/x3270/pkg-plist
+++ b/x11/x3270/pkg-plist
@@ -1,25 +1,25 @@
 bin/x3270
 bin/x3270if
 etc/x3270/ibm_hosts
-lib/X11/fonts/x3270/3270-12.pcf.gz
-lib/X11/fonts/x3270/3270-12b.pcf.gz
-lib/X11/fonts/x3270/3270-20.pcf.gz
-lib/X11/fonts/x3270/3270-20b.pcf.gz
-lib/X11/fonts/x3270/3270.pcf.gz
-lib/X11/fonts/x3270/3270b.pcf.gz
-lib/X11/fonts/x3270/3270gr.pcf.gz
-lib/X11/fonts/x3270/3270gt12.pcf.gz
-lib/X11/fonts/x3270/3270gt12b.pcf.gz
-lib/X11/fonts/x3270/3270gt16.pcf.gz
-lib/X11/fonts/x3270/3270gt16b.pcf.gz
-lib/X11/fonts/x3270/3270gt24.pcf.gz
-lib/X11/fonts/x3270/3270gt24b.pcf.gz
-lib/X11/fonts/x3270/3270gt32.pcf.gz
-lib/X11/fonts/x3270/3270gt32b.pcf.gz
-lib/X11/fonts/x3270/3270gt8.pcf.gz
-lib/X11/fonts/x3270/3270h.pcf.gz
+%%FONTSDIR%%/3270-12.pcf.gz
+%%FONTSDIR%%/3270-12b.pcf.gz
+%%FONTSDIR%%/3270-20.pcf.gz
+%%FONTSDIR%%/3270-20b.pcf.gz
+%%FONTSDIR%%/3270.pcf.gz
+%%FONTSDIR%%/3270b.pcf.gz
+%%FONTSDIR%%/3270gr.pcf.gz
+%%FONTSDIR%%/3270gt12.pcf.gz
+%%FONTSDIR%%/3270gt12b.pcf.gz
+%%FONTSDIR%%/3270gt16.pcf.gz
+%%FONTSDIR%%/3270gt16b.pcf.gz
+%%FONTSDIR%%/3270gt24.pcf.gz
+%%FONTSDIR%%/3270gt24b.pcf.gz
+%%FONTSDIR%%/3270gt32.pcf.gz
+%%FONTSDIR%%/3270gt32b.pcf.gz
+%%FONTSDIR%%/3270gt8.pcf.gz
+%%FONTSDIR%%/3270h.pcf.gz
+@comment %%FONTSDIR%%/fonts.dir
 man/man1/x3270-script.man.gz
 man/man1/x3270.man.gz
 man/man1/x3270if.man.gz
 man/man5/ibm_hosts.man.gz
-@fontsdir lib/X11/fonts/x3270