summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-01-28 18:57:51 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-01-28 18:57:51 +0000
commit4c16674e56fbefd2fc68cd24e6faf9aa8a343c2c (patch)
treece9aeb4318b988ec2d802909b3f1b196cc37a49e /x11-base
parentnice comment for bison mask (diff)
downloadgentoo-2-4c16674e56fbefd2fc68cd24e6faf9aa8a343c2c.tar.gz
gentoo-2-4c16674e56fbefd2fc68cd24e6faf9aa8a343c2c.tar.bz2
gentoo-2-4c16674e56fbefd2fc68cd24e6faf9aa8a343c2c.zip
.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/files/4.1.0-r4/10xfree5
-rw-r--r--x11-base/xfree/files/4.1.0-r4/XftConfig71
-rw-r--r--x11-base/xfree/files/4.1.0-r4/Xsession56
-rw-r--r--x11-base/xfree/files/4.1.0-r4/site.def20
-rw-r--r--x11-base/xfree/files/4.1.0-r4/xdm4
-rw-r--r--x11-base/xfree/files/4.1.0-r4/xdm.start42
-rw-r--r--x11-base/xfree/files/4.1.0-r4/xinitrc42
-rw-r--r--x11-base/xfree/files/4.1.0-r5/10xfree5
-rw-r--r--x11-base/xfree/files/4.1.0-r5/XftConfig71
-rw-r--r--x11-base/xfree/files/4.1.0-r5/Xsession56
-rw-r--r--x11-base/xfree/files/4.1.0-r5/site.def20
-rw-r--r--x11-base/xfree/files/4.1.0-r5/xdm4
-rw-r--r--x11-base/xfree/files/4.1.0-r5/xdm.start47
-rw-r--r--x11-base/xfree/files/4.1.0-r5/xfs.config52
-rw-r--r--x11-base/xfree/files/4.1.0-r5/xfs.start28
-rw-r--r--x11-base/xfree/files/4.1.0-r5/xinitrc42
16 files changed, 0 insertions, 565 deletions
diff --git a/x11-base/xfree/files/4.1.0-r4/10xfree b/x11-base/xfree/files/4.1.0-r4/10xfree
deleted file mode 100644
index 87d675d0a361..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/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-r4/XftConfig b/x11-base/xfree/files/4.1.0-r4/XftConfig
deleted file mode 100644
index 16af856f7c29..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/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-r4/Xsession b/x11-base/xfree/files/4.1.0-r4/Xsession
deleted file mode 100644
index 42215d8b80e8..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/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-r4/site.def b/x11-base/xfree/files/4.1.0-r4/site.def
deleted file mode 100644
index 612ff0a1646e..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/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-r4/xdm b/x11-base/xfree/files/4.1.0-r4/xdm
deleted file mode 100644
index f1773fb59a12..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/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-r4/xdm.start b/x11-base/xfree/files/4.1.0-r4/xdm.start
deleted file mode 100644
index 1dc15ff5c708..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/xdm.start
+++ /dev/null
@@ -1,42 +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.
-
-. /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"
-
-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.1.0-r4/xinitrc b/x11-base/xfree/files/4.1.0-r4/xinitrc
deleted file mode 100644
index 0c8faef40844..000000000000
--- a/x11-base/xfree/files/4.1.0-r4/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.1.0-r5/10xfree b/x11-base/xfree/files/4.1.0-r5/10xfree
deleted file mode 100644
index 87d675d0a361..000000000000
--- a/x11-base/xfree/files/4.1.0-r5/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-r5/XftConfig b/x11-base/xfree/files/4.1.0-r5/XftConfig
deleted file mode 100644
index 16af856f7c29..000000000000
--- a/x11-base/xfree/files/4.1.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.1.0-r5/Xsession b/x11-base/xfree/files/4.1.0-r5/Xsession
deleted file mode 100644
index 42215d8b80e8..000000000000
--- a/x11-base/xfree/files/4.1.0-r5/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-r5/site.def b/x11-base/xfree/files/4.1.0-r5/site.def
deleted file mode 100644
index 612ff0a1646e..000000000000
--- a/x11-base/xfree/files/4.1.0-r5/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-r5/xdm b/x11-base/xfree/files/4.1.0-r5/xdm
deleted file mode 100644
index f1773fb59a12..000000000000
--- a/x11-base/xfree/files/4.1.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.1.0-r5/xdm.start b/x11-base/xfree/files/4.1.0-r5/xdm.start
deleted file mode 100644
index 221c464952c4..000000000000
--- a/x11-base/xfree/files/4.1.0-r5/xdm.start
+++ /dev/null
@@ -1,47 +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 "$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"
-
-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.1.0-r5/xfs.config b/x11-base/xfree/files/4.1.0-r5/xfs.config
deleted file mode 100644
index de19ae0978db..000000000000
--- a/x11-base/xfree/files/4.1.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.1.0-r5/xfs.start b/x11-base/xfree/files/4.1.0-r5/xfs.start
deleted file mode 100644
index a4d883b75fd7..000000000000
--- a/x11-base/xfree/files/4.1.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.1.0-r5/xfs.start,v 1.2 2001/12/06 20:17:03 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.1.0-r5/xinitrc b/x11-base/xfree/files/4.1.0-r5/xinitrc
deleted file mode 100644
index 0c8faef40844..000000000000
--- a/x11-base/xfree/files/4.1.0-r5/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