bindir.patch revision 792
493N/A###############################################################################
0N/A#
606N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
731N/A# Use is subject to license terms.
0N/A#
0N/A# Permission is hereby granted, free of charge, to any person obtaining a
0N/A# copy of this software and associated documentation files (the
0N/A# "Software"), to deal in the Software without restriction, including
0N/A# without limitation the rights to use, copy, modify, merge, publish,
0N/A# distribute, and/or sell copies of the Software, and to permit persons
0N/A# to whom the Software is furnished to do so, provided that the above
0N/A# copyright notice(s) and this permission notice appear in all copies of
0N/A# the Software and that both the above copyright notice(s) and this
0N/A# permission notice appear in supporting documentation.
0N/A#
0N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
0N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
0N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
0N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
0N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
0N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
0N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
0N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
0N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
0N/A#
0N/A# Except as contained in this notice, the name of a copyright holder
0N/A# shall not be used in advertising or otherwise to promote the sale, use
0N/A# or other dealings in this Software without prior written authorization
0N/A# of the copyright holder.
0N/A#
731N/A###############################################################################
0N/A
0N/ASet paths used in config files for finding X utilities to look in /usr/X11/bin
0N/Auntil everything else is moved to /usr/bin too.
0N/A
0N/Adiff -urp -x '*~' -x '*.orig' config/Makefile.am config/Makefile.am
0N/A--- config/Makefile.am 2009-09-17 19:24:37.000000000 -0700
0N/A+++ config/Makefile.am 2009-09-24 15:02:04.421431000 -0700
0N/A@@ -49,7 +49,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
0N/A MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
0N/A #endif
0N/A
561N/A-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
561N/A+CPP_FILES_FLAGS = -DBINDIR="/usr/X11/bin" -DDEFAULTVT="$(DEFAULTVT)" \
0N/A -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
0N/A -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
0N/A -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
0N/Adiff -urp -x '*~' -x '*.orig' config/Makefile.in config/Makefile.in
0N/A--- config/Makefile.in 2009-09-18 15:32:28.000000000 -0700
493N/A+++ config/Makefile.in 2009-09-24 15:02:04.431540000 -0700
493N/A@@ -340,7 +340,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
493N/A #if HAVE_MKTEMP_COMMAND
0N/A MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
493N/A #endif
493N/A-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
0N/A+CPP_FILES_FLAGS = -DBINDIR="/usr/X11/bin" -DDEFAULTVT="$(DEFAULTVT)" \
493N/A -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
493N/A -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
653N/A -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
577N/Adiff -urp -x '*~' -x '*.orig' xdm.man.cpp xdm.man.cpp
705N/A--- xdm.man.cpp 2009-09-17 19:24:37.000000000 -0700
702N/A+++ xdm.man.cpp 2009-09-24 15:02:04.446548000 -0700
606N/A@@ -413,7 +413,7 @@ See the sections \fBXDMCP Access Control
637N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.xrdb\fP"
721N/A Specifies the program used to load the resources. By default,
619N/A .I xdm
663N/A-uses \fI BINDIR/xrdb\fP.
637N/A+uses \fI /usr/X11/bin/xrdb\fP.
725N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.cpp\fP"
731N/A This specifies the name of the C preprocessor which is used by \fIxrdb\fP.
731N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
731N/A@@ -431,7 +431,7 @@ file used here is \fIXstartup\fP.
0N/A See the section \fBStartup Program.\fP
493N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
493N/A This specifies the session to be executed (not running as root).
493N/A-By default, \fI BINDIR/xterm\fP is
731N/A+By default, \fI /usr/X11/bin/xterm\fP is
493N/A run. The conventional name is \fIXsession\fP.
493N/A See the section
493N/A .B "Session Program."
493N/A@@ -512,7 +512,7 @@ If the default session fails to execute,
493N/A will fall back to this program. This program is executed with no
493N/A arguments, but executes using the same environment variables as
493N/A the session would have had (see the section \fBSession Program\fP).
493N/A-By default, \fI BINDIR/xterm\fP is used.
493N/A+By default, \fI /usr/X11/bin/xterm\fP is used.
493N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
0N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
0N/A To improve security,
0N/A@@ -816,7 +816,7 @@ line to start the server. A typical ent
0N/A be:
561N/A .nf
561N/A
561N/A- :0 Digital-QV local BINDIR/X :0
561N/A+ :0 Digital-QV local /usr/X11/bin/X :0
561N/A
561N/A .fi
561N/A The display types are:
561N/A@@ -831,8 +831,8 @@ foreign remote display: \fIxdm\fP opens
561N/A The display name must be something that can be passed in the \fB\-display\fP
561N/A option to an X program. This string is used to generate the display-specific
561N/A resource names, so be careful to match the
561N/A-names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
561N/A-``localhost:0 Sun-CG3 local BINDIR/X :0''
561N/A+names (e.g., use ``:0 Sun-CG3 local /usr/X11/bin/X :0'' instead of
561N/A+``localhost:0 Sun-CG3 local /usr/X11/bin/X :0''
561N/A if your other resources are specified as
561N/A ``DisplayManager._0.session''). The display class portion is also used in the
561N/A display-specific resources, as the class of the resource. This is
561N/A@@ -1374,7 +1374,7 @@ line:
561N/A .nf
561N/A .ta .5i
561N/A
561N/A- xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
561N/A+ xdm \-server \(lq:0 SUN-3/60CG4 local /usr/X11/bin/X :0\(rq
561N/A
561N/A .fi
561N/A .PP
0N/A@@ -1414,13 +1414,13 @@ user authorization file where \fIxdm\fP
561N/A .I CHOOSERPATH
561N/A the default chooser
561N/A .TP 20
561N/A-.I BINDIR/xrdb
561N/A+.I /usr/X11/bin/xrdb
493N/A the default resource database loader
493N/A .TP 20
493N/A-.I BINDIR/X
493N/A+.I /usr/X11/bin/X
493N/A the default server
493N/A .TP 20
493N/A-.I BINDIR/xterm
493N/A+.I /usr/X11/bin/xterm
493N/A the default session program and failsafe client
0N/A .TP 20
493N/A .I XDMXAUTHDIR/A<display>\-<suffix>
493N/A