summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-08 15:06:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-08 15:06:53 +0000
commit998a2e45ab54e8ba634bbfa752331975262d9311 (patch)
tree581288ee87b679e998454a73d434225aabaa9c43
parent759c983bce8867d7126fa2e82dfb1aa83fd0bd34 (diff)
downloaddrakx-998a2e45ab54e8ba634bbfa752331975262d9311.tar
drakx-998a2e45ab54e8ba634bbfa752331975262d9311.tar.gz
drakx-998a2e45ab54e8ba634bbfa752331975262d9311.tar.bz2
drakx-998a2e45ab54e8ba634bbfa752331975262d9311.tar.xz
drakx-998a2e45ab54e8ba634bbfa752331975262d9311.zip
switch to xorg
-rw-r--r--perl-install/Xconfig/card.pm6
-rw-r--r--perl-install/Xconfig/main.pm2
-rw-r--r--perl-install/Xconfig/test.pm2
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--perl-install/standalone/drakedm2
6 files changed, 8 insertions, 8 deletions
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());
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 658dfc6f5..828aa7d12 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -859,7 +859,7 @@ sub configureXBefore {
my ($o) = @_;
#- keep this here if the package has to be updated.
- $o->pkg_install("XFree86");
+ $o->pkg_install("xorg-x11");
}
sub configureX {
my ($o) = @_;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index f6626d312..3934fa0fe 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -17,7 +17,7 @@ use loopback;
use c;
-our %preferred = map { $_ => undef } qw(lilo perl-base XFree86-libs gstreamer-oss openjade ctags glibc curl sane-backends perl-GTK postfix mdkkdm gcc gcc-cpp gcc-c++ proftpd ghostscript-X vim-minimal kernel db1 db2 libxpm4 zlib1 libncurses5 harddrake cups apache);
+our %preferred = map { $_ => undef } qw(lilo perl-base gstreamer-oss openjade ctags glibc curl sane-backends perl-GTK postfix mdkkdm gcc gcc-cpp gcc-c++ proftpd ghostscript-X vim-minimal kernel db1 db2 libxpm4 zlib1 libncurses5 harddrake cups apache);
#- lower bound on the left ( aka 90 means [90-100[ )
our %compssListDesc = (
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index cefd3198c..be21c2145 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -32,7 +32,7 @@ my $cfg_file = '/etc/sysconfig/desktop';
my %dm = ('GNOME' => [ 'GDM (GNOME Display Manager)', '/usr/bin/gdm', 'gdm' ],
'KDM' => [ 'KDM (KDE Display Manager)', '/usr/bin/kdm', 'kdebase-kdm' ],
'KDE' => [ 'MdkKDM (Mandrake Display Manager)', '/usr/bin/mdkkdm', 'mdkkdm' ],
- 'XDM' => [ 'XDM (X Display Manager)', '/usr/bin/X11/xdm', 'XFree86' ],
+ 'XDM' => [ 'XDM (X Display Manager)', '/usr/bin/X11/xdm', 'xorg-x11' ],
);
my $dm;