This commit was manufactured by cvs2svn to create tag 'V1_1_9_9mdk'.V1_1_9_9mdk

1 files changed, 0 insertions, 72 deletions

diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm
deleted file mode 100644
index b9072140e..000000000
--- a/perl-install/Xconfig/default.pm
+++ /dev/null
@@ -1,72 +0,0 @@
-package Xconfig::default; # $Id$
-
-use diagnostics;
-use strict;
-
-use Xconfig::xfree;
-use keyboard;
-use common;
-use mouse;
-
-
-sub configure {
-    my ($keyboard, $mouse) = @_;
-
-    $keyboard ||= keyboard::read($::prefix);
-    $mouse ||= do {
-	my $mouse = mouse::read($::prefix); 
-	add2hash($mouse, mouse::detect()) if !$::noauto;
-	$mouse;
-    };
-
-
-    my $raw_X = Xconfig::xfree->empty_config;
-
-    $raw_X->{xfree4}->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype);
-
-    config_keyboard($raw_X, $keyboard);
-    config_mouse($raw_X, $mouse);
-
-    $raw_X;
-}
-
-sub config_mouse {
-    my ($raw_X, $mouse) = @_;
-    mouse::set_xfree_conf($mouse, $raw_X);
-    if (my @wacoms = @{$mouse->{wacom} || []}) {
-	$raw_X->set_wacoms(map { { Device => "/dev/$_", USB => m|input/event| } } @wacoms);
-	$raw_X->{xfree3}->add_load_module('xf86Wacom.so');
-    }
-}
-
-sub config_keyboard {
-    my ($raw_X, $keyboard) = @_;
-
-    my $XkbLayout = keyboard::keyboard2xkb($keyboard);
-
-    if (!$XkbLayout || $XkbLayout =~ /([^(]*)/ && !-e "$::prefix/usr/X11R6/lib/X11/xkb/symbols/$1") {
-	my $f = keyboard::xmodmap_file($keyboard);
-	cp_af($f, "$::prefix/etc/X11/xinit/Xmodmap");	
-	$XkbLayout = '';
-    }
-
-    {
-	my $f = "$::prefix/etc/sysconfig/i18n";
-	setVarsInSh($f, add2hash_({ XKB_IN_USE => $XkbLayout ? '': 'no' }, { getVarsFromSh($f) })) if !$::testing;
-    }
-
-    my $XkbModel = 
-      arch() =~ /sparc/ ? 'sun' :
-	$XkbLayout eq 'jp' ? 'jp106' : 
-	$XkbLayout eq 'br' ? 'abnt2' : 'pc105';
-
-    my $xkb = { $XkbLayout ? (
-			      XkbLayout => $XkbLayout, 
-			      XkbModel => $XkbModel,
-			      if_($keyboard->{GRP_TOGGLE}, XkbOptions => "grp:$keyboard->{GRP_TOGGLE}"),
-			     ) : (XkbDisable => undef) };
-    $raw_X->set_keyboard($xkb);
-}
-
-1;
-