new version that adds glide3 support with glide3 in USE; also make use of sse and 3dnow USE flags

26 files changed, 645 insertions, 470 deletions

diff --git a/x11-base/xfree/files/4.2.0-r6/10xfree b/x11-base/xfree/files/4.2.0-r6/10xfree
new file mode 100644
index 000000000000..a302f743012c
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/10xfree
@@ -0,0 +1,6 @@
+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-r6/Sessions/Xsession b/x11-base/xfree/files/4.2.0-r6/Sessions/Xsession
new file mode 100644
index 000000000000..c86ccee19ff3
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/Sessions/Xsession
@@ -0,0 +1,107 @@
+#!/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-r6/XftConfig b/x11-base/xfree/files/4.2.0-r6/XftConfig
new file mode 100644
index 000000000000..16af856f7c29
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/XftConfig
@@ -0,0 +1,71 @@
+#
+# 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-r6/Xsession b/x11-base/xfree/files/4.2.0-r6/Xsession
new file mode 100644
index 000000000000..3b1f2f1fa535
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/Xsession
@@ -0,0 +1,42 @@
+#!/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-r6/Xsetup_0 b/x11-base/xfree/files/4.2.0-r6/Xsetup_0
new file mode 100644
index 000000000000..a8919175ae9d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/Xsetup_0
@@ -0,0 +1,25 @@
+#!/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
+
+# --- 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
+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-r6/chooser.sh b/x11-base/xfree/files/4.2.0-r6/chooser.sh
new file mode 100644
index 000000000000..37e4c224492f
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/chooser.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+# 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-r6/chooser.sh,v 1.1 2002/01/28 20:32:58 azarah Exp $
+
+#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-r6/lib/libGL.la b/x11-base/xfree/files/4.2.0-r6/lib/libGL.la
new file mode 100644
index 000000000000..78a7335b2f06
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/lib/libGL.la
@@ -0,0 +1,32 @@
+# 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/X11R6/lib'
diff --git a/x11-base/xfree/files/4.2.0-r6/lib/libGLU.la b/x11-base/xfree/files/4.2.0-r6/lib/libGLU.la
new file mode 100644
index 000000000000..3912cadb8386
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/lib/libGLU.la
@@ -0,0 +1,32 @@
+# 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-r6/lib/libOSMesa.la b/x11-base/xfree/files/4.2.0-r6/lib/libOSMesa.la
new file mode 100644
index 000000000000..1ca2ec61435e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/lib/libOSMesa.la
@@ -0,0 +1,32 @@
+# 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-r6/site.def b/x11-base/xfree/files/4.2.0-r6/site.def
new file mode 100644
index 000000000000..c7850225f25d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/site.def
@@ -0,0 +1,37 @@
+#define HasZlib YES
+#define HasGcc2ForCplusplus 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-r6/xdm b/x11-base/xfree/files/4.2.0-r6/xdm
new file mode 100644
index 000000000000..f1773fb59a12
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/xdm
@@ -0,0 +1,4 @@
+auth       required   pam_pwdb.so
+account    required   pam_pwdb.so
+password   required   pam_pwdb.so md5
+session    required   pam_pwdb.so
diff --git a/x11-base/xfree/files/4.2.0-r6/xdm.start b/x11-base/xfree/files/4.2.0-r6/xdm.start
new file mode 100644
index 000000000000..7b6227a2c1e1
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/xdm.start
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+# Based upon a script Copyright (c) 1996-99 SuSE GmbH Nuernberg, Germany.  All rights reserved.
+# Not sure how much of the SuSE original is left.
+
+# Start X Font Server before X
+depend() {
+	use xfs
+}
+
+. /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##*/}
+PID="/var/run/xdm.pid"
+
+start() {
+	ebegin "Starting ${SERVICE}"
+	start-stop-daemon --start --quiet --exe $EXE 1>&2
+	if [ -n "$?" ] ; then
+		# After a crash or a kill signal we may have
+		# a wrong ownership of /dev/console
+		chown root:tty /dev/console /dev/tty0
+		chmod 622 /dev/console /dev/tty0
+	else
+		eend $? "Error starting ${SERVICE}."
+	fi
+}
+
+stop() {
+	ebegin "Stopping ${SERVICE}"
+	killall X
+	start-stop-daemon --stop --quiet --exe $EXE 1>&2
+	eend $? "Error stopping ${SERVICE}."
+}
diff --git a/x11-base/xfree/files/4.2.0-r6/xfs.config b/x11-base/xfree/files/4.2.0-r6/xfs.config
new file mode 100644
index 000000000000..c99df93c8e3a
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/xfs.config
@@ -0,0 +1,53 @@
+#
+# X Font Server configuration file
+#
+
+# allow a max of 4 clients to connect to this font server
+#client-limit = 4
+
+# 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-r6/xfs.start b/x11-base/xfree/files/4.2.0-r6/xfs.start
new file mode 100644
index 000000000000..c2d9fe000e38
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/xfs.start
@@ -0,0 +1,28 @@
+#!/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-r6/xfs.start,v 1.1 2002/01/28 20:32:58 azarah 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 \
+			-- -port -1 -daemon -config /etc/X11/fs/config \
+				-droppriv -user xfs 1>&2
+	else
+		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+			-- -port -1 -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-r6/xinitrc b/x11-base/xfree/files/4.2.0-r6/xinitrc
new file mode 100644
index 000000000000..04821ff6466d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r6/xinitrc
@@ -0,0 +1,40 @@
+#!/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
diff --git a/x11-base/xfree/files/digest-xfree-4.1.0-r4 b/x11-base/xfree/files/digest-xfree-4.1.0-r4
deleted file mode 100644
index 095ff9a80b9d..000000000000
--- a/x11-base/xfree/files/digest-xfree-4.1.0-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2d4709f7106a1d65c175be445a3d3c32 X410src-1.tgz 24993792
-MD5 beaffed1cbdb700e5fed6a5490a7f222 X410src-2.tgz 22499328
-MD5 f94e42cd5c5e31a702ec64bfdc017a7d X410src-3.tgz 9306112
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1527808
diff --git a/x11-base/xfree/files/digest-xfree-4.1.0-r5 b/x11-base/xfree/files/digest-xfree-4.1.0-r5
deleted file mode 100644
index 095ff9a80b9d..000000000000
--- a/x11-base/xfree/files/digest-xfree-4.1.0-r5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2d4709f7106a1d65c175be445a3d3c32 X410src-1.tgz 24993792
-MD5 beaffed1cbdb700e5fed6a5490a7f222 X410src-2.tgz 22499328
-MD5 f94e42cd5c5e31a702ec64bfdc017a7d X410src-3.tgz 9306112
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1527808
diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r2 b/x11-base/xfree/files/digest-xfree-4.2.0-r2
deleted file mode 100644
index 036b8e54a0a5..000000000000
--- a/x11-base/xfree/files/digest-xfree-4.2.0-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25964544
-MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23228416
-MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9310208
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1527808
diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r3 b/x11-base/xfree/files/digest-xfree-4.2.0-r3
deleted file mode 100644
index 036b8e54a0a5..000000000000
--- a/x11-base/xfree/files/digest-xfree-4.2.0-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25964544
-MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23228416
-MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9310208
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1527808
diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r4 b/x11-base/xfree/files/digest-xfree-4.2.0-r4
deleted file mode 100644
index 036b8e54a0a5..000000000000
--- a/x11-base/xfree/files/digest-xfree-4.2.0-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25964544
-MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23228416
-MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9310208
-MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1527808
diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r6 b/x11-base/xfree/files/digest-xfree-4.2.0-r6
new file mode 100644
index 000000000000..08b5baf4dbd7
--- /dev/null
+++ b/x11-base/xfree/files/digest-xfree-4.2.0-r6
@@ -0,0 +1,4 @@
+MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25997312
+MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23257088
+MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9326592
+MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1531904
diff --git a/x11-base/xfree/xfree-4.1.0-r4.ebuild b/x11-base/xfree/xfree-4.1.0-r4.ebuild
deleted file mode 100644
index cd4471c31961..000000000000
--- a/x11-base/xfree/xfree-4.1.0-r4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Desktop Team <desktop@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0-r4.ebuild,v 1.2 2001/12/02 03:25:51 drobbins Exp $
-
-MY_V="`echo ${PV} |sed -e 's:\.::g'`"
-S=${WORKDIR}/xc
-DESCRIPTION="Xfree86: famouse and free X server"
-SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.1.0/source"
-SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.1.0/source"
-
-SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
-	 $SRC_PATH0/X${MY_V}src-2.tgz
-	 $SRC_PATH0/X${MY_V}src-3.tgz
-	 $SRC_PATH1/X${MY_V}src-1.tgz
-	 $SRC_PATH1/X${MY_V}src-2.tgz
-	 $SRC_PATH1/X${MY_V}src-3.tgz
-       	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
-
-HOMEPAGE="http://www.xfree.org"
-
-DEPEND=">=sys-libs/ncurses-5.1
-        >=sys-libs/zlib-1.1.3-r2
-        sys-devel/flex
-        sys-devel/perl"
-	
-RDEPEND=">=sys-libs/ncurses-5.1"
-
-PROVIDE="virtual/x11 virtual/opengl"
-# virtual/glu"
-# This has been removed.  Anyone know why exactly ??
-	
-
-src_unpack () {
-
-	unpack X${MY_V}src-{1,2,3}.tgz
-	
-	cd ${S}
-	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
-	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
-	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
-	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
-}
-
-src_compile() {
-
-	emake World || die
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-	make install.man DESTDIR=${D} || die
-
-	#we zap the host.def file which gets hard-coded with our CFLAGS, messing up other things that use xmkmf
-	echo > ${D}/usr/X11R6/lib/X11/config/host.def
-	#theoretically, /usr/X11R6/lib/X11/config is a possible candidate for config file management.
-	#If we find that people really worry about imake stuff, we may add it.  But for now, we leave
-	#the dir unprotected.
-
-	insinto /usr/X11R6/lib/X11
-	doins ${FILESDIR}/${PVR}/XftConfig
-	cd ${D}/usr/X11R6/lib/X11/fonts
-	tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz
-	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
-	dosym /usr/X11R6/bin /usr/bin/X11
-	
-	#X installs some /usr/lib/libGL symlinks, pointing to the libGL's in /usr/X11R6/lib.
-	#I don't see the point in this.  Yes, according to LSB, the correct location for libGL is
-	#in /usr/lib, but this is so closely integrated with X itself that /usr/X11R6/lib seems
-	#like the right place.
-	rm -rf ${D}/usr/lib    
-	
-	#dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
-	#We're no longer including libGLU from here.  Packaged separately, from separate sources.
-	
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
-	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
-	insinto /etc/X11/xdm
-	doins ${FILESDIR}/${PVR}/Xsession
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${PVR}/xdm
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/xdm.start xdm
-}
diff --git a/x11-base/xfree/xfree-4.1.0-r5.ebuild b/x11-base/xfree/xfree-4.1.0-r5.ebuild
deleted file mode 100644
index 341fe1ddb5d7..000000000000
--- a/x11-base/xfree/xfree-4.1.0-r5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Desktop Team <desktop@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0-r5.ebuild,v 1.2 2001/12/06 20:17:03 azarah Exp $
-
-MY_V="`echo ${PV} |sed -e 's:\.::g'`"
-S=${WORKDIR}/xc
-DESCRIPTION="Xfree86: famouse and free X server"
-SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.1.0/source"
-SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.1.0/source"
-
-SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
-	 $SRC_PATH0/X${MY_V}src-2.tgz
-	 $SRC_PATH0/X${MY_V}src-3.tgz
-	 $SRC_PATH1/X${MY_V}src-1.tgz
-	 $SRC_PATH1/X${MY_V}src-2.tgz
-	 $SRC_PATH1/X${MY_V}src-3.tgz
-       	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
-
-HOMEPAGE="http://www.xfree.org"
-
-DEPEND=">=sys-libs/ncurses-5.1
-        >=sys-libs/zlib-1.1.3-r2
-        sys-devel/flex
-        sys-devel/perl"
-	
-RDEPEND=">=sys-libs/ncurses-5.1"
-
-PROVIDE="virtual/x11 virtual/opengl"
-# virtual/glu"
-# This has been removed.  Anyone know why exactly ??
-	
-
-src_unpack () {
-
-	unpack X${MY_V}src-{1,2,3}.tgz
-	
-	cd ${S}
-	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
-	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
-	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
-	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
-}
-
-src_compile() {
-
-	emake World || die
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-	make install.man DESTDIR=${D} || die
-
-	#we zap the host.def file which gets hard-coded with our CFLAGS, messing up other things that use xmkmf
-	echo > ${D}/usr/X11R6/lib/X11/config/host.def
-	#theoretically, /usr/X11R6/lib/X11/config is a possible candidate for config file management.
-	#If we find that people really worry about imake stuff, we may add it.  But for now, we leave
-	#the dir unprotected.
-
-	insinto /usr/X11R6/lib/X11
-	doins ${FILESDIR}/${PVR}/XftConfig
-	cd ${D}/usr/X11R6/lib/X11/fonts
-	tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz
-	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
-	dosym /usr/X11R6/bin /usr/bin/X11
-	
-	#X installs some /usr/lib/libGL symlinks, pointing to the libGL's in /usr/X11R6/lib.
-	#I don't see the point in this.  Yes, according to LSB, the correct location for libGL is
-	#in /usr/lib, but this is so closely integrated with X itself that /usr/X11R6/lib seems
-	#like the right place.
-	rm -rf ${D}/usr/lib    
-	
-	#dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
-	#We're no longer including libGLU from here.  Packaged separately, from separate sources.
-	
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
-	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
-	insinto /etc/X11/xdm
-	doins ${FILESDIR}/${PVR}/Xsession
-	insinto /etc/X11/fs
-	newins ${FILESDIR}/${PVR}/xfs.config config
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${PVR}/xdm
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/xdm.start xdm
-	newexe ${FILESDIR}/${PVR}/xfs.start xfs
-}
diff --git a/x11-base/xfree/xfree-4.2.0-r2.ebuild b/x11-base/xfree/xfree-4.2.0-r2.ebuild
deleted file mode 100644
index 9c227eb81628..000000000000
--- a/x11-base/xfree/xfree-4.2.0-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r2.ebuild,v 1.3 2002/01/21 01:59:42 azarah Exp $
-
-MY_V="`echo ${PV} |sed -e 's:\.::g'`"
-S=${WORKDIR}/xc
-DESCRIPTION="Xfree86: famouse and free X server"
-SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${PV}/source"
-SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${PV}/source"
-
-SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
-	 $SRC_PATH0/X${MY_V}src-2.tgz
-	 $SRC_PATH0/X${MY_V}src-3.tgz
-	 $SRC_PATH1/X${MY_V}src-1.tgz
-	 $SRC_PATH1/X${MY_V}src-2.tgz
-	 $SRC_PATH1/X${MY_V}src-3.tgz
-       	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
-
-HOMEPAGE="http://www.xfree.org"
-
-DEPEND=">=sys-libs/ncurses-5.1
-        >=sys-libs/zlib-1.1.3-r2
-        sys-devel/flex
-        sys-devel/perl"
-	
-RDEPEND=">=sys-libs/ncurses-5.1"
-
-PROVIDE="virtual/x11 virtual/opengl"
-# virtual/glu"	
-
-src_unpack () {
-
-	unpack X${MY_V}src-{1,2,3}.tgz
-	
-	cd ${S}
-	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
-	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
-	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
-	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
-
-	# fix build problem
-	cp ${S}/programs/Xserver/Imakefile \
-		${S}/programs/Xserver/Imakefile.orig
-	sed -e '2i CCLINK = $(CC) -L../../lib/Xau -lXau' \
-		${S}/programs/Xserver/Imakefile.orig \
-		> ${S}/programs/Xserver/Imakefile
-}
-
-src_compile() {
-
-	emake World || die
-
-#this do not always build properly ...
-#
-#	#build glxinfo
-#	cd ${S}/programs/glxinfo
-#	xmkmf
-#	make || die
-#	cd ${S}
-
-	if [ "`use nls`" ]
-	then
-		cd ${S}/nls
-		make || die
-		cd ${s}
-	fi
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-	make install.man DESTDIR=${D} || die
-
-#	#install glxinfo and its docs
-#	cd ${S}/programs/glxinfo
-#	make install install.man DESTDIR=${D} || die
-#	cd ${S}
-
-	if [ "`use nls`" ]
-	then
-		cd ${S}/nls
-		make DESTDIR=${D} install || die
-		cd ${S}
-	fi
-
-	#we zap the host.def file which gets hard-coded with our CFLAGS, messing up other things that use xmkmf
-	echo > ${D}/usr/X11R6/lib/X11/config/host.def
-	#theoretically, /usr/X11R6/lib/X11/config is a possible candidate for config file management.
-	#If we find that people really worry about imake stuff, we may add it.  But for now, we leave
-	#the dir unprotected.
-
-	insinto /etc/X11
-	doins ${FILESDIR}/${PVR}/XftConfig
-	dosym ../../../.././etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
-	cd ${D}/usr/X11R6/lib/X11/fonts
-	tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz
-	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
-	dodir /usr/bin
-	dosym /usr/X11R6/bin /usr/bin/X11
-	
-	#X installs some /usr/lib/libGL symlinks, pointing to the libGL's in /usr/X11R6/lib.
-	#I don't see the point in this.  Yes, according to LSB, the correct location for libGL is
-	#in /usr/lib, but this is so closely integrated with X itself that /usr/X11R6/lib seems
-	#like the right place.
-	rm -rf ${D}/usr/lib    
-	
-	#dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
-	#We're no longer including libGLU from here.  Packaged separately, from separate sources.
-
-	exeinto /etc/X11
-	doexe ${FILESDIR}/${PVR}/chooser.sh
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/${PVR}/Sessions/*
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
-	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
-	insinto /etc/X11/xdm
-	doins ${FILESDIR}/${PVR}/Xsession
-	insinto /etc/X11/fs
-	newins ${FILESDIR}/${PVR}/xfs.config config
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${PVR}/xdm
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/xdm.start xdm
-	newexe ${FILESDIR}/${PVR}/xfs.start xfs
-}
-
-pkg_preinst() {
-	#this changed from a file to a symlink
-	rm -rf /usr/X11R6/lib/X11/XftConfig
-}
diff --git a/x11-base/xfree/xfree-4.2.0-r3.ebuild b/x11-base/xfree/xfree-4.2.0-r3.ebuild
deleted file mode 100644
index 1c3e9845ba09..000000000000
--- a/x11-base/xfree/xfree-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r3.ebuild,v 1.1 2002/01/23 13:54:09 danarmak Exp $
-
-MY_V="`echo ${PV} |sed -e 's:\.::g'`"
-S=${WORKDIR}/xc
-DESCRIPTION="Xfree86: famouse and free X server"
-SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${PV}/source"
-SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${PV}/source"
-
-SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
-	 $SRC_PATH0/X${MY_V}src-2.tgz
-	 $SRC_PATH0/X${MY_V}src-3.tgz
-	 $SRC_PATH1/X${MY_V}src-1.tgz
-	 $SRC_PATH1/X${MY_V}src-2.tgz
-	 $SRC_PATH1/X${MY_V}src-3.tgz
-       	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
-
-HOMEPAGE="http://www.xfree.org"
-
-DEPEND=">=sys-libs/ncurses-5.1
-        >=sys-libs/zlib-1.1.3-r2
-        sys-devel/flex
-        sys-devel/perl"
-	
-RDEPEND=">=sys-libs/ncurses-5.1"
-
-PROVIDE="virtual/x11 virtual/opengl"
-# virtual/glu"	
-
-src_unpack () {
-
-	unpack X${MY_V}src-{1,2,3}.tgz
-	
-	cd ${S}
-	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
-	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
-	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
-	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
-
-	# fix build problem
-	cp ${S}/programs/Xserver/Imakefile \
-		${S}/programs/Xserver/Imakefile.orig
-	sed -e '2i CCLINK = $(CC) -L../../lib/Xau -lXau' \
-		${S}/programs/Xserver/Imakefile.orig \
-		> ${S}/programs/Xserver/Imakefile
-}
-
-src_compile() {
-
-	emake World || die
-
-#this do not always build properly ...
-#
-#	#build glxinfo
-#	cd ${S}/programs/glxinfo
-#	xmkmf
-#	make || die
-#	cd ${S}
-
-	if [ "`use nls`" ]
-	then
-		cd ${S}/nls
-		make || die
-		cd ${s}
-	fi
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-	make install.man DESTDIR=${D} || die
-
-#	#install glxinfo and its docs
-#	cd ${S}/programs/glxinfo
-#	make install install.man DESTDIR=${D} || die
-#	cd ${S}
-
-	if [ "`use nls`" ]
-	then
-		cd ${S}/nls
-		make DESTDIR=${D} install || die
-		cd ${S}
-	fi
-
-	#we zap the host.def file which gets hard-coded with our CFLAGS, messing up other things that use xmkmf
-	echo > ${D}/usr/X11R6/lib/X11/config/host.def
-	#theoretically, /usr/X11R6/lib/X11/config is a possible candidate for config file management.
-	#If we find that people really worry about imake stuff, we may add it.  But for now, we leave
-	#the dir unprotected.
-
-	insinto /etc/X11
-	doins ${FILESDIR}/${PVR}/XftConfig
-	dosym ../../../.././etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
-	cd ${D}/usr/X11R6/lib/X11/fonts
-	tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz
-	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
-	dodir /usr/bin
-	dosym /usr/X11R6/bin /usr/bin/X11
-	
-	#X installs some /usr/lib/libGL symlinks, pointing to the libGL's in /usr/X11R6/lib.
-	#I don't see the point in this.  Yes, according to LSB, the correct location for libGL is
-	#in /usr/lib, but this is so closely integrated with X itself that /usr/X11R6/lib seems
-	#like the right place.
-	rm -rf ${D}/usr/lib    
-	
-	#dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
-	#We're no longer including libGLU from here.  Packaged separately, from separate sources.
-
-	exeinto /etc/X11
-	doexe ${FILESDIR}/${PVR}/chooser.sh
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/${PVR}/Sessions/*
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
-	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
-	insinto /etc/X11/xdm
-	doins ${FILESDIR}/${PVR}/Xsession ${FILESDIR}/${PVR}/Xsetup_0
-	insinto /etc/X11/fs
-	newins ${FILESDIR}/${PVR}/xfs.config config
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${PVR}/xdm
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/xdm.start xdm
-	newexe ${FILESDIR}/${PVR}/xfs.start xfs
-}
-
-pkg_preinst() {
-	#this changed from a file to a symlink
-	rm -rf /usr/X11R6/lib/X11/XftConfig
-}
diff --git a/x11-base/xfree/xfree-4.2.0-r4.ebuild b/x11-base/xfree/xfree-4.2.0-r6.ebuild
index 7a12e713ac30..e9fb237ba24c 100644
--- a/x11-base/xfree/xfree-4.2.0-r4.ebuild
+++ b/x11-base/xfree/xfree-4.2.0-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r4.ebuild,v 1.1 2002/01/23 22:22:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r6.ebuild,v 1.1 2002/01/28 20:32:58 azarah Exp $
 
 MY_V="`echo ${PV} |sed -e 's:\.::g'`"
 S=${WORKDIR}/xc
@@ -22,7 +22,8 @@ HOMEPAGE="http://www.xfree.org"
 DEPEND=">=sys-libs/ncurses-5.1
         >=sys-libs/zlib-1.1.3-r2
         sys-devel/flex
-        sys-devel/perl"
+        sys-devel/perl
+	glide3? ( media-libs/glide-v3 )"
 	
 RDEPEND=">=sys-libs/ncurses-5.1"
 
@@ -36,9 +37,22 @@ src_unpack () {
 	
 	cd ${S}
 	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
-	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
-	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
-	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
+	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> config/cf/host.def
+	echo "#define GccWarningOptions -Wno" >> config/cf/host.def
+	echo "#define DefaultCCOptions -ansi" >> config/cf/host.def
+
+	# optimize Mesa for architecture
+	if [ -n "`use sse`" ] ; then
+		echo "#define MesaUseKatmai YES" >> config/cf/host.def
+	fi
+	if [ -n "`use 3dnow`" ] ; then
+		echo "#define MesaUse3DNow YES" >> config/cf/host.def
+	fi
+
+	# build with glide3 support? (build the tdfx_dri.o module)
+	if [ -n "`use glide3`" ] ; then
+		echo "#define HasGlide3 YES" >> config/cf/host.def
+	fi
 
 	# fix build problem (XFree86 server among others, was not
 	#                    linked against libXau)
@@ -90,6 +104,10 @@ src_install() {
 	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
 	dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
 
+	# .la files for libtool support
+	insinto /usr/X11R6/lib
+	doins ${FILESDIR}/${PVR}/lib/*.la
+
 	exeinto /etc/X11
 	doexe ${FILESDIR}/${PVR}/chooser.sh
 	exeinto /etc/X11/Sessions
@@ -113,3 +131,8 @@ pkg_preinst() {
 	#this changed from a file to a symlink
 	rm -rf /usr/X11R6/lib/X11/XftConfig
 }
+
+pkg_postinst() {
+	echo ">>> Making font dirs..."
+	find /usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 -exec mkfontdir {} ';'
+}