Rename xbase-clients so as to use svn best practices

2006-04-29 23:24:34 +00:00 · 2006-04-29 23:24:34 +00:00 · 47af91413c
commit 47af91413c
44 changed files with 17219 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,86 @@
+xbase-clients (1:7.0.0-6) UNRELEASED; urgency=low
+
+  * Move xserverrc back to this package from xserver-xorg-core. Thanks
+    Benjamin Mesing. (closes: #365022)
+  * Update smproxy to version 1.0.2
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 29 Apr 2006 19:21:58 -0400
+
+xbase-clients (1:7.0.0-5) unstable; urgency=low
+
+  * Patch startx so that it points to /etc/X11/xinit for xserverrc and
+    xinitrc. Thanks Vasilis Vasaitis and Bastian Kleineidam.
+  * Move xserverrc back to /etc/X11/xinit
+  * Use --list-missing with dh_install
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 25 Apr 2006 21:37:22 -0400
+
+xbase-clients (1:7.0.0-4) unstable; urgency=low
+
+  * Add quilt to build-depends.
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 15 Apr 2006 19:49:02 -0400
+
+xbase-clients (1:7.0.0-3) unstable; urgency=low
+
+  * Remove mention of xorgconfig and xorgcfg in package description. Thanks
+    Daniel Leidert. (closes: #362066)
+  * Add 12_startx_paths.diff to use X11R7 paths for startx and xinit. Thanks
+    Arjan Opmeer. (closes: #357713)
+  * Add libxi-dev to build-depends
+  * Make xbase-clients explicitly pre-depend on x11-common >= 1:7.0.0, rather
+    than implicitly. Thanks Vasilis Vasaitis. (closes: #357713)
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 13 Apr 2006 22:39:46 -0400
+
+xbase-clients (1:7.0.0-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Add build-depends on libgl1-mesa-dev, versioned build-depneds on
+    libdrender-dev, and re-version build-depend on libxft-dev. Thanks Frank
+    Lichtenheld. (closes: #361821)
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 10 Apr 2006 19:49:23 -0400
+
+xbase-clients (1:7.0.0-1) experimental; urgency=low
+
+  [ Denis Barbier ]
+  * Set XKB base path to /usr/share/X11/xkb.
+
+  [ David Nusinow ]
+  * Update to x11perf 1.4.1 and setxkbmap 1.0.2 upstream releases
+  * Bump version number to match upstream's current katamari release
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 16 Mar 2006 23:06:15 -0500
+
+xbase-clients (1:1.0.1-2) experimental; urgency=low
+
+  * Add an empty /var/lib/xkb directory so that the server loads the correct
+    keymaps. Thanks Silvestre Zabala, Eugene Konev, and Daniel Stone.
+    (closes: #354130)
+  * Port patches from trunk
+    + general/014_startx_hostname_fix.diff
+    + general/015_startx_dummy_fix.diff
+    + general/073_xev_flush_standard_output.diff
+    + general/025c_bitmap_manpage_typo.diff
+    + general/025d_xedit_manpage_typos.diff
+    + general/025e_xvinfo_manpage_typo.diff
+    + general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
+    + debian/902_debian_startx_manpage.diff
+    + debian/916_add_XKBPATH_env_variable.diff
+    + general/051_xkb_documentation_updates.diff
+  * Suggest mesa-utils, where glxinfo and glxgears have been moved.
+    Thanks Mike Hommey. (closes: #354246)
+
+ -- David Nusinow <dnusinow@debian.org>  Sat,  4 Mar 2006 18:59:20 -0500
+
+xbase-clients (1:1.0.1-1) experimental; urgency=low
+
+  [ David Nusinow ]
+  * First modular upload to Debian
+
+  [ Eugene Konev ]
+  * Divide packages that we process in debian/rules by category so we can pass
+    the xkb packages the proper configure flags
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 19 Feb 2006 19:46:46 -0500
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+4
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,95 @@
+Source: xbase-clients
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev (>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), ssh | rsh, x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt
+Standards-Version: 3.6.1.0
+
+Package: xbase-clients
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: x11-common (>= 1:7.0.0)
+Suggests: mesa-utils
+Description: miscellaneous X clients
+ An X client is a program that interfaces with an X server (almost always via
+ the X libraries), and thus with some input and output hardware like a
+ graphics card, monitor, keyboard, and pointing device (such as a mouse).
+ .
+ This package provides a miscellaneous assortment of several dozen X clients
+ that ship with the X Window System, including:
+  - startx and xinit, which initialize X sessions from the command line;
+  - xauth, a tool for controlling access to the X session;
+  - xedit, a text editor;
+  - xbiff, a tool which tells you when you have new email;
+  - xcalc, a scientific calculator desktop accessory;
+  - xclipboard, a tool to manage cut-and-pasted text selections;
+  - xcutsel, which exchanges selection and cut buffer contents;
+  - xconsole, which monitors system console messages;
+  - xditview, a viewer for ditroff output;
+  - xeyes, a demo program in which a pair of eyes track the pointer;
+  - xfd, a tool that displays all the glyphs in a given X font;
+  - xfontsel, a tool for browsing and selecting X fonts;
+  - xhost, a very dangerous program that you should never use;
+  - xkill, a tool for terminating misbehaving X clients;
+  - xload, a monitor for the system load average;
+  - xlogo, a demo program that displays the X logo;
+  - xmag, which magnifies parts of the X screen;
+  - xman, a manual page browser;
+  - xmessage, a tool to display message or dialog boxes;
+  - xrandr, a command-line interface to the RandR extension;
+  - xrefresh, a tool that forces a redraw of the X screen;
+  - xsetroot, a tool for tailoring the appearance of the root window;
+  - xtrapchar, xtrapin, xtrapinfo, xtrapout, xtrapproto, xtrapreset, and
+    xtrapstats, a group of sample clients that use the XTrap extension;
+  - xvidtune, a tool for customizing X server modelines for your monitor;
+  - xwd, a utility for taking window dumps ("screenshots") of the X session;
+  - xwud, a viewer for window dumps created by xwd;
+  - oclock and xclock, graphical clocks;
+  - beforelight, a screen saver;
+  - atobm, a converter from ASCII to X bitmap (.xbm) files;
+  - bitmap, a monochrome bitmap file editor;
+  - bmtoa, a tool that converts a monochrome bitmap to ASCII text;
+  - cxpm and sxpm, tools for checking and viewing X pixmap files;
+  - iceauth, a tool for manipulating ICE protocol authorization records;
+  - xset, a tool for setting miscellaneous X server parameters;
+  - xmodmap, a utility for modifying keymaps and pointer button mappings in X;
+  - xsetmode and xsetpointer, tools for handling X Input devices;
+  - setxkbmap, xkbbell, xkbcomp, xkbevd, xkbprint, xkbvleds, and xkbwatch,
+    tools for managing the X Keyboard Extension (XKB);
+  - xsm, a session manager for X sessions;
+  - smproxy, a session manager proxy for X clients that do not use the X
+    session manager protocol;
+  - xgamma, a tool for querying and setting a monitor's gamma correction;
+  - appres, editres, listres, viewres, and xrdb, which query and update the
+    X resource database;
+  - Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical
+    operations under the X Window System;
+  - fstobdf, which retrieves a font in BDF format from an X font server;
+  - xcmsdb, a device color characteristic utility for the X Color Management
+    System;
+  - xstdcmap, a utility to selectively define standard colormap properties;
+  - xev, an X event displayer;
+  - xfindproxy, a tool to locate X proxy services;
+  - xlsatoms, which lists interned atoms defined on an X server;
+  - xlsclients, which lists client applications running on an X display;
+  - xlsfonts, a server font list displayer;
+  - xprop, a property displayer for X;
+  - xdpyinfo, a display information utility for X;
+  - xwininfo, a window information utility for X;
+  - xvinfo, an Xv extension information utility for X;
+  - ico, an X graphics demo using an animated polyhedron;
+  - dga, a demo program for the DGA extension; and
+  - xgc, an (unfinished) X graphics demo program.
+ .
+ The bitmap, editres, viewres, xbiff, xcalc, xconsole, xditview, xedit,
+ xf86cfg, xman, xsetroot, and xsm programs use bitmap images provided by the
+ xlibs-data package.  xkbcomp uses the XKEYBOARD (XKB) extension configuration
+ data provided by the xlibs package.
+ .
+ (Strictly speaking, atobm does not depend on any X libraries, but it shares a
+ manual page with bitmap and bmtoa, and so is grouped with them in this
+ package.)
+ .
+ This package no longer provides the 'mkfontscale' program; it has instead been
+ moved to xutils.
--- a/debian/copyright
+++ b/debian/copyright
--- a/debian/local/xserverrc
+++ b/debian/local/xserverrc
@ -0,0 +1,5 @@
+#!/bin/sh
+
+# $Id: xserverrc 189 2005-06-11 00:04:27Z branden $
+
+exec /usr/bin/X11/X -dpi 100 -nolisten tcp
--- a/debian/patches/001_debian_xinitrc.diff
+++ b/debian/patches/001_debian_xinitrc.diff
@ -0,0 +1,85 @@
+Index: xbase-clients/xinit-X11R7.0-1.0.1/xinitrc.cpp
+===================================================================
+--- xbase-clients.orig/xinit-X11R7.0-1.0.1/xinitrc.cpp	2006-01-30 19:14:59.000000000 -0500
+++ xbase-clients/xinit-X11R7.0-1.0.1/xinitrc.cpp	2006-02-18 14:50:45.000000000 -0500
+@@ -1,75 +1,9 @@
+ XCOMM!SHELL_CMD
+ XCOMM $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
+XCOMM /etc/X11/xinit/xinitrc
+XCOMM
+XCOMM global xinitrc file, used by all X sessions started by xinit (startx)
+ 
+-XCOMM 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
+-
+-XCOMM start some nice programs
+-
+-#if defined(__SCO__) || defined(__UNIXWARE__)
+-if [ -r /etc/default/xdesktops ]; then
+-  . /etc/default/xdesktops
+-fi
+-
+-if [ -r $HOME/.x11rc ]; then
+-  . $HOME/.x11rc
+-else
+-  if [ -r /etc/default/X11 ]; then
+-  . /etc/default/X11
+-  fi
+-fi
+-
+-#if defined(__SCO__)
+-if [ -n "$XSESSION" ]; then
+-  case "$XSESSION" in
+-    [Yy][Ee][Ss])
+-      [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession
+-      ;;
+-  esac
+-fi
+-
+-if [ -n "$XDESKTOP" ]; then
+-  exec `eval echo $"$XDESKTOP"`
+-else
+-  if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then
+-    /usr/bin/X11/scoterm 2> /dev/null &
+-    exec /usr/bin/X11/pmwm    2> /dev/null
+-  fi
+-fi
+-#elif defined(__UNIXWARE__)
+-if [ -n "$XDESKTOP" ]; then
+-  exec `eval echo $"$XDESKTOP"`
+-else
+-  if [ -x /usr/X/bin/pmwm ]; then
+-    exec /usr/X/bin/pmwm    2> /dev/null
+-  fi
+-fi
+-#endif
+-
+-XCOMM This is the fallback case if nothing else is executed above
+-#endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
+XCOMM invoke global X session script
+. /etc/X11/Xsession
--- a/debian/patches/02_startx_hostname.diff
+++ b/debian/patches/02_startx_hostname.diff
@ -0,0 +1,32 @@
+Index: xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp
+===================================================================
+--- xbase-clients.orig/xinit-X11R7.0-1.0.1/startx.cpp	2006-02-18 14:56:27.000000000 -0500
+++ xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp	2006-02-26 19:11:55.000000000 -0500
+@@ -172,18 +172,17 @@
+ 
+ #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
+ XCOMM set up default Xauth info for this machine
+-case `uname` in
+-Linux*)
+-	if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
+
+XCOMM check for GNU hostname
+if hostname --version > /dev/null 2>&1; then
+       if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
+ 		hostname=`hostname -f`
+-	else
+-		hostname=`hostname`
+-	fi
+-	;;
+-*)
+       fi
+fi
+
+if [ -z "$hostname" ]; then
+ 	hostname=`hostname`
+-	;;
+-esac
+fi
+ 
+ authdisplay=${display:-:0}
+ mcookie=`MK_COOKIE`
--- a/debian/patches/03_startx_dummy.diff
+++ b/debian/patches/03_startx_dummy.diff
@ -0,0 +1,13 @@
+Index: xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp
+===================================================================
+--- xbase-clients.orig/xinit-X11R7.0-1.0.1/startx.cpp	2006-02-26 19:14:32.000000000 -0500
+++ xbase-clients/xinit-X11R7.0-1.0.1/startx.cpp	2006-02-26 19:15:10.000000000 -0500
+@@ -207,7 +207,7 @@
+ EOF
+ 	removelist="$displayname $removelist"
+     else
+-        dummy=$((dummy+1));
+        dummy=$(($dummy+1));
+         XAUTH -q -f $xserverauthfile << EOF
+ add :$dummy . $authcookie
+ EOF
--- a/debian/patches/04_xev_flush_standard_output.diff
+++ b/debian/patches/04_xev_flush_standard_output.diff
@ -0,0 +1,20 @@
+$Id$
+
+Flush standard output after processing each event, since xev's exit(0) is
+unreachable code.
+
+This patch by Branden Robinson.  Thanks to Bill Currie for identifying the
+problem and the solution.  See Debian bug #238638.
+
+Index: xbase-clients/xev-X11R7.0-1.0.1/xev.c
+===================================================================
+--- xbase-clients.orig/xev-X11R7.0-1.0.1/xev.c	2006-02-18 14:56:32.000000000 -0500
+++ xbase-clients/xev-X11R7.0-1.0.1/xev.c	2006-02-26 19:50:37.000000000 -0500
+@@ -1045,6 +1045,7 @@
+ 	    printf ("Unknown event type %d\n", event.type);
+ 	    break;
+ 	}
+    fflush(stdout);
+     }
+ 
+     XCloseDisplay (dpy);
--- a/debian/patches/05_bitmap_manpage_typo.diff
+++ b/debian/patches/05_bitmap_manpage_typo.diff
@ -0,0 +1,13 @@
+Index: xbase-clients/bitmap-X11R7.0-1.0.1/bitmap.man
+===================================================================
+--- xbase-clients.orig/bitmap-X11R7.0-1.0.1/bitmap.man	2006-02-18 14:55:39.000000000 -0500
+++ xbase-clients/bitmap-X11R7.0-1.0.1/bitmap.man	2006-02-26 20:35:50.000000000 -0500
+@@ -162,7 +162,7 @@
+ .SH USAGE 
+ \fIBitmap\fP displays grid in which each square represents a single
+ bit in the picture being edited.  Actual size of the bitmap image, as
+-it would appear normaly and inverted, can be obtained by pressing\fB
+it would appear normally and inverted, can be obtained by pressing\fB
+ Meta-I\fP key.  You are free to move the image popup out of the way to
+ continue editing.  Pressing the left mouse button in the popup window
+ or\fB Meta-I\fP again will remove the real size bitmap image.
--- a/debian/patches/06_xedit_manpage_typos.diff
+++ b/debian/patches/06_xedit_manpage_typos.diff
@ -0,0 +1,22 @@
+Index: xbase-clients/xedit-X11R7.0-1.0.1/xedit.man
+===================================================================
+--- xbase-clients.orig/xedit-X11R7.0-1.0.1/xedit.man	2006-02-18 14:56:14.000000000 -0500
+++ xbase-clients/xedit-X11R7.0-1.0.1/xedit.man	2006-02-26 20:37:32.000000000 -0500
+@@ -291,7 +291,7 @@
+ .B autoReplace (\fPClass \fBReplace)
+ This resource is useful to automatically correct common misspelling errors, but
+ can also be used to create simple macros. The format is
+-\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
+\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines.
+ Example of use:
+ \"
+ .br
+@@ -308,7 +308,7 @@
+ when you type that words.
+ .TP 8
+ .B ispell.dictionaries (\fPClass \fBispell.Dictionary)
+-Specifies a list of dictionary names, separeted by spaces, available to the
+Specifies a list of dictionary names, separated by spaces, available to the
+ ispell program. The default value is \fI"american americamed+ english"\fP.
+ .TP 8
+ .B ispell.dictionary (\fPClass \fBispell.Dictionary)
--- a/debian/patches/07_xvinfo_manpage_typo.diff
+++ b/debian/patches/07_xvinfo_manpage_typo.diff
@ -0,0 +1,13 @@
+Index: xbase-clients/xvinfo-X11R7.0-1.0.1/xvinfo.man
+===================================================================
+--- xbase-clients.orig/xvinfo-X11R7.0-1.0.1/xvinfo.man	2006-02-18 14:55:11.000000000 -0500
+++ xbase-clients/xvinfo-X11R7.0-1.0.1/xvinfo.man	2006-02-26 20:38:32.000000000 -0500
+@@ -11,7 +11,7 @@
+ .PP
+ .B xvinfo
+ prints out the capabilities of any video adaptors associated
+-with the display that are accesible through the X-Video extension. 
+with the display that are accessible through the X-Video extension. 
+ .SH OPTIONS
+ .PP
+ .TP 8
--- a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
@ -0,0 +1,29 @@
+$Id: 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 480 2005-08-02 20:14:26Z branden $
+
+This patch by Branden Robinson.
+
+General philosophy:
+
+The user should only be shown a usage messages when:
+  * it is asked for with a --help option or the like.
+  * the command line is syntactically invalid.
+
+Because xlsfonts's dsimple.c source file is also used in xprop, xwd, and
+xwininfo, this patch also corrects this behavior for those programs.
+
+Not submitted upstream to XFree86 or X.Org.
+
+Index: xlsfonts-X11R7.0-1.0.1/dsimple.c
+===================================================================
+--- xlsfonts-X11R7.0-1.0.1/dsimple.c.orig	2006-02-18 14:55:15.000000000 -0500
+++ xlsfonts-X11R7.0-1.0.1/dsimple.c	2006-02-26 22:36:04.000000000 -0500
+@@ -188,8 +188,7 @@
+ 	if (d == NULL) {
+ 	    fprintf (stderr, "%s:  unable to open display '%s'\n",
+ 		     program_name, XDisplayName (display_name));
+-	    usage ();
+-	    /* doesn't return */
+	    exit (1);
+ 	}
+ 
+ 	return(d);
--- a/debian/patches/09_debian_startx_manpage.diff
+++ b/debian/patches/09_debian_startx_manpage.diff
@ -0,0 +1,77 @@
+$Id: 902_debian_startx_manpage.diff 867 2005-11-13 16:29:11Z dnusinow $
+
+Fix the startx manpage to be more correct for our setup; this patch by Branden
+Robinson.
+
+Index: xinit-X11R7.0-1.0.1/startx.man
+===================================================================
+--- xinit-X11R7.0-1.0.1/startx.man.orig	2005-11-12 16:31:16.000000000 -0500
+++ xinit-X11R7.0-1.0.1/startx.man	2005-11-13 11:00:34.000000000 -0500
+@@ -74,6 +74,28 @@
+ .RE
+ #ifdef __SCOMAN__
+ .PP
+Note that in the Debian system, what many people traditionally put in the
+.I .xinitrc
+file should go in
+.I .xsession
+instead; this permits the same X environment to be presented whether
+.IR startx ,
+.IR xdm ,
+or
+.I xinit
+is used to start the X session. All discussion of the
+.I .xinitrc
+file in the
+.IR xinit (1)
+manual page applies equally well to
+.IR .xsession.
+Keep in mind that
+.I .xinitrc
+is used only by
+.IR xinit (1)
+and completely ignored by
+.IR xdm (1).
+.PP
+ To determine the client to run,
+ .I startx
+ looks for the following files, in order:
+@@ -132,38 +154,6 @@
+ files are found in the
+ .I __xinitdir__
+ directory.
+-.PP
+-The
+-.I .xinitrc
+-is typically a shell script which starts many clients according to the
+-user's preference.  When this shell script exits,
+-.I startx
+-kills the server and performs any other session shutdown needed.
+-Most of the clients started by
+-.I .xinitrc
+-should be run in the background.  The last client should run in the
+-foreground; when it exits, the session will exit.  People often choose
+-a session manager, window manager, or \fIxterm\fP as the ''magic'' client.
+-.SH EXAMPLE
+-.PP
+-Below is a sample \fI\.xinitrc\fP that starts several applications and
+-leaves the window manager running as the ''last'' application.  Assuming that
+-the window manager has been configured properly, the user
+-then chooses the ''Exit'' menu item to shut down X.
+-.sp
+-.in +4
+-.nf
+-xrdb \-load $HOME/.Xresources
+-xsetroot \-solid gray &
+-xbiff \-geometry \-430+5 &
+-oclock \-geometry 75x75\-0\-0 &
+-xload \-geometry \-80\-0 &
+-xterm \-geometry +0+60 \-ls &
+-xterm \-geometry +0\-100 &
+-xconsole \-geometry \-0+0 \-fn 5x7 &
+-exec twm
+-.fi
+-.in -4
+ .SH "ENVIRONMENT VARIABLES"
+ .TP 25
+ DISPLAY
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff
@ -0,0 +1,88 @@
+$Id$
+
+As explained in #324768, this patch modifies setxkbmap and xkbcomp
+programs so that they look for XKB data files in $XKBPATH if this
+environment variable is set.  This allows installing both xlibs and
+xkeyboard-config at the same time, so that xkeyboard-config can
+install its files under /etc/X11/xkb-data until all packages depending
+on xlibs are fixed.  This patch by Denis Barbier.
+
+This patch will not be submitted upstream.
+
+Index: setxkbmap-1.0.2/setxkbmap.c
+===================================================================
+--- setxkbmap-1.0.2/setxkbmap.c
+++ setxkbmap-1.0.2/setxkbmap.c
+@@ -318,9 +318,13 @@
+ int 	i;
+ Bool	ok;
+ unsigned	present;
+char	*xkbpath;
+ 
+     ok= True;
+     addToList(&szInclPath,&numInclPath,&inclPath,".");
+    xkbpath= (char *)getenv("XKBPATH");
+    if (xkbpath!=NULL)
+	addToList(&szInclPath,&numInclPath,&inclPath,xkbpath);
+     addToList(&szInclPath,&numInclPath,&inclPath,DFLT_XKB_CONFIG_ROOT);
+     for (i=1;(i<argc)&&ok;i++) {
+ 	if (argv[i][0]!='-') {
+Index: xkbcomp-X11R7.0-1.0.1/xkbpath.c
+===================================================================
+--- xkbcomp-X11R7.0-1.0.1/xkbpath.c
+++ xkbcomp-X11R7.0-1.0.1/xkbpath.c
+@@ -131,9 +131,14 @@
+ void
+ XkbAddDefaultDirectoriesToPath(void)
+ {
+char *xkbpath;
+
+     if (noDefaultPath)
+ 	return;
+     XkbAddDirectoryToPath(".");
+    xkbpath= (char *)getenv("XKBPATH");
+    if (xkbpath!=NULL)
+	XkbAddDirectoryToPath(xkbpath);
+     XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
+ }
+ 
+Index: xkbevd-X11R7.0-1.0.1/xkbevd.c
+===================================================================
+--- xkbevd-X11R7.0-1.0.1/xkbevd.c
+++ xkbevd-X11R7.0-1.0.1/xkbevd.c
+@@ -471,20 +471,28 @@
+     else {
+ 	file= fopen(cfgFileName,"r");
+ 	if (file==NULL) { /* no personal config, try for a system one */
+	    char *xkbpath;
+ 	    if (cfgFileName!=buf) { /* user specified a file.  bail */
+ 		uError("Can't open config file \"%s\n",cfgFileName);
+ 		uAction("Exiting\n");
+ 		exit(1);
+ 	    }
+-	    sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,DFLT_XKB_CONFIG_ROOT);
+-	    file= fopen(cfgFileName,"r");
+	    xkbpath= (char *)getenv("XKBPATH");
+	    if (xkbpath!=NULL) {
+		sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,xkbpath);
+		file= fopen(cfgFileName,"r");
+	    }
+ 	    if (file==NULL) {
+-		if (verbose) {
+-		    uError("Couldn't find a config file anywhere\n");
+-		    uAction("Exiting\n");
+-		    exit(1);
+	        sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,DFLT_XKB_CONFIG_ROOT);
+	        file= fopen(cfgFileName,"r");
+		if (file==NULL) {
+		    if (verbose) {
+			uError("Couldn't find a config file anywhere\n");
+			uAction("Exiting\n");
+			exit(1);
+		    }
+		    exit(0);
+ 		}
+-		exit(0);
+ 	    }
+ 	}
+     }
--- a/debian/patches/11_xkb_documentation_updates.diff
+++ b/debian/patches/11_xkb_documentation_updates.diff
--- a/debian/patches/12_startx_paths.diff
+++ b/debian/patches/12_startx_paths.diff
@ -0,0 +1,50 @@
+Index: xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cmd
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/startx.cmd	2006-04-12 20:11:50.000000000 -0400
+++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cmd	2006-04-25 21:01:54.000000000 -0400
+@@ -31,8 +31,8 @@
+ 
+ userclientrc = home'\xinitrc.cmd'
+ userserverrc = home'\xservrc.cmd'
+-sysclientrc  = x11root'\usr\X11R6\lib\X11\xinit\xinitrc.cmd'
+-sysserverrc  = x11root'\usr\X11R6\lib\X11\xinit\xservrc.cmd'
+sysclientrc  = x11root'\etc\X11\xinit\xinitrc.cmd'
+sysserverrc  = x11root'\etc\X11\xinit\xservrc.cmd'
+ clientargs   = ''
+ serverargs   = ''
+ 
+Index: xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/xinitrc.cmd
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/xinitrc.cmd	2006-04-12 20:11:50.000000000 -0400
+++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/xinitrc.cmd	2006-04-25 21:01:54.000000000 -0400
+@@ -12,9 +12,9 @@
+ 
+ userresources = home'\.Xresources'
+ usermodmap    = home'\.Xmodmap'
+-sysresources  = x11root'\usr\X11R6\lib\X11\xinit\.Xresources'
+-sysmodmap     = x11root'\usr\X11R6\lib\X11\xinit\.Xmodmap'
+-xbitmapdir    = x11root'\usr\X11R6\include\X11\bitmaps'
+sysresources  = x11root'\etc\X11\xinit\.Xresources'
+sysmodmap     = x11root'\etc\X11\xinit\.Xmodmap'
+xbitmapdir    = x11root'\etc\X11\bitmaps'
+ manpath       = VALUE('MANPATH',,env)
+ 
+ /* merge in defaults */
+Index: xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cpp
+===================================================================
+--- xbase-clients-7.0.0.orig/xinit-X11R7.0-1.0.1/startx.cpp	2006-04-25 21:02:12.000000000 -0400
+++ xbase-clients-7.0.0/xinit-X11R7.0-1.0.1/startx.cpp	2006-04-25 21:17:19.000000000 -0400
+@@ -59,11 +59,11 @@
+ scosysclientrc=XINITDIR/xinitrc
+ #else
+ userclientrc=$HOME/.xinitrc
+-sysclientrc=XINITDIR/xinitrc
+sysclientrc=/etc/X11/xinit/xinitrc
+ #endif
+ 
+ userserverrc=$HOME/.xserverrc
+-sysserverrc=XINITDIR/xserverrc
+sysserverrc=/etc/X11/xinit/xserverrc
+ defaultclient=XTERM
+ defaultserver=XSERVER
+ defaultclientargs=""
--- a/debian/patches/series
+++ b/debian/patches/series
@ -0,0 +1,12 @@
+001_debian_xinitrc.diff
+02_startx_hostname.diff
+03_startx_dummy.diff
+04_xev_flush_standard_output.diff
+05_bitmap_manpage_typo.diff
+06_xedit_manpage_typos.diff
+07_xvinfo_manpage_typo.diff
+08_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
+09_debian_startx_manpage.diff -p0
+10_debian_add_xkbpath_env_variable.diff -p0
+11_xkb_documentation_updates.diff -p0
+12_startx_paths.diff
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,129 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian xutils package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow@debian.org>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# set this to the name of the main shlib's binary package
+PACKAGE = xbase-clients
+
+include debian/xsfbs/xsfbs.mk
+
+# This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each
+# subdirectory explicitly so that the build system knows what to build
+DEF_SUBDIRS=appres-X11R7.0-1.0.0 beforelight-X11R7.0-1.0.1 bitmap-X11R7.0-1.0.1 editres-X11R7.0-1.0.1 fstobdf-X11R7.0-1.0.1 iceauth-X11R7.0-1.0.1 ico-X11R7.0-1.0.1 listres-X11R7.0-1.0.1 oclock-X11R7.0-1.0.1 smproxy viewres-X11R7.0-1.0.1 x11perf-1.4.1 xauth-X11R7.0-1.0.1 xbiff-X11R7.0-1.0.1 xcalc-X11R7.0-1.0.1 xclipboard-X11R7.0-1.0.1 xclock-X11R7.0-1.0.1 xcmsdb-X11R7.0-1.0.1 xconsole-X11R7.0-1.0.1 xcursorgen-X11R7.0-1.0.0 xdbedizzy-X11R7.0-1.0.1 xditview-X11R7.0-1.0.1 xdpyinfo-X11R7.0-1.0.1 xdriinfo-X11R7.0-1.0.0 xedit-X11R7.0-1.0.1 xev-X11R7.0-1.0.1 xeyes-X11R7.0-1.0.1 xf86dga-X11R7.0-1.0.1 xfd-X11R7.0-1.0.1 xfontsel-X11R7.0-1.0.1 xgamma-X11R7.0-1.0.1 xgc-X11R7.0-1.0.1 xhost-X11R7.0-1.0.0 xinit-X11R7.0-1.0.1 xkill-X11R7.0-1.0.1 xload-X11R7.0-1.0.1 xlogo-X11R7.0-1.0.1 xlsatoms-X11R7.0-1.0.1 xlsclients-X11R7.0-1.0.1 xlsfonts-X11R7.0-1.0.1 xmag-X11R7.0-1.0.1 xman-X11R7.0-1.0.1 xmessage-X11R7.0-1.0.1 xmodmap-X11R7.0-1.0.0 xmore-X11R7.0-1.0.1 xprop-X11R7.0-1.0.1 xrandr-X11R7.0-1.0.1 xrdb-X11R7.0-1.0.1 xrefresh-X11R7.0-1.0.1 xsetmode-X11R7.0-1.0.0 xsetpointer-X11R7.0-1.0.0 xsetroot-X11R7.0-1.0.1 xset-X11R7.0-1.0.1 xsm-X11R7.0-1.0.1 xstdcmap-X11R7.0-1.0.1 xtrap-X11R7.0-1.0.1 xvidtune-X11R7.0-1.0.1 xvinfo-X11R7.0-1.0.1 xwd-X11R7.0-1.0.1 xwininfo-X11R7.0-1.0.1 xwud-X11R7.0-1.0.1
+XKB_SUBDIRS1=setxkbmap-1.0.2
+XKB_SUBDIRS2=xkbcomp-X11R7.0-1.0.1 xkbevd-X11R7.0-1.0.1 xkbprint-X11R7.0-1.0.1 xkbutils-X11R7.0-1.0.1
+SUBDIRS=$(DEF_SUBDIRS) $(XKB_SUBDIRS1) $(XKB_SUBDIRS2)
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+
+build: genscripts patch build-stamp
+build-stamp:
+	dh_testdir
+	for FILE in $(DEF_SUBDIRS); do \
+		echo "$$FILE" ; \
+		mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
+		(cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
+		../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+		             --infodir=\$${prefix}/share/info $(confflags) \
+		             CFLAGS="$(CFLAGS)" && \
+		$(MAKE)) || exit 1; \
+	done
+
+	for FILE in $(XKB_SUBDIRS1); do \
+		echo "$$FILE" ; \
+		mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
+		(cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
+		../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+		             --infodir=\$${prefix}/share/info $(confflags) \
+			     --with-xkb-config-root=/usr/share/X11/xkb \
+		             CFLAGS="$(CFLAGS)" && \
+		$(MAKE)) || exit 1; \
+	done
+
+	for FILE in $(XKB_SUBDIRS2); do \
+		echo "$$FILE" ; \
+		mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
+		(cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
+		../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+		             --infodir=\$${prefix}/share/info $(confflags) \
+			     --datadir=/etc \
+		             CFLAGS="$(CFLAGS)" && \
+		$(MAKE)) || exit 1; \
+	done
+
+	touch build-stamp
+
+clean: xsfclean
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	rm -f config.cache config.log config.status
+	rm -f */config.cache */config.log */config.status
+	rm -f conftest* */conftest*
+	rm -rf autom4te.cache */autom4te.cache
+	rm -rf *-obj-*
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	for FILE in $(SUBDIRS); do \
+		cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
+		cd ..; \
+	done
+	install -d debian/tmp/etc/X11/xinit
+	install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs
+	dh_install --sourcedir=debian/tmp --list-missing
+	dh_installchangelogs
+	dh_link
+	dh_strip --dbg-package=$(PACKAGE)
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_makeshlibs
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- a/debian/xbase-clients.dirs
+++ b/debian/xbase-clients.dirs
@ -0,0 +1,2 @@
+var/lib/xkb
+etc/X11/xinit
--- a/debian/xbase-clients.install
+++ b/debian/xbase-clients.install
@ -0,0 +1,10 @@
+usr/bin/*
+usr/share/man/man1/*
+usr/share/X11/xman.help
+usr/include/X11/bitmaps/*
+usr/lib/X11/x11perfcomp/*
+usr/lib/X11/xedit/*
+usr/lib/X11/xinit/xinitrc etc/X11/xinit
+usr/lib/X11/xsm/system.xsm
+etc/X11/app-defaults/*
+etc/X11/xinit/xserverrc
--- a/smproxy/AUTHORS
+++ b/smproxy/AUTHORS
--- a/smproxy/COPYING
+++ b/smproxy/COPYING
@ -0,0 +1,12 @@
+This is a stub file.  This package has not yet had its complete licensing
+information compiled.  Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
--- a/smproxy/ChangeLog
+++ b/smproxy/ChangeLog
@ -0,0 +1,35 @@
+2006-04-01  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	Bump to 1.0.2.
+
+2006-02-03  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* smproxy.man: 
+	Wrong name in .TH line in smproxy man page.
+
+2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version for X11R7 release.
+
+2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for final X11R7 release candidate.
+
+2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* Makefile.am:
+	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for X11R7 RC3 release.
+
+2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for RC1 release.
+
--- a/smproxy/INSTALL
+++ b/smproxy/INSTALL
--- a/smproxy/Makefile.am
+++ b/smproxy/Makefile.am
@ -0,0 +1,65 @@
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+bin_PROGRAMS = smproxy
+
+smproxy_CFLAGS = $(SMPROXY_CFLAGS)
+smproxy_LDADD = $(SMPROXY_LIBS)
+
+smproxy_SOURCES =	\
+        save.c \
+        smproxy.c \
+        smproxy.h
+
+appman_PRE = \
+        smproxy.man
+
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__apploaddir__|$(appdefaultdir)|' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
--- a/smproxy/Makefile.in
+++ b/smproxy/Makefile.in
@ -0,0 +1,672 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = smproxy$(EXEEXT)
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+	compile config.guess config.sub depcomp install-sh missing
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_smproxy_OBJECTS = smproxy-save.$(OBJEXT) smproxy-smproxy.$(OBJEXT)
+smproxy_OBJECTS = $(am_smproxy_OBJECTS)
+am__DEPENDENCIES_1 =
+smproxy_DEPENDENCIES = $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(smproxy_SOURCES)
+DIST_SOURCES = $(smproxy_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+appmanDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appman_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SMPROXY_CFLAGS = @SMPROXY_CFLAGS@
+SMPROXY_LIBS = @SMPROXY_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+smproxy_CFLAGS = $(SMPROXY_CFLAGS)
+smproxy_LDADD = $(SMPROXY_LIBS)
+smproxy_SOURCES = \
+        save.c \
+        smproxy.c \
+        smproxy.h
+
+appman_PRE = \
+        smproxy.man
+
+appmandir = $(APP_MAN_DIR)
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+XORGMANNAME = X Version 11
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__apploaddir__|$(appdefaultdir)|' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+smproxy$(EXEEXT): $(smproxy_OBJECTS) $(smproxy_DEPENDENCIES) 
+	@rm -f smproxy$(EXEEXT)
+	$(LINK) $(smproxy_LDFLAGS) $(smproxy_OBJECTS) $(smproxy_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smproxy-save.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smproxy-smproxy.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+smproxy-save.o: save.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -MT smproxy-save.o -MD -MP -MF "$(DEPDIR)/smproxy-save.Tpo" -c -o smproxy-save.o `test -f 'save.c' || echo '$(srcdir)/'`save.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/smproxy-save.Tpo" "$(DEPDIR)/smproxy-save.Po"; else rm -f "$(DEPDIR)/smproxy-save.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='save.c' object='smproxy-save.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -c -o smproxy-save.o `test -f 'save.c' || echo '$(srcdir)/'`save.c
+
+smproxy-save.obj: save.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -MT smproxy-save.obj -MD -MP -MF "$(DEPDIR)/smproxy-save.Tpo" -c -o smproxy-save.obj `if test -f 'save.c'; then $(CYGPATH_W) 'save.c'; else $(CYGPATH_W) '$(srcdir)/save.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/smproxy-save.Tpo" "$(DEPDIR)/smproxy-save.Po"; else rm -f "$(DEPDIR)/smproxy-save.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='save.c' object='smproxy-save.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -c -o smproxy-save.obj `if test -f 'save.c'; then $(CYGPATH_W) 'save.c'; else $(CYGPATH_W) '$(srcdir)/save.c'; fi`
+
+smproxy-smproxy.o: smproxy.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -MT smproxy-smproxy.o -MD -MP -MF "$(DEPDIR)/smproxy-smproxy.Tpo" -c -o smproxy-smproxy.o `test -f 'smproxy.c' || echo '$(srcdir)/'`smproxy.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/smproxy-smproxy.Tpo" "$(DEPDIR)/smproxy-smproxy.Po"; else rm -f "$(DEPDIR)/smproxy-smproxy.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smproxy.c' object='smproxy-smproxy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -c -o smproxy-smproxy.o `test -f 'smproxy.c' || echo '$(srcdir)/'`smproxy.c
+
+smproxy-smproxy.obj: smproxy.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -MT smproxy-smproxy.obj -MD -MP -MF "$(DEPDIR)/smproxy-smproxy.Tpo" -c -o smproxy-smproxy.obj `if test -f 'smproxy.c'; then $(CYGPATH_W) 'smproxy.c'; else $(CYGPATH_W) '$(srcdir)/smproxy.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/smproxy-smproxy.Tpo" "$(DEPDIR)/smproxy-smproxy.Po"; else rm -f "$(DEPDIR)/smproxy-smproxy.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smproxy.c' object='smproxy-smproxy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smproxy_CFLAGS) $(CFLAGS) -c -o smproxy-smproxy.obj `if test -f 'smproxy.c'; then $(CYGPATH_W) 'smproxy.c'; else $(CYGPATH_W) '$(srcdir)/smproxy.c'; fi`
+uninstall-info-am:
+install-appmanDATA: $(appman_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
+	@list='$(appman_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
+	  $(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
+	done
+
+uninstall-appmanDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(appman_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appmandir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(DATA) config.h
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-appmanDATA
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
+	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-appmanDATA install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-info-am
+
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/smproxy/NEWS
+++ b/smproxy/NEWS
--- a/smproxy/README
+++ b/smproxy/README
--- a/smproxy/aclocal.m4
+++ b/smproxy/aclocal.m4
--- a/smproxy/compile
+++ b/smproxy/compile
@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/smproxy/config.guess
+++ b/smproxy/config.guess
--- a/smproxy/config.h.in
+++ b/smproxy/config.h.in
@ -0,0 +1,25 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAS_MKSTEMP
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Version number of package */
+#undef VERSION
--- a/smproxy/config.sub
+++ b/smproxy/config.sub
--- a/smproxy/configure
+++ b/smproxy/configure
--- a/smproxy/configure.ac
+++ b/smproxy/configure.ac
@ -0,0 +1,44 @@
+dnl  Copyright 2005 Red Hat, Inc.
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Red Hat not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Red Hat makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+AC_INIT(smproxy,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],smproxy)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+AC_CHECK_FUNC([mkstemp], 
+   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(SMPROXY, xt xmu)
+AC_SUBST(SMPROXY_CFLAGS)
+AC_SUBST(SMPROXY_LIBS)
+
+XORG_MANPAGE_SECTIONS
+XORG_RELEASE_VERSION
+
+AC_OUTPUT([Makefile])
--- a/smproxy/depcomp
+++ b/smproxy/depcomp
@ -0,0 +1,530 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2005-07-09.11
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/smproxy/install-sh
+++ b/smproxy/install-sh
@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/smproxy/missing
+++ b/smproxy/missing
@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/smproxy/mkinstalldirs
+++ b/smproxy/mkinstalldirs
@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage" 1>&2
+      exit 0
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+case $dirmode in
+  '')
+    if mkdir -p -- . 2>/dev/null; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    fi
+    ;;
+esac
+
+for file
+do
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  shift
+
+  pathcomp=
+  for d
+  do
+    pathcomp="$pathcomp$d"
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+  	errstatus=$lasterr
+      else
+  	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+    	  lasterr=""
+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+  	  if test ! -z "$lasterr"; then
+  	    errstatus=$lasterr
+  	  fi
+  	fi
+      fi
+    fi
+
+    pathcomp="$pathcomp/"
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here
--- a/smproxy/save.c
+++ b/smproxy/save.c
@ -0,0 +1,493 @@
+/* $Xorg: save.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */
+/******************************************************************************
+
+Copyright 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Author:  Ralph Mor, X Consortium
+******************************************************************************/
+/* $XFree86: xc/programs/smproxy/save.c,v 1.7 2001/01/17 23:45:04 dawes Exp $ */
+
+#include "smproxy.h"
+#ifdef HAS_MKSTEMP
+#include <unistd.h>
+#endif
+
+
+ProxyFileEntry *proxyFileHead = NULL;
+
+extern WinInfo *win_head;
+
+static int write_byte ( FILE *file, unsigned char b );
+static int write_short ( FILE *file, unsigned short s );
+static int write_counted_string ( FILE *file, char *string );
+static int read_byte ( FILE *file, unsigned char *bp );
+static int read_short ( FILE *file, unsigned short *shortp );
+static int read_counted_string ( FILE *file, char **stringp );
+#ifndef HAS_MKSTEMP
+static char * unique_filename ( char *path, char *prefix );
+#else
+static char * unique_filename ( char *path, char *prefix, int *pFd );
+#endif
+
+
+static int
+write_byte (FILE *file, unsigned char b)
+{
+    if (fwrite ((char *) &b, 1, 1, file) != 1)
+	return 0;
+    return 1;
+}
+
+
+static int
+write_short (FILE *file, unsigned short s)
+{
+    unsigned char   file_short[2];
+
+    file_short[0] = (s & (unsigned)0xff00) >> 8;
+    file_short[1] = s & 0xff;
+    if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
+	return 0;
+    return 1;
+}
+
+
+static int
+write_counted_string (file, string)
+
+FILE	*file;
+char	*string;
+
+{
+    if (string)
+    {
+	unsigned char count = strlen (string);
+
+	if (write_byte (file, count) == 0)
+	    return 0;
+	if (fwrite (string, (int) sizeof (char), (int) count, file) != count)
+	    return 0;
+    }
+    else
+    {
+	if (write_byte (file, 0) == 0)
+	    return 0;
+    }
+
+    return 1;
+}
+
+
+
+static int
+read_byte (file, bp)
+
+FILE		*file;
+unsigned char	*bp;
+
+{
+    if (fread ((char *) bp, 1, 1, file) != 1)
+	return 0;
+    return 1;
+}
+
+
+static int
+read_short (file, shortp)
+
+FILE		*file;
+unsigned short	*shortp;
+
+{
+    unsigned char   file_short[2];
+
+    if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
+	return 0;
+    *shortp = file_short[0] * 256 + file_short[1];
+    return 1;
+}
+
+
+static int
+read_counted_string (file, stringp)
+
+FILE	*file;
+char	**stringp;
+
+{
+    unsigned char  len;
+    char	   *data;
+
+    if (read_byte (file, &len) == 0)
+	return 0;
+    if (len == 0) {
+	data = 0;
+    } else {
+    	data = (char *) malloc ((unsigned) len + 1);
+    	if (!data)
+	    return 0;
+    	if (fread (data, (int) sizeof (char), (int) len, file) != len) {
+	    free (data);
+	    return 0;
+    	}
+	data[len] = '\0';
+    }
+    *stringp = data;
+    return 1;
+}
+
+
+
+/*
+ * An entry in the .smproxy file looks like this:
+ *
+ * FIELD				BYTES
+ * -----                                ----
+ * client ID len			1
+ * client ID				LIST of bytes
+ * WM_CLASS "res name" length		1
+ * WM_CLASS "res name"			LIST of bytes
+ * WM_CLASS "res class" length          1
+ * WM_CLASS "res class"                 LIST of bytes
+ * WM_NAME length			1
+ * WM_NAME				LIST of bytes
+ * WM_COMMAND arg count			1
+ * For each arg in WM_COMMAND
+ *    arg length			1
+ *    arg				LIST of bytes
+ */
+
+int
+WriteProxyFileEntry (proxyFile, theWindow)
+
+FILE *proxyFile;
+WinInfo *theWindow;
+
+{
+    int i;
+
+    if (!write_counted_string (proxyFile, theWindow->client_id))
+	return 0;
+    if (!write_counted_string (proxyFile, theWindow->class.res_name))
+	return 0;
+    if (!write_counted_string (proxyFile, theWindow->class.res_class))
+	return 0;
+    if (!write_counted_string (proxyFile, theWindow->wm_name))
+	return 0;
+    
+    if (!theWindow->wm_command || theWindow->wm_command_count == 0)
+    {
+	if (!write_byte (proxyFile, 0))
+	    return 0;
+    }
+    else
+    {
+	if (!write_byte (proxyFile, (char) theWindow->wm_command_count))
+	    return 0;
+	for (i = 0; i < theWindow->wm_command_count; i++)
+	    if (!write_counted_string (proxyFile, theWindow->wm_command[i]))
+		return 0;
+    }
+
+    return 1;
+}
+
+
+int
+ReadProxyFileEntry (proxyFile, pentry)
+
+FILE *proxyFile;
+ProxyFileEntry **pentry;
+
+{
+    ProxyFileEntry *entry;
+    unsigned char byte;
+    int i;
+
+    *pentry = entry = (ProxyFileEntry *) malloc (
+	sizeof (ProxyFileEntry));
+    if (!*pentry)
+	return 0;
+
+    entry->tag = 0;
+    entry->client_id = NULL;
+    entry->class.res_name = NULL;
+    entry->class.res_class = NULL;
+    entry->wm_name = NULL;
+    entry->wm_command = NULL;
+    entry->wm_command_count = 0;
+
+    if (!read_counted_string (proxyFile, &entry->client_id))
+	goto give_up;
+    if (!read_counted_string (proxyFile, &entry->class.res_name))
+	goto give_up;
+    if (!read_counted_string (proxyFile, &entry->class.res_class))
+	goto give_up;
+    if (!read_counted_string (proxyFile, &entry->wm_name))
+	goto give_up;
+    
+    if (!read_byte (proxyFile, &byte))
+	goto give_up;
+    entry->wm_command_count = byte;
+
+    if (entry->wm_command_count == 0)
+	entry->wm_command = NULL;
+    else
+    {
+	entry->wm_command = (char **) malloc (entry->wm_command_count *
+	    sizeof (char *));
+
+	if (!entry->wm_command)
+	    goto give_up;
+
+	for (i = 0; i < entry->wm_command_count; i++)
+	    if (!read_counted_string (proxyFile, &entry->wm_command[i]))
+		goto give_up;
+    }
+
+    return 1;
+
+give_up:
+
+    if (entry->client_id)
+	free (entry->client_id);
+    if (entry->class.res_name)
+	free (entry->class.res_name);
+    if (entry->class.res_class)
+	free (entry->class.res_class);
+    if (entry->wm_name)
+	free (entry->wm_name);
+    if (entry->wm_command_count)
+    {
+	for (i = 0; i < entry->wm_command_count; i++)
+	    if (entry->wm_command[i])
+		free (entry->wm_command[i]);
+    }
+    if (entry->wm_command)
+	free ((char *) entry->wm_command);
+    
+    free ((char *) entry);
+    *pentry = NULL;
+
+    return 0;
+}
+
+
+void
+ReadProxyFile (filename)
+
+char *filename;
+
+{
+    FILE *proxyFile;
+    ProxyFileEntry *entry;
+    int done = 0;
+    unsigned short version;
+
+    proxyFile = fopen (filename, "rb");
+    if (!proxyFile)
+	return;
+
+    if (!read_short (proxyFile, &version) ||
+	version > SAVEFILE_VERSION)
+    {
+	done = 1;
+    }
+
+    while (!done)
+    {
+	if (ReadProxyFileEntry (proxyFile, &entry))
+	{
+	    entry->next = proxyFileHead;
+	    proxyFileHead = entry;
+	}
+	else
+	    done = 1;
+    }
+
+    fclose (proxyFile);
+}
+
+
+
+#ifndef HAS_MKSTEMP
+static char *
+unique_filename (path, prefix)
+char *path;
+char *prefix;
+#else
+static char *
+unique_filename (path, prefix, pFd)
+char *path;
+char *prefix;
+int *pFd;
+#endif
+
+{
+#ifndef HAS_MKSTEMP
+#ifndef X_NOT_POSIX
+    return ((char *) tempnam (path, prefix));
+#else
+    char tempFile[PATH_MAX];
+    char *tmp;
+
+    sprintf (tempFile, "%s/%sXXXXXX", path, prefix);
+    tmp = (char *) mktemp (tempFile);
+    if (tmp)
+    {
+	char *ptr = (char *) malloc (strlen (tmp) + 1);
+	strcpy (ptr, tmp);
+	return (ptr);
+    }
+    else
+	return (NULL);
+#endif
+#else 
+    char tempFile[PATH_MAX];
+    char *ptr;
+
+    sprintf (tempFile, "%s/%sXXXXXX", path, prefix);
+    ptr = (char *)malloc(strlen(tempFile) + 1);
+    if (ptr != NULL) 
+    {
+	strcpy(ptr, tempFile);
+	*pFd =  mkstemp(ptr);
+    }
+    return ptr;
+#endif
+}
+
+
+
+char *
+WriteProxyFile ()
+
+{
+    FILE *proxyFile = NULL;
+    char *filename = NULL;
+#ifdef HAS_MKSTEMP
+    int fd;
+#endif
+    char *path;
+    WinInfo *winptr;
+    Bool success = False;
+
+    path = getenv ("SM_SAVE_DIR");
+    if (!path)
+    {
+	path = getenv ("HOME");
+	if (!path)
+	    path = ".";
+    }
+
+#ifndef HAS_MKSTEMP
+    if ((filename = unique_filename (path, ".prx")) == NULL)
+	goto bad;
+
+    if (!(proxyFile = fopen (filename, "wb")))
+	goto bad;
+#else
+    if ((filename = unique_filename (path, ".prx", &fd)) == NULL)
+	goto bad;
+
+    if (!(proxyFile = fdopen(fd, "wb"))) 
+	goto bad;
+#endif
+    if (!write_short (proxyFile, SAVEFILE_VERSION))
+	goto bad;
+
+    success = True;
+    winptr = win_head;
+
+    while (winptr && success)
+    {
+	if (winptr->client_id)
+	    if (!WriteProxyFileEntry (proxyFile, winptr))
+	    {
+		success = False;
+		break;
+	    }
+
+	winptr = winptr->next;
+    }
+
+ bad:
+
+    if (proxyFile)
+	fclose (proxyFile);
+
+    if (success)
+	return (filename);
+    else
+    {
+	if (filename)
+	    free (filename);
+	return (NULL);
+    }
+}
+
+
+
+char *
+LookupClientID (theWindow)
+
+WinInfo *theWindow;
+
+{
+    ProxyFileEntry *ptr;
+    int found = 0;
+
+    ptr = proxyFileHead;
+    while (ptr && !found)
+    {
+	if (!ptr->tag &&
+            strcmp (theWindow->class.res_name, ptr->class.res_name) == 0 &&
+	    strcmp (theWindow->class.res_class, ptr->class.res_class) == 0 &&
+	    strcmp (theWindow->wm_name, ptr->wm_name) == 0)
+	{
+	    int i;
+
+	    if (theWindow->wm_command_count == ptr->wm_command_count)
+	    {
+		for (i = 0; i < theWindow->wm_command_count; i++)
+		    if (strcmp (theWindow->wm_command[i],
+			ptr->wm_command[i]) != 0)
+			break;
+
+		if (i == theWindow->wm_command_count)
+		    found = 1;
+	    }
+	}
+
+	if (!found)
+	    ptr = ptr->next;
+    }
+
+    if (found)
+    {
+	ptr->tag = 1;
+	return (ptr->client_id);
+    }
+    else
+	return NULL;
+}
--- a/smproxy/smproxy.c
+++ b/smproxy/smproxy.c
--- a/smproxy/smproxy.h
+++ b/smproxy/smproxy.h
@ -0,0 +1,111 @@
+/* $Xorg: smproxy.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ */
+/* $XdotOrg: app/smproxy/smproxy.h,v 1.3 2005/07/16 22:07:13 alanc Exp $ */
+/******************************************************************************
+
+Copyright 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Author:  Ralph Mor, X Consortium
+******************************************************************************/
+/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.5 2001/07/25 15:05:16 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <X11/Xosdefs.h>
+#include <X11/Xfuncs.h>
+
+#include <X11/StringDefs.h>
+#include <X11/Intrinsic.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <X11/SM/SMlib.h>
+
+#ifndef _POSIX_SOURCE
+#define _POSIX_SOURCE
+#include <stdio.h>
+#undef _POSIX_SOURCE
+#else
+#include <stdio.h>
+#endif
+#include <stdlib.h>
+
+#ifndef X_NOT_POSIX
+#ifdef _POSIX_SOURCE
+#include <limits.h>
+#else
+#define _POSIX_SOURCE
+#include <limits.h>
+#undef _POSIX_SOURCE
+#endif
+#endif /* X_NOT_POSIX */
+#ifndef PATH_MAX
+#include <sys/param.h>
+#ifndef PATH_MAX
+#ifdef MAXPATHLEN
+#define PATH_MAX MAXPATHLEN
+#else
+#define PATH_MAX 1024
+#endif
+#endif
+#endif /* PATH_MAX */
+
+
+typedef struct WinInfo {
+    Window window;
+    SmcConn smc_conn;
+    XtInputId input_id;
+    char *client_id;
+    char **wm_command;
+    int wm_command_count;
+    XClassHint class;
+    char *wm_name;
+    XTextProperty wm_client_machine;
+    struct WinInfo *next;
+
+    unsigned int tested_for_sm_client_id : 1;
+    unsigned int has_save_yourself : 1;
+    unsigned int waiting_for_update : 1;
+    unsigned int got_first_save_yourself : 1;
+
+} WinInfo;
+
+typedef struct ProxyFileEntry
+{
+    struct ProxyFileEntry *next;
+    int tag;
+    char *client_id;
+    XClassHint class;
+    char *wm_name;
+    int wm_command_count;
+    char **wm_command;
+} ProxyFileEntry;
+
+extern int WriteProxyFileEntry ( FILE *proxyFile, WinInfo *theWindow );
+extern int ReadProxyFileEntry ( FILE *proxyFile, ProxyFileEntry **pentry );
+extern void ReadProxyFile ( char *filename );
+extern char * WriteProxyFile ( void );
+extern char * LookupClientID ( WinInfo *theWindow );
+
+
+#define SAVEFILE_VERSION 1
--- a/smproxy/smproxy.man
+++ b/smproxy/smproxy.man
@ -0,0 +1,76 @@
+.\" $XdotOrg: app/smproxy/smproxy.man,v 1.3 2006/02/03 23:24:37 alanc Exp $
+.\" $Xorg: smproxy.man,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
+.\" Copyright 1994, 1998  The Open Group
+.\" 
+.\" Permission to use, copy, modify, distribute, and sell this software and its
+.\" documentation for any purpose is hereby granted without fee, provided that
+.\" the above copyright notice appear in all copies and that both that
+.\" copyright notice and this permission notice appear in supporting
+.\" documentation.
+.\" 
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\" 
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\" 
+.\" Except as contained in this notice, the name of The Open Group shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from The Open Group.
+.\"
+.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.6 2001/01/27 18:21:06 dawes Exp $
+.\"
+.TH SMPROXY 1 __xorgversion__
+.SH NAME
+smproxy \- Session Manager Proxy
+.SH SYNOPSIS
+.B smproxy
+[-clientId id] [-restore saveFile]
+.SH OPTIONS
+.TP 8
+.B \-clientId \fIid\fP
+Specifies the session ID used by \fIsmproxy\fP in the previous session.
+.TP 8
+.B \-restore \fIsaveFile\fP
+Specifies the file used by \fIsmproxy\fP to save state in the previous session.
+.SH DESCRIPTION
+.PP
+\fIsmproxy\fP allows X applications that do not support X11R6 session
+management to participate in an X11R6 session.  
+.br
+.sp
+In order for \fIsmproxy\fP to act as a proxy for an X application, one of
+the following must be true:
+.br
+.sp
+- The application maps a top level window containing the
+\fBWM_CLIENT_LEADER\fR property.  This property provides a pointer to
+the client leader window which contains the \fBWM_CLASS\fR, \fBWM_NAME\fR,
+\fBWM_COMMAND\fR, and \fBWM_CLIENT_MACHINE\fR properties.
+.br
+.sp
+or ...
+.br
+.sp
+- The application maps a top level window which does not contain the
+\fBWM_CLIENT_LEADER\fR property.  However, this top level window
+contains the \fBWM_CLASS\fR, \fBWM_NAME\fR, \fBWM_COMMAND\fR, and
+\fBWM_CLIENT_MACHINE\fR properties.
+.PP
+An application that support the \fBWM_SAVE_YOURSELF\fR protocol will receive
+a \fBWM_SAVE_YOURSELF\fR client message each time the session manager issues
+a checkpoint or shutdown.  This allows the application to save state.  If
+an application does not support the \fBWM_SAVE_YOURSELF\fR protocol, then
+the proxy will provide enough information to the session manager to restart
+the application (using \fBWM_COMMAND\fR), but no state will be restored.
+.SH SEE ALSO
+xsm(1)
+.SH AUTHOR
+Ralph Mor, X Consortium
+