From 998a2e45ab54e8ba634bbfa752331975262d9311 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 8 Jun 2004 15:06:53 +0000
Subject: switch to xorg

---
 perl-install/Xconfig/card.pm | 6 +++---
 perl-install/Xconfig/main.pm | 2 +-
 perl-install/Xconfig/test.pm | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install/Xconfig')

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index ec18eea31..d4ce05c99 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -273,17 +273,17 @@ sub configure {
 sub install_server {
     my ($card, $_options, $do_pkgs) = @_;
 
-    my $prog = "$::prefix/usr/X11R6/bin/XFree86";
+    my $prog = "$::prefix/usr/X11R6/bin/Xorg";
 
     my @packages;
-    push @packages, 'XFree86-server' if ! -x $prog;
+    push @packages, 'xorg-x11-server' if ! -x $prog;
 
     #- additional packages to install according available card.
     #- add XFree86-libs-DRI here if using DRI (future split of XFree86 TODO)
     if ($card->{use_DRI_GLX}) {
 	push @packages, 'Glide_V5' if $card->{card_name} eq 'Voodoo5 (generic)';
 	push @packages, 'Glide_V3-DRI' if member($card->{card_name}, 'Voodoo3 (generic)', 'Voodoo Banshee (generic)');
-	push @packages, 'XFree86-glide-module' if $card->{card_name} =~ /Voodoo/;
+	push @packages, 'xorg-x11-glide-module' if $card->{card_name} =~ /Voodoo/;
     }
 
     my %proprietary_Driver2 = (
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index cab241fae..f1ad91f41 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -188,7 +188,7 @@ sub write {
     export_to_install_X($X);
     $raw_X->write;
     Xconfig::various::check_XF86Config_symlink();
-    symlinkf "../../usr/X11R6/bin/XFree86", "$::prefix/etc/X11/X";
+    symlinkf "../../usr/X11R6/bin/Xorg", "$::prefix/etc/X11/X";
 }
 
 
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm
index e260acf42..ae4f1a9ec 100644
--- a/perl-install/Xconfig/test.pm
+++ b/perl-install/Xconfig/test.pm
@@ -57,7 +57,7 @@ sub test {
 	system("xauth add :9 . `mcookie`");
 	open STDERR, ">$f_err";
 	chroot $::prefix if $::prefix;
-	exec 'XFree86', '-xf86config', $f, ":9" or c::_exit(0);
+	exec 'Xorg', '-xf86config', $f, ":9" or c::_exit(0);
     }
 
     do { sleep 1 } until xtest(":9") || waitpid($pid, c::WNOHANG());
-- 
cgit v1.2.1