[patch] Xeasyconf patch to allow for use of Xfree86 or Xorg

Xeasyconf-0.1.5-xorg.diff (text/plain), 2.27 KB, created by mark guertin on 2004-04-26 09:48:59 UTC

--- Xeasyconf.orig	2004-04-26 12:45:17.000000000 +0000
+++ Xeasyconf	2004-04-26 12:42:36.000000000 +0000
@@ -29,14 +29,14 @@
 fi
 
 # Another show stopper:
-if [ ! -r /usr/X11R6/bin/XFree86 ]; then
+if [ ! -r /usr/X11R6/bin/X ]; then
 dialog --title "ERROR" \
-  --msgbox "/usr/X11R6/bin/XFree86 doesn't exist.  Exiting." 8 40
+  --msgbox "/usr/X11R6/bin/X doesn't exist.  Exiting." 8 40
   exit 1
 fi
 
 dialog --title "CONFIGURE X SERVER?" --yesno \
-"We will start by letting Xfree probe and try to autodetect your settings. \
+"We will start by letting X probe and try to autodetect your settings. \
 Are you ready to begin? (Your screen will blank momentarily)" 7 63
 
 if [ ! $? = 0 ]; then
@@ -47,11 +47,11 @@
 
 rm -f $HOME/XF86Config.new
 
-/usr/X11R6/bin/XFree86 -configure :1
+/usr/X11R6/bin/X -configure :1
 if [ ! $? = 0 ]; then
   # failure, bail.
-dialog --title "XFree86 MISSING" \
-  --msgbox "/usr/X11R6/bin/XFree86 doesn't exist.  Exiting."
+dialog --title "X MISSING" \
+  --msgbox "/usr/X11R6/bin/X doesn't exist.  Exiting."
   exit 1
 fi
 
@@ -63,7 +63,7 @@
 
 dialog --title "SELECT VIDEO CARD DRIVER" \
   --menu "Select your video driver" 15 80 9 \
-  "auto" "Let XFree86 pick (suggested)" \
+  "auto" "Let X pick (suggested)" \
   "ati" "Mach 64, Rage, Radeon (doesn't work on all configs)" \
   "nv" "Nvidia (Geforce) (experimental - see README)" \
   "mga" "Matrox" \
@@ -233,7 +233,7 @@
     HANDLER=skip
   fi
 
-  # keep the XFree86 default of vga from slipping through
+  # keep the X default of vga from slipping through
   # as it doesn't work on ppc, instead use fbdev
 
   if echo $LINE | grep "Driver" | grep "vga" 1> /dev/null ; then
@@ -293,7 +293,7 @@
     HANDLER=none
   fi
 
-# Xfree pre xkb maps are currently broken, let xfree pick your defaults
+# X pre xkb maps are currently broken, let x pick your defaults
 # and it seems to work much better
 
 #  # add typical ppc keyboard options
@@ -349,6 +349,6 @@
 rm -f $TMP/modes
 rm -f $TMP/keymap
 
-dialog --title "XFree86 CONFIGURED" \
-  --msgbox "Your new XFree86 configuration file \nhas been saved to $XF86CONFIG. \n\n\
+dialog --title "X CONFIGURED" \
+  --msgbox "Your new X configuration file \nhas been saved to $XF86CONFIG. \n\n\
 You can test with X -xf86config $XF86CONFIG \nor for the brave simply try startx :^)"  15 60