[Lunar-commits] CVS: moonbase/x11/XOrg BUILD, 1.13, 1.14 DEPENDS, 1.3, 1.4 POST_INSTALL, 1.10, 1.11

[Moritz Heiber]

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

Modified Files:
	BUILD DEPENDS POST_INSTALL 
Log Message:
Tweaks. Basicly merged a few changes from XOrg-beta into XOrg.
Minor message tweaks.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/BUILD,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- BUILD	9 Mar 2005 02:24:45 -0000	1.13
+++ BUILD	14 Apr 2005 08:36:17 -0000	1.14
@@ -49,13 +49,7 @@
   echo  "#define UseExpat  YES"                 >> config/cf/host.def &&
   echo  "#define HasLibpng YES"			>> config/cf/host.def &&
   echo  "#define BuildDocs NO"			>> config/cf/host.def &&
-  
-  if module_installed libxml2; then
-    echo "#define HasLibxml2 YES"		>> config/cf/host.def;
-  else
-    echo "#define HasLibxml2 YES"		>> config/cf/host.def;
-  fi &&
-  
+  echo  "#define HasLibxml2 YES"		>> config/cf/host.def;
   echo  "#define InstallFontconfigLibrary NO"   >> config/cf/host.def &&
   echo  "#define SharedLibXft YES"		>> config/cf/host.def &&
   echo  "#define PreferXdmcpIPv6 YES"		>> config/cf/host.def &&
@@ -73,8 +67,7 @@
   fi
   
   # explicitly exit here now and not later on
-  make World                            ||
-  exit 1
+  make World || exit 1
   
   prepare_install                       &&
   cd $SOURCE_DIRECTORY                  &&
@@ -121,12 +114,17 @@
   
   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
     chown root /tmp/.ICE-unix
     chmod 777 /tmp/.ICE-unix
+  fi &&
+
+  if [ -e /etc/X11/xinit/xinitrc.orig ]; then
+    cp /etc/X11/xinit/xinitrc.orig /etc/X11/xinit/xinitrc
+    message "${MESSAGE_COLOR}Your master xinitrc file has been restored from /etc/X11/xinit/xinitrc.orig${DEFAULT_COLOR}"
   fi
   
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/DEPENDS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEPENDS	22 Nov 2004 18:31:38 -0000	1.3
+++ DEPENDS	14 Apr 2005 08:36:17 -0000	1.4
@@ -1,5 +1,6 @@
 depends  perl    &&
 depends  libpng  &&
+depends  libxml2  &&
 depends  XOrg-fonts-base  &&
 
 optional_depends "XOrg-fonts-extra" "" "" "for even more fonts" &&

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/POST_INSTALL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- POST_INSTALL	11 Apr 2005 18:04:23 -0000	1.10
+++ POST_INSTALL	14 Apr 2005 08:36:17 -0000	1.11
@@ -1,4 +1,4 @@
-if  module_installed  NVIDIA;      then  lin NVIDIA;         fi
+if  module_installed  NVIDIA;      then  lin -c NVIDIA;      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
@@ -19,5 +19,5 @@
 message "Running fc-cache..." &&
 /usr/bin/fc-cache -f 
 
-message "Some things are diffrent from XFree86 f.e. xf86config=xorgconfig" 
-message "xf86cfg=xorgcfg and /etc/X11/XF86Config=/etc/X11/xorg.conf"
+message "${MESSAGE_COLOR}Some things are diffrent from XFree86 f.e. xf86config=xorgconfig${DEFAULT_COLOR}" 
+message "${MESSAGE_COLOR}xf86cfg=xorgcfg and /etc/X11/XF86Config=/etc/X11/xorg.conf${DEFAULT_COLOR}"