[Lunar-commits] CVS: moonbase/x11-utils/fontconfig BUILD, 1.3, 1.4 DEPENDS, 1.3, 1.4 DETAILS, 1.5, 1.6

[Chad Kittel]

Update of /var/cvs/lunar/moonbase/x11-utils/fontconfig
In directory espresso.foo-projects.org:/tmp/cvs-serv17784/fontconfig

Modified Files:
	BUILD DEPENDS DETAILS 
Log Message:
Thanks to help from jas0n (jdmelbye at wisc.edu) we finally tracked down the 
XML syntax error that sometimes appeared in /etc/fonts/fonts.conf.  If the 
user does not have a local timezone set, the ./configure script puts a 
comment in the file that leads to invalid xml syntax.  This prevents X from
starting because it cannot parse the file.  Removed the totally unnecessay
date call which prevents this from ever happening.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-utils/fontconfig/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	10 Sep 2004 15:02:06 -0000	1.3
+++ BUILD	25 Sep 2004 18:14:34 -0000	1.4
@@ -1,10 +1,16 @@
 (   
 
-./configure --prefix=/usr             \
-            --with-confdir=/etc/fonts \
-            --disable-docs            \
-            $OPTS                     &&
-default_make  
+  # There is a documented issue when the user does not have a 
+  # timezone set (/etc/localtime).  It creates invalid XML 
+  # syntax in a comment located in /etc/fonts/fonts.conf.
+  sedit "s:\`date\`::" configure        &&
+  
+  ./configure --prefix=/usr             \
+              --with-confdir=/etc/fonts \
+              --disable-docs            \
+              $OPTS                     &&
+  
+   default_make  
 
 ) > $C_FIFO 2>&1
 

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-utils/fontconfig/DEPENDS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEPENDS	3 Dec 2003 20:24:23 -0000	1.3
+++ DEPENDS	25 Sep 2004 18:14:34 -0000	1.4
@@ -1,2 +1,3 @@
+depends sed   &&
 depends expat &&
 depends freetype2 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-utils/fontconfig/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	10 Sep 2004 03:56:10 -0000	1.5
+++ DETAILS	25 Sep 2004 18:14:34 -0000	1.6
@@ -1,4 +1,4 @@
-           MODULE=fontconfig
+          MODULE=fontconfig
          VERSION=2.2.96
           SOURCE=$MODULE-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION