[Lunar-commits] CVS: crater/x11/XOrg BUILD, 1.1, 1.2 DETAILS, 1.1, 1.2 POST_INSTALL, 1.1, 1.2

[Nick Hudson]

Update of /var/cvs/lunar/crater/x11/XOrg
In directory dbguin.lunar-linux.org:/tmp/cvs-serv15556

Modified Files:
	BUILD DETAILS POST_INSTALL 
Log Message:

Ok this is prolly actually useful now.  The source is not on the server yet and wont be till later tonight when I have some bandwidth to upload it.  When the sources are on the server I will probobly move this to zbeta for some major testing.  Basically its the 4.3.902 version of Xfree86 with some minor fixes in it and before they changed the license.  Once they release a tarball I think we should really move to this xserver till something better comes along.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11/XOrg/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	25 Mar 2004 12:52:52 -0000	1.1
+++ BUILD	25 Mar 2004 20:25:42 -0000	1.2
@@ -30,7 +30,7 @@
   export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
 
   if  module_installed  Linux-PAM
-  then  echo  "#define  HasPam  YES"  >>  config/cf/site.def
+	  then  echo  "#define  HasPam  YES"  >>  config/cf/site.def
   fi                                    &&
 
   make World                            &&

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11/XOrg/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	25 Mar 2004 12:52:52 -0000	1.1
+++ DETAILS	25 Mar 2004 20:25:42 -0000	1.2
@@ -1,12 +1,12 @@
           MODULE=XOrg
-         VERSION=4.3.902-cvs
-          SOURCE=$MODULE-cvs20040325-CURRENT.tar.bz2
+         VERSION=cvs20040326-CURRENT
+          SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
    SOURCE_URL[0]=http://www.lunar-linux.org/~nhudson/modules/$MODULE/$SOURCE
-      SOURCE_VFY=md5:9810c522158f86fc5dcee68a104a0c1c
+      SOURCE_VFY=md5:5ab18c1ea75b59c3cbe1189bf45fed27
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20040325
-         UPDATED=20040325
+         UPDATED=20040326
            SHORT="XOrg is the Open Source Public Implementation of X11"
 cat << EOF
 What is XOrg?

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/crater/x11/XOrg/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	25 Mar 2004 12:52:52 -0000	1.1
+++ POST_INSTALL	25 Mar 2004 20:25:42 -0000	1.2
@@ -24,7 +24,11 @@
 fi 
 
 ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig        &&
-ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig &&
+
+#do not link if it is already there
+if ! [ -d /usr/lib/pkgconfig/fontconfig.pc ]
+   then ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig 
+fi
 
 message "Running fc-cache please be patient" &&
 /usr/X11R6/bin/fc-cache -f