add config stuff for new xfree

11 files changed, 474 insertions, 0 deletions

diff --git a/x11-base/xfree/files/4.2.0-r2/10xfree b/x11-base/xfree/files/4.2.0-r2/10xfree
new file mode 100644
index 000000000000..a302f743012c
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/Sessions/Xsession b/x11-base/xfree/files/4.2.0-r2/Sessions/Xsession
new file mode 100644
index 000000000000..c86ccee19ff3
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/XftConfig b/x11-base/xfree/files/4.2.0-r2/XftConfig
new file mode 100644
index 000000000000..16af856f7c29
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/Xsession b/x11-base/xfree/files/4.2.0-r2/Xsession
new file mode 100644
index 000000000000..7e0ae3fbfb0f
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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
+	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-r2/chooser.sh b/x11-base/xfree/files/4.2.0-r2/chooser.sh
new file mode 100644
index 000000000000..6f848a606550
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/chooser.sh,v 1.1 2002/01/20 23:22:14 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-r2/site.def b/x11-base/xfree/files/4.2.0-r2/site.def
new file mode 100644
index 000000000000..0da27e392339
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/site.def
@@ -0,0 +1,20 @@
+#define HasZlib YES
+#define HasGcc2ForCplusplus YES
+#define ForceNormalLib YES
+#define BuildXinerama YES
+#define SharedLibXau YES
+#define BuildRman YES
+#define BuildHtmlManPages NO
+#define BuildAllSpecsDocs NO
+#define BuildSpecsDocs NO
+#define BuildGLULibrary NO
+#define SharedLibGLU NO
+#define NormalLibGLU NO
+/* 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-r2/xdm b/x11-base/xfree/files/4.2.0-r2/xdm
new file mode 100644
index 000000000000..f1773fb59a12
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/xdm.start b/x11-base/xfree/files/4.2.0-r2/xdm.start
new file mode 100644
index 000000000000..ca7ef16138a4
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/xfs.config b/x11-base/xfree/files/4.2.0-r2/xfs.config
new file mode 100644
index 000000000000..de19ae0978db
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/xfs.config
@@ -0,0 +1,52 @@
+#
+# 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/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-r2/xfs.start b/x11-base/xfree/files/4.2.0-r2/xfs.start
new file mode 100644
index 000000000000..36844ccd7fe5
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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-r2/xfs.start,v 1.1 2002/01/20 23:22:14 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-r2/xinitrc b/x11-base/xfree/files/4.2.0-r2/xinitrc
new file mode 100644
index 000000000000..04821ff6466d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r2/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