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

[Nick Hudson]

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

Modified Files:
	BUILD CONFIGURE DETAILS POST_INSTALL 
Log Message:

Submitting changes to the XOrg module so that it might use the correct host.def file now


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11/XOrg/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	25 Mar 2004 20:25:42 -0000	1.2
+++ BUILD	25 Mar 2004 22:12:16 -0000	1.3
@@ -1,3 +1,5 @@
+CONFIG_CACHE=/etc/lunar/local
+
 install_drm()  {
 
   DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
@@ -30,9 +32,11 @@
   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                                    &&
 
+  cp $CONFIG_CACHE/host.def config/cf/host.def &&
+
   make World                            &&
   prepare_install                       &&
   cd $SOURCE_DIRECTORY                  &&

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/crater/x11/XOrg/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	25 Mar 2004 12:52:52 -0000	1.1
+++ CONFIGURE	25 Mar 2004 22:12:16 -0000	1.2
@@ -1,3 +1,5 @@
+CONFIG_CAHCE=/etc/lunar/local
+
 optimize $GCCVER
   CFLAGS=`echo $CFLAGS | sed s/-funroll-loops//`
   CFLAGS=`echo $CFLAGS | sed s/-ffast-math//`
@@ -344,6 +346,6 @@
 
 echo $CFLAGS   
 
-if    query  "Configure host.def?"  y
+if    query  "Configure host.def?"  n
 then  configure_host_def
 fi

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11/XOrg/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS	25 Mar 2004 20:25:42 -0000	1.2
+++ DETAILS	25 Mar 2004 22:12:16 -0000	1.3
@@ -3,10 +3,9 @@
           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:5ab18c1ea75b59c3cbe1189bf45fed27
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20040325
-         UPDATED=20040326
+         UPDATED=20040325
            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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_INSTALL	25 Mar 2004 20:25:42 -0000	1.2
+++ POST_INSTALL	25 Mar 2004 22:12:16 -0000	1.3
@@ -24,11 +24,7 @@
 fi 
 
 ln -sf /usr/X11R6/lib/pkgconfig/xft.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
+ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig &&
 
 message "Running fc-cache please be patient" &&
 /usr/X11R6/bin/fc-cache -f