new xfree release with Xft quality hack from

http://www.cs.mcgill.ca/~dchest/xfthack/

19 files changed, 735 insertions, 1 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 5b889acfbaef..239b60dfef28 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,7 +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.3 2002/03/01 23:08:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.4 2002/03/06 07:43:50 drobbins Exp $
 
+*xfree-4.2.0-r7 (05 Mar 2002)
+
+  05 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : New release of xfree.
+  Incorporated Xft quality fixes from http://www.cs.mcgill.ca/~dchest/xfthack/;
+  added Azarah's startDM.sh script.
+  
   28 Feb 2002; M.Schlemmer <azarah@gentoo.org> ${FILESDIR}/chooser.sh :
 
   Actually source /etc/conf.d/basic and /etc/rc.conf.
diff --git a/x11-base/xfree/files/4.2.0-r7/10xfree b/x11-base/xfree/files/4.2.0-r7/10xfree
new file mode 100644
index 000000000000..a302f743012c
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/Sessions/Xsession b/x11-base/xfree/files/4.2.0-r7/Sessions/Xsession
new file mode 100644
index 000000000000..c86ccee19ff3
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/XftConfig b/x11-base/xfree/files/4.2.0-r7/XftConfig
new file mode 100644
index 000000000000..16af856f7c29
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/Xsession b/x11-base/xfree/files/4.2.0-r7/Xsession
new file mode 100644
index 000000000000..3b1f2f1fa535
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/Xsetup_0 b/x11-base/xfree/files/4.2.0-r7/Xsetup_0
new file mode 100644
index 000000000000..d5d67d72294f
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/Xsetup_0
@@ -0,0 +1,26 @@
+#!/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
+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-r7/chooser.sh b/x11-base/xfree/files/4.2.0-r7/chooser.sh
new file mode 100644
index 000000000000..540c456be643
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/chooser.sh
@@ -0,0 +1,63 @@
+#!/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-r7/chooser.sh,v 1.1 2002/03/06 07:43:51 drobbins 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-r7/lib/libGL.la b/x11-base/xfree/files/4.2.0-r7/lib/libGL.la
new file mode 100644
index 000000000000..78a7335b2f06
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/lib/libGLU.la b/x11-base/xfree/files/4.2.0-r7/lib/libGLU.la
new file mode 100644
index 000000000000..3912cadb8386
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/lib/libOSMesa.la b/x11-base/xfree/files/4.2.0-r7/lib/libOSMesa.la
new file mode 100644
index 000000000000..1ca2ec61435e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/site.def b/x11-base/xfree/files/4.2.0-r7/site.def
new file mode 100644
index 000000000000..ff0afc986567
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/startDM.sh b/x11-base/xfree/files/4.2.0-r7/startDM.sh
new file mode 100644
index 000000000000..17be4ee71832
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/startDM.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# 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-r7/startDM.sh,v 1.1 2002/03/06 07:43:51 drobbins Exp $
+
+source /etc/init.d/functions.sh
+
+#dont quit too soon, else init will catch a respawn
+x=10
+while [ $x -ne 0 ]
+do
+	if [ -e ${svcdir}/options/xdm/service ]
+	then
+		exec "`cat ${svcdir}/options/xdm/service`" -nodaemon
+		if [ $? -ne 0 ]
+		then
+			#there was a error running the DM, so return control to
+			#init, so that it can catch any respawning
+			einfo "ERROR: could not start the Display Manager..."
+			continue
+		fi
+	else
+		sleep 3
+	fi
+	x=$((x - 1))
+done
+
+
diff --git a/x11-base/xfree/files/4.2.0-r7/xdm b/x11-base/xfree/files/4.2.0-r7/xdm
new file mode 100644
index 000000000000..f1773fb59a12
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/xdm.start b/x11-base/xfree/files/4.2.0-r7/xdm.start
new file mode 100644
index 000000000000..0c816b2b754b
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/xdm.start
@@ -0,0 +1,81 @@
+#!/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-r7/xdm.start,v 1.1 2002/03/06 07:43:51 drobbins 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:3:respawn:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in -nodaemon mode if
+# a lock is present, else just fall through (with a big enouth
+# delay so that init will not "detect" a respawning process and 
+# halt if for some odd time).
+#
+# We then use /etc/init.d/xdm to control the presence of this
+# lock, and this should ensure that the getty's is always started
+# *before* the DM.
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+
+# Start X Font Server before X
+depend() {
+	use xfs
+}
+
+setup_dm() {
+	. /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_options service "$EXE"
+	eend 0
+}
+
+stop() {
+	local myexe="`get_options service`"
+	local myservice=${myexe##*/}
+	ebegin "Stopping ${myservice}"
+	rm -f ${svcdir}/options/xdm/service
+	if [ "`ps -A | grep "${myservice}" `" ]
+	then
+		start-stop-daemon --stop --quiet \
+			--exe $myexe >/dev/null 2>/dev/null
+	fi
+	if [ "`ps -A | grep "X" `" ]
+	then
+		killall X >/dev/null 2>/dev/null
+	fi
+	eend $? "Error stopping ${myservice}."
+}
+
diff --git a/x11-base/xfree/files/4.2.0-r7/xfs.config b/x11-base/xfree/files/4.2.0-r7/xfs.config
new file mode 100644
index 000000000000..c99df93c8e3a
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/xfs.start b/x11-base/xfree/files/4.2.0-r7/xfs.start
new file mode 100644
index 000000000000..02693a0c6726
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/xfs.start,v 1.1 2002/03/06 07:43:51 drobbins 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-r7/xft-quality.diff b/x11-base/xfree/files/4.2.0-r7/xft-quality.diff
new file mode 100644
index 000000000000..a9ed1fe5fdb5
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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-r7/xinitrc b/x11-base/xfree/files/4.2.0-r7/xinitrc
new file mode 100644
index 000000000000..04821ff6466d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r7/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.2.0-r7 b/x11-base/xfree/files/digest-xfree-4.2.0-r7
new file mode 100644
index 000000000000..bdd80c03521a
--- /dev/null
+++ b/x11-base/xfree/files/digest-xfree-4.2.0-r7
@@ -0,0 +1,5 @@
+MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532
+MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328
+MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679
+MD5 19a91692fdb4fa3d2797f57beebee34a 4.2.0-xlib-i18n-module.patch 3970
+MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606