re-sync after the big svn loss

16 files changed, 0 insertions, 1889 deletions

diff --git a/perl-install/patch/9.1/hp.diff b/perl-install/patch/9.1/hp.diff
deleted file mode 100644
index befdf71f6..000000000
--- a/perl-install/patch/9.1/hp.diff
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: install_steps_interactive.pm
-===================================================================
-RCS file: /cooker/gi/perl-install/install_steps_interactive.pm,v
-retrieving revision 1.810
-retrieving revision 1.812
-diff -u -p -r1.810 -r1.812
---- install_steps_interactive.pm	12 Mar 2003 15:34:46 -0000	1.810
-+++ install_steps_interactive.pm	20 Mar 2003 10:12:38 -0000	1.812
-@@ -1006,6 +1006,9 @@ sub summary {
- 	    local $::expert = $::expert;
- 	    require network::netconnect;
- 	    network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf}, 0, 0, 1);
-+	    #- in case netcnx type is not updated.
-+	    require network::network;
-+	    network::network::probe_netcnx_type($o->{prefix}, $o->{netc}, $o->{intf}, $o->{netcnx});
- 	},
-     b
-     };
- 
-Index: lang.pm
-===================================================================
-RCS file: /cooker/gi/perl-install/lang.pm,v
-retrieving revision 1.309
-retrieving revision 1.312
-diff -u -p -r1.309 -r1.312
---- lang.pm	11 Mar 2003 23:35:36 -0000	1.309
-+++ lang.pm	19 Mar 2003 17:06:18 -0000	1.312
-@@ -229,7 +229,7 @@ my %countries = (
- 'GU' => [ N_("Guam"),           'en_US', '4' ], #
- 'GW' => [ N_("Guinea-Bissau"),  'pt_PT', '3' ], #
- 'GY' => [ N_("Guyana"),         'en_US', '5' ], #
--'HK' => [ N_("Hong Kong"),      'zh_HK', '2' ],
-+'HK' => [ N_("China") . ' (' . N_("Hong Kong") . ')',      'zh_HK', '2' ],
- 'HM' => [ N_("Heard and McDonald Islands"), 'en_US', '4' ], #
- 'HN' => [ N_("Honduras"),       'es_HN', '5' ],
- 'HR' => [ N_("Croatia"),        'hr_HR', '1' ],
-@@ -742,6 +742,9 @@ sub l2pango_font {
- 
- sub set {
-     my ($lang, $translate_for_console) = @_;
-+
-+    #- disable Arabic in install as no (free) fonts are available.
-+    $lang eq 'ar' and $lang='en_US';
- 
-     exists $langs{$lang} or log::l("lang::set: trying to set to $lang but I don't know it!"), return;
- 
-Index: standalone/service_harddrake
-===================================================================
-RCS file: /cooker/gi/perl-install/standalone/service_harddrake,v
-retrieving revision 1.34
-diff -u -p -r1.34 service_harddrake
---- standalone/service_harddrake	12 Mar 2003 10:55:35 -0000	1.34
-+++ standalone/service_harddrake	21 Mar 2003 16:06:52 -0000
-@@ -13,7 +13,7 @@ use modules;
- use Storable qw(store retrieve);
- 
- my $invert_do_it = $ARGV[0] eq 'X11' ? 1 : 0;
--my ($hw_sysconfdir, $timeout) = ("/etc/sysconfig/harddrake2", $invert_do_it ? 600 : 5);
-+my ($hw_sysconfdir, $timeout) = ("/etc/sysconfig/harddrake2", $invert_do_it ? 600 : 25);
- my $last_boot_config = $hw_sysconfdir."/previous_hw";
- 
- $last_boot_config .= '_X11' if $invert_do_it;
-Index: drakxtools.spec
-===================================================================
-RCS file: /cooker/gi/perl-install/drakxtools.spec,v
-retrieving revision 1.247
-diff -u -p -r1.247 drakxtools.spec
---- drakxtools.spec	16 Mar 2003 15:30:56 -0000	1.247
-+++ drakxtools.spec	21 Mar 2003 16:17:22 -0000
-@@ -1,7 +1,7 @@
- Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
- Name:    drakxtools
- Version: 9.1
--Release: 26mdk
-+Release: 27mdk
- Url: http://www.mandrakelinux.com/en/drakx.php2
- Source0: %name-%version.tar.bz2
- License: GPL
-@@ -303,6 +303,9 @@ file /etc/sysconfig/harddrake2/previous_
- %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
- 
- %changelog
-+* Fri Mar 21 2003 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.1-27mdk
-+- harddrake service: increase default timeout from 5 to 25 seconds
-+
- * Sun Mar 16 2003 Warly <warly@mandrakesoft.com> 9.1-25mdk
- - do a correct cvs up of all gi before (me sux)
- 
-Index: install_steps_interactive.pm
-===================================================================
-RCS file: /cooker/gi/perl-install/install_steps_interactive.pm,v
-retrieving revision 1.810
-diff -u -p -r1.810 install_steps_interactive.pm
---- install_steps_interactive.pm	12 Mar 2003 15:34:46 -0000	1.810
-+++ install_steps_interactive.pm	21 Mar 2003 16:11:09 -0000
-@@ -894,7 +894,7 @@ sub summary {
-     my $timezone_manually_set;  
-     push @l, {
- 	group => N("System"),
--	label => N("Country"),
-+	label => N("Country") . N(" / Region"),
- 	val => sub { lang::c2name($o->{locale}{country}) },
- 	clicked => sub {
- 	    any::selectCountry($o, $o->{locale}) or return;
-Index: any.pm
-===================================================================
-RCS file: /cooker/gi/perl-install/any.pm,v
-retrieving revision 1.340
-diff -u -p -r1.340 any.pm
---- any.pm	13 Mar 2003 10:42:51 -0000	1.340
-+++ any.pm	21 Mar 2003 16:11:09 -0000
-@@ -688,7 +688,7 @@ sub selectCountry {
-     my ($other, $ext_country);
-     member($country, @best) or ($ext_country, $country) = ($country, $ext_country);
-     $o->ask_from_(
--		  { title => N("Country"), 
-+		  { title => N("Country") . N(" / Region"), 
- 		    messages => N("Please choose your country."),
- 		    interactive_help_id => 'selectCountry',
- 		    advanced_messages => N("Here is the full list of available countries"),
-Index: lang.pm
-===================================================================
-RCS file: /cooker/gi/perl-install/lang.pm,v
-retrieving revision 1.312
-diff -u -r1.312 lang.pm
---- lang.pm     19 Mar 2003 17:06:18 -0000      1.312
-+++ lang.pm     28 Mar 2003 15:24:41 -0000
-@@ -23,7 +23,8 @@
- my %langs = (
- 'af' =>    [ 'Afrikaans',           'Afrikaans',         'af_ZA', '  3  ', 'iso-8859-1' ],
- 'am' =>    [ 'Amharic',             'ZZ emarNa',         'am_ET', '  3  ', 'utf_am' ],
--'ar' =>    [ 'Arabic',              'AA Arabic',         'ar_EG', ' 23  ', 'utf_ar' ],
-+#- doesn't work well after install
-+#'ar' =>    [ 'Arabic',              'AA Arabic',         'ar_EG', ' 23  ', 'utf_ar' ],
- 'az' =>    [ 'Azeri (Latin)',       'Azerbaycanca',      'az_AZ', ' 2   ', 'utf_az' ],
- 'be' =>    [ 'Belarussian',         'Belaruskaya',       'be_BY', '1    ', 'cp1251' ],
- 'bg' =>    [ 'Bulgarian',           'Blgarski',          'bg_BG', '1    ', 'cp1251' ],
diff --git a/perl-install/patch/9.1/patch-detectSMP-K6.pl b/perl-install/patch/9.1/patch-detectSMP-K6.pl
deleted file mode 100644
index acf5821f6..000000000
--- a/perl-install/patch/9.1/patch-detectSMP-K6.pl
+++ /dev/null
@@ -1,5 +0,0 @@
-use detect_devices;
-package detect_devices;
-
-undef *hasSMP;
-*hasSMP = sub { 0 };
diff --git a/perl-install/patch/9.1/patch-loopback.pl b/perl-install/patch/9.1/patch-loopback.pl
deleted file mode 100644
index d0f4185b3..000000000
--- a/perl-install/patch/9.1/patch-loopback.pl
+++ /dev/null
@@ -1,18 +0,0 @@
-use bootloader;
-package bootloader;
-log::l("PATCHING: fixing 9.1 aes.o missing in initrd for / on loopback");
-
-*mkinitrd = sub {
-    my ($kernelVersion, $initrdImage) = @_;
-
-    my $loop_boot = loopback::prepare_boot();
-
-    modules::load('loop');
-    if (!run_program::rooted($::prefix, "mkinitrd", "--with=aes", "-v", "-f", $initrdImage, "--ifneeded", $kernelVersion)) {
-	unlink("$::prefix/$initrdImage");
-	die "mkinitrd failed";
-    }
-    loopback::save_boot($loop_boot);
-
-    -e "$::prefix/$initrdImage";
-};
diff --git a/perl-install/patch/patch-2006-auto_install_LDAP_auth.pl b/perl-install/patch/patch-2006-auto_install_LDAP_auth.pl
deleted file mode 100644
index db719a905..000000000
--- a/perl-install/patch/patch-2006-auto_install_LDAP_auth.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-use do_pkgs;
-package do_pkgs_common;
-
-undef *ensure_are_installed;
-*ensure_are_installed = sub {
-    my ($do, $pkgs, $b_auto) = @_;
-
-    my @not_installed = difference2($pkgs, [ $do->are_installed(@$pkgs) ]) or return 1;
-
-    if (!$do->install(@not_installed)) {
-	$do->in->ask_warn(N("Error"), N("Could not install the %s package!", $not_installed[0]));
-	return;
-    }
-    1;
-};
-
diff --git a/perl-install/patch/patch-2006-new-dmraid.pl b/perl-install/patch/patch-2006-new-dmraid.pl
deleted file mode 100644
index 02f4b13aa..000000000
--- a/perl-install/patch/patch-2006-new-dmraid.pl
+++ /dev/null
@@ -1,12 +0,0 @@
-use MDK::Common;
-
-log::l("PATCH: 2006-new-dmraid");
-
-if (-e '/mnt/dmraid') {
-    mkdir_p('/tmp/bin');
-    cp_af('/mnt/dmraid', '/tmp/bin');
-    $ENV{PATH} = "/tmp/bin:$ENV{PATH}";
-} else {
-    warn "ERROR: dmraid not available\n";
-    die "ERROR: dmraid not available\n";
-}
diff --git a/perl-install/patch/patch-9.0-auto-inst-network-config.pl b/perl-install/patch/patch-9.0-auto-inst-network-config.pl
deleted file mode 100644
index f7cdc95ce..000000000
--- a/perl-install/patch/patch-9.0-auto-inst-network-config.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-package install_steps;
-log::l("fixing network module probe & configuration in interactive auto_install");
-my $old_configureNetwork = \&configureNetwork;
-undef *configureNetwork;
-*configureNetwork = sub {
-    modules::load_category('network/main|usb');
-    &$old_configureNetwork;
-};
diff --git a/perl-install/patch/patch-IMPS2.pl b/perl-install/patch/patch-IMPS2.pl
deleted file mode 100644
index 488b6ac11..000000000
--- a/perl-install/patch/patch-IMPS2.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-use install_gtk;
-package install_gtk;
-
-my $old_createXconf = \&createXconf;
-undef *createXconf;
-*createXconf = sub {
-    symlink 'mouse', '/dev/cdrom';
-    &$old_createXconf;
-}
diff --git a/perl-install/patch/patch-da.pl b/perl-install/patch/patch-da.pl
deleted file mode 100644
index 63a9f76d5..000000000
--- a/perl-install/patch/patch-da.pl
+++ /dev/null
@@ -1,6 +0,0 @@
-use common;
-
-log::l("PATCHING: installing mo");
-my $dir = '/usr/share/locale_special/da/LC_MESSAGES';
-mkdir_p($dir);
-system("gzip -dc /mnt/da_mo.gz > $dir/libDrakX.mo");
diff --git a/perl-install/patch/patch-nforce.pl b/perl-install/patch/patch-nforce.pl
deleted file mode 100644
index 35587ec75..000000000
--- a/perl-install/patch/patch-nforce.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-use install_steps;
-use common;
-
-package install_steps;
-
-my $old_afterInstallPackages = \&afterInstallPackages;
-undef *afterInstallPackages;
-*afterInstallPackages = sub {
-    &$old_afterInstallPackages;
-
-    my ($o) = @_;
-
-    # workaround nforce stuff.
-    #
-    # modules.pm uses /lib/modules/VERSION/modules*map to know which
-    # sound drivers to use : this'll cause i810_audio to override
-    # nvaudio since it exports the nvforce audio pci ids
-    #
-    # the right solution is to :
-    #
-    # - remove the nforce ids from i810_audio until the oss driver got
-    #   fixes implemented in alsa driver for nforce (snd-intel8x0.o)
-    #
-    # - ask nvidia to declare which pci ids they use and export them
-    #   for depmod :
-    #   MODULE_DEVICE_TABLE (pci, <name_of_the struct pci_device_id variable>);
-
-    #- try to workaround nforce stuff.
-    foreach (keys %{$o->{packages}{provides}{kernel}}) {
-	my $p = $o->{packages}{depslist}[$_];
-	my ($ext, $version, $release) = $p->name =~ /^kernel-([^\d\-]*)-?([^\-]*)\.([^\-\.]*)$/ or next;
-	-s "$o->{prefix}/lib/modules/$version-$release$ext/kernel/drivers/sound/nvaudio.o.gz" and
-	  run_program::rooted($o->{prefix}, "cp -f /lib/modules/$version-$release$ext/kernel/drivers/sound/nvaudio.o.gz /lib/modules/$version-$release$ext/kernel/drivers/sound/i810_audio.o.gz");
-    }
-};
diff --git a/perl-install/patch/patch-oem-9.0.pl b/perl-install/patch/patch-oem-9.0.pl
deleted file mode 100644
index 60c7422fe..000000000
--- a/perl-install/patch/patch-oem-9.0.pl
+++ /dev/null
@@ -1,52 +0,0 @@
-use install_steps;
-package install_steps;
-
-my $old_afterInstallPackages = \&afterInstallPackages;
-undef *afterInstallPackages;
-*afterInstallPackages = sub {
-    &$old_afterInstallPackages;
-
-    my ($o) = @_;
-
-    #- update oem lilo image if it exists.
-    if (-s "$o->{prefix}/boot/oem-message-graphic") {
-	rename "$o->{prefix}/boot/message-graphic", "$o->{prefix}/boot/message-graphic.mdkgiorig";
-	rename "$o->{prefix}/boot/oem-message-graphic", "$o->{prefix}/boot/message-graphic";
-    }
-
-    #- update background image if it exists for common environment.
-    if (-s "$o->{prefix}/usr/share/mdk/oem-background.png") {
-	if (-e "$o->{prefix}/usr/share/mdk/backgrounds/default.png") {
-	    rename "$o->{prefix}/usr/share/mdk/backgrounds/default.png",
-	           "$o->{prefix}/usr/share/mdk/backgrounds/default.png.mdkgiorig";
-	    rename "$o->{prefix}/usr/share/mdk/oem-background.png", "$o->{prefix}/usr/share/mdk/backgrounds/default.png";
-	} else {
-	    #- KDE desktop background.
-	    if (-e "$o->{prefix}/usr/share/config/kdesktoprc") {
-		update_gnomekderc("$o->{prefix}/usr/share/config/kdesktoprc", "Desktop0",
-				  MultiWallpaperMode => "NoMulti",
-				  Wallpaper => "/usr/share/mdk/oem-background.png",
-				  WallpaperMode => "Scaled",
-				 );
-	    }
-	    #- GNOME desktop background.
-	    if (-e "$o->{prefix}/etc/gnome/config/Background") {
-		update_gnomekderc("$o->{prefix}/etc/gnome/config/Background", "Default",
-				  wallpaper => "/usr/share/mdk/oem-background.png",
-				  wallpaperAlign => "3",
-				 );
-	    }
-	}
-    }
-
-    #- try to workaround nforce stuff.
-    foreach (keys %{$o->{packages}{provides}{kernel}}) {
-	my $p = $o->{packages}{depslist}[$_];
-	my ($ext, $version, $release) = $p->name =~ /^kernel-([^\d\-]*)-?([^\-]*)\.([^\-\.]*)$/ or next;
-	-s "$o->{prefix}/lib/modules/$version-$release$ext/kernel/drivers/sound/nvaudio.o.gz" and
-	  run_program::rooted($o->{prefix}, "cp -f /lib/modules/$version-$release$ext/kernel/drivers/sound/nvaudio.o.gz /lib/modules/$version-$release$ext/kernel/drivers/sound/i810_audio.o.gz");
-    }
-
-    #- try to check if pcitable and others have been built correctly.
-    -e "$o->{prefix}/usr/share/ldetect-lst/pcitable" or run_program::rooted($o->{prefix}, "/usr/sbin/update-ldetect-lst");
-};
diff --git a/perl-install/patch/patch-oem-hp.pl b/perl-install/patch/patch-oem-hp.pl
deleted file mode 100644
index 0a5b0b51e..000000000
--- a/perl-install/patch/patch-oem-hp.pl
+++ /dev/null
@@ -1,323 +0,0 @@
-use modules;
-package modules;
-my $old_load_raw = \&load_raw;
-undef *load_raw;
-*load_raw = sub {
-    &$old_load_raw;
-
-    my @l = map { my ($i, @i) = @$_; [ $i, \@i ] } grep { $_->[0] !~ /ignore/ } @_;
-    foreach (@l) {
-	if ($_->[0] eq 'ehci-hcd') {
-	    add_alias('usb-interface1', $_->[0]);
-	}
-    }
-
-    if (get_alias("usb-interface") || get_alias("usb-interface1")) {
-	unless (-e "/proc/bus/usb/devices") {
-	    require fs; fs::mount('/proc/bus/usb', '/proc/bus/usb', 'usbdevfs');
-	    #- ensure keyboard is working, the kernel must do the job the BIOS was doing
-	    sleep 4;
-	    load_multi("usbkbd", "keybdev") if detect_devices::usbKeyboards();
-	}
-    }
-};
-
-my $old_load = \&load;
-undef *load;
-*load = sub {
-    &$old_load;
-
-    #- hack to get back usb-interface (even if already loaded by stage1)
-    #- NOTE load_multi is not used for that so not overloaded to fix that too.
-    if ($_[0] =~ /usb-[uo]hci/ && !get_alias("usb-interface")) {
-	add_alias('usb-interface', $_[0]);
-    } elsif ($_[0] eq 'ehci-hcd' && !get_alias("usb-interface1")) {
-	add_alias('usb-interface1', $_[0]);
-    }
-
-    if (get_alias("usb-interface") || get_alias("usb-interface1")) {
-	unless (-e "/proc/bus/usb/devices") {
-	    require fs; fs::mount('/proc/bus/usb', '/proc/bus/usb', 'usbdevfs');
-	    #- ensure keyboard is working, the kernel must do the job the BIOS was doing
-	    sleep 4;
-	    load_multi("usbkbd", "keybdev") if detect_devices::usbKeyboards();
-	}
-    }
-};
-
-#- ensure it is loaded using this patch.
-$::noauto or modules::load_thiskind("usb"); 
-sleep 2;
-
-use install_steps;
-package install_steps;
-
-my $old_beforeInstallPackages = \&beforeInstallPackages;
-undef *beforeInstallPackages;
-*beforeInstallPackages = sub {
-    &$old_beforeInstallPackages;
-
-    my ($o) = @_;
-    mkdir "$o->{prefix}$_" foreach qw(/boot /usr /usr/share /usr/share/mdk);
-    install_any::getAndSaveFile("Mandrake/base/oem-message-graphic", "$o->{prefix}/boot/oem-message-graphic");
-    install_any::getAndSaveFile("Mandrake/base/oem-background.png", "$o->{prefix}/usr/share/mdk/oem-background.png");
-};
-
-my $old_afterInstallPackages = \&afterInstallPackages;
-undef *afterInstallPackages;
-*afterInstallPackages = sub {
-    &$old_afterInstallPackages;
-
-    my ($o) = @_;
-
-    #- lilo image.
-    rename "$o->{prefix}/boot/lilo-graphic/message", "$o->{prefix}/boot/lilo-graphic/message.orig";
-    system "chroot", $o->{prefix}, "cp", "-f", "/boot/oem-message-graphic", "/boot/lilo-graphic/message";
-
-    #- KDE desktop background.
-    if (-e "$o->{prefix}/usr/share/config/kdesktoprc") {
-	update_gnomekderc("$o->{prefix}/usr/share/config/kdesktoprc", "Desktop0",
-			  MultiWallpaperMode => "NoMulti",
-			  Wallpaper => "/usr/share/mdk/oem-background.png",
-			  WallpaperMode => "Scaled",
-			 );
-    }
-    #- GNOME desktop background.
-    if (-e "$o->{prefix}/etc/gnome/config/Background") {
-	update_gnomekderc("$o->{prefix}/etc/gnome/config/Background", "Default",
-			  wallpaper => "/usr/share/mdk/oem-background.png",
-			  wallpaperAlign => "3",
-			 );
-    }
-
-    #- make sure no error can be forwarded, test staroffice installed and OpenOffice.org,
-    #- remove the first if the second is installed.
-    eval {
-	if (!$o->{isUpgrade} && -e "$o->{prefix}/usr/lib/openoffice/program/soffice.bin" && grep { -e "$o->{prefix}/usr/lib/office60_$_/program/soffice.bin" } qw(de en es fr it)) {
-	    require run_program;
-	    log::l("removing OpenOffice.org as staroffice is installed");
-	    run_program::rooted($o->{prefix}, "rpm", "-e", "OpenOffice.org");
-	}
-    };
-};
-
-use install_any;
-package install_any;
-
-undef *copy_advertising;
-*copy_advertising = sub {
-    my ($o) = @_;
-
-    return if $::rootwidth < 800;
-
-    my $f;
-    my $source_dir = "Mandrake/share/advertising";
-    foreach ("." . $o->{lang}, "." . substr($o->{lang},0,2), '') {
-	$f = getFile("$source_dir$_/list") or next;
-	$source_dir = "$source_dir$_";
-    }
-    if (my @files = <$f>) {
-	my $dir = "$o->{prefix}/tmp/drakx-images";
-	mkdir $dir;
-	unlink glob_("$dir/*");
-	foreach (@files) {
-	    chomp;
-	    getAndSaveFile("$source_dir/$_", "$dir/$_");
-	    s/\.png/\.pl/;
-	    getAndSaveFile("$source_dir/$_", "$dir/$_");
-	    s/\.pl/_icon\.png/;
-	    getAndSaveFile("$source_dir/$_", "$dir/$_");
-	    s/_icon\.png/\.png/;
-	}
-	@advertising_images = map { $_ && -e "$dir/$_" ? ("$dir/$_") : () } @files;
-    }
-};
-
-#undef *allowNVIDIA_rpms;
-#*allowNVIDIA_rpms = sub {
-#    my ($packages) = @_;
-#    require pkgs;
-#    if (pkgs::packageByName($packages, "NVIDIA_GLX")) {
-#	#- at this point, we can allow using NVIDIA 3D acceleration packages.
-#	my @rpms;
-#	foreach (keys %{$packages->{names}}) {
-#	    my ($ext, $version, $release) = /kernel[^-]*(-smp|-enterprise|-secure)?(?:-(\d.*?)\.(\d+\.\d+mdk))?$/ or next;
-#	    my $p = pkgs::packageByName($packages, $_);
-#	    pkgs::packageSelectedOrInstalled($p) or next;
-#	    $version or ($version, $release) = (pkgs::packageVersion($p), pkgs::packageRelease($p));
-#	    my $name = "NVIDIA_kernel-$version-$release$ext";
-#	    pkgs::packageByName($packages, $name) or return;
-#	    push @rpms, $name;
-#	}
-#	@rpms > 0 or return;
-#	return [ @rpms, "NVIDIA_GLX" ];
-#    }
-#};
-
-use detect_devices;
-package detect_devices;
-
-undef *usbMice;
-*usbMice = sub { grep { ($_->{media_type} =~ /\|Mouse/ || $_->{driver} =~ /Mouse:USB/) &&
-			  $_->{driver} !~ /Tablet:wacom/} usb_probe() };
-
-use Xconfigurator;
-package Xconfigurator;
-
-undef *cardConfigurationAuto;
-*cardConfigurationAuto = sub {
-    my @cards;
-    if (my @c = grep { $_->{driver} =~ /(Card|Server):/ } detect_devices::probeall()) {
-	@c >= 2 && $c[0]{description} eq $c[1]{description} && $c[0]{description} =~ /82830 CGC/ and shift @c;
-	foreach my $i (0..$#c) {
-	    local $_ = $c[$i]->{driver};
-	    my $card = { identifier => ($c[$i]{description} . (@c > 1 && " $i")) };
-	    $card->{type} = $1 if /Card:(.*)/;
-	    $card->{server} = $1 if /Server:(.*)/;
-	    $card->{driver} = $1 if /Driver:(.*)/;
-	    $card->{flags}{needVideoRam} = /86c368|S3 Inc|Tseng.*ET6\d00/;
-	    $card->{busid} = "PCI:$c[$i]{pci_bus}:$c[$i]{pci_device}:$c[$i]{pci_function}";
-	    push @{$card->{lines}}, @{$lines{$card->{identifier}} || []};
-	    push @cards, $card;
-	}
-    }
-    #- take a default on sparc if nothing has been found.
-    if (arch() =~ /^sparc/ && !@cards) {
-        log::l("Using probe with /proc/fb as nothing has been found!");
-	local $_ = cat_("/proc/fb");
-	if (/Mach64/) { push @cards, { server => "Mach64" } }
-	elsif (/Permedia2/) { push @cards, { server => "3DLabs" } }
-	else { push @cards, { server => "Sun24" } }
-    }
-    #- special case for dual head card using only one busid.
-    @cards = map { my $dup = $_->{identifier} =~ /MGA G[45]50/ ? 2 : 1;
-		   if ($dup > 1) {
-		       my @result;
-		       my $orig = $_;
-		       foreach (1..$dup) {
-			   my $card = {};
-			   add2hash($card, $orig);
-			   push @result, $card;
-		       }
-		       @result;
-		   } else {
-		       ($_);
-		   }
-	       } @cards;
-    #- make sure no type are already used, duplicate both screen
-    #- and rename type (because used as id).
-    if (@cards > 1) {
-	my $card = 1;
-	foreach (@cards) {
-	    updateCardAccordingName($_, $_->{type}) if $_->{type};
-	    $_->{type} = "$_->{type} $card";
-	    $card++;
-	}
-    }
-    #- in case of only one cards, remove all busid reference, this will avoid
-    #- need of change of it if the card is moved.
-    #- on many PPC machines, card is on-board, busid is important, leave?
-    @cards == 1 and delete $cards[0]{busid} if arch() !~ /ppc/;
-    @cards;
-};
-
-use mouse;
-package mouse;
-undef *detect;
-*detect = sub {
-    if (arch() =~ /^sparc/) {
-	return fullname2mouse("sunmouse|Sun - Mouse");
-    }
-    if (arch() eq "ppc") {
-        return fullname2mouse(detect_devices::hasMousePS2("usbmouse") ? 
-			      "USB|1 button" :
-			      #- No need to search for an ADB mouse.  If I did, the PPC kernel would
-			      #- find one whether or not I had one installed!  So..  default to it.
-			      "busmouse|1 button");
-    }
-
-    my @wacom;
-    my $fast_mouse_probe = sub {
-	my $auxmouse = detect_devices::hasMousePS2("psaux") && fullname2mouse("PS/2|Standard", unsafe => 1);
-
-	if (modules::get_alias("usb-interface")) {
-	    if (my (@l) = detect_devices::usbMice()) {
-		log::l("found usb mouse $_->{driver} $_->{description} ($_->{type})") foreach @l;
-		eval { modules::load($_) foreach qw(hid mousedev usbmouse) };
-		if (!$@ && detect_devices::tryOpen("usbmouse")) {
-		    my $mouse = fullname2mouse($l[0]{driver} =~ /Mouse:(.*)/ ? $1 : "USB|Generic");
-		    $auxmouse and $mouse->{auxmouse} = $auxmouse; #- for laptop, we kept the PS/2 as secondary (symbolic).
-		    return $mouse;
-		}
-		eval { modules::unload($_) foreach qw(usbmouse mousedev hid) };
-	    }
-	}
-	$auxmouse;
-    };
-
-    if (modules::get_alias("usb-interface")) {
-	my $keep_mouse;
-	if (my (@l) = detect_devices::usbWacom()) {
-	    log::l("found usb wacom $_->{driver} $_->{description} ($_->{type})") foreach @l;
-	    eval { modules::load("wacom"); modules::load("evdev"); };
-	    unless ($@) {
-		foreach (0..$#l) {
-		    detect_devices::tryOpen("input/event$_") and $keep_mouse = 1, push @wacom, "input/event$_";
-		}
-	    }
-	    $keep_mouse or eval { modules::unload("evdev"); modules::unload("wacom"); };
-	}
-    }
-
-    #- at this level, not all possible mice are detected so avoid invoking serial_probe
-    #- which takes a while for its probe.
-    if ($::isStandalone) {
-	my $mouse = $fast_mouse_probe->();
-	$mouse and return ($mouse, @wacom);
-    }
-
-    #- probe serial device to make sure a wacom has been detected.
-    eval { modules::load("serial") };
-    my ($r, @serial_wacom) = mouseconfig(); push @wacom, @serial_wacom;
-
-    if (!$::isStandalone) {
-	my $mouse = $fast_mouse_probe->();
-	$r && $mouse and $r->{auxmouse} = $mouse; #- we kept the auxilliary mouse as PS/2.
-	$r and return ($r, @wacom);
-	$mouse and return ($mouse, @wacom);
-    } else {
-	$r and return ($r, @wacom);
-    }
-
-    #- in case only a wacom has been found, assume an inexistant mouse (necessary).
-    @wacom and return { CLASS      => 'MOUSE',
-			nbuttons   => 2,
-			device     => "nothing",
-			MOUSETYPE  => "Microsoft",
-			XMOUSETYPE => "Microsoft"}, @wacom;
-
-    if (!modules::get_alias("usb-interface") && detect_devices::is_a_recent_computer() && $::isInstall && !$::noauto) {
-	#- special case for non detected usb interface on a box with no mouse.
-	#- we *must* find out if there really is no usb, otherwise the box may
-	#- not be accessible via the keyboard (if the keyboard is USB)
-	#- the only way to know this is to make a full pci probe
-	modules::load_thiskind("usb", '', 'unsafe'); 
-	if (my $mouse = $fast_mouse_probe->()) {
-	    return $mouse;
-	}
-    }
-
-    if (modules::get_alias("usb-interface")) {
-	eval { modules::load($_) foreach qw(hid mousedev usbmouse) };
-	sleep 1;
-	if (!$@ && detect_devices::tryOpen("usbmouse")) {
-	    #- defaults to generic USB mouse on usbmouse.
-	    log::l("defaulting to usb generic mouse");
-	    return fullname2mouse("USB|Generic", unsafe => 1);
-	}
-    }
-
-    #- defaults to generic serial mouse on ttyS0.
-    #- Oops? using return let return a hash ref, if not using it, it return a list directly :-)
-    return fullname2mouse("serial|Generic 2 Button Mouse", unsafe => 1);
-};
diff --git a/perl-install/patch/patch-raidtab.pl b/perl-install/patch/patch-raidtab.pl
deleted file mode 100644
index de03a1b2a..000000000
--- a/perl-install/patch/patch-raidtab.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-use detect_devices;
-package detect_devices;
-log::l("PATCHING");
-
-*raidAutoStartRaidtab = sub {
-    my (@parts) = @_;
-    log::l("patched raidAutoStartRaidtab");
-    $::isInstall or return;
-    require raid;
-    #- faking a raidtab, it seems to be working :-)))
-    #- (choosing any inactive md)
-    raid::inactivate_all();
-    foreach (@parts) {
-	my ($nb) = grep { !raid::is_active("md$_") } 0..7;
-	output("/tmp/raidtab", "raiddev /dev/md$nb\n  device " . devices::make($_->{device}) . "\n");
-	run_program::run('raidstart', '-c', "/tmp/raidtab", devices::make("md$nb"));
-    }
-    unlink "/tmp/raidtab";
-};
-
-use raid;
-package raid;
-
-*prepare_prefixed = sub {
-    my ($raids, $prefix) = @_;
-
-    log::l("patched prepare_prefixed");
-
-    $raids or return;
-
-    &write($raids, "/etc/raidtab") if ! -e "/etc/raidtab";
-    
-    eval { cp_af("/etc/raidtab", "$prefix/etc/raidtab") };
-    foreach (grep { $_ } @$raids) {
-	devices::make("$prefix/dev/$_->{device}") foreach @{$_->{disks}};
-    }
-};
diff --git a/perl-install/patch/patch-rh9-mdk10.pl b/perl-install/patch/patch-rh9-mdk10.pl
deleted file mode 100644
index 92c4e58ab..000000000
--- a/perl-install/patch/patch-rh9-mdk10.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-
-warn "PATCHING\n";
-log::l("PATCHING\n");
-
-use install_any;
-
-undef *find_root_parts;
-*find_root_parts = sub {
-    my ($fstab, $prefix) = @_;
-    map { 
-	my $handle = any::inspect($_, $prefix);
-	my $s = $handle && cat_("$handle->{dir}/etc/redhat-release");
-	if ($s) {
-	    chomp($s);
-	    $s =~ s/\s+for\s+\S+//;
-	    log::l("find_root_parts found $_->{device}: $s");
-	    { release => $s, part => $_ };
-	} else { () }
-    } @$fstab;
-};
-
-
-use pkgs;
-package pkgs;
-
-my $old_compare_pkg = \&URPM::Package::compare_pkg;
-undef *URPM::Package::compare_pkg;
-*URPM::Package::compare_pkg = sub {
-    my ($lpkg, $rpkg) = @_;
-    my $c = ($lpkg->release =~ /mdk$/ ? 1 : 0) - ($rpkg->release =~ /mdk$/ ? 1 : 0);
-    if ($c) {
-	my $lpkg_ver = $lpkg->version . '-' . $lpkg->release;
-	my $rpkg_ver = $rpkg->version . '-' . $rpkg->release;
-	log::l($lpkg->name . ' ' . $rpkg->name . ': prefering ' . ($c == 1 ? "$lpkg_ver over $rpkg_ver" : "$rpkg_ver over $lpkg_ver"));
-	return $c;
-    }
-    &$old_compare_pkg;
-};
-
-my $old_compare = \&URPM::Package::compare;
-undef *URPM::Package::compare;
-*URPM::Package::compare = sub {
-    my ($lpkg, $rpkg_ver) = @_;
-    my $c = ($lpkg->release =~ /mdk$/ ? 1 : 0) - ($rpkg_ver =~ /mdk$/ ? 1 : 0);
-    if ($c) {
-	my $lpkg_ver = $lpkg->version . '-' . $lpkg->release;
-	log::l($lpkg->name . ' ' . ': prefering ' . ($c == 1 ? "$lpkg_ver over $rpkg_ver" : "$rpkg_ver over $lpkg_ver"));
-	return $c;
-    }
-    &$old_compare;
-};
-
-use install2;
-package install2;
-my $old_choosePackages = \&choosePackages;
-undef *choosePackages;
-*choosePackages = sub {
-    my @should_not_be_dirs = qw(/usr/X11R6/lib/X11/xkb /usr/share/locale/zh_TW/LC_TIME /usr/include/GL);
-    my @should_be_dirs = qw(/etc/X11/xkb);
-    foreach (@should_not_be_dirs) {
-	my $f = "$::prefix$_";
-	rm_rf($f) if !-l $f && -d $f;
-    }
-    foreach (@should_be_dirs) {
-	my $f = "$::prefix$_";
-	rm_rf($f) if -l $f || !-d $f;
-    }
-    unlink "$::prefix/etc/X11/XF86Config";
-    unlink "$::prefix/etc/X11/XF86Config-4";
-
-    &$old_choosePackages;
-};
-
-use fs;
-package fs;
-
-my $old = \&read_fstab;
-undef *read_fstab;
-*read_fstab = sub {
-    my @l = &$old;
-
-    my %label2device = map {
- 	my $dev = devices::make($_->{device});
-	if (my ($label) = `tune2fs -l $dev 2>/dev/null` =~ /volume name:\s*(\S+)/) {
-	    log::l("device $_->{device} has label $label");
-	    $label => $_->{device};
-	} else {
-	    ();
-	}
-    } fsedit::read_proc_partitions([]);
-
-    foreach (@l) {
-	my ($label) = ($_->{device_LABEL} || $_->{device}) =~ /^LABEL=(.*)/ or next;
-	if ($label2device{$label}) {
-	    $_->{device} = $label2device{$label};
-	} else {
-	    log::l("can't find label $label");
-	}
-    }
-
-    @l;
-};
-
-use any;
-package any;
-
-undef *fix_broken_alternatives;
-*fix_broken_alternatives = sub {
-    #- fix bad update-alternatives that may occurs after upgrade (and sometimes for install too).
-    -d "$::prefix/etc/alternatives" or return;
-
-    foreach (all("$::prefix/etc/alternatives")) {
-	log::l("setting alternative $_");
-	run_program::rooted($::prefix, 'update-alternatives', '--auto', $_);
-    }
-};
diff --git a/perl-install/patch/patch-stage2-updatemodules.pl b/perl-install/patch/patch-stage2-updatemodules.pl
deleted file mode 100644
index a62e83e46..000000000
--- a/perl-install/patch/patch-stage2-updatemodules.pl
+++ /dev/null
@@ -1,12 +0,0 @@
-# put this file in install/patch.pl, and boot with auto_install=install/patch.pl
-# put modules in install/modules and list them below
-
-my @modules = map { "install/modules/$_.ko" } 'tg3';
-
-foreach my $remote (@modules) {
-    my $local = '/tmp/' . basename($remote);
-    
-    install_any::getAndSaveFile($remote, $local);
-
-    run_program::run(["/usr/bin/insmod_", "insmod"], "-f", $local);
-}
diff --git a/perl-install/patch/rpmsrate.oem-9.0-openoffice b/perl-install/patch/rpmsrate.oem-9.0-openoffice
deleted file mode 100644
index a8d40cd0f..000000000
--- a/perl-install/patch/rpmsrate.oem-9.0-openoffice
+++ /dev/null
@@ -1,551 +0,0 @@
-LSB
-  5 lsb
-
-GRAPHICAL_DESKTOP
-  4 WindowMaker icewm
-  3 Epplets WMRack blackbox enlightenment ethemes icepref
-    wmakerconf xlockmore xfce
-  2 wmnet
-  1 lesstif-mwm xbanner
-
-GNOME
-  5 gnome-panel nautilus gnome-control-center metacity gnome-terminal yelp
-    nautilus-gtkhtml
-  4 gnome-tiles gdm gnome-applets gnome-user-docs gtk-themes file-roller
-    gnome-network gnome-utils xlockmore gtk-engines2 
-    gnome-vfs-extras gconf-editor
-  3 gnome-pilot
-  2 bug-buddy
-
-KDE
-  5 kdebase kdebase-nsplugins
-  5 kde-i18n-af kde-i18n-az kde-i18n-bg kde-i18n-ca kde-i18n-cs kde-i18n-da kde-i18n-de kde-i18n-el kde-i18n-en_GB kde-i18n-eo kde-i18n-es kde-i18n-et kde-i18n-fi kde-i18n-fr kde-i18n-he kde-i18n-hu kde-i18n-is kde-i18n-it kde-i18n-ja kde-i18n-ko kde-i18n-lt kde-i18n-lv kde-i18n-nl kde-i18n-no kde-i18n-no_NY kde-i18n-pl kde-i18n-pt kde-i18n-pt_BR kde-i18n-ro kde-i18n-ru kde-i18n-sk kde-i18n-sl kde-i18n-sr kde-i18n-sv kde-i18n-ta kde-i18n-th kde-i18n-tr kde-i18n-uk kde-i18n-zh_CN.GB2312 kde-i18n-zh_TW.Big5 
-  4 kdeaddutils kdeadmin kdegraphics kdemultimedia kdenetwork krozat
-    kdepim kdetoys kdeutils quanta 
-
-  2 kdesdk kdoc
-
-VIDEO
-  4 xine-ui xine-oss xine-xv powerdvd RealPlayer
-  3 nist xanim xmms-smpeg xmovie 
-  2 mtv mtv-fullscreen-extension
-  1 bcast mpeg2_movie
-TV
-  4 zapping xawtv gatos
-  4 KDE kwintv
-
-OFFICE
-  4 staroffice-de staroffice-en staroffice-es staroffice-fr staroffice-it
-    acroread acroread-nppdf
-    OpenOffice.org OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-fr OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nl OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-ru OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr
-  4 cbb gaddr xpdf moneydance
-  3 wv ical pyDict
-  2 units lyx
-  GNOME
-    4 gnome-pim gnome-pim-conduits gnumeric mrproject
-    3 dia gnome-pilot-conduits Guppi
-    2 ggv gnucash
-  KDE
-    3 koffice
-    3 koffice-i18n-az koffice-i18n-bg koffice-i18n-cs koffice-i18n-da koffice-i18n-de koffice-i18n-en_GB koffice-i18n-eo koffice-i18n-es koffice-i18n-et koffice-i18n-fr koffice-i18n-hu koffice-i18n-it koffice-i18n-ja koffice-i18n-lt koffice-i18n-mt koffice-i18n-nl koffice-i18n-no koffice-i18n-no_NY koffice-i18n-pl koffice-i18n-pt koffice-i18n-pt_BR koffice-i18n-ro koffice-i18n-ru koffice-i18n-sk koffice-i18n-sl koffice-i18n-sv koffice-i18n-ta koffice-i18n-tr koffice-i18n-uk
-    2 klyx
-
-SOUND
-  5 sox
-  4 aumix
-  4 KDE xmms-arts
-
-AUDIO
-  4 grip xmms xmms-skins
-  4 GNOME gnome-audio gnome-media
-  4 KDE kdelibs-sound
-  4 3D xmms-mesa
-  3 cdp cdparanoia cdrecord-cdda2wav space_sounds timidity-instruments xmms-esd
-    xmms-kjofol-skins xmms-more-vis-plugins
-  3 GNOME gnome-audio-extra 
-  2 mokmod mp3info mpg123 playmidi playmidi-X11 xmms-mikmod
-
-  4 HW"Rio 500" rio500 grio500
-
-ACCESSIBILITY
-  2 gtkeyboard
-
-PUBLISHING
-  5 enscript ghostscript-module-X
-  4 ghostscript-utils gv psutils texinfo nlpr
-  2 latex2html jadetex tetex-afm tetex-dvips tetex-latex tetex-xdvi tetex-latex-arab tetex-latex-heb docbook-dtd31-sgml
-  2 BOOKS tetex-doc
-  1 docbook-style-dsssl openjade sgml-tools ghostscript-module-SVGALIB cttex
-  1 BOOKS docbook-style-dsssl-doc
-
-  5 CUPS 
-      cups-drivers xpp
-  5 CUPS || LPR foomatic
-  1 CUPS hpoj
-
-SHELLS
-  3 zsh
-  3 BOOKS bash-doc zsh-doc
-  2 eshell pdksh tcsh
-  1 bash1
-
-SCIENCES
-  5 3D openuniverse
-  4 gnuplot gtkgraphh
-  3 xlispstat HDF
-  2 mathplot octave
-  1 xoscope
-
-EDITORS
-  4 emacs-X11
-  3 GXedit vim-X11 yudit
-  2 nedit cooledit emacs-tramp joe emacs-leim jed-xjed xemacs xemacs-extras xemacs-info
-  1 auctex emacs-el jed xemacs-el emacs-nox xwpe xwpe-X11
-  GNOME
-    4 gedit
-
-TEXT_TOOLS
-  5 words
-  4 groff patch recode rgrep
-  4 ispell-af ispell-br ispell-ca ispell-cs ispell-da ispell-de ispell-el ispell-en ispell-eo ispell-es ispell-fi ispell-fr ispell-ga ispell-gd ispell-gv ispell-id ispell-it ispell-nl ispell-no ispell-pl ispell-pt ispell-pt_BR ispell-ro ispell-ru ispell-sk ispell-sl ispell-sv
-  3 ed
-  2 groff-gxditview lout
-  BOOKS
-    3 gawk-doc
-    1 lout-doc
-
-COMMUNICATIONS
-  4 efax
-  3 jpilot pilot-link
-  2 hylafax-server hylafax-client dip
-  2 lrzsz mgetty mgetty-contrib mgetty-sendfax mgetty-viewfax mgetty-voice minicom
-  1 jpilot-Mail jpilot-syncmal statserial tkbabel
-
-TERMINALS
-  5 open xterm
-  4 screen kon2
-  3 Eterm vlock
-  1 aterm x3270
-
-  4 KDE ktelnet
-  4 GNOME gnome-telnet
-  4 LOCALES"ja" kterm 
-
-NETWORKING_CHAT
-  3 talk ytalk
-NETWORKING_CHAT_SERVER
-  4 jabber 
-  3 talk-server
-
-NETWORKING_FILE_TRANSFER
-  5 lftp mirrordir rsync
-  4 gftp rdist
-  3 fmirror ncftp tftp
-  3 GNOME dpsftp
-  2 uucp
-
-NETWORKING_FILE_TRANSFER_SERVER
-  4 proftpd bwbserver_linux
-  2 wu-ftpd anonftp
-
-NETWORKING_LDAP_SERVER
-  4 openldap directory_administrator
-
-NETWORKING_INSTANT_MESSAGING
-  4 licq
-  3 everybuddy licq-console licq-rms
-  GNOME
-    5 aspell-br aspell-ca aspell-cs aspell-da aspell-de aspell-de_CH aspell-en aspell-en_CA aspell-en_GB aspell-eo aspell-es aspell-fr aspell-it aspell-nl aspell-no aspell-pl aspell-sv
-    4 gnomeicu gabber gaim
-    3 gtk+licq
-
-NETWORKING_IRC
-  3 BitchX mozilla-irc
-  3 GNOME xchat
-  2 irssi
-  1 eggdrop
-
-NETWORKING_FIREWALLING_SERVER
-  5 iproute2 routed iptables
-  3 prelude
-  1 portsentry 
-
-NETWORKING_GROUPWARE_SERVER
-  4 phpgroupware bwbserver_linux
-
-NETWORKING_MAIL
-  5 mailx metamail
-  4 faces mozilla-mail evolution
-  3 fetchmail urlview mutt
-  3 !GNOME !KDE xmailbox
-  2 FaxMail comsat elm faces-xface
-  1 exmh sylpheed fetchmail-daemon fetchmailconf
-NETWORKING_MAIL_SERVER
-  5 postfix 
-  4 mailman 
-
-NETWORKING_NEWS
-  5 GNOME pan
-  2 slrn tin trn 
-  1 slrn-pull xrn
-NETWORKING_NEWS_SERVER
-  4 inn 
-  3 inews 
-
-NETWORKING_OTHER
-  2 finger fwhois ucd-snmp-utils htdig macutils
-NETWORKING_OTHER_SERVER
-  3 dhcp-server gated timed ntp
-
-  3 intimed mcserv nscd imap pidentd
-    rdate bootparamd 
-    cleanfeed ucd-snmp leafnode
-    cvsweb nut-server
-    XFree86-Xvfb XFree86-Xnest
-  2 heartbeat diald finger-server mars-nwe
-
-NIS
-  5 ypbind
-NIS_SERVER
-  5 ypserv
-
-NETWORKING_REMOTE_ACCESS
-  5 openssh-clients telnet telnet-client-krb5
-    KDE lisa
-  4 traceroute rfbdrake
-  3 vnc
-  2 rsh
-  2 BOOKS vnc-doc
-NETWORKING_REMOTE_ACCESS_SERVER
-  5 openssh-server
-  4 rfbdrake
-  2 vnc-server
-  1 telnet-server-krb5 rsh-server
-
-NETWORKING_DNS
-  4 bind-utils 
-NETWORKING_DNS_SERVER
-  5 bind 
-  4 caching-nameserver
-  1 nslint
-
-NETWORKING_FILE
-  4 samba-client nfs-utils-clients
-  2 arkeia-gui arkeia-client arkeia-arkc
-  2 GNOME gnomba gtm
-  2 autofs
-  1 am-utils
-NETWORKING_FILE_SERVER 
-  5 nfs-utils
-  4 samba-server bwbserver_linux
-  3 BOOKS samba-doc 
-  2 arkeia-server samba-winbind
-  3 squid squidGuard
-
-NETWORKING_WWW
-  3 lynx 
-  4 !LOCALES"eu" netscape-communicator netscape-plugins 
-  4 wget links mozilla Flashplayer crossover-plugin-demo j2re
-  4 GNOME 
-      screem 
-      !LOCALES"eu" galeon 
-  3 plugger opera bluefish
-NETWORKING_WWW_SERVER
-  5 apache apache-mod_perl mod_ssl mod_php 
-  4 apache-suexec 
-    bwbserver_linux
-  4 BOOKS apache-manual
-  3 php-dba_gdbm_db2 php-gd php-imap php-ldap php-manual php-mysql php-oracle
-    php-pgsql php-readline php mod_sxnet auth_ldap HTML-Embperl
-  2 ApacheJServ
-  1 Zope Zope-core Zope-pcgi Zope-zserver
-
-GRAPHICS
-  4 ImageMagick giftrans gimp gphoto gphoto2 qiv ac3d
-  3 gimp-data-extras gqview sketch xwpick xli
-  2 gif2png gimp-perl xpcd xfig xpcd-gimp gd-utils cameleo
-  1 libgr-progs libungif-progs qcad transfig xpaint xmorph
-  1 3D Mesa-demos
-  GNOME
-    4 gnome-iconedit
-    3 ee
-
-ARCHIVING
-  5 dump ncompress sharutils unzip
-  4 gtkzip zip
-  3 unarj unstuff mt-st
-  2 taper
-  1 lha
-  GNOME
-    4 gnozip
-    3 gtktalog
-
-BURNER
-  5 mkisofs cdrecord
-  4 GNOME gnome-toaster gcombust
-  4 X xcdroast
-  2 X eroaster 
-  DEVELOPMENT
-    3 cdrecord-devel
-
-SCANNER
-  5 sane-frontends
-  4 gimp
-  4 xsane
-
-PHOTO
-  4 gphoto gphoto2
-  3 gnomemeeting openmcu
-
-DATABASES
-  5 postgresql
-  3 MySQL-client MySQL-shared
-  DATABASES_SERVER
-    4 postgresql-server
-    3 MySQL
-    3 postgresql-perl postgresql-python
-    2 postgresql-jdbc postgresql-tk postgresql-odbc postgresql-tcl postgresql-test
-  DEVELOPMENT 
-    4 perl-Mysql
-    3 postgresql-devel
-    1 MySQL-bench MySQL-devel
-
-GAMES
-  4 sin-demo
-  4 clanbomber freeciv lbreakout2 toppler frozen-bubble
-  3 shogo-demo 
-  3 cxhextris rocksndiamonds powermanga mures methane
-  2 Maelstrom pingus ltris penguin-command pysol xtrojka bunnies xpilot trophy xboard xgammon xkobo xpat2 xpuzzles xsoldier xfishtank
-  1 7colors xrally fortune-mod nil
-  GNOME
-    4 gnome-games
-    3 gnome-chess
-    2 3D gtulpas
-    1 gtkgo
-    DEVELOPMENT
-      2 gnomes-games-devel
-  KDE
-    4 kdegames
-    DEVELOPMENT
-      2 kdegames-devel
-  3D
-    4 csmash armagetron
-      !HW"Riva.*128" chromium tuxracer
-
-    3 !HW"Riva.*128" !HW"Rage X[CL]" !HW"Rage Mobility (?:P\/M|L) " !HW"3D Rage (?:LT|Pro)" 
-        bzflag
-
-DEVELOPMENT
-  5 autoconf automake m4 make 
-  3 autoconf2.5
-  1 tmake pmake pmake-customs
-
-  3 libtool binutils ltrace gdb gcc
-  2 gperf cdecl cproto indent ElectricFence
-  1 egcs glibc-profile xxgdb
-
-  4 gcc-c++ libstdc++5-devel libstdc++-devel
-  2 libsigc++-examples
-  1 egcs-c++ 
-
-  3 bison flex
-  2 byacc
-
-  2 doxygen C++2LaTeX
-
-  3 jikes kaffe
-  1 gcc-java
-
-  5 cvs rcs
-  2 diffstat tkcvs
-
-  3 swig
-
-  4 python veepee tkinter
-  3 libpython2.2-devel python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
-
-  4 perl perl-Term-Readline-Gnu perl-libnet perl-libwww-perl perl-devel
-  3 perl-DBI perl-Digest-MD5 perl-IO-stringy perl-PDL perl-Parse-RecDescent 
-    perl-GTK-GLArea perl-Tk perlftlib eperl perl-URI perl-DB_File
-    perl-Data-ShowTable perl-HTML-Parser perl-HTML-SimpleParse perl-MIME-Base64
-    perl-MIME-tools perl-MP3-Info perl-MailTools perl-Msgcat
-
-  4 rpm-build
-  3 rpmlint rpm-devel
-  3 kernel-source
-
-  2 gcc-g77 nasm dev86 
-  1 gcc-objc
-
-  2 teyjus gprolog ocaml umb-scheme mawk guile clisp SmallEiffel p2c 
-    ghc ghc-prof happy haskell-GTK haskell-GTK-devel hugs98 mercury swi-prolog 
-    ruby-extensions ruby-gtk ruby 
-
-  4 gettext-devel
-
-  BOOKS
-    2 pam-doc python-docs slang-doc kernel-doc nasm-doc qt2-doc ruby-doc lkmpg
-
-  KDE
-    3 kdevelop
-    3 kdebase-devel kdegraphics-devel kdelibs-devel kdelibs-sound-devel
-      kdemultimedia-devel kdenetwork-devel
-    1 kdesupport-devel kdeaddutils-devel koffice-devel
-
-  GNOME
-    4 perl-GTK-Glade perl-GTK-Gnome 
-    3 memprof glade gnome-guile pygnome libgnomeui2_0-devel gnome-guile-devel
-      gnome-pim-devel gob 
-    2 pygnome-applet pygnome-capplet pygnome-libglade rep-gtk-gnome
-      libgnomemm-1.2_9-devel gnomemm-devel libgnome-pilot1-devel gnome-pilot-devel glademm 
-    1 gnucash-devel rep-gtk-libglade
-
-  DEVELOPMENT_OTHER
-    2 ImageMagick-devel Mesa-common-devel libXaw3d7-devel Xaw3d-devel detect-devel
-      libgd2-devel gd-devel p2c-devel libgmp3-devel gmp-devel libguile9-devel guile-devel libgr-devel libjpeg62-devel libjpeg-devel libpng3-devel libpng-devel
-      libtermcap2-devel libtermcap-devel libtiff3-devel libtiff-devel libungif4-devel libungif-devel libxml2-devel libxml-devel
-      linuxconf-devel libslang1-devel slang-devel sox-devel zlib1-devel zlib-devel XFree86-devel dev86-devel
-      libgdk-pixbuf2-devel gdk-pixbuf-devel libgimp1.2_1-devel gimp-devel libgpm1-devel gpm-devel kudzu-devel libghttp1-devel libghttp-devel libgtop2.0_0-devel libgtop-devel
-      libmikmod2-devel libmikmod-devel librep9-devel librep-devel libunicode-devel popt-devel pwdb-devel t1lib1-devel t1lib-devel
-      ucd-snmp-devel mpeg_lib-devel WindowMaker-devel aalib-devel libadns1-devel adns-devel
-      alsa-lib-devel audiofile-devel libcups1-devel cups-devel e2fsprogs-devel egcs-objc-devel
-      libg-wrap2-devel g-wrap-devel gkrellm-devel ibtk libPropList-devel licq-devel openldap-devel
-      libparted1.6-devel parted-devel pciutils-devel pilot-link-devel svgalib-devel
-      recode-devel libaspell10-devel aspell-devel cracklib-devel faces-devel fnlib-devel
-      freetype-devel libgtk+mdk0.1_6-devel gtk+mdk-devel libgtkglarea5-devel gtkglarea-devel XFree86-static-libs imap-devel
-      php-devel libpth14-devel pth-devel libsane1-devel sane-devel swig-devel xdelta-devel isapnptools-devel
-      libpango1.0_0-devel pango-devel readline-devel
-
-MONITORING
-  5 procinfo psacct
-  5 PCMCIA apmd
-  4 lsof swatch tcpdump traceroute
-  3 iplog arpwatch lslk nmap nmap-frontend procps-X11 xcpustate xsysinfo
-  2 cfengine gkrellm gps rusers mon xosview 3D xtraceroute
-  1 logcheck bonnie
-  GNOME
-    4 gnome-system-monitor
-
-FILE_TOOLS
-  5 file gnupg mkxauth mtools slocate
-  4 symlinks
-  3 dosfstools draksync mc tree
-  2 git gentoo sfm xwc FileRunner
-  1 xdelta
-
-WEBMIN
-  3 webmin
-
-WIZARDS
-  5 drakwizard
-
-CONFIG
-  4 linuxconf linuxconf-lang-cs linuxconf-lang-de linuxconf-lang-es linuxconf-lang-fi linuxconf-lang-fr linuxconf-lang-hu linuxconf-lang-it linuxconf-lang-ko linuxconf-lang-no linuxconf-lang-pt linuxconf-lang-ro linuxconf-lang-sk linuxconf-lang-sv linuxconf-lang-zh
-  4 X gnome-linuxconf
-  3 ipvsadm quota usernet nut
-  2 gfcc control-panel adjtimex isicom xinput timeconfig samba-swat
-  1 ipxutils
-
-BOOKS
-  3 mandrake_doc-de mandrake_doc-en mandrake_doc-es mandrake_doc-fr mandrake_doc-it mandrake_doc-ru
-
-X
-  5 XFree86 rxvt XFree86-75dpi-fonts urw-fonts
-  5 icewm-light
-
-  4 vim-enhanced
-  4 gurpmi rpmdrake drakconf userdrake fonts-ttf-decoratives fonts-ttf-west_european
-    mandrake-mime menudrake mandrake_desk
-    mdkonline drakfirsttime gtk-engines bootsplash
-  4 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" rxvt-CJK 
-
-  3 XFree86-100dpi-fonts draksync drakprofile
-  3 USB usbview
-  2 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" jmcce 
-  2 tksysv imlib-cfgeditor
-  1 DrakeLogo Mesa xtoolwait X11R6-contrib 
-
-  GNOME
-    3 gnorpm
-
-  5 xcin Chinput xa+cv xvnkb FreeWnn ami kinput2-wnn4
-
-  2 app-defaults-be app-defaults-cs app-defaults-ga app-defaults-ru app-defaults-th app-defaults-uk
-
-  5 CHARSET"iso-8859-13" fonts-type1-baltic
-    LOCALES"ru" || LOCALES"uk" XFree86-cyrillic-fonts
-    LOCALES"he" fonts-hebrew-elmar
-    LOCALES"hy" fonts-ttf-armenian
-    LOCALES"ja" fonts-ttf-japanese
-    LOCALES"ko" fonts-ttf-korean
-    LOCALES"ta" fonts-ttf-tscii fonts-bitmap-tscii
-    LOCALES"th" fonts-ttf-thai
-    LOCALES"zh_CN" || LOCALES"zh" fonts-ttf-gb2312
-    LOCALES"zh_TW" || LOCALES"zh" taipeifonts fonts-ttf-big5
-
-DOCS
-  5 man info man-pages
-
-SYSTEM
-  5 at MAKEDEV eject ldetect devfsd
-    locales iputils urpmi cpio msec tmpwatch
-
-  5 HIGH_SECURITY libsafe kernel-secure-2.4.19.16mdk kernel-secure
-  5 BIGMEM kernel-enterprise-2.4.19.16mdk kernel-enterprise
-  5 SMP kernel-smp-2.4.19.16mdk kernel-smp
-  5 PCMCIA pcmcia-cs
-  5 USB hotplug
-
-  5 HW"nForce.*(?:Audio|Network)" 
-     NVIDIA_nforce-2.4.19-16mdk
-     BIGMEM NVIDIA_nforce-2.4.19-16mdk-enterprise
-
-  4 ftp-client-krb5 gpm hexedit strace sudo grub procmail gnupg
-
-  3 bc
-  2 sndconfig kernel-utils acpid adns audiofile freeswan awesfx fbset vlan-utils
-  1 fdutils genromfs mailcap pinfo
-
-  BOOKS 
-    5 man-pages-cs man-pages-da man-pages-de man-pages-es man-pages-fr man-pages-hu man-pages-id man-pages-it man-pages-ja man-pages-ko man-pages-pl man-pages-ru man-pages-zh
-    3 grub-doc lilo-doc
-      howto-html-de howto-html-el howto-html-en howto-html-es howto-html-fr howto-html-hr howto-html-hu howto-html-id howto-html-it howto-html-ja howto-html-ko howto-html-nl howto-html-pl howto-html-ro howto-html-sl howto-html-sv howto-html-zh
-
-  4 NIS yp-tools
-  3 PCMCIA irda-utils
-  3 USB usbutils
-
-  4 LOCALES"ar" || LOCALES"fa" || LOCALES"he" || LOCALES"yi" acon
-  3 LOCALES"zh" zh-autoconvert
-
-EMULATORS
-  3 wine
-  2 BasiliskII-jit
-  1 BasiliskII
-  2 xdosemu 
-  1 xmame xmess
-
-INSTALL
-  NOCOPY
-    5 kernel-2.4.19.16mdk kernel-2.4.19.16mdk kernel kernel-smp-2.4.19.16mdk kernel-smp-2.4.19.16mdk kernel-smp kernel-enterprise-2.4.19.16mdk kernel-enterprise-2.4.19.16mdk kernel-enterprise
-      raidtools lvm reiserfsprogs jfsprogs xfsprogs 
-      alsa alsa-utils
-    4 XFree86
-
-  5 pptp-adsl dhcpcd dhcpxd dhcp-client isdn4net isdn-light isdn4k-utils ibod rp-pppoe pump wireless-tools speedtouch
-    ppp nfs-utils-clients
-    autologin ntp cups-drivers samba ncpfs hpoj ucd-snmp libptal0
-    libhpojip0 libsnmp0 xojpanel libsane-hpoj0
-    ipchains shorewall iptables printer-utils rlpr samba-client
-    xpp pdq printer-testpages nmap scli net-tools
-    cups lpr foomatic gimpprint
-    nc sndconfig 
-    ImageMagick ghostscript printer-filters mpage a2ps ppdfilt libppd1 gpr groff libgimpprint1 numlock curl
-    sane-backends sane-frontends xsane xsane-gimp mtools mtoolsfm
-    hotplug dev ypbind speedtouch_mgmt
-  4 XFree86-server XFree86-FBDev
-#  4 XFree86-SVGA XFree86-server XFree86-Mach64 XFree86-FBDev
-#    XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa
-#  3 XFree86-S3 XFree86-S3V XFree86-VGA16
-#  2 XFree86-8514 XFree86-AGX XFree86-I128 XFree86-Mach32 XFree86-Mach8 XFree86-Mono XFree86-P9000 XFree86-W32
-#  1 XFree86-3DLabs XFree86-Sun XFree86-SunMono XFree86-Sun24 
diff --git a/perl-install/patch/rpmsrate.oem-9.0-staroffice b/perl-install/patch/rpmsrate.oem-9.0-staroffice
deleted file mode 100644
index 179e19d06..000000000
--- a/perl-install/patch/rpmsrate.oem-9.0-staroffice
+++ /dev/null
@@ -1,552 +0,0 @@
-LSB
-  5 lsb
-
-GRAPHICAL_DESKTOP
-  4 icewm
-  3 WindowMaker
-  3 Epplets WMRack blackbox enlightenment ethemes icepref
-    wmakerconf xlockmore xfce
-  2 wmnet
-  1 lesstif-mwm xbanner
-
-GNOME
-  5 gnome-panel nautilus gnome-control-center metacity gnome-terminal yelp
-    nautilus-gtkhtml
-  4 gnome-tiles gdm gnome-applets gnome-user-docs gtk-themes file-roller
-    gnome-network gnome-utils xlockmore gtk-engines2 
-    gnome-vfs-extras gconf-editor
-  3 gnome-pilot
-  2 bug-buddy
-
-KDE
-  5 kdebase kdebase-nsplugins
-  5 kde-i18n-af kde-i18n-az kde-i18n-bg kde-i18n-ca kde-i18n-cs kde-i18n-da kde-i18n-de kde-i18n-el kde-i18n-en_GB kde-i18n-eo kde-i18n-es kde-i18n-et kde-i18n-fi kde-i18n-fr kde-i18n-he kde-i18n-hu kde-i18n-is kde-i18n-it kde-i18n-ja kde-i18n-ko kde-i18n-lt kde-i18n-lv kde-i18n-nl kde-i18n-no kde-i18n-no_NY kde-i18n-pl kde-i18n-pt kde-i18n-pt_BR kde-i18n-ro kde-i18n-ru kde-i18n-sk kde-i18n-sl kde-i18n-sr kde-i18n-sv kde-i18n-ta kde-i18n-th kde-i18n-tr kde-i18n-uk kde-i18n-zh_CN.GB2312 kde-i18n-zh_TW.Big5 
-  4 kdeaddutils kdeadmin kdegraphics kdemultimedia kdenetwork krozat
-    kdepim kdetoys kdeutils quanta 
-
-  2 kdesdk kdoc
-
-VIDEO
-  4 xine-ui xine-oss xine-xv powerdvd RealPlayer
-  3 nist xanim xmms-smpeg xmovie 
-  2 mtv mtv-fullscreen-extension
-  1 bcast mpeg2_movie
-TV
-  4 zapping xawtv gatos
-  4 KDE kwintv
-
-OFFICE
-  4 staroffice-de staroffice-en staroffice-es staroffice-fr staroffice-it
-    acroread acroread-nppdf
-  3 OpenOffice.org OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-fr OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nl OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-ru OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr
-  4 cbb gaddr xpdf moneydance
-  3 wv ical pyDict
-  2 units lyx
-  GNOME
-    4 gnome-pim gnome-pim-conduits gnumeric mrproject
-    3 dia gnome-pilot-conduits Guppi
-    2 ggv gnucash
-  KDE
-    3 koffice
-    3 koffice-i18n-az koffice-i18n-bg koffice-i18n-cs koffice-i18n-da koffice-i18n-de koffice-i18n-en_GB koffice-i18n-eo koffice-i18n-es koffice-i18n-et koffice-i18n-fr koffice-i18n-hu koffice-i18n-it koffice-i18n-ja koffice-i18n-lt koffice-i18n-mt koffice-i18n-nl koffice-i18n-no koffice-i18n-no_NY koffice-i18n-pl koffice-i18n-pt koffice-i18n-pt_BR koffice-i18n-ro koffice-i18n-ru koffice-i18n-sk koffice-i18n-sl koffice-i18n-sv koffice-i18n-ta koffice-i18n-tr koffice-i18n-uk
-    2 klyx
-
-SOUND
-  5 sox
-  4 aumix
-  4 KDE xmms-arts
-
-AUDIO
-  4 grip xmms xmms-skins
-  4 GNOME gnome-audio gnome-media
-  4 KDE kdelibs-sound
-  4 3D xmms-mesa
-  3 cdp cdparanoia cdrecord-cdda2wav space_sounds timidity-instruments xmms-esd
-    xmms-kjofol-skins xmms-more-vis-plugins
-  3 GNOME gnome-audio-extra 
-  2 mokmod mp3info mpg123 playmidi playmidi-X11 xmms-mikmod
-
-  4 HW"Rio 500" rio500 grio500
-
-ACCESSIBILITY
-  2 gtkeyboard
-
-PUBLISHING
-  5 enscript ghostscript-module-X
-  4 ghostscript-utils gv psutils texinfo nlpr
-  2 latex2html jadetex tetex-afm tetex-dvips tetex-latex tetex-xdvi tetex-latex-arab tetex-latex-heb docbook-dtd31-sgml
-  2 BOOKS tetex-doc
-  1 docbook-style-dsssl openjade sgml-tools ghostscript-module-SVGALIB cttex
-  1 BOOKS docbook-style-dsssl-doc
-
-  5 CUPS 
-      cups-drivers xpp
-  5 CUPS || LPR foomatic
-  1 CUPS hpoj
-
-SHELLS
-  3 zsh
-  3 BOOKS bash-doc zsh-doc
-  2 eshell pdksh tcsh
-  1 bash1
-
-SCIENCES
-  5 3D openuniverse
-  4 gnuplot gtkgraphh
-  3 xlispstat HDF
-  2 mathplot octave
-  1 xoscope
-
-EDITORS
-  4 emacs-X11
-  3 GXedit vim-X11 yudit
-  2 nedit cooledit emacs-tramp joe emacs-leim jed-xjed xemacs xemacs-extras xemacs-info
-  1 auctex emacs-el jed xemacs-el emacs-nox xwpe xwpe-X11
-  GNOME
-    4 gedit
-
-TEXT_TOOLS
-  5 words
-  4 groff patch recode rgrep
-  4 ispell-af ispell-br ispell-ca ispell-cs ispell-da ispell-de ispell-el ispell-en ispell-eo ispell-es ispell-fi ispell-fr ispell-ga ispell-gd ispell-gv ispell-id ispell-it ispell-nl ispell-no ispell-pl ispell-pt ispell-pt_BR ispell-ro ispell-ru ispell-sk ispell-sl ispell-sv
-  3 ed
-  2 groff-gxditview lout
-  BOOKS
-    3 gawk-doc
-    1 lout-doc
-
-COMMUNICATIONS
-  4 efax
-  3 jpilot pilot-link
-  2 hylafax-server hylafax-client dip
-  2 lrzsz mgetty mgetty-contrib mgetty-sendfax mgetty-viewfax mgetty-voice minicom
-  1 jpilot-Mail jpilot-syncmal statserial tkbabel
-
-TERMINALS
-  5 open xterm
-  4 screen kon2
-  3 Eterm vlock
-  1 aterm x3270
-
-  4 KDE ktelnet
-  4 GNOME gnome-telnet
-  4 LOCALES"ja" kterm 
-
-NETWORKING_CHAT
-  3 talk ytalk
-NETWORKING_CHAT_SERVER
-  4 jabber 
-  3 talk-server
-
-NETWORKING_FILE_TRANSFER
-  5 lftp mirrordir rsync
-  4 gftp rdist
-  3 fmirror ncftp tftp
-  3 GNOME dpsftp
-  2 uucp
-
-NETWORKING_FILE_TRANSFER_SERVER
-  4 proftpd bwbserver_linux
-  2 wu-ftpd anonftp
-
-NETWORKING_LDAP_SERVER
-  4 openldap directory_administrator
-
-NETWORKING_INSTANT_MESSAGING
-  4 licq
-  3 everybuddy licq-console licq-rms
-  GNOME
-    5 aspell-br aspell-ca aspell-cs aspell-da aspell-de aspell-de_CH aspell-en aspell-en_CA aspell-en_GB aspell-eo aspell-es aspell-fr aspell-it aspell-nl aspell-no aspell-pl aspell-sv
-    4 gnomeicu gabber gaim
-    3 gtk+licq
-
-NETWORKING_IRC
-  3 BitchX mozilla-irc
-  3 GNOME xchat
-  2 irssi
-  1 eggdrop
-
-NETWORKING_FIREWALLING_SERVER
-  5 iproute2 routed iptables
-  3 prelude
-  1 portsentry 
-
-NETWORKING_GROUPWARE_SERVER
-  4 phpgroupware bwbserver_linux
-
-NETWORKING_MAIL
-  5 mailx metamail
-  4 faces mozilla-mail evolution
-  3 fetchmail urlview mutt
-  3 !GNOME !KDE xmailbox
-  2 FaxMail comsat elm faces-xface
-  1 exmh sylpheed fetchmail-daemon fetchmailconf
-NETWORKING_MAIL_SERVER
-  5 postfix 
-  4 mailman 
-
-NETWORKING_NEWS
-  5 GNOME pan
-  2 slrn tin trn 
-  1 slrn-pull xrn
-NETWORKING_NEWS_SERVER
-  4 inn 
-  3 inews 
-
-NETWORKING_OTHER
-  2 finger fwhois ucd-snmp-utils htdig macutils
-NETWORKING_OTHER_SERVER
-  3 dhcp-server gated timed ntp
-
-  3 intimed mcserv nscd imap pidentd
-    rdate bootparamd 
-    cleanfeed ucd-snmp leafnode
-    cvsweb nut-server
-    XFree86-Xvfb XFree86-Xnest
-  2 heartbeat diald finger-server mars-nwe
-
-NIS
-  5 ypbind
-NIS_SERVER
-  5 ypserv
-
-NETWORKING_REMOTE_ACCESS
-  5 openssh-clients telnet telnet-client-krb5
-    KDE lisa
-  4 traceroute rfbdrake
-  3 vnc
-  2 rsh
-  2 BOOKS vnc-doc
-NETWORKING_REMOTE_ACCESS_SERVER
-  5 openssh-server
-  4 rfbdrake
-  2 vnc-server
-  1 telnet-server-krb5 rsh-server
-
-NETWORKING_DNS
-  4 bind-utils 
-NETWORKING_DNS_SERVER
-  5 bind 
-  4 caching-nameserver
-  1 nslint
-
-NETWORKING_FILE
-  4 samba-client nfs-utils-clients
-  2 arkeia-gui arkeia-client arkeia-arkc
-  2 GNOME gnomba gtm
-  2 autofs
-  1 am-utils
-NETWORKING_FILE_SERVER 
-  5 nfs-utils
-  4 samba-server bwbserver_linux
-  3 BOOKS samba-doc 
-  2 arkeia-server samba-winbind
-  3 squid squidGuard
-
-NETWORKING_WWW
-  3 lynx 
-  4 !LOCALES"eu" netscape-communicator netscape-plugins 
-  4 wget links mozilla Flashplayer crossover-plugin-demo j2re
-  4 GNOME 
-      screem 
-      !LOCALES"eu" galeon 
-  3 plugger opera bluefish
-NETWORKING_WWW_SERVER
-  5 apache apache-mod_perl mod_ssl mod_php 
-  4 apache-suexec 
-    bwbserver_linux
-  4 BOOKS apache-manual
-  3 php-dba_gdbm_db2 php-gd php-imap php-ldap php-manual php-mysql php-oracle
-    php-pgsql php-readline php mod_sxnet auth_ldap HTML-Embperl
-  2 ApacheJServ
-  1 Zope Zope-core Zope-pcgi Zope-zserver
-
-GRAPHICS
-  4 ImageMagick giftrans gimp gphoto gphoto2 qiv ac3d
-  3 gimp-data-extras gqview sketch xwpick xli
-  2 gif2png gimp-perl xpcd xfig xpcd-gimp gd-utils cameleo
-  1 libgr-progs libungif-progs qcad transfig xpaint xmorph
-  1 3D Mesa-demos
-  GNOME
-    4 gnome-iconedit
-    3 ee
-
-ARCHIVING
-  5 dump ncompress sharutils unzip
-  4 gtkzip zip
-  3 unarj unstuff mt-st
-  2 taper
-  1 lha
-  GNOME
-    4 gnozip
-    3 gtktalog
-
-BURNER
-  5 mkisofs cdrecord
-  4 GNOME gnome-toaster gcombust
-  4 X xcdroast
-  2 X eroaster 
-  DEVELOPMENT
-    3 cdrecord-devel
-
-SCANNER
-  5 sane-frontends
-  4 gimp
-  4 xsane
-
-PHOTO
-  4 gphoto gphoto2
-  3 gnomemeeting openmcu
-
-DATABASES
-  5 postgresql
-  3 MySQL-client MySQL-shared
-  DATABASES_SERVER
-    4 postgresql-server
-    3 MySQL
-    3 postgresql-perl postgresql-python
-    2 postgresql-jdbc postgresql-tk postgresql-odbc postgresql-tcl postgresql-test
-  DEVELOPMENT 
-    4 perl-Mysql
-    3 postgresql-devel
-    1 MySQL-bench MySQL-devel
-
-GAMES
-  4 sin-demo
-  3 clanbomber freeciv lbreakout2 toppler frozen-bubble
-  3 shogo-demo 
-  3 cxhextris rocksndiamonds powermanga mures methane
-  2 Maelstrom pingus ltris penguin-command pysol xtrojka bunnies xpilot trophy xboard xgammon xkobo xpat2 xpuzzles xsoldier xfishtank
-  1 7colors xrally fortune-mod nil
-  GNOME
-    3 gnome-games
-    3 gnome-chess
-    2 3D gtulpas
-    1 gtkgo
-    DEVELOPMENT
-      2 gnomes-games-devel
-  KDE
-    3 kdegames
-    DEVELOPMENT
-      2 kdegames-devel
-  3D
-    3 csmash armagetron
-      !HW"Riva.*128" chromium tuxracer
-
-    3 !HW"Riva.*128" !HW"Rage X[CL]" !HW"Rage Mobility (?:P\/M|L) " !HW"3D Rage (?:LT|Pro)" 
-        bzflag
-
-DEVELOPMENT
-  3 autoconf automake m4 make 
-  3 autoconf2.5
-  1 tmake pmake pmake-customs
-
-  3 libtool binutils ltrace gdb gcc
-  2 gperf cdecl cproto indent ElectricFence
-  1 egcs glibc-profile xxgdb
-
-  3 gcc-c++ libstdc++5-devel libstdc++-devel
-  2 libsigc++-examples
-  1 egcs-c++ 
-
-  3 bison flex
-  2 byacc
-
-  2 doxygen C++2LaTeX
-
-  3 jikes kaffe
-  1 gcc-java
-
-  3 cvs rcs
-  2 diffstat tkcvs
-
-  3 swig
-
-  3 python veepee tkinter
-  3 libpython2.2-devel python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
-
-  4 perl perl-Term-Readline-Gnu perl-libnet perl-libwww-perl perl-devel
-  3 perl-DBI perl-Digest-MD5 perl-IO-stringy perl-PDL perl-Parse-RecDescent 
-    perl-GTK-GLArea perl-Tk perlftlib eperl perl-URI perl-DB_File
-    perl-Data-ShowTable perl-HTML-Parser perl-HTML-SimpleParse perl-MIME-Base64
-    perl-MIME-tools perl-MP3-Info perl-MailTools perl-Msgcat
-
-  3 rpm-build
-  3 rpmlint rpm-devel
-  3 kernel-source
-
-  2 gcc-g77 nasm dev86 
-  1 gcc-objc
-
-  2 teyjus gprolog ocaml umb-scheme mawk guile clisp SmallEiffel p2c 
-    ghc ghc-prof happy haskell-GTK haskell-GTK-devel hugs98 mercury swi-prolog 
-    ruby-extensions ruby-gtk ruby 
-
-  3 gettext-devel
-
-  BOOKS
-    2 pam-doc python-docs slang-doc kernel-doc nasm-doc qt2-doc ruby-doc lkmpg
-
-  KDE
-    3 kdevelop
-    3 kdebase-devel kdegraphics-devel kdelibs-devel kdelibs-sound-devel
-      kdemultimedia-devel kdenetwork-devel
-    1 kdesupport-devel kdeaddutils-devel koffice-devel
-
-  GNOME
-    4 perl-GTK-Glade perl-GTK-Gnome 
-    3 memprof glade gnome-guile pygnome libgnomeui2_0-devel gnome-guile-devel
-      gnome-pim-devel gob 
-    2 pygnome-applet pygnome-capplet pygnome-libglade rep-gtk-gnome
-      libgnomemm-1.2_9-devel gnomemm-devel libgnome-pilot1-devel gnome-pilot-devel glademm 
-    1 gnucash-devel rep-gtk-libglade
-
-  DEVELOPMENT_OTHER
-    2 ImageMagick-devel Mesa-common-devel libXaw3d7-devel Xaw3d-devel detect-devel
-      libgd2-devel gd-devel p2c-devel libgmp3-devel gmp-devel libguile9-devel guile-devel libgr-devel libjpeg62-devel libjpeg-devel libpng3-devel libpng-devel
-      libtermcap2-devel libtermcap-devel libtiff3-devel libtiff-devel libungif4-devel libungif-devel libxml2-devel libxml-devel
-      linuxconf-devel libslang1-devel slang-devel sox-devel zlib1-devel zlib-devel XFree86-devel dev86-devel
-      libgdk-pixbuf2-devel gdk-pixbuf-devel libgimp1.2_1-devel gimp-devel libgpm1-devel gpm-devel kudzu-devel libghttp1-devel libghttp-devel libgtop2.0_0-devel libgtop-devel
-      libmikmod2-devel libmikmod-devel librep9-devel librep-devel libunicode-devel popt-devel pwdb-devel t1lib1-devel t1lib-devel
-      ucd-snmp-devel mpeg_lib-devel WindowMaker-devel aalib-devel libadns1-devel adns-devel
-      alsa-lib-devel audiofile-devel libcups1-devel cups-devel e2fsprogs-devel egcs-objc-devel
-      libg-wrap2-devel g-wrap-devel gkrellm-devel ibtk libPropList-devel licq-devel openldap-devel
-      libparted1.6-devel parted-devel pciutils-devel pilot-link-devel svgalib-devel
-      recode-devel libaspell10-devel aspell-devel cracklib-devel faces-devel fnlib-devel
-      freetype-devel libgtk+mdk0.1_6-devel gtk+mdk-devel libgtkglarea5-devel gtkglarea-devel XFree86-static-libs imap-devel
-      php-devel libpth14-devel pth-devel libsane1-devel sane-devel swig-devel xdelta-devel isapnptools-devel
-      libpango1.0_0-devel pango-devel readline-devel
-
-MONITORING
-  5 procinfo psacct
-  5 PCMCIA apmd
-  4 lsof swatch tcpdump traceroute
-  3 iplog arpwatch lslk nmap nmap-frontend procps-X11 xcpustate xsysinfo
-  2 cfengine gkrellm gps rusers mon xosview 3D xtraceroute
-  1 logcheck bonnie
-  GNOME
-    4 gnome-system-monitor
-
-FILE_TOOLS
-  5 file gnupg mkxauth mtools slocate
-  4 symlinks
-  3 dosfstools draksync mc tree
-  2 git gentoo sfm xwc FileRunner
-  1 xdelta
-
-WEBMIN
-  3 webmin
-
-WIZARDS
-  5 drakwizard
-
-CONFIG
-  4 linuxconf linuxconf-lang-cs linuxconf-lang-de linuxconf-lang-es linuxconf-lang-fi linuxconf-lang-fr linuxconf-lang-hu linuxconf-lang-it linuxconf-lang-ko linuxconf-lang-no linuxconf-lang-pt linuxconf-lang-ro linuxconf-lang-sk linuxconf-lang-sv linuxconf-lang-zh
-  4 X gnome-linuxconf
-  3 ipvsadm quota usernet nut
-  2 gfcc control-panel adjtimex isicom xinput timeconfig samba-swat
-  1 ipxutils
-
-BOOKS
-  3 mandrake_doc-de mandrake_doc-en mandrake_doc-es mandrake_doc-fr mandrake_doc-it mandrake_doc-ru
-
-X
-  5 XFree86 rxvt XFree86-75dpi-fonts urw-fonts
-  5 icewm-light
-
-  4 vim-enhanced
-  4 gurpmi rpmdrake drakconf userdrake fonts-ttf-decoratives fonts-ttf-west_european
-    mandrake-mime menudrake mandrake_desk
-    mdkonline drakfirsttime gtk-engines bootsplash
-  4 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" rxvt-CJK 
-
-  3 XFree86-100dpi-fonts draksync drakprofile
-  3 USB usbview
-  2 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" jmcce 
-  2 tksysv imlib-cfgeditor
-  1 DrakeLogo Mesa xtoolwait X11R6-contrib 
-
-  GNOME
-    3 gnorpm
-
-  5 xcin Chinput xa+cv xvnkb FreeWnn ami kinput2-wnn4
-
-  2 app-defaults-be app-defaults-cs app-defaults-ga app-defaults-ru app-defaults-th app-defaults-uk
-
-  5 CHARSET"iso-8859-13" fonts-type1-baltic
-    LOCALES"ru" || LOCALES"uk" XFree86-cyrillic-fonts
-    LOCALES"he" fonts-hebrew-elmar
-    LOCALES"hy" fonts-ttf-armenian
-    LOCALES"ja" fonts-ttf-japanese
-    LOCALES"ko" fonts-ttf-korean
-    LOCALES"ta" fonts-ttf-tscii fonts-bitmap-tscii
-    LOCALES"th" fonts-ttf-thai
-    LOCALES"zh_CN" || LOCALES"zh" fonts-ttf-gb2312
-    LOCALES"zh_TW" || LOCALES"zh" taipeifonts fonts-ttf-big5
-
-DOCS
-  5 man info man-pages
-
-SYSTEM
-  5 at MAKEDEV eject ldetect devfsd
-    locales iputils urpmi cpio msec tmpwatch
-
-  5 HIGH_SECURITY libsafe kernel-secure-2.4.19.16mdk kernel-secure
-  5 BIGMEM kernel-enterprise-2.4.19.16mdk kernel-enterprise
-  5 SMP kernel-smp-2.4.19.16mdk kernel-smp
-  5 PCMCIA pcmcia-cs
-  5 USB hotplug
-
-  5 HW"nForce.*(?:Audio|Network)" 
-     NVIDIA_nforce-2.4.19-16mdk
-     BIGMEM NVIDIA_nforce-2.4.19-16mdk-enterprise
-
-  4 ftp-client-krb5 gpm hexedit strace sudo grub procmail gnupg
-
-  3 bc
-  2 sndconfig kernel-utils acpid adns audiofile freeswan awesfx fbset vlan-utils
-  1 fdutils genromfs mailcap pinfo
-
-  BOOKS 
-    5 man-pages-cs man-pages-da man-pages-de man-pages-es man-pages-fr man-pages-hu man-pages-id man-pages-it man-pages-ja man-pages-ko man-pages-pl man-pages-ru man-pages-zh
-    3 grub-doc lilo-doc
-      howto-html-de howto-html-el howto-html-en howto-html-es howto-html-fr howto-html-hr howto-html-hu howto-html-id howto-html-it howto-html-ja howto-html-ko howto-html-nl howto-html-pl howto-html-ro howto-html-sl howto-html-sv howto-html-zh
-
-  4 NIS yp-tools
-  3 PCMCIA irda-utils
-  3 USB usbutils
-
-  4 LOCALES"ar" || LOCALES"fa" || LOCALES"he" || LOCALES"yi" acon
-  3 LOCALES"zh" zh-autoconvert
-
-EMULATORS
-  3 wine
-  2 BasiliskII-jit
-  1 BasiliskII
-  2 xdosemu 
-  1 xmame xmess
-
-INSTALL
-  NOCOPY
-    5 kernel-2.4.19.16mdk kernel-2.4.19.16mdk kernel kernel-smp-2.4.19.16mdk kernel-smp-2.4.19.16mdk kernel-smp kernel-enterprise-2.4.19.16mdk kernel-enterprise-2.4.19.16mdk kernel-enterprise
-      raidtools lvm reiserfsprogs jfsprogs xfsprogs 
-      alsa alsa-utils
-    4 XFree86
-
-  5 pptp-adsl dhcpcd dhcpxd dhcp-client isdn4net isdn-light isdn4k-utils ibod rp-pppoe pump wireless-tools speedtouch
-    ppp nfs-utils-clients
-    autologin ntp cups-drivers samba ncpfs hpoj ucd-snmp libptal0
-    libhpojip0 libsnmp0 xojpanel libsane-hpoj0
-    ipchains shorewall iptables printer-utils rlpr samba-client
-    xpp pdq printer-testpages nmap scli net-tools
-    cups lpr foomatic gimpprint
-    nc sndconfig 
-    ImageMagick ghostscript printer-filters mpage a2ps ppdfilt libppd1 gpr groff libgimpprint1 numlock curl
-    sane-backends sane-frontends xsane xsane-gimp mtools mtoolsfm
-    hotplug dev ypbind speedtouch_mgmt
-  4 XFree86-server XFree86-FBDev
-#  4 XFree86-SVGA XFree86-server XFree86-Mach64 XFree86-FBDev
-#    XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa
-#  3 XFree86-S3 XFree86-S3V XFree86-VGA16
-#  2 XFree86-8514 XFree86-AGX XFree86-I128 XFree86-Mach32 XFree86-Mach8 XFree86-Mono XFree86-P9000 XFree86-W32
-#  1 XFree86-3DLabs XFree86-Sun XFree86-SunMono XFree86-Sun24