new version with libGL switching

23 files changed, 888 insertions, 363 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index a625f7e72e89..8466b08cd6ea 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.10 2002/04/04 14:44:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.11 2002/04/07 05:41:58 azarah Exp $
+
+*xfree-4.2.0-r9 (7 Apr 2002)
+
+  7 Apr 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r9.ebuild,
+                                                   files/4.2.0-r9/opengl-update :
+
+  Update for dynamic libGL switching with nvidia drivers.
 
   4 Apr 2002; Seemant Kulleen <seemant@gentoo.org> files/4.2.0-r8/xdm :
 
diff --git a/x11-base/xfree/files/4.2.0-r9/10xfree b/x11-base/xfree/files/4.2.0-r9/10xfree
new file mode 100644
index 000000000000..a302f743012c
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/Sessions/Xsession b/x11-base/xfree/files/4.2.0-r9/Sessions/Xsession
new file mode 100644
index 000000000000..c86ccee19ff3
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/XftConfig b/x11-base/xfree/files/4.2.0-r9/XftConfig
new file mode 100644
index 000000000000..16af856f7c29
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/Xsession b/x11-base/xfree/files/4.2.0-r9/Xsession
new file mode 100644
index 000000000000..3b1f2f1fa535
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/Xsetup_0 b/x11-base/xfree/files/4.2.0-r9/Xsetup_0
new file mode 100644
index 000000000000..7cbdfc32d07e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/Xsetup_0
@@ -0,0 +1,30 @@
+#!/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
new file mode 100644
index 000000000000..1f4c9691fe73
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/chooser.sh
@@ -0,0 +1,64 @@
+#!/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
new file mode 100644
index 000000000000..04e36c10b64e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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/lib/opengl/xfree'
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
new file mode 100644
index 000000000000..3912cadb8386
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/lib/libOSMesa.la b/x11-base/xfree/files/4.2.0-r9/lib/libOSMesa.la
new file mode 100644
index 000000000000..1ca2ec61435e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/opengl-update b/x11-base/xfree/files/4.2.0-r9/opengl-update
new file mode 100644
index 000000000000..60385b62a1c7
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/opengl-update
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+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/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
new file mode 100644
index 000000000000..ff0afc986567
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/site.def
@@ -0,0 +1,40 @@
+#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
new file mode 100644
index 000000000000..a127c6e950bb
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/startDM.sh
@@ -0,0 +1,19 @@
+#!/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
new file mode 100644
index 000000000000..1d2e081625f1
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/xdm
@@ -0,0 +1,7 @@
+#%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
new file mode 100644
index 000000000000..f85ce5ce22fc
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/xdm.start
@@ -0,0 +1,100 @@
+#!/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
new file mode 100644
index 000000000000..c99df93c8e3a
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/xfs.start b/x11-base/xfree/files/4.2.0-r9/xfs.start
new file mode 100644
index 000000000000..3f2aa16da101
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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-r9/xfs.start,v 1.1 2002/04/07 05:41: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-r9/xft-quality.diff b/x11-base/xfree/files/4.2.0-r9/xft-quality.diff
new file mode 100644
index 000000000000..a9ed1fe5fdb5
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/xft-quality.diff
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..04821ff6466d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r9/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/xfree-4.1.0-r1.ebuild b/x11-base/xfree/xfree-4.1.0-r1.ebuild
deleted file mode 100644
index 3c1853906479..000000000000
--- a/x11-base/xfree/xfree-4.1.0-r1.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-r1.ebuild,v 1.4 2001/11/13 18:31:20 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() {
-
-	make 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/rc.d/init.d
-	newexe ${FILESDIR}/${PVR}/xdm.start xdm
-}
diff --git a/x11-base/xfree/xfree-4.2.0-r5.ebuild b/x11-base/xfree/xfree-4.2.0-r5.ebuild
deleted file mode 100644
index 0b6d588562f6..000000000000
--- a/x11-base/xfree/xfree-4.2.0-r5.ebuild
+++ /dev/null
@@ -1,119 +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-r5.ebuild,v 1.1 2002/01/27 09:19:53 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 (XFree86 server among others, was not
-	#                    linked against libXau)
-	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
-
-	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
-
-	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
-	dodir /usr/bin
-	dosym /usr/X11R6/bin /usr/bin/X11
-
-	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
-	doexe ${FILESDIR}/${PVR}/Sessions/*
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
-	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
-	exeinto /etc/X11/xdm
-	doexe ${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-r6.ebuild b/x11-base/xfree/xfree-4.2.0-r6.ebuild
deleted file mode 100644
index 91303b34068b..000000000000
--- a/x11-base/xfree/xfree-4.2.0-r6.ebuild
+++ /dev/null
@@ -1,146 +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-r6.ebuild,v 1.4 2002/02/23 15:47:34 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
-	 ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-xlib-i18n-module.patch
-	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
-# NOTE:  4.2.0-xlib-i18n-module.patch is ONLY for XFree86 4.2.0
-
-HOMEPAGE="http://www.xfree.org"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3-r2
-	sys-devel/flex
-	sys-devel/perl
-	glide? ( >=media-libs/glide-v3-3.10 )"
-	
-RDEPEND=">=sys-libs/ncurses-5.1"
-
-PROVIDE="virtual/x11
-	virtual/opengl
-	virtual/glu"	
-
-src_unpack () {
-
-	unpack X${MY_V}src-{1,2,3}.tgz
-
-	# resolve bug #794
-	# NOTE:  4.2.0-xlib-i18n-module.patch is ONLY for XFree86 4.2.0
-	cd ${WORKDIR}
-	patch -p0 < ${DISTDIR}/4.2.0-xlib-i18n-module.patch || die
-	
-	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
-
-	# 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 glide`" ]
-	then
-		echo "#define HasGlide3 YES" >> config/cf/host.def
-	fi
-
-	# fix build problem (XFree86 server among others, was not
-	#                    linked against libXau)
-	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
-
-	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
-
-	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
-	dodir /usr/bin
-	dosym /usr/X11R6/bin /usr/bin/X11
-
-	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
-	doexe ${FILESDIR}/${PVR}/Sessions/*
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
-	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
-	exeinto /etc/X11/xdm
-	doexe ${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
-}
-
-pkg_postinst() {
-	echo ">>> Making font dirs..."
-	find /usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 -exec mkfontdir {} ';'
-}
diff --git a/x11-base/xfree/xfree-4.2.0-r7.ebuild b/x11-base/xfree/xfree-4.2.0-r9.ebuild
index 834b9e430c12..b0c24d2648ec 100644
--- a/x11-base/xfree/xfree-4.2.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.2.0-r9.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-r7.ebuild,v 1.2 2002/03/08 02:18:07 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r9.ebuild,v 1.1 2002/04/07 05:41:58 azarah Exp $
 
 MY_V="`echo ${PV} |sed -e 's:\.::g'`"
 S=${WORKDIR}/xc
@@ -16,6 +16,8 @@ SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
 	 $SRC_PATH1/X${MY_V}src-2.tgz
 	 $SRC_PATH1/X${MY_V}src-3.tgz
 	 ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-xlib-i18n-module.patch
+	 ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-zlib-security.patch
+	 ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-libGLU-bad-extern.patch
 	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
 # NOTE:  4.2.0-xlib-i18n-module.patch is ONLY for XFree86 4.2.0
 
@@ -39,8 +41,13 @@ src_unpack () {
 
 	# resolve bug #794
 	# NOTE:  4.2.0-xlib-i18n-module.patch is ONLY for XFree86 4.2.0
+	#        4.2.0-zlib-security.patch is also ONLY for XFree86 4.2.0
+	#        4.2.0-libGLU-bad-extern.patch same here .. fixes gcc-3.x compile
+	#                                      errors
 	cd ${WORKDIR}
-	patch -p0 < ${DISTDIR}/4.2.0-xlib-i18n-module.patch || die
+	patch -p0 < ${DISTDIR}/${PV}-xlib-i18n-module.patch || die
+	patch -p0 < ${DISTDIR}/${PV}-zlib-security.patch || die
+	patch -p0 < ${DISTDIR}/${PV}-libGLU-bad-extern.patch || die
 	
 	cd ${S}
 	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
@@ -113,15 +120,18 @@ src_install() {
 	dodir /usr/bin
 	dosym /usr/X11R6/bin /usr/bin/X11
 
-	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
+	dosym libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
+	dosym ../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
+	#new session management script
 	doexe ${FILESDIR}/${PVR}/chooser.sh
+	#new display manager script
+	doexe ${FILESDIR}/${PVR}/startDM.sh
 	exeinto /etc/X11/Sessions
 	doexe ${FILESDIR}/${PVR}/Sessions/*
 	insinto /etc/env.d
@@ -138,17 +148,41 @@ src_install() {
 	newexe ${FILESDIR}/${PVR}/xdm.start xdm
 	newexe ${FILESDIR}/${PVR}/xfs.start xfs
 
-	#new display manager script
-	exeinto /etc/X11
-	doexe ${FILESDIR}/${PVR}/startDM.sh
+	#next section is to setup the dinamic libGL stuff
+	dosbin ${FILESDIR}/${PVR}/opengl-update
+	dodir /usr/lib/opengl/xfree/{lib,extensions,include}
+	mv ${D}/usr/X11R6/lib/libGL.so* ${D}/usr/lib/opengl/xfree/lib
+	mv ${D}/usr/X11R6/lib/libGL.la ${D}/usr/lib/opengl/xfree/lib
+	dosym libGL.so
+	mv ${D}/usr/X11R6/lib/libMesaGL.so ${D}/usr/lib/opengl/xfree/lib
+	mv ${D}/usr/X11R6/lib/modules/extensions/libglx* \
+		${D}/usr/lib/opengl/xfree/extensions
+	mv ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h} \
+		${D}/usr/lib/opengl/xfree/include
 }
 
 pkg_preinst() {
 	#this changed from a file to a symlink
-	rm -rf /usr/X11R6/lib/X11/XftConfig
+	rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig
+
+	#clean the dinamic libGL stuff's home to ensure
+	#we dont have stale libs floating around
+	if [ -d ${ROOT}/usr/lib/opengl/xfree ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/xfree/*
+	fi
 }
 
 pkg_postinst() {
+	env-update
 	echo ">>> Making font dirs..."
-	find /usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 -exec mkfontdir {} ';'
+	find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 \
+		-exec ${ROOT}/usr/X11R6/bin/mkfontdir {} ';'
+
+	#switch to the xfree implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		/usr/sbin/opengl-update xfree
+	fi
 }
+