--- a/open-src/app/xlsclients/Makefile	Sat May 07 18:29:44 2011 -0700
+++ b/open-src/app/xlsclients/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -33,17 +33,17 @@
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
-MODULE_VERSION=1.1.1
+MODULE_VERSION=1.1.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 6d42621616da0c720f640d23873604ce
-TARBALL_SHA1 = 67bfdcb089e8669df7ec5bc7a137e037047f2535
+TARBALL_MD5  = 760099f0af112401735801e3b9aa8595
+TARBALL_SHA1 = c4051429c190444ae9ba327f0ad776a74eb7b27b
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/*.man
 MODULE_STABILITY=Committed
 
 # Compatibility links from /usr/X11/bin to /usr/bin

--- a/open-src/common/Makefile.inc	Sat May 07 18:29:44 2011 -0700
+++ b/open-src/common/Makefile.inc	Mon May 09 10:12:33 2011 -0700
@@ -104,7 +104,7 @@
 
 # Set default download location if not set in module makefile
 SOURCE_URL_DEFAULT		= $(SOURCE_URL_SET:yes=$(POUND_SIGN))
-$(SOURCE_URL_DEFAULT)		SOURCE_URL=$(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
+$(SOURCE_URL_DEFAULT)		SOURCE_URL=$(SOURCE_URL_$(UPSTREAM_PROJECT))
 
 # Set default git repo location if not set in module makefile
 GIT_URL_DEFAULT		= $(GIT_URL_SET:yes=$(POUND_SIGN))
@@ -780,13 +780,21 @@
 
 UPSTREAM_xorg		= X.Org Foundation
 UPSTREAM_URL_xorg	= http://www.x.org/
+SOURCE_URL_xorg		= $(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
+
+UPSTREAM_xcb		= The XCB Project
+UPSTREAM_URL_xcb	= http://xcb.freedesktop.org/
+SOURCE_URL_xcb		= http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
+
+UPSTREAM_PROJECT_DEFAULT	= $(UPSTREAM_PROJECT_SET:yes=$(POUND_SIGN))
+$(UPSTREAM_PROJECT_DEFAULT)	UPSTREAM_PROJECT = xorg
 
 UPSTREAM_DEFAULT	= $(UPSTREAM_SET:yes=$(POUND_SIGN))
 $(UPSTREAM_DEFAULT) UPSTREAM = $(UPSTREAM_$(SOURCE_TARBALL_NAME))
 $(UPSTREAM_DEFAULT) UPSTREAM_SET_YET = $(UPSTREAM_$(SOURCE_TARBALL_NAME)_SET)
 $(UPSTREAM_DEFAULT) UPSTREAM_NOTFOUND = $(UPSTREAM_SET_YET:yes=$(POUND_SIGN))
-$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM = $(UPSTREAM_xorg)
-$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM_URL = $(UPSTREAM_URL_xorg)
+$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM = $(UPSTREAM_$(UPSTREAM_PROJECT))
+$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM_URL = $(UPSTREAM_URL_$(UPSTREAM_PROJECT))
 
 ## Attributes files
 

--- a/open-src/common/delibtoolize.pl	Sat May 07 18:29:44 2011 -0700
+++ b/open-src/common/delibtoolize.pl	Mon May 09 10:12:33 2011 -0700
@@ -27,30 +27,31 @@
 # Undo libtool damage to makefiles to allow us to control the linker
 # settings that libtool tries to force on us.
 #
-# Usage: delibtoolize.pl [-P] <path>
+# Usage: delibtoolize.pl [-P] [-s] [--shared=<so>] <path>
 # -P - Use large pic flags (-KPIC/-fPIC) instead of default/small (-Kpic/-fpic)
 # -s - Only track libraries from a single file at a time, instead of across all
 #	files in a project
+# --shared=libname.so.0 - force libname to be treated as a shared library, 
+#	even if version flags are not found
 
 use strict;
 use warnings;
 use integer;
-use Getopt::Std;
+use Getopt::Long;
 
 use File::Find;
 
-my %opts;
-getopts('Ps', \%opts);
+my $large_pic = '';	# -P
+my $single_file = '';	# -s
+my @shared_args = ();
 
-my $pic_size = "pic";
-if (exists($opts{'P'})) {
-  $pic_size = "PIC";
-}
+die unless GetOptions(
+    "P" => \$large_pic,
+    "s" => \$single_file,
+    "shared=s" => \@shared_args
+);
 
-my $single_file;
-if (exists($opts{'s'})) {
-  $single_file = 1;
-}
+my $pic_size = $large_pic ? "PIC" : "pic";
 
 my %compiler_pic_flags = ( 'cc' => "-K$pic_size -DPIC",
 			   'gcc' => "-f$pic_size -DPIC" );
@@ -61,6 +62,17 @@
 my %ltlib_names = ();
 my @Makefiles;
 
+# initialize %so_versions with command line flags
+foreach my $so ( @shared_args ) {
+    if ($so =~ m{^(.*)\.so\.([\d\.]+)}) {
+	$so_versions{$1} = $2;
+    } elsif ($so =~ m{^(.*)\.so$}) {
+	$so_versions{$1} = 'none';
+    } else {
+	die "Unable to parse --shared object name $so\n";
+    }
+}
+
 sub rulename_to_filename {
   my $rulename = $_[0];
   if (exists($ltlib_names{$rulename})) {

--- a/open-src/lib/Makefile	Sat May 07 18:29:44 2011 -0700
+++ b/open-src/lib/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -1,6 +1,6 @@
 # Makefile for X Consolidation Open Source Library modules
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -38,7 +38,7 @@
 # Xt before Xmu and Xpm and Xtst
 # Xext before any other extension library, including mesa
 # Xfixes before Xcomposite, Xcursor or Xdamage
-# libpthread-stubs before libdrm (and in the future, before xcb)
+# libpthread-stubs before libdrm and xcb
 # libdrm before mesa
 
 # Dependencies needed for parallel make:
@@ -48,11 +48,15 @@
 libdmx: libX11 libXext
 libdrm: libpthread-stubs
 libxcb: libpthread-stubs
-xcbutil: libxcb
+xcb-util: libxcb
+xcb-util-image: libxcb xcb-util
+xcb-util-keysyms: libxcb
+xcb-util-renderutil: libxcb
+xcb-util-wm: libxcb
 libFS: libxtrans
 libICE: libxtrans
 libSM: libxtrans libICE
-libX11: libxtrans libXau libXdmcp libxcb xcbutil
+libX11: libxtrans libXau libXdmcp libxcb
 libXaw: libX11 libXt libXmu libXpm
 libXaw4: libX11 libXt libXmu
 libXaw5: libX11 libXt libXmu
@@ -102,7 +106,11 @@
 	libXau \
 	libXdmcp \
 	libxcb \
-	xcbutil \
+	xcb-util \
+	xcb-util-image \
+	xcb-util-keysyms \
+	xcb-util-renderutil \
+	xcb-util-wm \
 	libX11 \
 	libXext \
 	libfontenc \

--- a/open-src/lib/libxcb/Makefile	Sat May 07 18:29:44 2011 -0700
+++ b/open-src/lib/libxcb/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -38,13 +38,8 @@
 MODULE_ARC_CASES = PSARC/2010/109
 
 # Package metadata
-UPSTREAM = The XCB Project
-UPSTREAM_URL = http://xcb.freedesktop.org/
-UPSTREAM_SET = yes
-
-# Download site for source
-SOURCE_URL = http://xcb.freedesktop.org/dist//$(SOURCE_TARBALL_NAME)
-SOURCE_URL_SET = yes
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-image/COPYING	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,153 @@
+The following software (or certain identified files distributed with the
+software) may be included in this product. Unless otherwise specified,
+the software identified in this file is licensed under the licenses
+described below. The disclaimers and copyright notices provided are
+based on information made available to Oracle by the third party
+licensors listed.
+
+--------------------------------------------------------------------
+image/test_swap.c:
+
+Copyright © 2008 Keith Packard <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+
+--------------------------------------------------------------------
+
+image/test_bitmap.c:
+
+Copyright © 2008 Bart Massey <[email protected]>
+Copyright © 2008 Julien Danjou <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+
+--------------------------------------------------------------------
+
+image/xcb_image.c:
+
+Copyright © 2007 Bart Massey
+
+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
+AUTHORS 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 names of the authors or their
+institutions 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 authors.
+
+--------------------------------------------------------------------
+
+image/test_formats.c, image/test_xcb_image.c:
+
+Copyright © 2008 Bart Massey <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+
+--------------------------------------------------------------------
+
+image/test_xcb_image_shm.c:
+
+Copyright © 2007 Bart Massey <[email protected]>
+
+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
+AUTHORS 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 names of the authors or their
+institutions 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 authors.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-image/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,65 @@
+###############################################################################
+#
+# xcb-util-image Makefile
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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 (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+
+# Package name used in tarballs
+MODULE_NAME=xcb-util-image
+
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/library/xcb-util
+MODULE_PKGNAME_SET=yes
+
+# Version number (used in path names)
+MODULE_VERSION=0.3.8
+
+# Checksums for upstream tarball
+TARBALL_MD5  = 245a96041f373b05764148e52d2e0211
+TARBALL_SHA1 = 9f5e07f93bc73fddd18e6e9d6e530b05a3549e71
+
+# ARC cases that covered this module
+MODULE_ARC_CASES = PSARC/2010/109
+
+# Package metadata
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=xcb-image
+
+# Need to tell delibtoolize.pl the shared object name since upstream makefile
+# relies on libtool defaults 
+DELIBTOOLIZE_FLAGS = --shared libxcb-image.so.0
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+MODULE_STABILITY=Uncommitted
+
+include ../Makefile.inc
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-keysyms/COPYING	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,39 @@
+The following software (or certain identified files distributed with the
+software) may be included in this product. Unless otherwise specified,
+the software identified in this file is licensed under the licenses
+described below. The disclaimers and copyright notices provided are
+based on information made available to Oracle by the third party
+licensors listed.
+
+--------------------------------------------------------------------
+keysyms/keysyms.c:
+
+Copyright © 2008 Ian Osgood <[email protected]>
+Copyright © 2008 Jamey Sharp <[email protected]>
+Copyright © 2008 Josh Triplett <[email protected]>
+Copyright © 2008 Ulrich Eckhardt <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-keysyms/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,58 @@
+###############################################################################
+#
+# xcb-util-keysyms Makefile
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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 (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+# Package name used in tarballs
+MODULE_NAME=xcb-util-keysyms
+
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/library/xcb-util
+MODULE_PKGNAME_SET=yes
+
+# Version number (used in path names)
+MODULE_VERSION=0.3.8
+
+# Checksums for upstream tarball
+TARBALL_MD5  = c75bb20e709093580a67eaf263251b50
+TARBALL_SHA1 = e835f800688f0cc89d7d362a35a28152d3251828
+
+# ARC cases that covered this module
+MODULE_ARC_CASES = PSARC/2010/109
+
+# Package metadata
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=xcb-keysyms
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+MODULE_STABILITY=Uncommitted
+
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-renderutil/COPYING	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,86 @@
+The following software (or certain identified files distributed with the
+software) may be included in this product. Unless otherwise specified,
+the software identified in this file is licensed under the licenses
+described below. The disclaimers and copyright notices provided are
+based on information made available to Oracle by the third party
+licensors listed.
+
+--------------------------------------------------------------------
+renderutil/cache.c, renderutil/xcb_renderutil.h:
+
+Copyright © 2006 Jamey Sharp.
+
+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
+AUTHORS 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 names of the authors or their
+institutions 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 authors.
+
+--------------------------------------------------------------------
+
+renderutil/glyph.c:
+
+Copyright © 2006 Ian Osgood
+
+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
+AUTHORS 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 names of the authors or their
+institutions 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 authors.
+
+--------------------------------------------------------------------
+
+renderutil/util.c:
+
+Copyright © 2000 Keith Packard
+
+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 Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD 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.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-renderutil/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,62 @@
+###############################################################################
+#
+# xcb-util-renderutil Makefile
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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 (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+# Package name used in tarballs
+MODULE_NAME=xcb-util-renderutil
+
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/library/xcb-util
+MODULE_PKGNAME_SET=yes
+
+# Version number (used in path names)
+MODULE_VERSION=0.3.8
+
+# Checksums for upstream tarball
+TARBALL_MD5  = b346ff598ee093c141f836fbc0f8f721
+TARBALL_SHA1 = ce6b6acb015fa47c716adfd83b2f36c874401277
+
+# ARC cases that covered this module
+MODULE_ARC_CASES = PSARC/2010/109
+
+# Package metadata
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=xcb-render-util
+
+# Need to tell delibtoolize.pl the shared object name since upstream makefile
+# relies on libtool defaults 
+DELIBTOOLIZE_FLAGS = --shared libxcb-render-util.so.0
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+MODULE_STABILITY=Uncommitted
+
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-wm/COPYING	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,67 @@
+The following software (or certain identified files distributed with the
+software) may be included in this product. Unless otherwise specified,
+the software identified in this file is licensed under the licenses
+described below. The disclaimers and copyright notices provided are
+based on information made available to Oracle by the third party
+licensors listed.
+
+--------------------------------------------------------------------
+ewmh/ewmh.c:
+
+Copyright © 2009-2011 Arnaud Fontaine <[email protected]>
+
+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 AUTHORS 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  names of the  authors or
+their institutions 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 authors.
+
+--------------------------------------------------------------------
+
+icccm/icccm.c:
+
+Copyright © 2008 Arnaud Fontaine <[email protected]>
+Copyright © 2007-2008 Vincent Torri <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util-wm/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,62 @@
+###############################################################################
+#
+# xcb-util-wm Makefile
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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 (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+# Package name used in tarballs
+MODULE_NAME=xcb-util-wm
+
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/library/xcb-util
+MODULE_PKGNAME_SET=yes
+
+# Version number (used in path names)
+MODULE_VERSION=0.3.8
+
+# Checksums for upstream tarball
+TARBALL_MD5  = dda47289bc846a6a3e07824e9ec3aef8
+TARBALL_SHA1 = e7684921870a62c9e4f53ff8376a468206dc977f
+
+# ARC cases that covered this module
+MODULE_ARC_CASES = PSARC/2010/109
+
+# Package metadata
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=xcbutil
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+MODULE_STABILITY=Uncommitted
+
+# Need to use GNU Make to build, due to the use of $< in explicit rules
+MODULE_MAKE=$(GNUMAKE)
+MODULE_MAKE_SET=yes
+
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util/COPYING	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,69 @@
+The following software (or certain identified files distributed with the
+software) may be included in this product. Unless otherwise specified,
+the software identified in this file is licensed under the licenses
+described below. The disclaimers and copyright notices provided are
+based on information made available to Oracle by the third party
+licensors listed.
+
+--------------------------------------------------------------------
+src/xcb_aux.c:
+
+Copyright © 2008 Bart Massey <[email protected]>
+Copyright © 2008 Ian Osgood <[email protected]>
+Copyright © 2008 Jamey Sharp <[email protected]>
+Copyright © 2008 Josh Triplett <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+
+--------------------------------------------------------------------
+
+src/event.c, src/xcb_event.h:
+
+Copyright © 2008-2009 Julien Danjou <[email protected]>
+
+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 AUTHORS 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 names of the authors or
+their institutions 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 authors.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/xcb-util/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -0,0 +1,58 @@
+###############################################################################
+#
+# xcb-util Makefile
+#
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# 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 (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+# Package name used in tarballs
+MODULE_NAME=xcb-util
+
+# Version number (used in path names)
+MODULE_VERSION=0.3.8
+
+# Checksums for upstream tarball
+TARBALL_MD5  = 8ce019c4bbf20dce246b98f177cfccff
+TARBALL_SHA1 = 71093ad81feb21758a2446cf3297bebaf03af228
+
+# ARC cases that covered this module
+MODULE_ARC_CASES = PSARC/2010/109
+
+# Package metadata
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=xcbutil
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+MODULE_STABILITY=Uncommitted
+
+# Need to use GNU Make to build, due to the use of $< in explicit rules
+MODULE_MAKE=$(GNUMAKE)
+MODULE_MAKE_SET=yes
+
+include ../Makefile.inc

--- a/open-src/lib/xcbutil/Makefile	Sat May 07 18:29:44 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-###############################################################################
-#
-# xcbutil 0.3.6 Makefile
-#
-# Copyright 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# 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, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-# 
-# 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
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-# 
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-
-# Package name used in tarballs
-MODULE_NAME=xcb-util
-
-# Version number (used in path names)
-MODULE_VERSION=0.3.6
-
-# Checksums for upstream tarball
-TARBALL_MD5  = dd8968b8ee613cb027a8ef1fcbdc8fc9
-TARBALL_SHA1 = 8585a421c077382937d181b921263fac2e448d31
-
-# ARC cases that covered this module
-MODULE_ARC_CASES = PSARC/2010/109
-#
-# Package metadata
-UPSTREAM = The XCB Project
-UPSTREAM_URL = http://xcb.freedesktop.org/
-UPSTREAM_SET = yes
-
-# Download site for source
-SOURCE_URL = http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
-SOURCE_URL_SET = yes
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xcb_icccm.h.0.patch
-
-# Library name (used for specfiles/mapfiles)
-LIBNAME=xcbutil
-
-# We need GNU M4 and not SVR4 M4
-GM4 = /usr/gnu/bin/m4
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=
-MODULE_STABILITY=Uncommitted
-
-# Need to use GNU Make to build
-MODULE_MAKE=$(GNUMAKE)
-MODULE_MAKE_SET=yes
-GNUMAKEFLAGS=-j1 --jobs=1
-
-# Environment variables to pass to configure & build steps
-MODULE_ENV = \
-	     M4=$(GM4) \
-	     MAKE=$(GNUMAKE) \
-	     GNUMAKE=$(GNUMAKE)
-
-include ../Makefile.inc
-
-# We need libtool
-DELIBTOOLIZE=no
-
-# But we don't want autoreconf 
-AUTORECONF=no
-
-MODULE_CONFIG_ENV = env \
-		    M4=$(GM4) \
-		    PKG_CONFIG_PATH=$(DEFAULT_PKG_CONFIG_PATH) \
-		    MAKE="$(GNUMAKE) $(GNUMAKEFLAGS)" \
-		    GNUMAKE=$(GNUMAKE)
-
-MODULE_BUILD_ENV = env \
-		   M4=$(GM4) \
-		   PKG_CONFIG_PATH=$(DEFAULT_PKG_CONFIG_PATH) \
-		   MAKE="$(GNUMAKE) $(GNUMAKEFLAGS)" \
-		   GNUMAKE=$(GNUMAKE)
-

--- a/open-src/lib/xcbutil/xcb_icccm.h.0.patch	Sat May 07 18:29:44 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- icccm/xcb_icccm.h	2009-08-24 04:47:36.000000000 -0400
-+++ icccm/xcb_icccm.h	2009-12-07 00:07:19.709961000 -0500
-@@ -521,7 +521,7 @@
-  * @param win_gravity Window gravity value.
-  */
- void xcb_size_hints_set_win_gravity(xcb_size_hints_t *hints,
--                                    uint32_t win_gravity);
-+                                    xcb_gravity_t win_gravity);
- 
- /**
-  * @brief Deliver a ChangeProperty request to set a value to a given property.

--- a/open-src/proto/xcbproto/Makefile	Sat May 07 18:29:44 2011 -0700
+++ b/open-src/proto/xcbproto/Makefile	Mon May 09 10:12:33 2011 -0700
@@ -1,33 +1,27 @@
 ###############################################################################
 #
-# xcbproto 1.6 Makefile
+# xcbproto Makefile
 #
-# Copyright 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # 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, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-# 
-# 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
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-# 
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
+# 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 (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
 #
 
 # Package name used in tarballs
@@ -44,13 +38,8 @@
 MODULE_ARC_CASES = PSARC/2010/109
 
 # Package metadata
-UPSTREAM = The XCB Project
-UPSTREAM_URL = http://xcb.freedesktop.org/
-UPSTREAM_SET = yes
-
-# Download site for source
-SOURCE_URL = http://xcb.freedesktop.org/dist//$(SOURCE_TARBALL_NAME)
-SOURCE_URL_SET = yes
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = configure.0.patch \

--- a/pkg/manifests/developer-opensolaris-X.p5m	Sat May 07 18:29:44 2011 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Mon May 09 10:12:33 2011 -0700
@@ -52,6 +52,7 @@
 # Some packages need GNU make to build
 depend fmri=pkg:/developer/build/gnu-make type=require
 
+# Many packages need to use GNU libtool to rebuild upstream libtool files
 depend fmri=pkg:/developer/build/libtool type=require
 
 # Most of the X gate requires Solaris make to build
@@ -76,16 +77,26 @@
 # For now, this is the package that delivers pkg-config (Defect #15543)
 depend fmri=pkg:/developer/gnome/gettext type=require
 
+# xcb-util needs gperf to generate hash functions
+depend fmri=pkg:/developer/gperf type=require
+
 # tigervnc builds a java applet with javac
 depend fmri=pkg:/developer/java/jdk type=require
 
+# Various modules need flex to generate lexers
 depend fmri=pkg:/developer/lexer/flex type=require
 
 # Various libraries build lint libraries, that depend on system lint libs
 depend fmri=pkg:/developer/library/lint type=require
 
-# Basic build utilities - ld, ar, nm, mcs, etc.
+# Almost all modules need ld to link binaries
 depend fmri=pkg:/developer/linker type=require
+
+# xcb, xcb-util, xcb-util-wm need GNU M4 to build
+# (also required by any module running autoconf/autoreconf)
+depend fmri=pkg:/developer/macro/gnu-m4 type=require
+
+# Basic build utilities - ar, nm, mcs, etc.
 depend fmri=pkg:/developer/object-file type=require
 
 # Xserver build uses flex & bison
@@ -139,6 +150,7 @@
 depend fmri=pkg:/system/library/math type=require
 depend fmri=pkg:/system/library/math/header-math type=require
 
+
 depend fmri=pkg:/text/doctools type=require
 
 # Some packages need GNU gettext to process upstream localization data
@@ -150,10 +162,6 @@
 # Some X.Org packages use groff to transform their old troff docs to HTML
 depend fmri=pkg:/text/groff type=require
 
-# xcb and xcb-utils need gperf and GNU M4 to build
-depend fmri=pkg:/developer/gperf type=require
-depend fmri=pkg:/developer/macro/gnu-m4 type=require
-
 # docbook2txt uses lynx to translate html docs to text during the build
 depend fmri=pkg:/web/browser/lynx type=require
 

--- a/pkg/manifests/x11-library-xcb-util.p5m	Sat May 07 18:29:44 2011 -0700
+++ b/pkg/manifests/x11-library-xcb-util.p5m	Mon May 09 10:12:33 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,98 +31,69 @@
 dir path=usr/include
 dir path=usr/include/xcb
 dir path=usr/lib
-dir path=usr/lib/pkgconfig
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/$(ARCH64)/pkgconfig
+dir path=usr/lib/pkgconfig
 dir path=usr/share
 dir path=usr/share/xcb
 #
-file path=usr/lib/libxcb-atom.so.1.0.0
-file path=usr/lib/libxcb-aux.so.0.0.0
-file path=usr/lib/libxcb-event.so.1.0.0
-file path=usr/lib/libxcb-icccm.so.1.0.0
-file path=usr/lib/libxcb-image.so.0.0.0
-file path=usr/lib/libxcb-keysyms.so.1.0.0
-file path=usr/lib/libxcb-property.so.1.0.0
-file path=usr/lib/libxcb-render-util.so.0.0.0
-file path=usr/lib/libxcb-reply.so.1.0.0
-#
-link path=usr/lib/libxcb-atom.so.1 target=./libxcb-atom.so.1.0.0
-link path=usr/lib/libxcb-atom.so target=./libxcb-atom.so.1.0.0
-link path=usr/lib/libxcb-aux.so.0 target=./libxcb-aux.so.0.0.0
-link path=usr/lib/libxcb-aux.so target=./libxcb-aux.so.0.0.0
-link path=usr/lib/libxcb-event.so.1 target=./libxcb-event.so.1.0.0
-link path=usr/lib/libxcb-event.so target=./libxcb-event.so.1.0.0
-link path=usr/lib/libxcb-icccm.so.1 target=./libxcb-icccm.so.1.0.0
-link path=usr/lib/libxcb-icccm.so target=./libxcb-icccm.so.1.0.0
-link path=usr/lib/libxcb-image.so.0 target=./libxcb-image.so.0.0.0
-link path=usr/lib/libxcb-image.so target=./libxcb-image.so.0.0.0
-link path=usr/lib/libxcb-keysyms.so.1 target=./libxcb-keysyms.so.1.0.0
-link path=usr/lib/libxcb-keysyms.so target=./libxcb-keysyms.so.1.0.0
-link path=usr/lib/libxcb-property.so.1 target=./libxcb-property.so.1.0.0
-link path=usr/lib/libxcb-property.so target=./libxcb-property.so.1.0.0
-link path=usr/lib/libxcb-render-util.so.0 target=./libxcb-render-util.so.0.0.0
-link path=usr/lib/libxcb-render-util.so target=./libxcb-render-util.so.0.0.0
-link path=usr/lib/libxcb-reply.so.1 target=./libxcb-reply.so.1.0.0
-link path=usr/lib/libxcb-reply.so target=./libxcb-reply.so.1.0.0
-#
-file path=usr/lib/$(ARCH64)/libxcb-atom.so.1.0.0
-file path=usr/lib/$(ARCH64)/libxcb-aux.so.0.0.0
-file path=usr/lib/$(ARCH64)/libxcb-event.so.1.0.0
-file path=usr/lib/$(ARCH64)/libxcb-icccm.so.1.0.0
-file path=usr/lib/$(ARCH64)/libxcb-image.so.0.0.0
-file path=usr/lib/$(ARCH64)/libxcb-keysyms.so.1.0.0
-file path=usr/lib/$(ARCH64)/libxcb-property.so.1.0.0
-file path=usr/lib/$(ARCH64)/libxcb-render-util.so.0.0.0
-file path=usr/lib/$(ARCH64)/libxcb-reply.so.1.0.0
-#
-link path=usr/lib/$(ARCH64)/libxcb-atom.so.1 target=./libxcb-atom.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-atom.so target=./libxcb-atom.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-aux.so.0 target=./libxcb-aux.so.0.0.0
-link path=usr/lib/$(ARCH64)/libxcb-aux.so target=./libxcb-aux.so.0.0.0
-link path=usr/lib/$(ARCH64)/libxcb-event.so.1 target=./libxcb-event.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-event.so target=./libxcb-event.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-icccm.so.1 target=./libxcb-icccm.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-icccm.so target=./libxcb-icccm.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-image.so.0 target=./libxcb-image.so.0.0.0
-link path=usr/lib/$(ARCH64)/libxcb-image.so target=./libxcb-image.so.0.0.0
-link path=usr/lib/$(ARCH64)/libxcb-keysyms.so.1 target=./libxcb-keysyms.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-keysyms.so target=./libxcb-keysyms.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-property.so.1 target=./libxcb-property.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-property.so target=./libxcb-property.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-render-util.so.0 target=./libxcb-render-util.so.0.0.0
-link path=usr/lib/$(ARCH64)/libxcb-render-util.so target=./libxcb-render-util.so.0.0.0
-link path=usr/lib/$(ARCH64)/libxcb-reply.so.1 target=./libxcb-reply.so.1.0.0
-link path=usr/lib/$(ARCH64)/libxcb-reply.so target=./libxcb-reply.so.1.0.0
-#
 file path=usr/include/xcb/xcb_atom.h
 file path=usr/include/xcb/xcb_aux.h
 file path=usr/include/xcb/xcb_bitops.h
 file path=usr/include/xcb/xcb_event.h
+file path=usr/include/xcb/xcb_ewmh.h
 file path=usr/include/xcb/xcb_icccm.h
 file path=usr/include/xcb/xcb_image.h
+file path=usr/include/xcb/xcb_keysyms.h
 file path=usr/include/xcb/xcb_pixel.h
-file path=usr/include/xcb/xcb_keysyms.h
-file path=usr/include/xcb/xcb_property.h
 file path=usr/include/xcb/xcb_renderutil.h
-file path=usr/include/xcb/xcb_reply.h
+file path=usr/include/xcb/xcb_util.h
+#
+file path=usr/lib/$(ARCH64)/libxcb-ewmh.so.1
+file path=usr/lib/$(ARCH64)/libxcb-icccm.so.4
+file path=usr/lib/$(ARCH64)/libxcb-image.so.0
+file path=usr/lib/$(ARCH64)/libxcb-keysyms.so.1
+file path=usr/lib/$(ARCH64)/libxcb-render-util.so.0
+file path=usr/lib/$(ARCH64)/libxcb-util.so.0
+#
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-atom.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-aux.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-event.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-ewmh.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-icccm.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-image.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-keysyms.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-renderutil.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-util.pc
+#
+file path=usr/lib/libxcb-ewmh.so.1
+file path=usr/lib/libxcb-icccm.so.4
+file path=usr/lib/libxcb-image.so.0
+file path=usr/lib/libxcb-keysyms.so.1
+file path=usr/lib/libxcb-render-util.so.0
+file path=usr/lib/libxcb-util.so.0
 #
 file path=usr/lib/pkgconfig/xcb-atom.pc
 file path=usr/lib/pkgconfig/xcb-aux.pc
 file path=usr/lib/pkgconfig/xcb-event.pc
+file path=usr/lib/pkgconfig/xcb-ewmh.pc
 file path=usr/lib/pkgconfig/xcb-icccm.pc
 file path=usr/lib/pkgconfig/xcb-image.pc
 file path=usr/lib/pkgconfig/xcb-keysyms.pc
-file path=usr/lib/pkgconfig/xcb-property.pc
 file path=usr/lib/pkgconfig/xcb-renderutil.pc
-file path=usr/lib/pkgconfig/xcb-reply.pc
+file path=usr/lib/pkgconfig/xcb-util.pc
 #
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-atom.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-aux.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-event.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-icccm.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-image.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-keysyms.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-property.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-renderutil.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-reply.pc
+link path=usr/lib/$(ARCH64)/libxcb-ewmh.so target=libxcb-ewmh.so.1
+link path=usr/lib/$(ARCH64)/libxcb-icccm.so target=libxcb-icccm.so.4
+link path=usr/lib/$(ARCH64)/libxcb-image.so target=libxcb-image.so.0
+link path=usr/lib/$(ARCH64)/libxcb-keysyms.so target=libxcb-keysyms.so.1
+link path=usr/lib/$(ARCH64)/libxcb-render-util.so \
+    target=libxcb-render-util.so.0
+link path=usr/lib/$(ARCH64)/libxcb-util.so target=libxcb-util.so.0
+#
+link path=usr/lib/libxcb-ewmh.so target=libxcb-ewmh.so.1
+link path=usr/lib/libxcb-icccm.so target=libxcb-icccm.so.4
+link path=usr/lib/libxcb-image.so target=libxcb-image.so.0
+link path=usr/lib/libxcb-keysyms.so target=libxcb-keysyms.so.1
+link path=usr/lib/libxcb-render-util.so target=libxcb-render-util.so.0
+link path=usr/lib/libxcb-util.so target=libxcb-util.so.0