cleanup

38 files changed, 0 insertions, 1737 deletions

diff --git a/x11-base/xfree/files/4.0.3/XftConfig b/x11-base/xfree/files/4.0.3/XftConfig
deleted file mode 100644
index 16af856f7c29..000000000000
--- a/x11-base/xfree/files/4.0.3/XftConfig
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# XftConfig
-#
-# Use with Type1 and TrueType fonts
-#
-
-dir "/usr/X11R6/lib/X11/fonts/Type1"
-dir "/usr/X11R6/lib/X11/fonts/truetype"
-
-#
-# alias 'fixed' for 'mono'
-#
-match any family == "fixed"		edit family =+ "mono";
-
-#
-#Check users config file
-#
-includeif	"~/.xftconfig"
-
-#
-# Substitute TrueType fonts for Type1 versions
-#
-match any family == "Times"		edit family += "Times New Roman";
-match any family == "Helvetica"		edit family += "Verdana";
-match any family == "Courier"		edit family += "Courier New";
-
-#
-# Use TrueType fonts for defaults
-#
-match any family == "serif" 		edit family += "Times New Roman";
-match any family == "sans" 		edit family += "Verdana";
-
-#
-# Use monotype.com (andale) face where possible
-#
-match 
-	any family == "mono" 
-	all slant == roman 
-	all weight < bold
-edit
-	family += "monotype.com";
-#
-# otherwise, use courier
-#
-match any family == "mono"		edit family += "Courier New";
-
-#
-# Alias between XLFD families and font file family name, prefer local fonts
-#
-match any family == "Charter"		edit family += "Bitstream Charter";
-match any family == "Bitstream Charter" edit family =+ "Charter";
-
-match any family == "Lucidux Serif"	edit family += "LuciduxSerif";
-match any family == "LuciduxSerif"	edit family =+ "Lucidux Serif";
-
-match any family == "Lucidux Sans"	edit family += "LuciduxSans";
-match any family == "LuciduxSans"	edit family =+ "Lucidux Sans";
-
-match any family == "Lucidux Mono"	edit family += "LuciduxMono";
-match any family == "LuciduxMono"	edit family =+ "Lucidux Mono";
-    
-#
-# TrueType font aliases
-#
-match any family == "Comic Sans"	edit family += "Comic Sans MS";
-match any family == "Comic Sans MS"	edit family =+ "Comic Sans";
-match any family == "Trebuchet" 	edit family += "Trebuchet MS";
-match any family == "Trebuchet MS" 	edit family =+ "Trebuchet";
-match any family == "Monotype" 		edit family =+ "Monotype.com";
-match any family == "Andale Mono"	edit family += "Monotype.com";
-match any family == "Monotype.com"	edit family =+ "Andale Mono";
diff --git a/x11-base/xfree/files/4.0.3/glibc-2.2.2-ClockP.diff b/x11-base/xfree/files/4.0.3/glibc-2.2.2-ClockP.diff
deleted file mode 100644
index 34f6f048a589..000000000000
--- a/x11-base/xfree/files/4.0.3/glibc-2.2.2-ClockP.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xc/programs/xclock/ClockP.h~	Tue Nov  7 00:05:41 2000
-+++ xc/programs/xclock/ClockP.h	Tue Feb 20 00:58:10 2001
-@@ -52,6 +52,7 @@
- 
- #include <X11/Xos.h>		/* Needed for struct tm. */
- #include "Clock.h"
-+#include <time.h>
- #include <X11/Xaw/SimpleP.h>
- 
- #define SEG_BUFF_SIZE		128
diff --git a/x11-base/xfree/files/4.0.3/site.def b/x11-base/xfree/files/4.0.3/site.def
deleted file mode 100644
index 5fffd836f18f..000000000000
--- a/x11-base/xfree/files/4.0.3/site.def
+++ /dev/null
@@ -1,8 +0,0 @@
-#define HasZlib YES
-#define HasGcc2ForCplusplus YES
-#define GccWarningOptions -Wall 
-#define ForceNormalLib YES
-#define BuildXinerama YES
-#define SharedLibXau YES
-
-
diff --git a/x11-base/xfree/files/4.2.0-r11/10xfree b/x11-base/xfree/files/4.2.0-r11/10xfree
deleted file mode 100644
index a302f743012c..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/10xfree
+++ /dev/null
@@ -1,6 +0,0 @@
-PATH=/usr/X11R6/bin
-ROOTPATH=/usr/X11R6/bin
-LDPATH=/usr/X11R6/lib
-MANPATH=/usr/X11R6/man
-INFODIR=/usr/X11R6/info
-XINITRC=/etc/X11/xinit/xinitrc
diff --git a/x11-base/xfree/files/4.2.0-r11/Sessions/Xsession b/x11-base/xfree/files/4.2.0-r11/Sessions/Xsession
deleted file mode 100644
index c86ccee19ff3..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/Sessions/Xsession
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
-
-case $# in
-1)
-	case $1 in
-	failsafe)
-		exec xterm -geometry 80x24-0-0
-		;;
-	esac
-esac
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-# clean up after xbanner
-if which freetemp 2> /dev/null ; then
-	freetemp
-fi
-
-startup=$HOME/.xsession
-
-userresources=$HOME/.Xresources 
-usermodmap=$HOME/.Xmodmap 
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources 
-sysmodmap=/etc/X11/Xmodmap 
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources 
-rh6sysmodmap=/etc/X11/xinit/Xmodmap 
-
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-if [ -x "$startup" ]; then
-	exec "$startup"
-elif [ -x "$HOME/.Xclients" ]; then
-	exec "$HOME/.Xclients"
-elif [ -x /etc/X11/xinit/Xclients ]; then
-	exec /etc/X11/xinit/Xclients
-elif [ -x /etc/X11/Xclients ]; then
-	exec /etc/X11/Xclients
-else
-	exec xsm
-fi
diff --git a/x11-base/xfree/files/4.2.0-r11/XftConfig b/x11-base/xfree/files/4.2.0-r11/XftConfig
deleted file mode 100644
index 16af856f7c29..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/XftConfig
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# XftConfig
-#
-# Use with Type1 and TrueType fonts
-#
-
-dir "/usr/X11R6/lib/X11/fonts/Type1"
-dir "/usr/X11R6/lib/X11/fonts/truetype"
-
-#
-# alias 'fixed' for 'mono'
-#
-match any family == "fixed"		edit family =+ "mono";
-
-#
-#Check users config file
-#
-includeif	"~/.xftconfig"
-
-#
-# Substitute TrueType fonts for Type1 versions
-#
-match any family == "Times"		edit family += "Times New Roman";
-match any family == "Helvetica"		edit family += "Verdana";
-match any family == "Courier"		edit family += "Courier New";
-
-#
-# Use TrueType fonts for defaults
-#
-match any family == "serif" 		edit family += "Times New Roman";
-match any family == "sans" 		edit family += "Verdana";
-
-#
-# Use monotype.com (andale) face where possible
-#
-match 
-	any family == "mono" 
-	all slant == roman 
-	all weight < bold
-edit
-	family += "monotype.com";
-#
-# otherwise, use courier
-#
-match any family == "mono"		edit family += "Courier New";
-
-#
-# Alias between XLFD families and font file family name, prefer local fonts
-#
-match any family == "Charter"		edit family += "Bitstream Charter";
-match any family == "Bitstream Charter" edit family =+ "Charter";
-
-match any family == "Lucidux Serif"	edit family += "LuciduxSerif";
-match any family == "LuciduxSerif"	edit family =+ "Lucidux Serif";
-
-match any family == "Lucidux Sans"	edit family += "LuciduxSans";
-match any family == "LuciduxSans"	edit family =+ "Lucidux Sans";
-
-match any family == "Lucidux Mono"	edit family += "LuciduxMono";
-match any family == "LuciduxMono"	edit family =+ "Lucidux Mono";
-    
-#
-# TrueType font aliases
-#
-match any family == "Comic Sans"	edit family += "Comic Sans MS";
-match any family == "Comic Sans MS"	edit family =+ "Comic Sans";
-match any family == "Trebuchet" 	edit family += "Trebuchet MS";
-match any family == "Trebuchet MS" 	edit family =+ "Trebuchet";
-match any family == "Monotype" 		edit family =+ "Monotype.com";
-match any family == "Andale Mono"	edit family += "Monotype.com";
-match any family == "Monotype.com"	edit family =+ "Andale Mono";
diff --git a/x11-base/xfree/files/4.2.0-r11/Xsession b/x11-base/xfree/files/4.2.0-r11/Xsession
deleted file mode 100644
index 961becdb1963..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/Xsession
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
-#
-#
-#
-#
-# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-# handle KDM
-if [ -n "$1" ]; then
-	export XSESSION="$1"
-fi
-
-# This next bit should be in the users ~/.xsession,
-# but we have it here as reference
-#
-#userdefaults=$HOME/.Xdefaults  
-#userresources=$HOME/.Xresources   
-#usermodmap=$HOME/.Xmodmap   
-#  
-##Xdefaults  
-#if [ -f "$userdefaults" ]; then  
-#	xrdb -merge "$userdefaults"  
-#fi  
-#Xresorces  
-#if [ -f "$userresources" ]; then  
-#	xrdb -merge "$userresources"  
-#fi  
-##Xmodmap  
-#if [ -f "$usermodmap" ]; then  
-#	xmodmap "$usermodmap"  
-#fi  
-
-startup=$HOME/.xsession
-
-# First run ~/.xsession if it exists
-if [ -s "$startup" ]; then
-	if [ -x "$startup" ]; then
-		exec "$startup"
-	else
-		exec /bin/sh "$startup"
-	fi
-# If not, try the system default
-elif [ -n "`/etc/X11/chooser.sh`" ]; then
-	exec "`/etc/X11/chooser.sh`"
-# Lastly, xsm as failsafe
-else
-	exec xsm
-fi
-
diff --git a/x11-base/xfree/files/4.2.0-r11/Xsetup_0 b/x11-base/xfree/files/4.2.0-r11/Xsetup_0
deleted file mode 100644
index 7cbdfc32d07e..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/Xsetup_0
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
-#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
-
-# get KDEDIR value (only) and run kdmdesktop from there
-eval "`grep KDEDIR /etc/profile.env`"
-[ -n "$KDEDIR" ]  && ${KDEDIR}/bin/kdmdesktop
-
-# --- Gentoo ---
-# create list of sessions for kdm
-sessions="SessionTypes="
-for x in `ls /etc/X11/Sessions`
-do
-    sessions="${sessions}${x},"
-done
-echo sessions: $sessions
-
-# update all kdmrcs located
-source /etc/make.conf
-for dir in $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR $KDEDIR ~/.kde /usr/kde/2 /usr/kde/3 /usr
-do
-
-    cd ${dir}/share/config/kdm || continue
-    
-    cp kdmrc kdmrc.orig
-    sed -e "/SessionTypes=/c\
-${sessions}" kdmrc.orig > kdmrc
-    rm kdmrc.orig
-    
-done
diff --git a/x11-base/xfree/files/4.2.0-r11/chooser.sh b/x11-base/xfree/files/4.2.0-r11/chooser.sh
deleted file mode 100644
index 7bae2ea56d90..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/chooser.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/chooser.sh,v 1.1 2002/05/29 00:21:58 azarah Exp $
-
-#if $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
-if [ -z "$XSESSION" ]
-then
-	[ -f /etc/conf.d/basic ] && source /etc/conf.d/basic
-	[ -f /etc/rc.conf ] && source /etc/rc.conf
-fi
-
-#find a match for $XSESSION in /etc/X11/Sessions
-GENTOO_SESSION=""
-for x in /etc/X11/Sessions/*
-do
-	if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
-		= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]
-	then
-		GENTOO_SESSION=${x}
-		break
-	fi
-done
-
-GENTOO_EXEC=""
-
-if [ -n "$XSESSION" ]; then
-	if [ -f "/etc/X11/Sessions/${XSESSION}" ]; then
-		if [ -x "/etc/X11/Sessions/${XSESSION}" ]; then
-			GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
-		else
-			GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
-		fi
-	elif [ -n "$GENTOO_SESSION" ]; then
-		if [ -x "$GENTOO_SESSION" ]; then
-			GENTOO_EXEC="$GENTOO_SESSION"
-		else
-			GENTOO_EXEC="/bin/sh $GENTOO_SESSION"
-		fi
-	else
-		for x in "$XSESSION" \
-			"`echo $XSESSION | awk '{ print toupper($1) }'`" \
-			"`echo $XSESSION | awk '{ print tolower($1) }'`"
-		do
-			#fall through ...
-			if [ -x "/bin/${x}" ]; then
-				GENTOO_EXEC="/bin/${x}"
-				break
-			elif [ -x "/usr/bin/${x}" ]; then
-				GENTOO_EXEC="/usr/bin/${x}"
-				break
-			elif [ -x "/usr/X11R6/bin/${x}" ]; then
-				GENTOO_EXEC="/usr/X11R6/bin/${x}"
-				break
-			elif [ -x "/usr/local/bin/${x}" ]; then
-				GENTOO_EXEC="/usr/local/bin/${x}"
-				break
-			fi
-		done
-	fi
-fi
-
-echo "$GENTOO_EXEC"
diff --git a/x11-base/xfree/files/4.2.0-r11/lib/libGL.la b/x11-base/xfree/files/4.2.0-r11/lib/libGL.la
deleted file mode 100644
index 8566b67d4c3d..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/lib/libGL.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.1.2 libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread        '
-
-# Version information for libGL.
-current=3
-age=2
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib/opengl/xfree/lib'
diff --git a/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la b/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la
deleted file mode 100644
index 86b6432cf5db..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGLU.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGLU.so.1'
-
-# Names of this library.
-library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread      '
-
-# Version information for libGLU.
-current=4
-age=3
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
diff --git a/x11-base/xfree/files/4.2.0-r11/lib/libOSMesa.la b/x11-base/xfree/files/4.2.0-r11/lib/libOSMesa.la
deleted file mode 100644
index 56a72ed91f02..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/lib/libOSMesa.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libOSMesa.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libOSMesa.so.3'
-
-# Names of this library.
-library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread '
-
-# Version information for libOSMesa.
-current=4
-age=3
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/X11R6/lib'
diff --git a/x11-base/xfree/files/4.2.0-r11/site.def b/x11-base/xfree/files/4.2.0-r11/site.def
deleted file mode 100644
index d53217da7df5..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/site.def
+++ /dev/null
@@ -1,60 +0,0 @@
-#define HasZlib YES
-#define HasPam YES
-#define HasNCurses YES
-#define HasLibCrypt YES
-#define HasGcc2ForCplusplus YES
-#define LocalThreads YES
-#define ThreadedX YES
-#define HasPosixThreads YES
-#define HasThreadSafeAPI YES
-#define ForceNormalLib YES
-#define BuildXinerama YES
-#define XprtServer YES
-#define XnestServer YES
-#define SharedLibXau YES
-#define BuildFonts YES
-#define BuildFreeType YES
-#define BuildFreetype2Library YES
-#define BuildXTrueType YES
-/* #define BuildCyrillicFonts YES */
-#define BuildXF86MiscExt YES
-#define BuildXInputExt YES
-#define BuildXKB YES
-#define BuildDBE YES
-#define BuildScreenSaverExt YES
-#define BuildRman YES
-#define BuildHtmlManPages NO
-#define BuildAllSpecsDocs NO
-#define BuildSpecsDocs NO
-#define BuildXF86DRI YES
-#define HasAgpGart YES
-#define BuildGLXLibrary YES
-#define BuildGlxExt YES
-#define BuildGLULibrary YES
-#define SharedLibGLU YES
-#define NormalLibGLU YES
-#define DoLoadableServer YES
-#define BuildXvExt YES
-#define BuildXF86DGA YES
-#define BuildRender YES
-#define BuildRECORD YES
-#define BuildPexExt YES
-#define BuildXIE YES
-
-/* required for Lokis Erics Ultimate Solitaire */
-#define UseInternalMalloc NO
-#define ForceNormalLib YES
-#define SharedLibXxf86vm YES
-#define SharedLibXxf86dga YES
-#define SharedLibXxf86misc YES
-#define SharedLibXv YES
-
-/* binutils-2.9 */
-#define LinuxBinUtilsMajorVersion 29
-/* glibc-2.2 (6.2 because glibc is considered libc-6) */
-#define LinuxCLibMajorVersion 6
-#define LinuxClibMinorVersion 2
-#define HasTk NO
-#define HasTcl NO
-#define FSUseSyslog YES
-
diff --git a/x11-base/xfree/files/4.2.0-r11/startDM.sh b/x11-base/xfree/files/4.2.0-r11/startDM.sh
deleted file mode 100644
index 30b4e6e1015b..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/startDM.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/startDM.sh,v 1.1 2002/05/29 00:21:58 azarah Exp $
-
-source /etc/init.d/functions.sh
-
-if [ -e ${svcdir}/options/xdm/service ]
-then
-	/sbin/start-stop-daemon --start --quiet \
-		--exec "`cat ${svcdir}/options/xdm/service`"
-	if [ $? -ne 0 ]
-	then
-		#there was a error running the DM
-		einfo "ERROR: could not start the Display Manager..."
-	fi
-fi
-
diff --git a/x11-base/xfree/files/4.2.0-r11/xdm b/x11-base/xfree/files/4.2.0-r11/xdm
deleted file mode 100644
index 1d2e081625f1..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/xdm
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth       required	/lib/security/pam_stack.so service=system-auth
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_stack.so service=system-auth
-password   required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth
-session    optional     /lib/security/pam_console.so
diff --git a/x11-base/xfree/files/4.2.0-r11/xdm.start b/x11-base/xfree/files/4.2.0-r11/xdm.start
deleted file mode 100644
index 1dd5ae6dd026..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/xdm.start
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xdm.start,v 1.1 2002/05/29 00:21:58 azarah Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) have the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runleve, as was
-# done previously.
-#
-# This script then just calls "tellinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-
-# Start X Font Server before X
-depend() {
-	use xfs
-}
-
-setup_dm() {
-	source /etc/profile.env
-	export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}"
-
-	case "$(echo ${DISPLAYMANAGER} | awk '{ print toupper($1) }')" in
-		KDM|KDE|KDE2|KDE3)	 
-			EXE="$(which kdm)"
-			;;
-		GDM|GNOME) 
-			EXE=/usr/bin/gdm
-			;;
-		*)	
-			EXE=/usr/X11R6/bin/xdm
-			;;
-	esac
-
-	test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm
-
-	SERVICE="${EXE##*/}"
-}
-
-start() {
-	setup_dm
-	ebegin "Setting up ${SERVICE}"
-	#save the prefered DM
-	save_options "service" "${EXE}"
-	#tell init to run /etc/X11/startDM.sh after current
-	#runlevel is finished (should *not* be in the "boot"
-	#                      runlevel).
-	/sbin/telinit a &>/dev/null
-	eend 0
-}
-
-stop() {
-	local retval=0
-	local curvt="$(fgconsole)"
-	local myexe="$(get_options "service")"
-	local myservice="${myexe##*/}"
-	ebegin "Stopping ${myservice}"
-	rm -f ${svcdir}/options/xdm/service
-	if [ "$(ps -A | grep -e "${myservice}")" ]
-	then
-		start-stop-daemon --stop --quiet \
-			--exe ${myexe} &>/dev/null
-		retval=$?
-	else
-		retval=1
-	fi
-	#switch back to original vt
-	chvt "${curvt}" &>/dev/null
-	eend ${retval} "Error stopping ${myservice}."
-	return ${retval}
-}
-
-
-# vim:ts=4
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.conf.d b/x11-base/xfree/files/4.2.0-r11/xfs.conf.d
deleted file mode 100644
index 4c986fa4e89c..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/xfs.conf.d
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.conf.d,v 1.1 2002/05/31 15:38:03 azarah Exp $
-
-# Config file for /etc/init.d/xfs
-
-
-# Port for xfs to listen on.  Default is set to "-1", meaning
-# it will only listen on unix sockets, and not tcp ports.  If
-# you however want it to listen on tcp, remember to comment
-# "nolisten = tcp" in /etc/X11/fs/config.
-
-XFS_PORT="-1"
-
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.config b/x11-base/xfree/files/4.2.0-r11/xfs.config
deleted file mode 100644
index d8bc52b30d68..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/xfs.config
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# X Font Server configuration file
-#
-
-# allow a max of 4 clients to connect to this font server
-#client-limit = 4
-
-# no tcp, use sockets!
-no-listen  =  tcp
-
-# when a font server reaches its limit, start up a new one
-clone-self = on
-
-# alternate font servers for clients to use
-#alternate-servers = foo:7101,bar:7102
-
-# where to look for fonts
-# Some of these are commented out, i.e. the TrueType and Type1
-# directories in /usr/share, because they aren't forced to be
-# installed alongside X.
-#
-catalogue = /usr/X11R6/lib/X11/fonts/75dpi,
-	/usr/X11R6/lib/X11/fonts/100dpi,
-	/usr/X11R6/lib/X11/fonts/misc,
-	/usr/X11R6/lib/X11/fonts/Type1,
-	/usr/X11R6/lib/X11/fonts/Speedo,
-	/usr/X11R6/lib/X11/fonts/CID,
-	/usr/X11R6/lib/X11/fonts/PEX,
-	/usr/X11R6/lib/X11/fonts/util,
-	/usr/X11R6/lib/X11/fonts/Type1,
-	/usr/X11R6/lib/X11/fonts/local,
-	/usr/X11R6/lib/X11/fonts/Speedo,
-	/usr/X11R6/lib/X11/fonts/truetype,
-	/usr/X11R6/lib/X11/fonts/TTF,
-	/usr/X11R6/lib/X11/fonts/encodings,
-	/usr/X11R6/lib/X11/fonts/cyrillic,
-	/usr/X11R6/lib/X11/fonts/freefont,
-	/usr/X11R6/lib/X11/fonts/sharefont,
-	/usr/share/fonts/default/Type1,
-	/usr/share/fonts/ttf/decoratives,
-	/usr/share/fonts/ttf/western
-
-# in 12 points, decipoints
-default-point-size = 120
-
-# 100 x 100 and 75 x 75
-default-resolutions = 75,75,100,100
-
-# how to log errors
-use-syslog = on
-
-# font cache control, specified in KB
-cache-hi-mark = 2048
-cache-low-mark = 1433
-cache-balance = 70
-
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.start b/x11-base/xfree/files/4.2.0-r11/xfs.start
deleted file mode 100644
index 5ffeab04b93b..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/xfs.start
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.start,v 1.3 2002/06/06 19:33:10 azarah Exp $
-
-#NB: Config is in /etc/conf.d/xfs
-
-
-depend() {
-	use logger
-}
-
-check_config() {
-	if [ -z "${XFS_PORT}" ]
-	then
-		eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	check_config || return 1
-	ebegin "Starting X Font Server"
-	if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-			-- -daemon -config /etc/X11/fs/config \
-				-droppriv -user xfs -port ${XFS_PORT} 1>&2
-	else
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-			-- -daemon -config /etc/X11/fs/config \
-				-port ${XFS_PORT} 1>&2
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping X Font Server"
-	start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2
-	rm -rf /tmp/.font-unix
-	eend $?
-}
diff --git a/x11-base/xfree/files/4.2.0-r11/xinitrc b/x11-base/xfree/files/4.2.0-r11/xinitrc
deleted file mode 100644
index 9a669469a542..000000000000
--- a/x11-base/xfree/files/4.2.0-r11/xinitrc
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=XINITDIR/.Xresources
-sysmodmap=XINITDIR/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    xmodmap $usermodmap
-fi
-
-# First try ~/.xinitrc
-if [ -f "$HOME/.xinitrc" ]; then
-	XINITRC="$HOME/.xinitrc"
-	exec /bin/sh "$HOME/.xinitrc"
-# If not present, try the system default
-elif [ -n "`/etc/X11/chooser.sh`" ]; then
-	exec "`/etc/X11/chooser.sh`"
-# Failsafe
-else
-	# start some nice programs
-	twm &
-	xclock -geometry 50x50-1+1 &
-	xterm -geometry 80x50+494+51 &
-	xterm -geometry 80x20+494-0 &
-	exec xterm -geometry 80x66+0+0 -name login
-fi
diff --git a/x11-base/xfree/files/4.2.0-r9/10xfree b/x11-base/xfree/files/4.2.0-r9/10xfree
deleted file mode 100644
index a302f743012c..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/10xfree
+++ /dev/null
@@ -1,6 +0,0 @@
-PATH=/usr/X11R6/bin
-ROOTPATH=/usr/X11R6/bin
-LDPATH=/usr/X11R6/lib
-MANPATH=/usr/X11R6/man
-INFODIR=/usr/X11R6/info
-XINITRC=/etc/X11/xinit/xinitrc
diff --git a/x11-base/xfree/files/4.2.0-r9/Sessions/Xsession b/x11-base/xfree/files/4.2.0-r9/Sessions/Xsession
deleted file mode 100644
index c86ccee19ff3..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/Sessions/Xsession
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
-
-case $# in
-1)
-	case $1 in
-	failsafe)
-		exec xterm -geometry 80x24-0-0
-		;;
-	esac
-esac
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-# clean up after xbanner
-if which freetemp 2> /dev/null ; then
-	freetemp
-fi
-
-startup=$HOME/.xsession
-
-userresources=$HOME/.Xresources 
-usermodmap=$HOME/.Xmodmap 
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources 
-sysmodmap=/etc/X11/Xmodmap 
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources 
-rh6sysmodmap=/etc/X11/xinit/Xmodmap 
-
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-if [ -x "$startup" ]; then
-	exec "$startup"
-elif [ -x "$HOME/.Xclients" ]; then
-	exec "$HOME/.Xclients"
-elif [ -x /etc/X11/xinit/Xclients ]; then
-	exec /etc/X11/xinit/Xclients
-elif [ -x /etc/X11/Xclients ]; then
-	exec /etc/X11/Xclients
-else
-	exec xsm
-fi
diff --git a/x11-base/xfree/files/4.2.0-r9/XftConfig b/x11-base/xfree/files/4.2.0-r9/XftConfig
deleted file mode 100644
index 16af856f7c29..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/XftConfig
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# XftConfig
-#
-# Use with Type1 and TrueType fonts
-#
-
-dir "/usr/X11R6/lib/X11/fonts/Type1"
-dir "/usr/X11R6/lib/X11/fonts/truetype"
-
-#
-# alias 'fixed' for 'mono'
-#
-match any family == "fixed"		edit family =+ "mono";
-
-#
-#Check users config file
-#
-includeif	"~/.xftconfig"
-
-#
-# Substitute TrueType fonts for Type1 versions
-#
-match any family == "Times"		edit family += "Times New Roman";
-match any family == "Helvetica"		edit family += "Verdana";
-match any family == "Courier"		edit family += "Courier New";
-
-#
-# Use TrueType fonts for defaults
-#
-match any family == "serif" 		edit family += "Times New Roman";
-match any family == "sans" 		edit family += "Verdana";
-
-#
-# Use monotype.com (andale) face where possible
-#
-match 
-	any family == "mono" 
-	all slant == roman 
-	all weight < bold
-edit
-	family += "monotype.com";
-#
-# otherwise, use courier
-#
-match any family == "mono"		edit family += "Courier New";
-
-#
-# Alias between XLFD families and font file family name, prefer local fonts
-#
-match any family == "Charter"		edit family += "Bitstream Charter";
-match any family == "Bitstream Charter" edit family =+ "Charter";
-
-match any family == "Lucidux Serif"	edit family += "LuciduxSerif";
-match any family == "LuciduxSerif"	edit family =+ "Lucidux Serif";
-
-match any family == "Lucidux Sans"	edit family += "LuciduxSans";
-match any family == "LuciduxSans"	edit family =+ "Lucidux Sans";
-
-match any family == "Lucidux Mono"	edit family += "LuciduxMono";
-match any family == "LuciduxMono"	edit family =+ "Lucidux Mono";
-    
-#
-# TrueType font aliases
-#
-match any family == "Comic Sans"	edit family += "Comic Sans MS";
-match any family == "Comic Sans MS"	edit family =+ "Comic Sans";
-match any family == "Trebuchet" 	edit family += "Trebuchet MS";
-match any family == "Trebuchet MS" 	edit family =+ "Trebuchet";
-match any family == "Monotype" 		edit family =+ "Monotype.com";
-match any family == "Andale Mono"	edit family += "Monotype.com";
-match any family == "Monotype.com"	edit family =+ "Andale Mono";
diff --git a/x11-base/xfree/files/4.2.0-r9/Xsession b/x11-base/xfree/files/4.2.0-r9/Xsession
deleted file mode 100644
index 3b1f2f1fa535..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/Xsession
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
-#
-#
-#
-#
-# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-
-# handle KDM
-if [ -n "$1" ]; then
-	export XSESSION="$1"
-fi
-
-startup=$HOME/.xsession
-resources=$HOME/.Xresources
-
-if [ -n "`/etc/X11/chooser.sh`" ]; then
-	exec "`/etc/X11/chooser.sh`"
-elif [ -s "$startup" ]; then
-	if [ -x "$startup" ]; then
-		exec "$startup"
-	else
-		exec /bin/sh "$startup"
-	fi
-else
-	if [ -r "$resources" ]; then
-		xrdb -load "$resources"
-	fi
-	exec xsm
-fi
diff --git a/x11-base/xfree/files/4.2.0-r9/Xsetup_0 b/x11-base/xfree/files/4.2.0-r9/Xsetup_0
deleted file mode 100644
index 7cbdfc32d07e..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/Xsetup_0
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
-#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
-
-# get KDEDIR value (only) and run kdmdesktop from there
-eval "`grep KDEDIR /etc/profile.env`"
-[ -n "$KDEDIR" ]  && ${KDEDIR}/bin/kdmdesktop
-
-# --- Gentoo ---
-# create list of sessions for kdm
-sessions="SessionTypes="
-for x in `ls /etc/X11/Sessions`
-do
-    sessions="${sessions}${x},"
-done
-echo sessions: $sessions
-
-# update all kdmrcs located
-source /etc/make.conf
-for dir in $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR $KDEDIR ~/.kde /usr/kde/2 /usr/kde/3 /usr
-do
-
-    cd ${dir}/share/config/kdm || continue
-    
-    cp kdmrc kdmrc.orig
-    sed -e "/SessionTypes=/c\
-${sessions}" kdmrc.orig > kdmrc
-    rm kdmrc.orig
-    
-done
diff --git a/x11-base/xfree/files/4.2.0-r9/chooser.sh b/x11-base/xfree/files/4.2.0-r9/chooser.sh
deleted file mode 100644
index 1f4c9691fe73..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/chooser.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/chooser.sh,v 1.1 2002/04/07 05:41:58 azarah Exp $
-
-#if $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
-if [ -z "$XSESSION" ]
-then
-	[ -f /etc/conf.d/basic ] && source /etc/conf.d/basic
-	[ -f /etc/rc.conf ] && source /etc/rc.conf
-fi
-
-#find a match for $XSESSION in /etc/X11/Sessions
-GENTOO_SESSION=""
-for x in /etc/X11/Sessions/*
-do
-	if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
-		= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]
-	then
-		GENTOO_SESSION=${x}
-		break
-	fi
-done
-
-GENTOO_EXEC=""
-
-if [ -n "$XSESSION" ]; then
-	if [ -f "/etc/X11/Sessions/${XSESSION}" ]; then
-		if [ -x "/etc/X11/Sessions/${XSESSION}" ]; then
-			GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
-		else
-			GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
-		fi
-	elif [ -n "$GENTOO_SESSION" ]; then
-		if [ -x "$GENTOO_SESSION" ]; then
-			GENTOO_EXEC="$GENTOO_SESSION"
-		else
-			GENTOO_EXEC="/bin/sh $GENTOO_SESSION"
-		fi
-	else
-		for x in "$XSESSION" \
-			"`echo $XSESSION | awk '{ print toupper($1) }'`" \
-			"`echo $XSESSION | awk '{ print tolower($1) }'`"
-		do
-			#fall through ...
-			if [ -x "/bin/${x}" ]; then
-				GENTOO_EXEC="/bin/${x}"
-				break
-			elif [ -x "/usr/bin/${x}" ]; then
-				GENTOO_EXEC="/usr/bin/${x}"
-				break
-			elif [ -x "/usr/X11R6/bin/${x}" ]; then
-				GENTOO_EXEC="/usr/X11R6/bin/${x}"
-				break
-			elif [ -x "/usr/local/bin/${x}" ]; then
-				GENTOO_EXEC="/usr/local/bin/${x}"
-				break
-			fi
-		done
-	fi
-fi
-
-echo "$GENTOO_EXEC"
diff --git a/x11-base/xfree/files/4.2.0-r9/lib/libGL.la b/x11-base/xfree/files/4.2.0-r9/lib/libGL.la
deleted file mode 100644
index 4d71c18c6a56..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/lib/libGL.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.1.2 libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread        '
-
-# Version information for libGL.
-current=3
-age=2
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib/opengl/xfree/lib'
diff --git a/x11-base/xfree/files/4.2.0-r9/lib/libGLU.la b/x11-base/xfree/files/4.2.0-r9/lib/libGLU.la
deleted file mode 100644
index 3912cadb8386..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/lib/libGLU.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGLU.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGLU.so.1'
-
-# Names of this library.
-library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread      '
-
-# Version information for libGLU.
-current=4
-age=3
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/X11R6/lib'
diff --git a/x11-base/xfree/files/4.2.0-r9/lib/libOSMesa.la b/x11-base/xfree/files/4.2.0-r9/lib/libOSMesa.la
deleted file mode 100644
index 1ca2ec61435e..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/lib/libOSMesa.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libOSMesa.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libOSMesa.so.3'
-
-# Names of this library.
-library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread '
-
-# Version information for libOSMesa.
-current=4
-age=3
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/X11R6/lib'
diff --git a/x11-base/xfree/files/4.2.0-r9/opengl-update b/x11-base/xfree/files/4.2.0-r9/opengl-update
deleted file mode 100644
index 4d4ea39b7e0d..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/opengl-update
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/opengl-update,v 1.3 2002/04/07 20:25:46 azarah Exp $
-
-
-source /etc/init.d/functions.sh
-
-if [ `id -u` -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-cat << FOO
-usage: opengl-update <GL implementation>
-
-note:  
-       This utility switch between OpenGL implementations.  Currently there
-       are two supported implementations, namely "xfree" and "nvidia", the
-       implementations for XFree86 and the NVidia drivers respectively.
-
-examples:
-       opengl-update xfree86
-       This will setup things to use libGL.so from XFree86
-
-       opengl-update nvidia
-       This will setup things to use libGL.so from the NVidia drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ "$#" -ne 1 ]
-then
-	usage
-fi
-if [ ! -d /usr/lib/opengl/${1} ]
-then
-	usage
-else
-	ebegin "Switching to ${1} OpenGL interface"
-
-	#setup the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${1}/lib" >/etc/env.d/09opengl
-	/usr/sbin/env-update &>/dev/null
-
-	#setup the /usr/lib/libGL.so symlink
-	if [ -e /usr/lib/libGL.so ]
-	then
-		rm -f /usr/lib/libGL.so
-	fi
-	if [ -e /usr/lib/libGL.so.1 ]
-	then
-		rm -f /usr/lib/libGL.so.1
-	fi
-	realname="$(readlink /usr/lib/opengl/${1}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so.1
-	
-	#setup the /usr/X11R6/lib/libMesaGL.so symlink
-	if [ -e /usr/X11R6/lib/libMesaGL.so ]
-	then
-		rm -f /usr/X11R6/lib/libMesaGL.so
-	fi
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/X11R6/lib/libMesaGL.so
-
-	#setup the /usr/lib/libGLcore.so symlink
-	if [ -e /usr/lib/libGLcore.so ]
-	then
-		rm -f /usr/lib/libGLcore.so
-	fi
-	if [ -e /usr/lib/libGLcore.so.1 ]
-	then
-		rm -f /usr/lib/libGLcore.so.1
-	fi
-	if [ -e /usr/lib/opengl/${1}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${1}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so.1
-	fi
-
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.so symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.so ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	if [ -e /usr/lib/opengl/${1}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${1}/extensions/libglx.so \
-			/usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.a symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.a ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-	if [ -e /usr/lib/opengl/${1}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${1}/extensions/libglx.a \
-			/usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-
-	#setup the includes
-	for x in gl.h glx.h glxtokens.h
-	do
-		if [ -e /usr/X11R6/include/GL/${x} ]
-		then
-			rm -f /usr/X11R6/include/GL/${x}
-		fi
-		ln -sf /usr/lib/opengl/${1}/include/${x} \
-			/usr/X11R6/include/GL/${x}
-	done
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/x11-base/xfree/files/4.2.0-r9/site.def b/x11-base/xfree/files/4.2.0-r9/site.def
deleted file mode 100644
index ff0afc986567..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/site.def
+++ /dev/null
@@ -1,40 +0,0 @@
-#define HasZlib YES
-#define HasGcc2ForCplusplus YES
-#define LocalThreads YES
-#define HasPosixThreads YES
-#define HasThreadSafeAPI YES
-#define ForceNormalLib YES
-#define BuildXinerama YES
-#define SharedLibXau YES
-#define BuildFonts YES
-#define BuildFreeType YES
-#define BuildXTrueType YES
-#define BuildXInputExt YES
-#define BuildXKB YES
-#define BuildDBE YES
-#define BuildScreenSaverExt YES
-#define BuildRman YES
-#define BuildHtmlManPages NO
-#define BuildAllSpecsDocs NO
-#define BuildSpecsDocs NO
-#define BuildXF86DRI YES
-#define BuildGLXLibrary YES
-#define BuildGlxExt YES
-#define BuildGLULibrary YES
-#define SharedLibGLU YES
-#define NormalLibGLU YES
-#define DoLoadableServer YES
-#define BuildXvExt YES
-#define BuildXF86DGA YES
-#define BuildRender YES
-#define BuildRECORD YES
-#define BuildPexExt YES
-#define BuildXIE YES
-/* binutils-2.9 */
-#define LinuxBinUtilsMajorVersion 29
-/* glibc-2.2 (6.2 because glibc is considered libc-6) */
-#define LinuxCLibMajorVersion 6
-#define LinuxClibMinorVersion 2
-#define HasTk NO
-#define HasTcl NO
-#define FSUseSyslog YES
diff --git a/x11-base/xfree/files/4.2.0-r9/startDM.sh b/x11-base/xfree/files/4.2.0-r9/startDM.sh
deleted file mode 100644
index a127c6e950bb..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/startDM.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/startDM.sh,v 1.1 2002/04/07 05:41:58 azarah Exp $
-
-source /etc/init.d/functions.sh
-
-if [ -e ${svcdir}/options/xdm/service ]
-then
-	/sbin/start-stop-daemon --start --quiet \
-		--exec "`cat ${svcdir}/options/xdm/service`"
-	if [ $? -ne 0 ]
-	then
-		#there was a error running the DM
-		einfo "ERROR: could not start the Display Manager..."
-	fi
-fi
-
diff --git a/x11-base/xfree/files/4.2.0-r9/xdm b/x11-base/xfree/files/4.2.0-r9/xdm
deleted file mode 100644
index 1d2e081625f1..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/xdm
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth       required	/lib/security/pam_stack.so service=system-auth
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_stack.so service=system-auth
-password   required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth
-session    optional     /lib/security/pam_console.so
diff --git a/x11-base/xfree/files/4.2.0-r9/xdm.start b/x11-base/xfree/files/4.2.0-r9/xdm.start
deleted file mode 100644
index f85ce5ce22fc..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/xdm.start
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/xdm.start,v 1.1 2002/04/07 05:41:58 azarah Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) have the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runleve, as was
-# done previously.
-#
-# This script then just calls "tellinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-
-# Start X Font Server before X
-depend() {
-	use xfs
-}
-
-setup_dm() {
-	source /etc/profile.env
-	export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}"
-
-	case "$(echo ${DISPLAYMANAGER} | awk '{ print toupper($1) }')" in
-		KDM|KDE|KDE2|KDE3)	 
-			EXE="$(which kdm)"
-			;;
-		GDM|GNOME) 
-			EXE=/usr/bin/gdm
-			;;
-		*)	
-			EXE=/usr/X11R6/bin/xdm
-			;;
-	esac
-
-	test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm
-
-	SERVICE="${EXE##*/}"
-}
-
-start() {
-	setup_dm
-	ebegin "Setting up ${SERVICE}"
-	#save the prefered DM
-	save_options "service" "${EXE}"
-	#tell init to run /etc/X11/startDM.sh after current
-	#runlevel is finished (should *not* be in the "boot"
-	#                      runlevel).
-	/sbin/telinit a &>/dev/null
-	eend 0
-}
-
-stop() {
-	local retval=0
-	local curvt="$(fgconsole)"
-	local myexe="$(get_options "service")"
-	local myservice="${myexe##*/}"
-	ebegin "Stopping ${myservice}"
-	rm -f ${svcdir}/options/xdm/service
-	if [ "$(ps -A | grep -e "${myservice}")" ]
-	then
-		start-stop-daemon --stop --quiet \
-			--exe ${myexe} &>/dev/null
-		retval=$?
-	else
-		retval=1
-	fi
-	#switch back to original vt
-	chvt "${curvt}" &>/dev/null
-	eend ${retval} "Error stopping ${myservice}."
-	return ${retval}
-}
-
-
-# vim:ts=4
diff --git a/x11-base/xfree/files/4.2.0-r9/xfs.config b/x11-base/xfree/files/4.2.0-r9/xfs.config
deleted file mode 100644
index 8db2737ca71c..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/xfs.config
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# X Font Server configuration file
-#
-
-# allow a max of 4 clients to connect to this font server
-#client-limit = 4
-
-# the port to listen on; -1 means only listen on the local unix domain
-# socket
-port = -1
-
-# when a font server reaches its limit, start up a new one
-clone-self = on
-
-# alternate font servers for clients to use
-#alternate-servers = foo:7101,bar:7102
-
-# where to look for fonts
-# Some of these are commented out, i.e. the TrueType and Type1
-# directories in /usr/share, because they aren't forced to be
-# installed alongside X.
-#
-catalogue = /usr/X11R6/lib/X11/fonts/75dpi,
-	/usr/X11R6/lib/X11/fonts/100dpi,
-	/usr/X11R6/lib/X11/fonts/misc,
-	/usr/X11R6/lib/X11/fonts/Type1,
-	/usr/X11R6/lib/X11/fonts/Speedo,
-	/usr/X11R6/lib/X11/fonts/CID,
-	/usr/X11R6/lib/X11/fonts/PEX,
-	/usr/X11R6/lib/X11/fonts/util,
-	/usr/X11R6/lib/X11/fonts/Type1,
-	/usr/X11R6/lib/X11/fonts/local,
-	/usr/X11R6/lib/X11/fonts/Speedo,
-	/usr/X11R6/lib/X11/fonts/truetype,
-	/usr/X11R6/lib/X11/fonts/TTF,
-	/usr/X11R6/lib/X11/fonts/encodings,
-	/usr/X11R6/lib/X11/fonts/cyrillic,
-	/usr/X11R6/lib/X11/fonts/freefont,
-	/usr/X11R6/lib/X11/fonts/sharefont,
-	/usr/share/fonts/default/Type1,
-	/usr/share/fonts/ttf/decoratives,
-	/usr/share/fonts/ttf/western
-
-# in 12 points, decipoints
-default-point-size = 120
-
-# 100 x 100 and 75 x 75
-default-resolutions = 75,75,100,100
-
-# how to log errors
-use-syslog = on
-
-# font cache control, specified in KB
-cache-hi-mark = 2048
-cache-low-mark = 1433
-cache-balance = 70
-
diff --git a/x11-base/xfree/files/4.2.0-r9/xfs.start b/x11-base/xfree/files/4.2.0-r9/xfs.start
deleted file mode 100644
index 6e4d1305ce91..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/xfs.start
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/xfs.start,v 1.2 2002/05/20 17:47:34 agenkin Exp $
-
-depend() {
-	use logger
-}
-
-start() {
-	ebegin "Starting X Font Server"
-	if [ "`grep xfs /etc/passwd`" ] ; then
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-			-- -daemon -config /etc/X11/fs/config \
-				-droppriv -user xfs 1>&2
-	else
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-			-- -daemon -config /etc/X11/fs/config 1>&2
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping X Font Server"
-	start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2
-	rm -rf /tmp/.font-unix
-	eend $?
-}
diff --git a/x11-base/xfree/files/4.2.0-r9/xft-quality.diff b/x11-base/xfree/files/4.2.0-r9/xft-quality.diff
deleted file mode 100644
index a9ed1fe5fdb5..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/xft-quality.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN Xft.orig/xftfreetype.c Xft/xftfreetype.c
---- Xft.orig/xftfreetype.c	Thu Dec 13 10:26:00 2001
-+++ Xft/xftfreetype.c	Wed Mar  6 00:23:19 2002
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.16 2001/12/13 17:26:00 keithp Exp $
-+ * $XFree86: xc/lib/Xft1/xftfreetype.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -236,7 +236,7 @@
- 		if (_XftFontDebug() & XFT_DBG_GLYPH)
- 		    printf ("Set face size to %d (%d)\n", 
- 			    (int) (size >> 6), (int) size);
--		if (FT_Set_Char_Size (face, size, size, 0, 0))
-+		if (FT_Set_Char_Size (face, size, size, 69, 72))
- 		    return False;
- 		f->size = size;
- 	    }
-diff -urN Xft.orig/xftglyphs.c Xft/xftglyphs.c
---- Xft.orig/xftglyphs.c	Sat Nov 17 01:22:45 2001
-+++ Xft/xftglyphs.c	Wed Mar  6 00:23:19 2002
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.14 2001/11/17 08:22:45 keithp Exp $
-+ * $XFree86: xc/lib/Xft1/xftglyphs.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -124,7 +124,7 @@
- 	}
- 	else
- 	    glyphindex = (FT_UInt) charcode;
--	error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP);
-+	error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING);
- 	if (error)
- 	    continue;
- 
diff --git a/x11-base/xfree/files/4.2.0-r9/xinitrc b/x11-base/xfree/files/4.2.0-r9/xinitrc
deleted file mode 100644
index 04821ff6466d..000000000000
--- a/x11-base/xfree/files/4.2.0-r9/xinitrc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=XINITDIR/.Xresources
-sysmodmap=XINITDIR/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    xmodmap $usermodmap
-fi
-
-# handle xinit
-if [ -f "$HOME/.xinitrc" ]; then
-	XINITRC="$HOME/.xinitrc"
-	exec /bin/sh "$HOME/.xinitrc"
-elif [ -n "`/etc/X11/chooser.sh`" ]; then
-	exec "`/etc/X11/chooser.sh`"
-else
-	# start some nice programs
-	twm &
-	xclock -geometry 50x50-1+1 &
-	xterm -geometry 80x50+494+51 &
-	xterm -geometry 80x20+494-0 &
-	exec xterm -geometry 80x66+0+0 -name login
-fi