From f284619d375b6868428a999e15ef613a8122c67b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 8 Jun 2004 14:28:52 +0000
Subject: switch to xorg

---
 perl-install/install2.pm                  | 2 +-
 perl-install/install_steps_gtk.pm         | 2 +-
 perl-install/install_steps_interactive.pm | 2 +-
 perl-install/share/list.i386              | 2 +-
 perl-install/standalone/XFdrake           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3b0812952..39bd34847 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -306,7 +306,7 @@ sub configureX {
     modules::write_conf();
 
     require pkgs;
-    installStepsCall($o, $auto, 'configureX') if !$::testing && pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled};
+    installStepsCall($o, $auto, 'configureX') if !$::testing && eval { pkgs::packageByName($o->{packages}, 'xorg-x11')->flag_installed } && !$o->{X}{disabled};
 }
 #------------------------------------------------------------------------------
 sub exitInstall {
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 68082c61b..6a1f7d064 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -111,7 +111,7 @@ sub new($$) {
 	foreach (@servers) {
 	    log::l("Trying with server $_");
 	    my $dir = "/usr/X11R6/bin";
-	    my ($prog, $Driver) = /Driver:(.*)/ ? ('XFree86', $1) : /Xsun|Xpmac|Xnest|^X_move$/ ? $_ : "XF86_$_";
+	    my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xsun|Xpmac|Xnest|^X_move$/ ? $_ : "XF86_$_";
 	    unless (-x "$dir/$prog") {
 		unlink $_ foreach glob_("$dir/X*");
 		install_any::getAndSaveFile("Mandrake/mdkinst$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!";
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 62e40599c..39c3729b3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1079,7 +1079,7 @@ sub summary {
     };
 
     my $check_complete = sub {
-	$o->{raw_X} || !$::testing && !pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed ||
+	$o->{raw_X} || !$::testing && !pkgs::packageByName($o->{packages}, 'xorg-x11')->flag_installed ||
 	$o->ask_yesorno('', N("You have not configured X. Are you sure you really want this?"));
     };
 
diff --git a/perl-install/share/list.i386 b/perl-install/share/list.i386
index d40421cf6..843c5edb5 100644
--- a/perl-install/share/list.i386
+++ b/perl-install/share/list.i386
@@ -7,7 +7,7 @@
 /sbin/ifport
 /sbin/mkdosfs
 /sbin/resize_reiserfs
-/usr/X11R6/bin/XFree86
+/usr/X11R6/bin/Xorg
 /usr/X11R6/bin/xmodmap
 /usr/X11R6/lib/modules/libpcidata.a
 /usr/X11R6/lib/modules/drivers/fbdev_drv.o
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 6aec02673..d0d977628 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -70,7 +70,7 @@ sub check_XFree {
     }
 
     my $f = "/usr/X11R6/lib/X11/rgb.txt"; #- this one is on all platform
-    -e $f or $in->do_pkgs->install('XFree86', 'XFree86-75dpi-fonts');
+    -e $f or $in->do_pkgs->install('xorg-x11', 'xorg-x11-75dpi-fonts');
     -e $f or die "install XFree86 first!\n";
 
     system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
-- 
cgit v1.2.1