linux-fonconfig-2.2.3_6 not X11BASE clean

[Karol Kwiatkowski]

Hello all,

environment:
	X11BASE=/usr/local

problem:
	new version of linux-fonconfig (2.2.3_6) installs fonts.conf into
${PREFIX}/etc/fonts/fonts.conf. In that file there is a hardcoded path
to /usr/X11R6/lib/X11/fonts which doesn't exist in my environment.

solution:
	patch to x11-fonts/linux-config attached, I'm sending it here cause I'm
not sure if that's a proper solution.


Cheers,

Karol

-- 
Karol Kwiatkowski   <karol.kwiat at gmail dot com>
OpenPGP 0x06E09309
-------------- next part --------------
diff -ru x11-fonts/linux-fontconfig.orig/Makefile x11-fonts/linux-fontconfig/Makefile
--- x11-fonts/linux-fontconfig.orig/Makefile	Mon Mar 19 06:13:58 2007
+++ x11-fonts/linux-fontconfig/Makefile	Wed Mar 21 12:54:49 2007
@@ -29,5 +29,6 @@
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
+	${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${PREFIX}/etc/fonts/fonts.conf
 
 .include <bsd.port.mk>
diff -ru x11-fonts/linux-fontconfig.orig/files/fonts.conf x11-fonts/linux-fontconfig/files/fonts.conf
--- x11-fonts/linux-fontconfig.orig/files/fonts.conf	Mon Mar 19 06:13:58 2007
+++ x11-fonts/linux-fontconfig/files/fonts.conf	Wed Mar 21 12:55:54 2007
@@ -23,7 +23,7 @@
 
 <!-- Font directory list -->
 
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
+	<dir>%%X11BASE%%/lib/X11/fonts</dir>
 	
 	<dir>~/.fonts</dir>
 
diff -ru x11-fonts/linux-fontconfig.orig/pkg-plist x11-fonts/linux-fontconfig/pkg-plist
--- x11-fonts/linux-fontconfig.orig/pkg-plist	Sun Jul  9 23:01:45 2006
+++ x11-fonts/linux-fontconfig/pkg-plist	Wed Mar 21 12:56:50 2007
@@ -1,4 +1,5 @@
 etc/fonts/fonts.conf
+etc/fonts/fonts.conf.bak
 etc/fonts/fonts.dtd
 etc/fonts/local.conf
 usr/bin/fc-cache