--- a/make_release_packages	Wed Dec 02 21:38:00 2009 -0800
+++ b/make_release_packages	Sat Dec 05 22:13:03 2009 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-# ident	"@(#)make_release_packages	1.79	09/11/23 SMI"
+# ident	"@(#)make_release_packages	1.80	09/12/05 SMI"
 #
 #	Create and fill a package staging area for X
 #
@@ -100,6 +100,7 @@
     SUNWxorg-compatlinks
     SUNWxorg-graphics-ddx
     SUNWxorg-headers
+    SUNWxorg-mesa
     SUNWxorg-server
     SUNWxorg-tsol-module 
     SUNWxvnc
@@ -132,7 +133,7 @@
     	XW_PACKAGE_LIST="$XW_PACKAGE_LIST $XSUN_PACKAGE_LIST SUNWxwpsr" 
 	;;
     i386)	
-    	XW_PACKAGE_LIST="$XW_PACKAGE_LIST SUNWxorg-mesa" 
+    	XW_PACKAGE_LIST="$XW_PACKAGE_LIST"
 	;;
 esac
 

--- a/open-src/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile	1.24	09/11/06 SMI"
+# ident	"@(#)Makefile	1.25	09/12/05 SMI"
 #
 ###############################################################################
 #
@@ -58,7 +58,9 @@
 driver: xserver/xorg
 app/rgb: xserver/xorg
 data: app
-font: app
+FONTAPPS = app/bdftopcf app/mkfontscale app/mkfontdir
+font: $(FONTAPPS)
+$(FONTAPPS): lib
 
 OS_SUBDIRS_common = \
 	util/util-macros \
@@ -68,6 +70,7 @@
 	doc \
 	lib \
 	app \
+	$(FONTAPPS) \
 	xserver/xorg \
 	xserver/xvnc \
 	driver \

--- a/open-src/README	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/README	Sat Dec 05 22:13:03 2009 -0800
@@ -187,8 +187,8 @@
 
 MODULE_SUNTOUCH_MAN_FLAGS
  - Additional flags to pass to open-src/common/suntouch-manpages.pl, such as
-   -p /usr/X11/bin to add a path of /usr/X11/bin to the command in the 
-   synopsis.   Available flags are:
+   -p /usr/bin to add a path of /usr/bin to the command in the synopsis.
+   Available flags are:
       -a '{attribute, value}, ...' - entries for Attributes section table
       -l libname                   - add library line to synopsis
       -p path                      - add path to command in synopsis
@@ -309,7 +309,7 @@
 
 MODULE_PREFIX
  - Prefix to install files under, passed to configure scripts via --prefix.
-   Default: $(X11_DIR) (aka /usr/X11).
+   Default: $(X11_DIR) (aka /usr).
 
 SOURCE_DIRNAME
  - Directory that will be created when the source tarball is unpacked.
@@ -514,7 +514,7 @@
 =============================================================================
 
 Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-Use subject to license terms.
+Use is subject to license terms.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the

--- a/open-src/app/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -28,14 +28,18 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile	1.91	09/11/19 SMI"
+# ident	"@(#)Makefile	1.92	09/12/05 SMI"
 #
 ###############################################################################
 
+# Several utilities are not listed here because they are called out in
+# the makefile in the higher level directory due to dependencies between
+# them and modules in other directories.   These include:
+#	rgb, mkfontdir, mkfontscale, bdftopcf
+
 OS_SUBDIRS_common = \
 	accessx \
 	appres \
-	bdftopcf \
 	bitmap \
 	cmap_alloc \
         cmap_compact \
@@ -54,8 +58,6 @@
 	kbd_mode \
 	mesa-demos \
 	mkcookie \
-	mkfontdir \
-	mkfontscale \
 	oclock \
 	proxymngr \
 	rstart \

--- a/open-src/app/accessx/sun-src/AccessX.c	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/accessx/sun-src/AccessX.c	Sat Dec 05 22:13:03 2009 -0800
@@ -1,7 +1,7 @@
 /*
 *
-* Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-* Use subject to license terms.
+* Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+* Use is subject to license terms.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the
@@ -70,7 +70,7 @@
 /*			Redesign GUI					*/
 /*									*/
 /************************************************************************/
-#pragma ident "@(#)AccessX.c	35.18	08/09/30 SMI"
+#pragma ident	"@(#)AccessX.c	35.19	09/12/05 SMI"
 
 /* Special constants needed for the accessx extension */
 #define NEED_EVENTS
@@ -279,11 +279,11 @@
 static char *slowHelpString = NULL;
 static char *bounceHelpString = NULL;
 
-#define ACCESSXHELP_DIRECTORY "/usr/X11/lib/locale/"
+#define ACCESSXHELP_DIRECTORY "/usr/share/X11/locale/"
 /* used for debugging.
 #define ACCESSXHELP_DIRECTORY "./locale/"
 */
-#define HELPDIR "/help/"
+#define HELPDIR "/accessx/"
 #define ACCESSXHELP_FILE      "accessx.hlp"
 #define COMMENT '-'
 
@@ -2948,9 +2948,9 @@
 
    if (!inited) {
 	 if (InitHelp() == False) {
-		fprintf(stderr, "The help file \
-[/usr/X11/lib/locale/<locale>/help/accessx.hlp] is not installed. Please \
-contact your system administrator\n");
+		fprintf(stderr, "The help file \n"
+			"[" ACCESSXHELP_DIRECTORY "<locale>" HELPDIR ACCESSXHELP_FILE "] is not installed.\n"
+			"Please contact your system administrator\n");
 		return(False);
 	 }
 	 inited = 1;
@@ -3747,8 +3747,8 @@
     char		*argv[];
 #endif
 {
-    char *uidpathstr = "UIDPATH=/usr/X11/lib/locale/%L/app-defaults/accessx.uid:/usr/X11/lib/app-defaults/accessx.uid";
-    char *xfilesearchpathstr = "XFILESEARCHPATH=/usr/dt/app-defaults/%L/%N:/usr/dt/app-defaults/C/%N";
+    char *uidpathstr = "UIDPATH=/usr/share/X11/locale/%L/accessx/accessx.uid:/usr/share/X11/locale/C/accessx/accessx.uid";
+    char *xfilesearchpathstr = "XFILESEARCHPATH=/usr/dt/app-defaults/%L/%N:/usr/dt/app-defaults/C/%N:/usr/share/X11/app-defaults/%L/%N:/usr/share/X11/app-defaults/C/%N";
     char *tmpstr;
 
     if ((tmpstr = getenv("UIDPATH")) == NULL) {

--- a/open-src/app/accessx/sun-src/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/accessx/sun-src/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -1,5 +1,5 @@
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	08/10/28
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 
 UIL = /usr/dt/bin/uil
 UIL_INCLUDES = -I/usr/dt/include/uil
@@ -48,12 +48,10 @@
 
 install: accessx
 	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/app-defaults
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/locale/C/help
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/locale/C/app-defaults
+	mkdir -p $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx
 	$(INSTALL) accessx $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) accessx.uid $(DESTDIR)$(PREFIX)/lib/app-defaults
 	$(INSTALL) accessx.1 $(DESTDIR)$(PREFIX)/share/man/man1
-	$(INSTALL) accessx.hlp $(DESTDIR)$(PREFIX)/lib/locale/C/help
-	$(INSTALL) accessx.uil $(DESTDIR)$(PREFIX)/lib/locale/C/app-defaults
-	$(INSTALL) accessxstrings.uil $(DESTDIR)$(PREFIX)/lib/locale/C/app-defaults
+	$(INSTALL) accessx.hlp $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
+	$(INSTALL) accessx.uid $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
+	$(INSTALL) accessx.uil $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
+	$(INSTALL) accessxstrings.uil $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/

--- a/open-src/app/appres/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/appres/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # appres 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2 08/08/08
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=appres
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/bdftopcf/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/bdftopcf/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # bdftopcf Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	08/08/08
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=bdftopcf
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
@@ -47,13 +47,11 @@
 SUN_PACKAGE=SUNWxwplt
 MODULE_STABILITY=Committed
 
-# Need to build 64-bit on SPARC since we only ship 64-bit libXfont there
-BUILD_TYPES_SET		= yes
-BUILD_TYPES_sparc	= 64
-BUILD_TYPES_i386	= 32
-BUILD_TYPES		= $(BUILD_TYPES_$(MACH))
-
 # Need to link with libXfont in server private directory
 MODULE_LDFLAGS		= $(X11_SERVERLIBS_LDFLAGS)
+MODULE_LD_OPTIONS	= -R $$ORIGIN/../lib/xorg$(ARCHLIBSUBDIR)
 
 include ../Makefile.inc
+
+# Clean up old 64-bit builds from before we stopped building them
+clean:: clean_64

--- a/open-src/app/bitmap/COPYING	Wed Dec 02 21:38:00 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-
-Copyright 1989, 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.
-
-
-Copyright 1989, 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.
-
-
-Copyright 1989, 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.
-
-
-Copyright 1989, 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.
-
-
-Copyright 1989, 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.
-
-
-Copyright 1989, 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.
-
-
-Copyright 1989, 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.
-
-
-Copyright 1988, 1993, 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.
-
-Copyright 1988, 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and i
-ts
-documentation for any purpose is hereby granted without fee, provided tha
-t
-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.
-
-
-/*
- * bmtoa - bitmap to ascii filter
- * Author:  Jim Fulton, MIT X Consortium
- */
-

--- a/open-src/app/bitmap/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/bitmap/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # bitmap 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2  08/08/08
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=bitmap
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/constype/6822628.patch	Wed Dec 02 21:38:00 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-From 9f47f2b67f0f105c1c396da171ca46b06905301f Mon Sep 17 00:00:00 2001
-From: John Martin <[email protected]>
-Date: Thu, 26 Mar 2009 13:31:09 -0700
-Subject: [PATCH] Sun bug 6822628: constype returns unexpected value
-
-<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6822628>
-
-Declare fbid as static to ensure the string returned from it is still
-present when the function returns.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- constype.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/constype.c b/constype.c
-index 11f3948..9d68a43 100644
---- a/constype.c
-+++ b/constype.c
-@@ -149,7 +149,7 @@ wu_fbid(const char* devname, char** fbname, int* fbtype)
- 	int fd, ioctl_ret;
- #ifdef VIS_GETIDENTIFIER
- 	int vistype;
--	struct vis_identifier fbid;
-+	static struct vis_identifier fbid;
- #endif
- 
- 
--- 
-1.5.6.5
-

--- a/open-src/app/constype/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/constype/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -3,7 +3,7 @@
 # constype 1.x Makefile
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,17 +30,17 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	09/03/26
+# ident	"@(#)Makefile	1.4	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=constype
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6822628.patch,-p1
+SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=*.man

--- a/open-src/app/dispswitch/sun-src/dispswitch.man	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/dispswitch/sun-src/dispswitch.man	Sat Dec 05 22:13:03 2009 -0800
@@ -27,7 +27,7 @@
 .SH NAME
 dispswitch \- Display Device Switch
 .SH SYNOPSIS
-.B "/usr/X11/bin/dispswitch"
+.B "/usr/bin/dispswitch"
 [\-display \fIdisplay\fP]
 [\-key \fIkeysym\fP]
 [\-mod \fImodifier\fP]
@@ -54,9 +54,11 @@
 Switch/rotate display device states repeatedly without hotkey strokes.
 .IP "\-key <keysym> or -k <keysym>"
 Define the keysym of hotkey to be <keysym>, which can be any entry defined in
-defined in /usr/X11/include/X11/keysymdef.h, with prefix XK_ removed, such as F5, F8, Escape.
+defined in /usr/include/X11/keysymdef.h, with prefix XK_ removed, such as F5, F8, Escape.
 .IP "\-mod <modifier> or -m <modifier>"
-Define the modifier of hotkey to be <modifier>. <modifier> is any or combination of modifiers on your system. Run /usr/X11/bin/xmodmap to find all available modifiers on your system. They can be none, shift, control, mod1, mod3, mod4, mod5, any.
+Define the modifier of hotkey to be <modifier>. <modifier> is any or combination of modifiers on your system. Run 
+.BR xmodmap (1)
+to find all available modifiers on your system. They can be none, shift, control, mod1, mod3, mod4, mod5, any.
 .SH
 Examples:
 

--- a/open-src/app/dispswitch/sun-src/gnome-dispswitch.desktop	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/dispswitch/sun-src/gnome-dispswitch.desktop	Sat Dec 05 22:13:03 2009 -0800
@@ -3,7 +3,7 @@
 Name=Display Switch Daemon
 Comment=Handles switching of displays devices
 Icon=display
-Exec=/usr/X11/bin/dispswitch
+Exec=/usr/bin/dispswitch
 Terminal=false
 Type=Application
 Categories=

--- a/open-src/app/editres/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/editres/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # editres 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3   08/08/08
+# ident	"@(#)Makefile	1.4	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=editres
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/iceauth/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/iceauth/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # iceauth 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	08/08/08
+# ident	"@(#)Makefile	1.4	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=iceauth
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES =

--- a/open-src/app/installalias/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/installalias/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # installalias module Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/09/15
+# ident	"@(#)Makefile	1.2	09/12/05 SMI"
 #
 
 # Package name used in tarballs
@@ -60,10 +60,8 @@
 
 # Need to find libXfont in matching directory when used
 # in alternate root environments, like during OS install
-# $ORIGIN paths are relative to /usr/X11/lib, since that's where 
+# $ORIGIN paths are relative to /usr/lib/X11, since that's where 
 # installalias is installed
-MODULE_LD_OPTIONS= -R $$ORIGIN/X11/xserver$(ARCHLIBSUBDIR)
+MODULE_LD_OPTIONS= -R $$ORIGIN/../xorg$(ARCHLIBSUBDIR)
 
 include ../Makefile.inc
-
-source_gen:: $(LNDIR)

--- a/open-src/app/installalias/sun-src/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/installalias/sun-src/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -1,5 +1,5 @@
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/09/15
+# ident	"@(#)Makefile	1.2	09/12/05 SMI"
 
 SRCS = installalias.c
 OBJS = $(SRCS:.c=.o)
@@ -36,8 +36,8 @@
 	$(LD) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
 
 install: installalias
-	mkdir -p $(DESTDIR)$(PREFIX)/lib
-	$(INSTALL) installalias $(DESTDIR)$(PREFIX)/lib
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/X11
+	$(INSTALL) installalias $(DESTDIR)$(PREFIX)/lib/X11
 
 lint:
 	$(LINT) -b -h $(LINTFLAGS) $(CPPFLAGS) $(SRCS) $(LIBS)

--- a/open-src/app/kbd_mode/sun-src/kbd_mode.1	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/kbd_mode/sun-src/kbd_mode.1	Sat Dec 05 22:13:03 2009 -0800
@@ -1,5 +1,6 @@
 '\" t
-.\" Copyright 2008, Sun Microsystems, Inc.  All rights reserved.
+.\" Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+.\" Use is subject to license terms.
 .\" 
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the
@@ -30,7 +31,7 @@
 .IX "kbd_mode" "" "\f3kbd_mode\f1(1) \(em keyboard translation utility" ""
 .IX "keyboard" "trans" "keyboard" "translation utility \(em \f3kbd_mode\f1(1)"
 .SH NAME
-/usr/X11/bin/kbd_mode \- change the keyboard translation mode
+/usr/bin/kbd_mode \- change the keyboard translation mode
 .SH SYNOPSIS
 .B kbd_mode -a | -n |
 .B -e | -u

--- a/open-src/app/lbxproxy/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/lbxproxy/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # lbxproxy 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.4 08/08/13
+# ident	"@(#)Makefile	1.5	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=lbxproxy
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 6718029.patch

--- a/open-src/app/luit/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/luit/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # luit 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -36,7 +36,7 @@
 MODULE_NAME=luit
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = solaris-man.patch \

--- a/open-src/app/mesa-demos/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/mesa-demos/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -58,21 +58,15 @@
 GLXINFO_BIN=$(SOURCE_DIR)/progs/xdemos/glxinfo
 
 # configure script is run in ../lib/mesa build, just link to results here
-CONFIGURE_TARGETS_sparc=
-CONFIGURE_TARGETS_i386=$(SOURCE_DIR)/configs/current
-CONFIGURE_TARGETS= $(CONFIGURE_TARGETS_$(MACH))
+CONFIGURE_TARGETS= $(SOURCE_DIR)/configs/current
 CONFIGURE_TARGETS_SET=yes
 
 # What to build
-BUILD_TARGETS_sparc=
-BUILD_TARGETS_i386=$(GLXGEARS_BIN) $(GLXINFO_BIN)
-BUILD_TARGETS= $(BUILD_TARGETS_$(MACH))
+BUILD_TARGETS= $(GLXGEARS_BIN) $(GLXINFO_BIN)
 BUILD_TARGETS_SET=yes
 
 # What to install
-INSTALL_TARGETS_sparc=install_man
-INSTALL_TARGETS_i386=install_glxgears install_glxinfo install_man
-INSTALL_TARGETS= $(INSTALL_TARGETS_$(MACH))
+INSTALL_TARGETS= install_glxgears install_glxinfo install_man
 INSTALL_TARGETS_SET=yes
 
 ### Include common rulesets
@@ -83,10 +77,8 @@
 # Only care about building X demos
 DEMOS_DIR=$(SOURCE_DIR)/progs/xdemos
 
-DEMO_LDFLAGS=$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR)
-
-# Workaround 6724478 libc printf should not SEGV when passed NULL for %s format
-DEMO_LDFLAGS += /usr/lib$(ARCHLIBSUBDIR)/[email protected]
+DEMO_LDFLAGS=$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_LIB_DIR)$(ARCHLIBSUBDIR) \
+	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
 
 # Flags passed on make command line when building
 MODULE_BUILD_MAKEFLAGS = LDFLAGS="$(DEMO_LDFLAGS)"

--- a/open-src/app/mkcookie/sun-src/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/mkcookie/sun-src/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -1,5 +1,5 @@
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/09/30
+# ident	"@(#)Makefile	1.2	09/12/05 SMI"
 
 SRCS = mkcookie.c
 OBJS = $(SRCS:.c=.o)
@@ -36,5 +36,5 @@
 	$(LD) -o $@ $(CFLAGS) $(CFLAGS1) $(LDFLAGS) $(OBJS) -lX11 -lXau -lnsl
 
 install: mkcookie
-	mkdir -p $(DESTDIR)$(PREFIX)/lib
-	$(INSTALL) mkcookie $(DESTDIR)$(PREFIX)/lib
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/X11
+	$(INSTALL) mkcookie $(DESTDIR)$(PREFIX)/lib/X11

--- a/open-src/app/mkfontdir/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/mkfontdir/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # mkfontdir 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	08/09/15
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=mkfontdir
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = altroot.patch

--- a/open-src/app/mkfontdir/altroot.patch	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/mkfontdir/altroot.patch	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # mkfontdir 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -44,7 +44,7 @@
 -exec BINDIR/mkfontscale -b -s -l "$@"
 +FONTUTILDIR=`dirname $0`
 +if [ ! -x ${FONTUTILDIR}/mkfontscale ] ; then
-+    FONTUTILDIR=${FONTUTILDIR}/../../X11/bin
++    FONTUTILDIR=${FONTUTILDIR}/../bin
 +    if [ ! -x ${FONTUTILDIR}/mkfontscale ] ; then
 +        FONTUTILDIR=BINDIR
 +    fi

--- a/open-src/app/mkfontscale/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/mkfontscale/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # mkfontscale 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.7	08/12/19
+# ident	"@(#)Makefile	1.8	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=mkfontscale
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.6
+MODULE_VERSION=1.0.7
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/rstart/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/rstart/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # rstart 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1 08/08/29
+# ident	"@(#)Makefile	1.2	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=rstart
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/sessreg/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/sessreg/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # sessreg 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2 08/08/08
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=sessreg
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/smproxy/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/smproxy/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # smproxy 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -36,7 +36,7 @@
 MODULE_NAME=smproxy
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/winsysck/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/winsysck/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # winsysck 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	08/08/08
+# ident	"@(#)Makefile	1.4	09/12/05 SMI"
 #
 
 # Package name used in tarballs
@@ -50,6 +50,7 @@
 CONFIGURE_TARGETS_SET=yes
 
 MODULE_BUILD_ENV=$(CONFIG_ENV)
+MODULE_INSTALL_MAKEFLAGS = bindir=$(X11_BIN_DIR) mandir=$(X11_MAN_DIR)
 
 include ../Makefile.inc
 

--- a/open-src/app/winsysck/sun-src/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/winsysck/sun-src/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # winsysck 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/08/07
+# ident	"@(#)Makefile	1.2	09/12/05 SMI"
 #
 
 OBJS = main.o
@@ -38,7 +38,8 @@
 winsysck: $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -lX11
 
-install:
-	$(INSTALL) -m 755 winsysck $(DESTDIR)/usr/X11/bin/winsysck
+install: winsysck
+	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+	$(INSTALL) -m 755 winsysck $(DESTDIR)$(bindir)/winsysck
 	$(INSTALL) -m 644 winsysck.man \
-		$(DESTDIR)/usr/X11/share/man/man1/winsysck.1
+		$(DESTDIR)$(mandir)/man1/winsysck.1

--- a/open-src/app/x11perf/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/x11perf/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # x11perf 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3 08/08/27
+# ident	"@(#)Makefile	1.4	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=x11perf
 
 # Version number (used in path names)
-MODULE_VERSION=1.5
+MODULE_VERSION=1.5.1
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/xauth/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xauth/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xauth 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -36,7 +36,7 @@
 MODULE_NAME=xauth
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/xclipboard/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xclipboard/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xclipboard 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2   08/08/08 
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=xclipboard
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.1.0
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/xclock/COPYING	Wed Dec 02 21:38:00 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-Copyright 1989, 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.
- 
- * Copyright 2004 Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Sun Microsystems, Inc. nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind.
- *
- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
- * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR
- * LIABILITIES  SUFFERED BY LICENSEE AS A RESULT OF  OR RELATING TO USE,
- * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES.
- * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
- * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
- * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
- * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
- * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- *
- * Authors:  I18N - Steve Swales - March 2000
- *	     bgpixmap - Alan Coopersmith (as part of STSF project) - Sept. 2001
- 
-**********************************************************
-
-Copyright 1987, 1988, 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.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-*****************************************************************

--- a/open-src/app/xclock/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xclock/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xclock 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	08/08/08 SMI
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=xclock
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/xcmsdb/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xcmsdb/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xcmsdb 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2 08/08/08
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=xcmsdb
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/xcolor/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xcolor/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xcolor 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	08/08/08
+# ident	"@(#)Makefile	1.2	09/12/05 SMI"
 #
 
 # Package name used in tarballs
@@ -50,6 +50,7 @@
 CONFIGURE_TARGETS_SET=yes
 
 MODULE_BUILD_ENV=$(CONFIG_ENV)
+MODULE_INSTALL_MAKEFLAGS = bindir=$(X11_BIN_DIR) mandir=$(X11_MAN_DIR)
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=# None
@@ -57,6 +58,3 @@
 MODULE_STABILITY=Committed
 
 include ../Makefile.inc
-install_gen::install_man
-install_man:
-	cp -f sun-src/xcolor.1 $(PROTODIR)/usr/X11/share/man/man1/xcolor.1

--- a/open-src/app/xcolor/sun-src/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xcolor/sun-src/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xcolor 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/08/07
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 OBJS = HSBmap.o XCrDynCmap.o XCrHsbCmap.o xcolor.o
@@ -38,5 +38,8 @@
 xcolor: $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -lX11
 
-install:
-	$(INSTALL) -m 755 xcolor $(DESTDIR)/usr/X11/bin/xcolor
+install: xcolor
+	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 755 xcolor $(DESTDIR)$(bindir)/xcolor
+	$(INSTALL) -m 444 xcolor.1 $(DESTDIR)$(mandir)/man1/xcolor.1
+

--- a/open-src/app/xcursorgen/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xcursorgen/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -2,8 +2,8 @@
 #
 # xcursorgen 1.x Makefile
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	08/08/08
+# ident	"@(#)Makefile	1.3	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=xcursorgen
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 

--- a/open-src/app/xdm/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xdm/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -71,8 +71,8 @@
 # Special handling while xdm is moved to /usr but other apps are still in
 # /usr/X11
 MODULE_CONFIG_OPTS += \
-	--with-xrdb='/usr/X11/bin/xrdb' \
-	--with-default-session=command='/usr/X11/bin/xterm -ls' \
+	--with-xrdb='$(X11_BIN_DIR)/xrdb' \
+	--with-default-session=command='$(X11_BIN_DIR)/xterm -ls' \
 
 # Additional build & install targets
 MODULE_ADD_BUILD_TARGETS=build_xdm_configs
@@ -114,7 +114,7 @@
 $(XCF_USR_FILES): $(PROTODIR)/$(XDM_USR_CONFIGDIR) $(XCF_USR_SRCFILES)
 	-rm -f $@
 	mkdir -p $(PROTODIR)/$(XDM_USR_CONFIGDIR)
-	@ set -x ; cp -p $(XCF_USR_SRCDIR)/$$(basename $@) $@
+	@ $(START_CMD_ECHO) ; cp -p $(XCF_USR_SRCDIR)/$$(basename $@) $@
 
 $(XCF_USR_SRCFILES): $(XCF_USR_SRCDIR) $(XCF_ETC_SRCFILES)
 	-rm -f $@

--- a/open-src/app/xdm/bindir.patch	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xdm/bindir.patch	Sat Dec 05 22:13:03 2009 -0800
@@ -30,8 +30,8 @@
 #
 ###############################################################################
 
-Set paths used in config files for finding X utilities to look in /usr/X11/bin
-until everything else is moved to /usr/bin too.
+Set paths used in config files for finding X utilities to look in /usr/bin
+even though --bindir is set to /usr/sbin
 
 diff -urp -x '*~' -x '*.orig' config/Makefile.am config/Makefile.am
 --- config/Makefile.am	2009-09-17 19:24:37.000000000 -0700
@@ -41,7 +41,7 @@
  #endif
  
 -CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
-+CPP_FILES_FLAGS = -DBINDIR="/usr/X11/bin" -DDEFAULTVT="$(DEFAULTVT)" \
++CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
      -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
      -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
      -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
@@ -53,7 +53,7 @@
  MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
  #endif
 -CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
-+CPP_FILES_FLAGS = -DBINDIR="/usr/X11/bin" -DDEFAULTVT="$(DEFAULTVT)" \
++CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
      -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
      -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
      -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
@@ -65,7 +65,7 @@
  Specifies the program used to load the resources.  By default,
  .I xdm
 -uses \fI BINDIR/xrdb\fP.
-+uses \fI /usr/X11/bin/xrdb\fP.
++uses \fI /usr/bin/xrdb\fP.
  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.cpp\fP"
  This specifies the name of the C preprocessor which is used by \fIxrdb\fP.
  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
@@ -74,7 +74,7 @@
  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
  This specifies the session to be executed (not running as root).
 -By default, \fI BINDIR/xterm\fP is
-+By default, \fI /usr/X11/bin/xterm\fP is
++By default, \fI /usr/bin/xterm\fP is
  run.  The conventional name is \fIXsession\fP.
  See the section
  .B "Session Program."
@@ -83,7 +83,7 @@
  arguments, but executes using the same environment variables as
  the session would have had (see the section \fBSession Program\fP).
 -By default, \fI BINDIR/xterm\fP is used.
-+By default, \fI /usr/X11/bin/xterm\fP is used.
++By default, \fI /usr/bin/xterm\fP is used.
  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
  To improve security,
@@ -92,7 +92,7 @@
  .nf
  
 -  :0 Digital-QV local BINDIR/X :0
-+  :0 Digital-QV local /usr/X11/bin/X :0
++  :0 Digital-QV local /usr/bin/X :0
  
  .fi
  The display types are:
@@ -102,8 +102,8 @@
  resource names, so be careful to match the
 -names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
 -``localhost:0 Sun-CG3 local BINDIR/X :0''
-+names (e.g., use ``:0 Sun-CG3 local /usr/X11/bin/X :0'' instead of
-+``localhost:0 Sun-CG3 local /usr/X11/bin/X :0''
++names (e.g., use ``:0 Sun-CG3 local /usr/bin/X :0'' instead of
++``localhost:0 Sun-CG3 local /usr/bin/X :0''
  if your other resources are specified as
  ``DisplayManager._0.session'').  The display class portion is also used in the
  display-specific resources, as the class of the resource.  This is
@@ -112,7 +112,7 @@
  .ta .5i
  
 -	xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
-+	xdm \-server \(lq:0 SUN-3/60CG4 local /usr/X11/bin/X :0\(rq
++	xdm \-server \(lq:0 SUN-3/60CG4 local /usr/bin/X :0\(rq
  
  .fi
  .PP
@@ -121,15 +121,15 @@
  the default chooser
  .TP 20
 -.I BINDIR/xrdb
-+.I /usr/X11/bin/xrdb
++.I /usr/bin/xrdb
  the default resource database loader
  .TP 20
 -.I BINDIR/X
-+.I /usr/X11/bin/X
++.I /usr/bin/X
  the default server
  .TP 20
 -.I BINDIR/xterm
-+.I /usr/X11/bin/xterm
++.I /usr/bin/xterm
  the default session program and failsafe client
  .TP 20
  .I XDMXAUTHDIR/A<display>\-<suffix>

--- a/open-src/app/xdpyinfo/Makefile	Wed Dec 02 21:38:00 2009 -0800
+++ b/open-src/app/xdpyinfo/Makefile	Sat Dec 05 22:13:03 2009 -0800
@@ -3,7 +3,7 @@
 # xdpyinfo Makefile
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -30,20 +30,17 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.4	09/02/06
+# ident	"@(#)Makefile	1.5	09/12/05 SMI"
 #
 
 # Package name used in tarballs
 MODULE_NAME=xdpyinfo
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.1.0
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = composite.patch,-p1
-
-# Need to regenerate configure & Makefile.in after applying composite.patch
-AUTORECONF = yes
+SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=*.man

--- a/open-src/app/xdpyinfo/composite.patch	Wed Dec 02 21:38:00 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-From bb7e3c9ac00d5b3933b69470e03fadfe1800f7ae Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 4 Feb 2009 13:43:34 -0800
-Subject: [PATCH] Print Composite extension version for "-ext Composite"
-
-The only other information I could see to query in the Composite 0.4
-protocol spec is the Composite Overlay Window XID, but the request to
-get that ID has the side effect of mapping the overlay window, and
-xdpyinfo shouldn't have side effects like that.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- Makefile.am  |    2 ++
- configure.ac |    6 ++++++
- xdpyinfo.c   |   24 ++++++++++++++++++++++++
- 3 files changed, 32 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index ee33b76..5f3bb9b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -30,6 +30,7 @@ AM_CFLAGS = \
- 	$(DPY_XF86MISC_CFLAGS) \
- 	$(DPY_XINPUT_CFLAGS) \
- 	$(DPY_XRENDER_CFLAGS) \
-+	$(DPY_XCOMPOSITE_CFLAGS) \
- 	$(DPY_XINERAMA_CFLAGS) \
- 	$(DPY_DMX_CFLAGS) \
- 	$(DPY_XPRINT_CFLAGS) \
-@@ -44,6 +45,7 @@ xdpyinfo_LDADD = \
- 	$(DPY_XF86MISC_LIBS) \
- 	$(DPY_XINPUT_LIBS) \
- 	$(DPY_XRENDER_LIBS) \
-+	$(DPY_XCOMPOSITE_LIBS) \
- 	$(DPY_XINERAMA_LIBS) \
- 	$(DPY_DMX_LIBS) \
- 	$(DPY_XPRINT_LIBS) \
-diff --git a/configure.ac b/configure.ac
-index c787a02..2b8bb5c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,6 +99,12 @@ PKG_CHECK_MODULES(DPY_XRENDER, xrender,
- 	AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>])
- 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
- 
-+PKG_CHECK_MODULES(DPY_XCOMPOSITE, xcomposite,
-+	[SAVE_CPPFLAGS="$CPPFLAGS"
-+	CPPFLAGS="$CPPFLAGS $DPY_XCOMPOSITE_CFLAGS $DPY_X11_CFLAGS"
-+	AC_CHECK_HEADERS([X11/extensions/Xcomposite.h],,,[#include <X11/Xlib.h>])
-+	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+
- AC_ARG_WITH(xinerama, AC_HELP_STRING([--without-xinerama],[Disable xinerama support.]),
- 		[USE_XINERAMA="$withval"], [USE_XINERAMA="yes"])
- if test "x$USE_XINERAMA" != "xno" ; then
-diff --git a/xdpyinfo.c b/xdpyinfo.c
-index 014e2bb..ede6465 100644
---- a/xdpyinfo.c
-+++ b/xdpyinfo.c
-@@ -66,6 +66,10 @@ in this Software without prior written authorization from The Open Group.
- #  define XRENDER
- # endif
- 
-+# if HAVE_X11_EXTENSIONS_XCOMPOSITE_H
-+#  define COMPOSITE
-+# endif
-+
- # if HAVE_X11_EXTENSIONS_XINERAMA_H
- #  define PANORAMIX
- # endif
-@@ -116,6 +120,9 @@ in this Software without prior written authorization from The Open Group.
- #ifdef XRENDER
- #include <X11/extensions/Xrender.h>
- #endif
-+#ifdef COMPOSITE
-+#include <X11/extensions/Xcomposite.h>
-+#endif
- #ifdef PANORAMIX
- #include <X11/extensions/Xinerama.h>
- #endif
-@@ -1166,6 +1173,20 @@ print_xrender_info(Display *dpy, char *extname)
- }
- #endif /* XRENDER */
- 
-+#ifdef COMPOSITE
-+static int
-+print_composite_info(Display *dpy, char *extname)
-+{
-+    int majorrev, minorrev, foo;
-+
-+    if (!XCompositeQueryExtension(dpy, &foo, &foo))
-+	return 0;
-+    if (!XCompositeQueryVersion(dpy, &majorrev, &minorrev))
-+	return 0;
-+    print_standard_extension_info(dpy, extname, majorrev, minorrev);
-+    return 1;
-+}
-+#endif
- 
- #ifdef PANORAMIX
- 
-@@ -1443,6 +1464,9 @@ static ExtensionPrintInfo known_extensions[] =
- #ifdef XRENDER
-     {RENDER_NAME, print_xrender_info, False},
- #endif
-+#ifdef COMPOSITE
-+    {COMPOSITE_NAME, print_composite_info, False},
-+#endif
- #ifdef PANORAMIX
-     {"XINERAMA", print_xinerama_info, False},
- #endif
--- 
-1.5.6.5
-