Unused file.

Package-Manager: portage-2.0.53

14 files changed, 31 insertions, 464 deletions

diff --git a/x11-apps/rgb/ChangeLog b/x11-apps/rgb/ChangeLog
index b9fea09e4d59..bed2093b11aa 100644
--- a/x11-apps/rgb/ChangeLog
+++ b/x11-apps/rgb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/rgb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/ChangeLog,v 1.13 2005/12/09 06:36:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/ChangeLog,v 1.14 2005/12/09 15:22:53 spyderous Exp $
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/rgb-path.patch:
+  Unused file.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -rgb-0.99.0-r1.ebuild, -rgb-0.99.1.ebuild, -rgb-0.99.2.ebuild:
diff --git a/x11-apps/rgb/files/rgb-path.patch b/x11-apps/rgb/files/rgb-path.patch
deleted file mode 100644
index cfd2ffc6bd27..000000000000
--- a/x11-apps/rgb/files/rgb-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvs/xorg/app/rgb/configure.ac,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -b -B -r1.3 -r1.4
---- configure.ac	29 Jul 2005 21:22:30 -0000	1.3
-+++ configure.ac	1 Aug 2005 22:35:37 -0000	1.4
-@@ -40,8 +40,8 @@
- AC_MSG_CHECKING([for rgb database location])
- AC_ARG_WITH([rgb-db-dir],
- 	AC_HELP_STRING([--with-rgb-db=<path>],
--		[rgb database location (default is libdir/rgb)]),
--	[db_path=$withval], [db_path=$libdir/rgb])
-+		[rgb database location (default is libdir/X11/rgb)]),
-+	[db_path=$withval], [db_path=$libdir/X11/rgb])
- AC_MSG_RESULT([$db_path])
- dnl XXX not working - AC_DEFINE([RGB_DB], $db_path, [set to location of rgb database (without any file type suffix)])
- db_file=`basename $db_path`
diff --git a/x11-apps/rstart/ChangeLog b/x11-apps/rstart/ChangeLog
index 5103fc4a4b69..390b35cdf9da 100644
--- a/x11-apps/rstart/ChangeLog
+++ b/x11-apps/rstart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/rstart
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/rstart/ChangeLog,v 1.6 2005/12/09 06:36:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rstart/ChangeLog,v 1.7 2005/12/09 15:23:37 spyderous Exp $
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/rstart-destdir.patch:
+  Unused file.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -rstart-0.99.0.ebuild, -rstart-0.99.1.ebuild:
diff --git a/x11-apps/rstart/files/rstart-destdir.patch b/x11-apps/rstart/files/rstart-destdir.patch
deleted file mode 100644
index 5a778b1dca53..000000000000
--- a/x11-apps/rstart/files/rstart-destdir.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-? rstart/commands
-? rstart/contexts
-? rstart/rstart.patch
-? rstart/samples
-Index: rstart/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/app/rstart/Makefile.am,v
-retrieving revision 1.5
-diff -u -b -B -r1.5 Makefile.am
---- rstart/Makefile.am	28 Jul 2005 15:57:12 -0000	1.5
-+++ rstart/Makefile.am	29 Jul 2005 16:53:42 -0000
-@@ -40,7 +40,7 @@
- config_DATA = config
- 
- config: config.cpp
--	$(CPP) -DPACKAGEname=rstart -DLIBDIR=$(configdir) -DENVPREFIX=RSTART ${srcdir}/config.cpp |	\
-+	$(CPP) -DPACKAGEname=rstart -DLIBDIR=$(configdir) -DENVPREFIX=RSTART $(top_srcdir)/config.cpp |	\
- 		$(SED) -e /^\#.*$$/d  -e s/XCOMM/\#/g   > $@
- 
- # wrapper scripts
-@@ -48,12 +48,12 @@
- bin_SCRIPTS = rstart rstartd
- 
- rstart: client.cpp
--	$(CPP) -DRSHCMD=$(RSH) -DSERVERNAME=rstartd ${srcdir}/client.cpp |	\
-+	$(CPP) -DRSHCMD=$(RSH) -DSERVERNAME=rstartd $(top_srcdir)/client.cpp |	\
- 		$(SED) -e /^\#.*$$/d  -e s/XCOMM/\#/g   > $@
- 
- rstartd: server.cpp
- 	$(CPP) -DBINDIR=$(rstart_serverdir) -DLIBDIR=$(configdir) \
--		${srcdir}/server.cpp |	\
-+		$(top_srcdir)/server.cpp |	\
- 		$(SED) -e /^\#.*$$/d  -e s/XCOMM/\#/g   > $@
- 
- # man pages
-@@ -76,39 +76,39 @@
- DATA_DIR = $(libdir)/X11/rstart
- 
- install-data-hook:
--	for name in `find ${srcdir}/commands -print | grep -v CVS` ; do	\
-+	for name in `find $(top_srcdir)/commands -print | grep -v CVS` ; do	\
- 	    if test -f $$name; then					\
--	        sed							\
-+	        $(SED)							\
- 		    -e 's,ENVPREFIX,RSTART,g'				\
--		        < $$name > $(DATA_DIR)/$$name;			\
--		case `basename $(DATA_DIR)/$$name` in			\
-+		        < $$name > $(DESTDIR)$(DATA_DIR)/$$name;			\
-+		case `basename $(DESTDIR)$(DATA_DIR)/$$name` in			\
- 		@*)							\
- 		    ;;							\
- 		*)							\
--		    chmod a+x $(DATA_DIR)/$$name ;;			\
-+		    chmod a+x $(DESTDIR)$(DATA_DIR)/$$name ;;			\
- 		esac;							\
- 	    else							\
- 	        if [ -d $$name ] ; then					\
--	            mkdir -p $(DATA_DIR)/$$name ;			\
-+	            mkdir -p $(DESTDIR)$(DATA_DIR)/$$name ;			\
- 	        fi;							\
- 	    fi;								\
- 	done;								\
- 									\
--	for name in `find ${srcdir}/contexts -print | grep -v CVS` ; do	\
-+	for name in `find $(top_srcdir)/contexts -print | grep -v CVS` ; do	\
- 	    if test -f $$name; then					\
--	        sed							\
-+	        $(SED)							\
- 	            -e 's,_PATH,$(DEFAULT_USER_PATH),g'			\
- 	            -e 's,_MANPATH,$(DEFAULT_X_MANPATH),g'		\
--				< $$name > $(DATA_DIR)/$$name ;		\
-+				< $$name > $(DESTDIR)$(DATA_DIR)/$$name ;		\
- 	    else							\
- 	        if [ -d $$name ] ; then					\
--	            mkdir -p $(DATA_DIR)/$$name	;			\
-+	            mkdir -p $(DESTDIR)$(DATA_DIR)/$$name	;			\
- 	        fi ;							\
- 	    fi ;							\
- 	done;								\
- 									\
--	cd $(DATA_DIR)/contexts;					\
--	sed -e '/^$$/d' -e '/^#/d' ${srcdir}/contexts/@Aliases |	\
-+	cd $(DESTDIR)$(DATA_DIR)/contexts;					\
-+	$(SED) -e '/^$$/d' -e '/^#/d' @Aliases |	\
- 	    while read real aliases; do					\
- 	        for i in $$aliases; do					\
- 	            $(RM) $$i;						\
diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index f1c6796b3173..5a3c975eeb3d 100644
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/setxkbmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.9 2005/12/09 06:38:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.10 2005/12/09 15:24:07 spyderous Exp $
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/use-right-xkb-config-root.patch:
+  Unused file.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -setxkbmap-0.99.0.ebuild, -setxkbmap-0.99.1.ebuild,
diff --git a/x11-apps/setxkbmap/files/use-right-xkb-config-root.patch b/x11-apps/setxkbmap/files/use-right-xkb-config-root.patch
deleted file mode 100644
index 3180c8a46c2f..000000000000
--- a/x11-apps/setxkbmap/files/use-right-xkb-config-root.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- setxkbmap-0.99.1.orig/Makefile.am	2005-10-17 16:56:20.000000000 -0700
-+++ setxkbmap-0.99.1/Makefile.am	2005-10-20 15:12:51.000000000 -0700
-@@ -21,7 +21,9 @@
- 
- bin_PROGRAMS = setxkbmap
- 
--setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"xorg"'
-+setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) \
-+	-D__XKBDEFRULES__='"xorg"' \
-+	-DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
- setxkbmap_LDADD = $(SETXKBMAP_LIBS)
- 
- setxkbmap_SOURCES =	\
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 6d2b7c376ab4..fc7e68228dd7 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.29 2005/12/09 06:45:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.30 2005/12/09 15:25:24 spyderous Exp $
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/gentoo_locations-0.99.3.patch, -files/gentoo_locations.patch:
+  Unused file.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xdm-0.99.2_p20051026-r1.ebuild, -xdm-0.99.2_p20051026-r2.ebuild,
diff --git a/x11-apps/xdm/files/gentoo_locations-0.99.3.patch b/x11-apps/xdm/files/gentoo_locations-0.99.3.patch
deleted file mode 100644
index 906faa16b56a..000000000000
--- a/x11-apps/xdm/files/gentoo_locations-0.99.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/Makefile.am.old	2005-11-11 12:12:33.743566368 -0700
-+++ config/Makefile.am	2005-11-11 12:13:36.163077160 -0700
-@@ -14,10 +14,8 @@
- 	Xresources \
- 	Xservers
- 
--xdmlib_SCRIPTS = \
--	Xsession
--
--dist_xdmlib_SCRIPTS = \
-+dist_xdmconfig_SCRIPTS = \
-+	Xsession \
- 	GiveConsole \
- 	TakeConsole \
- 	Xsetup_0 \
diff --git a/x11-apps/xdm/files/gentoo_locations.patch b/x11-apps/xdm/files/gentoo_locations.patch
deleted file mode 100644
index c9cf67987ee8..000000000000
--- a/x11-apps/xdm/files/gentoo_locations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Makefile.am	2005-10-26 21:58:56.924178584 -0600
-+++ config/Makefile.am.new	2005-10-26 22:39:29.336395720 -0600
-@@ -14,7 +14,7 @@
- 	Xresources \
- 	Xservers
- 
--dist_xdmlib_SCRIPTS = \
-+dist_xdmconfig_SCRIPTS = \
- 	Xsession \
- 	GiveConsole \
- 	TakeConsole \
diff --git a/x11-apps/xdpyinfo/ChangeLog b/x11-apps/xdpyinfo/ChangeLog
index 560514d23495..b0f4b8fc6064 100644
--- a/x11-apps/xdpyinfo/ChangeLog
+++ b/x11-apps/xdpyinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xdpyinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.9 2005/12/09 06:45:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.10 2005/12/09 15:26:16 spyderous Exp $
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/xineramaproto.patch:
+  Unused file.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xdpyinfo-0.99.0.ebuild, -xdpyinfo-0.99.1.ebuild:
diff --git a/x11-apps/xdpyinfo/files/xineramaproto.patch b/x11-apps/xdpyinfo/files/xineramaproto.patch
deleted file mode 100644
index 0bb0ec58171a..000000000000
--- a/x11-apps/xdpyinfo/files/xineramaproto.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xdpyinfo-0.99.0.orig/configure.ac xdpyinfo-0.99.0/configure.ac
---- xdpyinfo-0.99.0.orig/configure.ac	2005-08-01 13:15:17.000000000 -0700
-+++ xdpyinfo-0.99.0/configure.ac	2005-08-22 01:03:37.000000000 -0700
-@@ -82,7 +82,7 @@
- 	AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>])
- 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
- 
--PKG_CHECK_MODULES(XINERAMA, panoramixproto xinerama, 
-+PKG_CHECK_MODULES(XINERAMA, xineramaproto xinerama, 
- 	[SAVE_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="$CPPFLAGS $XINERAMA_CFLAGS"
- 	AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>])
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 15cf5b3f7264..7c54e4667a81 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.26 2005/12/09 06:52:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.27 2005/12/09 15:27:13 spyderous Exp $
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/gentoo-startx-customization-0.99.3.patch,
+  -files/gentoo-startx-customization.patch:
+  Unused file.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xinit-0.99.2-r1.ebuild, -xinit-0.99.3.ebuild:
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-0.99.3.patch b/x11-apps/xinit/files/gentoo-startx-customization-0.99.3.patch
deleted file mode 100644
index ca9b2ecefec9..000000000000
--- a/x11-apps/xinit/files/gentoo-startx-customization-0.99.3.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- startx.cpp.old	2005-11-11 12:29:49.244146352 -0700
-+++ startx.cpp	2005-11-11 12:34:11.169327672 -0700
-@@ -64,8 +64,6 @@
- 
- userserverrc=$HOME/.xserverrc
- sysserverrc=XINITDIR/xserverrc
--defaultclient=BINDIR/xterm
--defaultserver=BINDIR/X
- defaultclientargs=""
- defaultserverargs="-nolisten tcp -br"
- clientargs=""
-@@ -107,60 +105,41 @@
- whoseargs="client"
- while [ x"$1" != x ]; do
-     case "$1" in
--    XCOMM '' required to prevent cpp from treating "/*" as a C comment.
--    /''*|\./''*)
--	if [ "$whoseargs" = "client" ]; then
--	    if [ x"$clientargs" = x ]; then
--		client="$1"
--	    else
--		clientargs="$clientargs $1"
--	    fi
--	else
--	    if [ x"$serverargs" = x ]; then
--		server="$1"
--	    else
--		serverargs="$serverargs $1"
--	    fi
--	fi
--	;;
--    --)
--	whoseargs="server"
--	;;
--    *)
--	if [ "$whoseargs" = "client" ]; then
--	    clientargs="$clientargs $1"
--	else
--	    XCOMM display must be the FIRST server argument
--	    if [ x"$serverargs" = x ] && @@
--		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
--		display="$1"
--	    else
--		serverargs="$serverargs $1"
--	    fi
--	fi
--	;;
-+      /''*|\.*)       if [ "$whoseargs" = "client" ]; then
-+                  if [ "x$clientargs" = x ]; then
-+                      clientargs="$1"
-+                  else
-+                      clientargs="$clientargs $1"
-+                  fi
-+              else
-+                  if [ "x$serverargs" = x ]; then
-+                      serverargs="$1"
-+                  else
-+                      serverargs="$serverargs $1"
-+                  fi
-+              fi ;;
-+      --)     whoseargs="server" ;;
-+      *)      if [ "$whoseargs" = "client" ]; then
-+                  if [ "x$clientargs" = x ]; then
-+                      clientargs="$defaultclientargs $1"
-+                  else
-+                      clientargs="$clientargs $1"
-+                  fi
-+              else
-+                  case "$1" in
-+                      :[0-9]*) display="$1"; serverargs="$serverargs $1";;
-+                      *) serverargs="$serverargs $1" ;;
-+                  esac
-+              fi ;;
-     esac
-     shift
- done
- 
--XCOMM process client arguments
--if [ x"$client" = x ]; then
--    XCOMM if no client arguments either, use rc file instead
--    if [ x"$clientargs" = x ]; then
--	client="$defaultclientargs"
--    else
--	client=$defaultclient
--    fi
-+if [ x"$clientargs" = x ]; then
-+	clientargs="$defaultclientargs"
- fi
--
--XCOMM process server arguments
--if [ x"$server" = x ]; then
--    XCOMM if no server arguments or display either, use rc file instead
--    if [ x"$serverargs" = x -a x"$display" = x ]; then
--	server="$defaultserverargs"
--    else
--	server=$defaultserver
--    fi
-+if [ x"$serverargs" = x ]; then
-+	serverargs="$defaultserverargs"
- fi
- 
- if [ x"$XAUTHORITY" = x ]; then
-@@ -217,15 +196,8 @@
- 
- #endif
- 
--#if defined(__SCO__) || defined(__UNIXWARE__)
--if [ "$REMOTE_SERVER" = "TRUE" ]; then
--        exec SHELL_CMD ${client}
--else
--        BINDIR/xinit $client $clientargs -- $server $display $serverargs
--fi
--#else
--BINDIR/xinit $client $clientargs -- $server $display $serverargs
--#endif
-+cleanup() {
-+    [ -n "$PID" ] && kill $PID > /dev/null 2>&1
- 
- if [ x"$removelist" != x ]; then
-     BINDIR/xauth remove $removelist
-@@ -251,3 +223,15 @@
- #if defined(sun)
- kbd_mode -a
- #endif
-+}
-+
-+
-+trap cleanup 0
-+
-+xinit $clientargs -- $serverargs -deferglyphs 16 &
-+
-+PID=$!
-+
-+wait $PID
-+
-+unset PID
---- xinit.c.old	2005-11-11 12:30:19.199592432 -0700
-+++ xinit.c	2005-11-11 12:30:47.983216656 -0700
-@@ -446,6 +446,7 @@
- 	signal(SIGINT, sigCatch);
- 	signal(SIGHUP, sigCatch);
- 	signal(SIGPIPE, sigCatch);
-+	signal(SIGTERM, sigCatch);
- #else
- 	/* Let those signal interrupt the wait() call in the main loop */
- 	memset(&sa, 0, sizeof sa);
-@@ -458,6 +459,7 @@
- 	sigaction(SIGINT, &sa, NULL);
- 	sigaction(SIGHUP, &sa, NULL);
- 	sigaction(SIGPIPE, &sa, NULL);
-+	sigaction(SIGTERM, &sa, NULL);
- #endif
- 	signal(SIGALRM, sigAlarm);
- 	signal(SIGUSR1, sigUsr1);
diff --git a/x11-apps/xinit/files/gentoo-startx-customization.patch b/x11-apps/xinit/files/gentoo-startx-customization.patch
deleted file mode 100644
index f1246d84f4e0..000000000000
--- a/x11-apps/xinit/files/gentoo-startx-customization.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- XFree86-4.2.99.3/xc/programs/xinit/startx.cpp.startx	2002-09-19 02:19:38.000000000 +0200
-+++ XFree86-4.2.99.3/xc/programs/xinit/startx.cpp	2002-12-23 13:13:22.000000000 +0100
-@@ -52,8 +52,6 @@
- userserverrc=$HOME/.xserverrc
- sysclientrc=XINITDIR/xinitrc
- sysserverrc=XINITDIR/xserverrc
--defaultclient=BINDIR/xterm
--defaultserver=BINDIR/X
- defaultclientargs=""
- defaultserverargs=""
- clientargs=""
-@@ -82,60 +80,41 @@
- whoseargs="client"
- while [ x"$1" != x ]; do
-     case "$1" in
--    XCOMM '' required to prevent cpp from treating "/*" as a C comment.
--    /''*|\./''*)
--	if [ "$whoseargs" = "client" ]; then
--	    if [ x"$clientargs" = x ]; then
--		client="$1"
--	    else
--		clientargs="$clientargs $1"
--	    fi
--	else
--	    if [ x"$serverargs" = x ]; then
--		server="$1"
--	    else
--		serverargs="$serverargs $1"
--	    fi
--	fi
--	;;
--    --)
--	whoseargs="server"
--	;;
--    *)
--	if [ "$whoseargs" = "client" ]; then
--	    clientargs="$clientargs $1"
--	else
--	    XCOMM display must be the FIRST server argument
--	    if [ x"$serverargs" = x ] && @@
--		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
--		display="$1"
--	    else
--		serverargs="$serverargs $1"
--	    fi
--	fi
--	;;
-+      /''*|\.*)       if [ "$whoseargs" = "client" ]; then
-+                  if [ "x$clientargs" = x ]; then
-+                      clientargs="$1"
-+                  else
-+                      clientargs="$clientargs $1"
-+                  fi
-+              else
-+                  if [ "x$serverargs" = x ]; then
-+                      serverargs="$1"
-+                  else
-+                      serverargs="$serverargs $1"
-+                  fi
-+              fi ;;
-+      --)     whoseargs="server" ;;
-+      *)      if [ "$whoseargs" = "client" ]; then
-+                  if [ "x$clientargs" = x ]; then
-+                      clientargs="$defaultclientargs $1"
-+                  else
-+                      clientargs="$clientargs $1"
-+                  fi
-+              else
-+                  case "$1" in
-+                      :[0-9]*) display="$1"; serverargs="$serverargs $1";;
-+                      *) serverargs="$serverargs $1" ;;
-+                  esac
-+              fi ;;
-     esac
-     shift
- done
- 
--XCOMM process client arguments
--if [ x"$client" = x ]; then
--    XCOMM if no client arguments either, use rc file instead
--    if [ x"$clientargs" = x ]; then
--	client="$defaultclientargs"
--    else
--	client=$defaultclient
--    fi
-+if [ x"$clientargs" = x ]; then
-+	clientargs="$defaultclientargs"
- fi
--
--XCOMM process server arguments
--if [ x"$server" = x ]; then
--    XCOMM if no server arguments or display either, use rc file instead
--    if [ x"$serverargs" = x -a x"$display" = x ]; then
--	server="$defaultserverargs"
--    else
--	server=$defaultserver
--    fi
-+if [ x"$serverargs" = x ]; then
-+	serverargs="$defaultserverargs"
- fi
- 
- if [ x"$XAUTHORITY" = x ]; then
-@@ -172,7 +151,9 @@
- done
- #endif
- 
--xinit $client $clientargs -- $server $display $serverargs
-+cleanup() {
-+    [ -n "$PID" ] && kill $PID > /dev/null 2>&1
-+
- 
- if [ x"$removelist" != x ]; then
-     xauth remove $removelist
-@@ -195,3 +176,15 @@
- #if defined(sun) && !defined(i386)
- kbd_mode -a
- #endif
-+}
-+
-+
-+trap cleanup 0
-+
-+xinit $clientargs -- $serverargs -deferglyphs 16 &
-+
-+PID=$!
-+
-+wait $PID
-+
-+unset PID
---- XFree86-4.2.99.3/xc/programs/xinit/xinit.c.startx	2002-05-31 20:46:13.000000000 +0200
-+++ XFree86-4.2.99.3/xc/programs/xinit/xinit.c	2002-12-23 13:27:35.000000000 +0100
-@@ -431,6 +431,7 @@
- 	signal(SIGINT, sigCatch);
- 	signal(SIGHUP, sigCatch);
- 	signal(SIGPIPE, sigCatch);
-+	signal(SIGTERM, sigCatch);
- #else
- 	/* Let those signal interrupt the wait() call in the main loop */
- 	memset(&sa, 0, sizeof sa);
-@@ -442,6 +443,7 @@
- 	sigaction(SIGINT, &sa, NULL);
- 	sigaction(SIGHUP, &sa, NULL);
- 	sigaction(SIGPIPE, &sa, NULL);
-+	sigaction(SIGTERM, &sa, NULL);
- #endif
- 	signal(SIGALRM, sigAlarm);
- 	signal(SIGUSR1, sigUsr1);