[Lunar-commits] CVS: moonbase/x11/XOrg BUILD, 1.12, 1.13 CONFLICTS, 1.4, 1.5 DETAILS, 1.9, 1.10 POST_INSTALL, 1.8, 1.9

[Aaron Watry]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory espresso.foo-projects.org:/tmp/cvs-serv11291

Modified Files:
	BUILD CONFLICTS DETAILS POST_INSTALL 
Log Message:
Need to make sure to leave the CVS/ directory out next time I copy XOrg/ 
to XOrg-test for updates purposes...  Sorry.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/BUILD,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- BUILD	9 Mar 2005 02:09:50 -0000	1.12
+++ BUILD	9 Mar 2005 02:24:45 -0000	1.13
@@ -74,7 +74,7 @@
   
   # explicitly exit here now and not later on
   make World                            ||
-  exit 1				&&
+  exit 1
   
   prepare_install                       &&
   cd $SOURCE_DIRECTORY                  &&
@@ -121,7 +121,7 @@
   
   if [ ! -e /usr/lib/pkgconfig/xft.pc ]; then
     ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig/xft.pc
-  fi &&
+  fi
 
   if [ ! -d /tmp/.ICE-unix ]; then
     mkdir -p /tmp/.ICE-unix

Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/CONFLICTS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CONFLICTS	9 Mar 2005 02:09:50 -0000	1.4
+++ CONFLICTS	9 Mar 2005 02:24:45 -0000	1.5
@@ -1,3 +1,3 @@
 conflicts xfree86 &&
 conflicts xfree86-beta &&
-conflicts XOrg
+conflicts XOrg-test

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/DETAILS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- DETAILS	9 Mar 2005 02:11:26 -0000	1.9
+++ DETAILS	9 Mar 2005 02:24:45 -0000	1.10
@@ -1,13 +1,21 @@
-          MODULE=XOrg-test
-         VERSION=6.8.2
-          SOURCE=X11R${VERSION}-src.tar.bz2
+          MODULE=XOrg
+         VERSION=6.8.1
+          SOURCE=X11R${VERSION}-src1.tar.gz
+         SOURCE2=X11R${VERSION}-src2.tar.gz
+         SOURCE3=X11R${VERSION}-src3.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
-   SOURCE_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src-single/
+   SOURCE_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
    SOURCE_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
-      SOURCE_VFY=sha1:632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0
+  SOURCE2_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
+  SOURCE2_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+  SOURCE3_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
+  SOURCE3_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+      SOURCE_VFY=sha1:027d16317e07d9df166c0176a1f28b2614f38cc9
+     SOURCE2_VFY=sha1:17f543f49599290b6e4cd4d963c643cd8c19158a
+     SOURCE3_VFY=sha1:e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20040325
-         UPDATED=20050308
+         UPDATED=20041122
            SHORT="XOrg is the Open Source Public Implementation of X11"
 cat << EOF
 What is XOrg?

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/POST_INSTALL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- POST_INSTALL	9 Mar 2005 02:09:50 -0000	1.8
+++ POST_INSTALL	9 Mar 2005 02:24:45 -0000	1.9
@@ -1,5 +1,4 @@
 if    module_installed  NVIDIA;  then  lin  NVIDIA;  fi
-if    module_installed  fglrx; then lin fglrx; fi   
 if    module_installed  fontconfig; then lin -c fontconfig; fi
 if    module_installed  glut; then lin -c glut; fi
 if    module_installed  openMotif; then lin -c openMotif; fi