diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-04-07 04:26:41 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-04-07 04:26:41 +0000 |
| commit | 524a89acf5867b6f03c92a21bf1a061438b29b96 (patch) | |
| tree | 7452f66204d5fcc6920f9fd2679da32351d9d6bd /x11-base | |
| parent | Added latest pan, which is yenc support. (diff) | |
| download | gentoo-2-524a89acf5867b6f03c92a21bf1a061438b29b96.tar.gz gentoo-2-524a89acf5867b6f03c92a21bf1a061438b29b96.tar.bz2 gentoo-2-524a89acf5867b6f03c92a21bf1a061438b29b96.zip | |
cleanup
Diffstat (limited to 'x11-base')
46 files changed, 2 insertions, 1676 deletions
diff --git a/x11-base/xfree/files/4.1.0-r1/10xfree b/x11-base/xfree/files/4.1.0-r1/10xfree deleted file mode 100644 index 87d675d0a361..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/10xfree +++ /dev/null @@ -1,5 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFODIR=/usr/X11R6/info diff --git a/x11-base/xfree/files/4.1.0-r1/XftConfig b/x11-base/xfree/files/4.1.0-r1/XftConfig deleted file mode 100644 index 16af856f7c29..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/XftConfig +++ /dev/null @@ -1,71 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -dir "/usr/X11R6/lib/X11/fonts/Type1" -dir "/usr/X11R6/lib/X11/fonts/truetype" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -#Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family += "Times New Roman"; -match any family == "Helvetica" edit family += "Verdana"; -match any family == "Courier" edit family += "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; diff --git a/x11-base/xfree/files/4.1.0-r1/Xsession b/x11-base/xfree/files/4.1.0-r1/Xsession deleted file mode 100644 index 42215d8b80e8..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/Xsession +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 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 - -case $# in -1) - if [ -f /usr/X11R6/bin/wm/$1 ] - then - source /etc/profile - /usr/X11R6/bin/wm/$1 - else - #failsafe - exec xterm -geometry 80x24-0-0 - fi - ;; -0) - startup=$HOME/.xsession - resources=$HOME/.Xresources - - - if [ -s "$startup" -a -x "$startup" ]; then - exec "$startup" - else - if [ -f $HOME/.wm ] - then - mywm="/usr/X11R6/bin/wm/`cat $HOME/.wm`" - if [ -f $mywm ] - then - source /etc/profile - $mywm - exit 0 - fi - else - if [ -r "$resources" ]; then - xrdb -load "$resources" - exec xsm - fi - fi - fi - ;; - -esac - diff --git a/x11-base/xfree/files/4.1.0-r1/site.def b/x11-base/xfree/files/4.1.0-r1/site.def deleted file mode 100644 index 612ff0a1646e..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/site.def +++ /dev/null @@ -1,20 +0,0 @@ -#define HasZlib YES -#define HasGcc2ForCplusplus YES -#define ForceNormalLib YES -#define BuildXinerama YES -#define SharedLibXau YES -#define BuildRman NO -#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.1.0-r1/xdm b/x11-base/xfree/files/4.1.0-r1/xdm deleted file mode 100644 index f1773fb59a12..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/xdm +++ /dev/null @@ -1,4 +0,0 @@ -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.1.0-r1/xdm.start b/x11-base/xfree/files/4.1.0-r1/xdm.start deleted file mode 100644 index 40ae96b0be9f..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/xdm.start +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/bash -#RCUPDATE:4:99:This line is required for script management -# Copyright (c) 1996-99 SuSE GmbH Nuernberg, Germany. All rights reserved. -# -# Author: Florian La Roche <florian@suse.de>, 1996 -# Werner Fink <werner@suse.de>, 1996,98,99 -# Martin Scherbaum <maddin@suse.de>, 1997 -# Reinhard Max <max@suse.de>, 1997 -# -# /sbin/init.d/xdm -# - -. /etc/rc.d/config/basic -. /etc/rc.d/config/functions - -. /etc/profile.env -export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$ROOTPATH - -case "$DISPLAYMANAGER" in - kdm|kde|KDM|KDE) - EXE=$KDEDIR/bin/kdm - ;; - gdm|GDM|Gnome|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" -opts="start stop restart" - -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 owner ship 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}." -} - -restart() { - stop - start -} - -doservice ${@} diff --git a/x11-base/xfree/files/4.1.0-r1/xinitrc b/x11-base/xfree/files/4.1.0-r1/xinitrc deleted file mode 100644 index 0c8faef40844..000000000000 --- a/x11-base/xfree/files/4.1.0-r1/xinitrc +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.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 - -# start some nice program -if [ -f $HOME/.wm ] -then - mywm="/usr/X11R6/bin/wm/`cat $HOME/.wm`" - if [ -f $mywm ] - then - $mywm - exit 0 - fi -else - 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
\ No newline at end of file diff --git a/x11-base/xfree/files/4.2.0-r5/10xfree b/x11-base/xfree/files/4.2.0-r5/10xfree deleted file mode 100644 index a302f743012c..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/10xfree +++ /dev/null @@ -1,6 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFODIR=/usr/X11R6/info -XINITRC=/etc/X11/xinit/xinitrc diff --git a/x11-base/xfree/files/4.2.0-r5/XftConfig b/x11-base/xfree/files/4.2.0-r5/XftConfig deleted file mode 100644 index 16af856f7c29..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/XftConfig +++ /dev/null @@ -1,71 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -dir "/usr/X11R6/lib/X11/fonts/Type1" -dir "/usr/X11R6/lib/X11/fonts/truetype" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -#Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family += "Times New Roman"; -match any family == "Helvetica" edit family += "Verdana"; -match any family == "Courier" edit family += "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; diff --git a/x11-base/xfree/files/4.2.0-r5/Xsession b/x11-base/xfree/files/4.2.0-r5/Xsession deleted file mode 100644 index 3b1f2f1fa535..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/Xsession +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# handle KDM -if [ -n "$1" ]; then - export XSESSION="$1" -fi - -startup=$HOME/.xsession -resources=$HOME/.Xresources - -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -elif [ -s "$startup" ]; then - if [ -x "$startup" ]; then - exec "$startup" - else - exec /bin/sh "$startup" - fi -else - if [ -r "$resources" ]; then - xrdb -load "$resources" - fi - exec xsm -fi diff --git a/x11-base/xfree/files/4.2.0-r5/Xsetup_0 b/x11-base/xfree/files/4.2.0-r5/Xsetup_0 deleted file mode 100644 index d5d67d72294f..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/Xsetup_0 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail - -# --- 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-r5/chooser.sh b/x11-base/xfree/files/4.2.0-r5/chooser.sh deleted file mode 100644 index 9460e8ab1742..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/chooser.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/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-r5/chooser.sh,v 1.2 2002/03/01 23:08:12 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-r5/site.def b/x11-base/xfree/files/4.2.0-r5/site.def deleted file mode 100644 index c7850225f25d..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/site.def +++ /dev/null @@ -1,37 +0,0 @@ -#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-r5/xdm b/x11-base/xfree/files/4.2.0-r5/xdm deleted file mode 100644 index f1773fb59a12..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/xdm +++ /dev/null @@ -1,4 +0,0 @@ -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-r5/xdm.start b/x11-base/xfree/files/4.2.0-r5/xdm.start deleted file mode 100644 index 7b6227a2c1e1..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/xdm.start +++ /dev/null @@ -1,48 +0,0 @@ -#!/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-r5/xfs.config b/x11-base/xfree/files/4.2.0-r5/xfs.config deleted file mode 100644 index de19ae0978db..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/xfs.config +++ /dev/null @@ -1,52 +0,0 @@ -# -# 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-r5/xfs.start b/x11-base/xfree/files/4.2.0-r5/xfs.start deleted file mode 100644 index c6b7c67a94e1..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/xfs.start +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r5/xfs.start,v 1.1 2002/01/27 09:19:53 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-r5/xinitrc b/x11-base/xfree/files/4.2.0-r5/xinitrc deleted file mode 100644 index 04821ff6466d..000000000000 --- a/x11-base/xfree/files/4.2.0-r5/xinitrc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=XINITDIR/.Xresources -sysmodmap=XINITDIR/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# handle xinit -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" -elif [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -else - # start some nice programs - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -fi diff --git a/x11-base/xfree/files/4.2.0-r6/10xfree b/x11-base/xfree/files/4.2.0-r6/10xfree deleted file mode 100644 index a302f743012c..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/10xfree +++ /dev/null @@ -1,6 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFODIR=/usr/X11R6/info -XINITRC=/etc/X11/xinit/xinitrc diff --git a/x11-base/xfree/files/4.2.0-r6/XftConfig b/x11-base/xfree/files/4.2.0-r6/XftConfig deleted file mode 100644 index 16af856f7c29..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/XftConfig +++ /dev/null @@ -1,71 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -dir "/usr/X11R6/lib/X11/fonts/Type1" -dir "/usr/X11R6/lib/X11/fonts/truetype" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -#Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family += "Times New Roman"; -match any family == "Helvetica" edit family += "Verdana"; -match any family == "Courier" edit family += "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; diff --git a/x11-base/xfree/files/4.2.0-r6/Xsession b/x11-base/xfree/files/4.2.0-r6/Xsession deleted file mode 100644 index 3b1f2f1fa535..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/Xsession +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# handle KDM -if [ -n "$1" ]; then - export XSESSION="$1" -fi - -startup=$HOME/.xsession -resources=$HOME/.Xresources - -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -elif [ -s "$startup" ]; then - if [ -x "$startup" ]; then - exec "$startup" - else - exec /bin/sh "$startup" - fi -else - if [ -r "$resources" ]; then - xrdb -load "$resources" - fi - exec xsm -fi diff --git a/x11-base/xfree/files/4.2.0-r6/Xsetup_0 b/x11-base/xfree/files/4.2.0-r6/Xsetup_0 deleted file mode 100644 index d5d67d72294f..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/Xsetup_0 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail - -# --- 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-r6/chooser.sh b/x11-base/xfree/files/4.2.0-r6/chooser.sh deleted file mode 100644 index 40684438eaa6..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/chooser.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/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.2 2002/03/01 23:08:12 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-r6/site.def b/x11-base/xfree/files/4.2.0-r6/site.def deleted file mode 100644 index ff0afc986567..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/site.def +++ /dev/null @@ -1,40 +0,0 @@ -#define HasZlib YES -#define HasGcc2ForCplusplus YES -#define LocalThreads YES -#define HasPosixThreads YES -#define HasThreadSafeAPI YES -#define ForceNormalLib YES -#define BuildXinerama YES -#define SharedLibXau YES -#define BuildFonts YES -#define BuildFreeType YES -#define BuildXTrueType YES -#define BuildXInputExt YES -#define BuildXKB YES -#define BuildDBE YES -#define BuildScreenSaverExt YES -#define BuildRman YES -#define BuildHtmlManPages NO -#define BuildAllSpecsDocs NO -#define BuildSpecsDocs NO -#define BuildXF86DRI YES -#define BuildGLXLibrary YES -#define BuildGlxExt YES -#define BuildGLULibrary YES -#define SharedLibGLU YES -#define NormalLibGLU YES -#define DoLoadableServer YES -#define BuildXvExt YES -#define BuildXF86DGA YES -#define BuildRender YES -#define BuildRECORD YES -#define BuildPexExt YES -#define BuildXIE YES -/* binutils-2.9 */ -#define LinuxBinUtilsMajorVersion 29 -/* glibc-2.2 (6.2 because glibc is considered libc-6) */ -#define LinuxCLibMajorVersion 6 -#define LinuxClibMinorVersion 2 -#define HasTk NO -#define HasTcl NO -#define FSUseSyslog YES diff --git a/x11-base/xfree/files/4.2.0-r6/xdm b/x11-base/xfree/files/4.2.0-r6/xdm deleted file mode 100644 index f1773fb59a12..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/xdm +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 2e809eec99cc..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/xdm.start +++ /dev/null @@ -1,81 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r6/xdm.start,v 1.4 2002/03/04 22:45:15 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: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-r6/xfs.config b/x11-base/xfree/files/4.2.0-r6/xfs.config deleted file mode 100644 index c99df93c8e3a..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/xfs.config +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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 deleted file mode 100644 index c2d9fe000e38..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/xfs.start +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-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 deleted file mode 100644 index 04821ff6466d..000000000000 --- a/x11-base/xfree/files/4.2.0-r6/xinitrc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=XINITDIR/.Xresources -sysmodmap=XINITDIR/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# handle xinit -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" -elif [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -else - # start some nice programs - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -fi diff --git a/x11-base/xfree/files/4.2.0-r7/10xfree b/x11-base/xfree/files/4.2.0-r7/10xfree deleted file mode 100644 index a302f743012c..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/10xfree +++ /dev/null @@ -1,6 +0,0 @@ -PATH=/usr/X11R6/bin -ROOTPATH=/usr/X11R6/bin -LDPATH=/usr/X11R6/lib -MANPATH=/usr/X11R6/man -INFODIR=/usr/X11R6/info -XINITRC=/etc/X11/xinit/xinitrc diff --git a/x11-base/xfree/files/4.2.0-r7/XftConfig b/x11-base/xfree/files/4.2.0-r7/XftConfig deleted file mode 100644 index 16af856f7c29..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/XftConfig +++ /dev/null @@ -1,71 +0,0 @@ -# -# XftConfig -# -# Use with Type1 and TrueType fonts -# - -dir "/usr/X11R6/lib/X11/fonts/Type1" -dir "/usr/X11R6/lib/X11/fonts/truetype" - -# -# alias 'fixed' for 'mono' -# -match any family == "fixed" edit family =+ "mono"; - -# -#Check users config file -# -includeif "~/.xftconfig" - -# -# Substitute TrueType fonts for Type1 versions -# -match any family == "Times" edit family += "Times New Roman"; -match any family == "Helvetica" edit family += "Verdana"; -match any family == "Courier" edit family += "Courier New"; - -# -# Use TrueType fonts for defaults -# -match any family == "serif" edit family += "Times New Roman"; -match any family == "sans" edit family += "Verdana"; - -# -# Use monotype.com (andale) face where possible -# -match - any family == "mono" - all slant == roman - all weight < bold -edit - family += "monotype.com"; -# -# otherwise, use courier -# -match any family == "mono" edit family += "Courier New"; - -# -# Alias between XLFD families and font file family name, prefer local fonts -# -match any family == "Charter" edit family += "Bitstream Charter"; -match any family == "Bitstream Charter" edit family =+ "Charter"; - -match any family == "Lucidux Serif" edit family += "LuciduxSerif"; -match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; - -match any family == "Lucidux Sans" edit family += "LuciduxSans"; -match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; - -match any family == "Lucidux Mono" edit family += "LuciduxMono"; -match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; - -# -# TrueType font aliases -# -match any family == "Comic Sans" edit family += "Comic Sans MS"; -match any family == "Comic Sans MS" edit family =+ "Comic Sans"; -match any family == "Trebuchet" edit family += "Trebuchet MS"; -match any family == "Trebuchet MS" edit family =+ "Trebuchet"; -match any family == "Monotype" edit family =+ "Monotype.com"; -match any family == "Andale Mono" edit family += "Monotype.com"; -match any family == "Monotype.com" edit family =+ "Andale Mono"; diff --git a/x11-base/xfree/files/4.2.0-r7/Xsession b/x11-base/xfree/files/4.2.0-r7/Xsession deleted file mode 100644 index 3b1f2f1fa535..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/Xsession +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# handle KDM -if [ -n "$1" ]; then - export XSESSION="$1" -fi - -startup=$HOME/.xsession -resources=$HOME/.Xresources - -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -elif [ -s "$startup" ]; then - if [ -x "$startup" ]; then - exec "$startup" - else - exec /bin/sh "$startup" - fi -else - if [ -r "$resources" ]; then - xrdb -load "$resources" - fi - exec xsm -fi diff --git a/x11-base/xfree/files/4.2.0-r7/Xsetup_0 b/x11-base/xfree/files/4.2.0-r7/Xsetup_0 deleted file mode 100644 index d5d67d72294f..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/Xsetup_0 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail - -# --- 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 deleted file mode 100644 index 540c456be643..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/chooser.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/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/site.def b/x11-base/xfree/files/4.2.0-r7/site.def deleted file mode 100644 index ff0afc986567..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/site.def +++ /dev/null @@ -1,40 +0,0 @@ -#define HasZlib YES -#define HasGcc2ForCplusplus YES -#define LocalThreads YES -#define HasPosixThreads YES -#define HasThreadSafeAPI YES -#define ForceNormalLib YES -#define BuildXinerama YES -#define SharedLibXau YES -#define BuildFonts YES -#define BuildFreeType YES -#define BuildXTrueType YES -#define BuildXInputExt YES -#define BuildXKB YES -#define BuildDBE YES -#define BuildScreenSaverExt YES -#define BuildRman YES -#define BuildHtmlManPages NO -#define BuildAllSpecsDocs NO -#define BuildSpecsDocs NO -#define BuildXF86DRI YES -#define BuildGLXLibrary YES -#define BuildGlxExt YES -#define BuildGLULibrary YES -#define SharedLibGLU YES -#define NormalLibGLU YES -#define DoLoadableServer YES -#define BuildXvExt YES -#define BuildXF86DGA YES -#define BuildRender YES -#define BuildRECORD YES -#define BuildPexExt YES -#define BuildXIE YES -/* binutils-2.9 */ -#define LinuxBinUtilsMajorVersion 29 -/* glibc-2.2 (6.2 because glibc is considered libc-6) */ -#define LinuxCLibMajorVersion 6 -#define LinuxClibMinorVersion 2 -#define HasTk NO -#define HasTcl NO -#define FSUseSyslog YES diff --git a/x11-base/xfree/files/4.2.0-r7/startDM.sh b/x11-base/xfree/files/4.2.0-r7/startDM.sh deleted file mode 100644 index a15b369d8645..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/startDM.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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.2 2002/03/06 21:58:35 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-r7/xdm b/x11-base/xfree/files/4.2.0-r7/xdm deleted file mode 100644 index f1773fb59a12..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/xdm +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 312679e8acf7..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/xdm.start +++ /dev/null @@ -1,103 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r7/xdm.start,v 1.2 2002/03/06 21:58:35 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() { - . /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 2>&1 - 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 2>&1 - retval=$? - else - retval=1 - fi -# sleep 1 -# if [ "`ps -A | grep -e "X"`" ] -# then -# killall X >/dev/null 2>&1 -# fi - #switch back to original vt - chvt "$curvt" >/dev/null 2>&1 - eend $retval "Error stopping ${myservice}." - return $retval -} - diff --git a/x11-base/xfree/files/4.2.0-r7/xfs.config b/x11-base/xfree/files/4.2.0-r7/xfs.config deleted file mode 100644 index c99df93c8e3a..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/xfs.config +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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 deleted file mode 100644 index 02693a0c6726..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/xfs.start +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-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 deleted file mode 100644 index a9ed1fe5fdb5..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/xft-quality.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN Xft.orig/xftfreetype.c Xft/xftfreetype.c ---- Xft.orig/xftfreetype.c Thu Dec 13 10:26:00 2001 -+++ Xft/xftfreetype.c Wed Mar 6 00:23:19 2002 -@@ -1,5 +1,5 @@ - /* -- * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.16 2001/12/13 17:26:00 keithp Exp $ -+ * $XFree86: xc/lib/Xft1/xftfreetype.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $ - * - * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. - * -@@ -236,7 +236,7 @@ - if (_XftFontDebug() & XFT_DBG_GLYPH) - printf ("Set face size to %d (%d)\n", - (int) (size >> 6), (int) size); -- if (FT_Set_Char_Size (face, size, size, 0, 0)) -+ if (FT_Set_Char_Size (face, size, size, 69, 72)) - return False; - f->size = size; - } -diff -urN Xft.orig/xftglyphs.c Xft/xftglyphs.c ---- Xft.orig/xftglyphs.c Sat Nov 17 01:22:45 2001 -+++ Xft/xftglyphs.c Wed Mar 6 00:23:19 2002 -@@ -1,5 +1,5 @@ - /* -- * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.14 2001/11/17 08:22:45 keithp Exp $ -+ * $XFree86: xc/lib/Xft1/xftglyphs.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $ - * - * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. - * -@@ -124,7 +124,7 @@ - } - else - glyphindex = (FT_UInt) charcode; -- error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP); -+ error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING); - if (error) - continue; - diff --git a/x11-base/xfree/files/4.2.0-r7/xinitrc b/x11-base/xfree/files/4.2.0-r7/xinitrc deleted file mode 100644 index 04821ff6466d..000000000000 --- a/x11-base/xfree/files/4.2.0-r7/xinitrc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=XINITDIR/.Xresources -sysmodmap=XINITDIR/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# handle xinit -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" -elif [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -else - # start some nice programs - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -fi diff --git a/x11-base/xfree/files/digest-xfree-4.1.0-r1 b/x11-base/xfree/files/digest-xfree-4.1.0-r1 deleted file mode 100644 index a88ef04fe4b2..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.1.0-r1 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 2d4709f7106a1d65c175be445a3d3c32 X410src-1.tgz 24990773 -MD5 beaffed1cbdb700e5fed6a5490a7f222 X410src-2.tgz 22496001 -MD5 f94e42cd5c5e31a702ec64bfdc017a7d X410src-3.tgz 9305312 -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606 diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r5 b/x11-base/xfree/files/digest-xfree-4.2.0-r5 deleted file mode 100644 index 461cdd9b3f25..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.2.0-r5 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532 -MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328 -MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679 -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606 diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r7 b/x11-base/xfree/files/digest-xfree-4.2.0-r7 deleted file mode 100644 index bdd80c03521a..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.2.0-r7 +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r6 b/x11-base/xfree/files/digest-xfree-4.2.0-r9 index bdd80c03521a..b283fdfb86c8 100644 --- a/x11-base/xfree/files/digest-xfree-4.2.0-r6 +++ b/x11-base/xfree/files/digest-xfree-4.2.0-r9 @@ -2,4 +2,6 @@ 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 5684153cb1f84875fb3535e3263dc447 4.2.0-zlib-security.patch 1391 +MD5 2d5c738854c7cc0378ae457b09a029f4 4.2.0-libGLU-bad-extern.patch 1463 MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606 |