--- a/.hgignore	Thu Aug 26 16:31:52 2010 -0700
+++ b/.hgignore	Mon Aug 30 15:16:59 2010 -0700
@@ -1,3 +1,26 @@
+#
+# Copyright (c) 2009, 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, 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.
+#
+
 # Use perl/python regular expression syntax
 syntax: regexp
 # Skip build directories
@@ -17,7 +40,8 @@
 ^log/
 ^report/
 # Skip other files built during the build
-open-src/data/smf-rbac/x11-server.xml
+^open-src/common/Makefile.options$
+^open-src/data/smf-rbac/x11-server.xml$
 # Skip emacs/patch backup files
 .*\~$
 # Skip Solaris make state files

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,71 @@
+# Makefile for X Consolidation
+#
+# Copyright (c) 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, 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.
+#
+#
+###############################################################################
+#
+
+PWD:sh=pwd
+TOP=$(PWD)
+
+OS_SUBDIRS_common = open-src pkg
+OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
+OS_SUBDIRS_i386 = $(OS_SUBDIRS_common)
+
+all: setup install check
+
+setup: open-src/common/Makefile.options
+
+# Choose options for branding, download sites, etc.
+# Makefile.options is created as a link to a file containing the desired
+# options, chosen by the first of these found in open-src/common:
+#	1) Makefile.options.$(X_BUILD_OPTIONS)
+#	2) Makefile.options.<last two components of `domainname`, lowercased>
+#	3) Makefile.options.opensolaris
+MK_OPTS = open-src/common/Makefile.options
+
+$(MK_OPTS):
+	@ if [[ -n "${X_BUILD_OPTIONS}" ]] ; then \
+	    X_BUILD_OPTIONS="${X_BUILD_OPTIONS}" ; \
+	    if [[ ! -f "$(MK_OPTS).$${X_BUILD_OPTIONS}" ]] ; then \
+		print -u2 "Invalid X_BUILD_OPTIONS: " \
+			"$(MK_OPTS).$${X_BUILD_OPTIONS} not found" ; \
+		exit 1 ; \
+	    fi \
+	else \
+	    X_BUILD_OPTIONS="$$(domainname | \
+		awk -F. '{if (NF > 1) {printf "%s.%s", $$(NF-1), $$NF}}')" ; \
+	    typeset -l X_BUILD_OPTIONS ; \
+	    if [[ ! -f "$(MK_OPTS).$${X_BUILD_OPTIONS}" ]] ; then \
+		X_BUILD_OPTIONS='opensolaris' ; \
+	    fi \
+	fi ; \
+	print "Choosing build options from $(MK_OPTS).$${X_BUILD_OPTIONS}" ; \
+	rm -f $@ ; \
+	ln -s "Makefile.options.$${X_BUILD_OPTIONS}" $@
+
+# install & check are run in each subdir via Makefile.subdirs 
+
+### Include common definitions
+DIRNAME=""
+include $(TOP)/open-src/common/Makefile.subdirs

--- a/buildit	Thu Aug 26 16:31:52 2010 -0700
+++ b/buildit	Mon Aug 30 15:16:59 2010 -0700
@@ -36,6 +36,13 @@
 PATH=/usr/bin:${PATH}:/usr/sbin
 export PATH
 
+progname="$0"
+function fatal_error
+{
+    print -u2 "${progname}: ERROR: $*"
+    exit 1
+}
+
 MAKE_PKGS=0
 VERBOSE_FLAGS=""	# verbosity flag passed to xmake/make_release_packages
 PUBLISHER_FLAGS=""
@@ -109,6 +116,8 @@
 
 XMAKE="$(pwd)/open-src/util/build-tools/xmake ${VERBOSE_FLAGS} -k"
 
+${XMAKE} setup || fatal_error "make setup failed: cannot build"
+
 cd open-src
 # Run as two steps to avoid race between cleaning & rebuilding when
 # using parallel make

--- a/exception_lists/cddlchk	Thu Aug 26 16:31:52 2010 -0700
+++ b/exception_lists/cddlchk	Mon Aug 30 15:16:59 2010 -0700
@@ -1,1 +1,1 @@
-/
+.*

--- a/make_release_packages	Thu Aug 26 16:31:52 2010 -0700
+++ b/make_release_packages	Mon Aug 30 15:16:59 2010 -0700
@@ -37,6 +37,13 @@
 SHELL=/bin/ksh93
 export PATH
 
+progname="$0"
+function fatal_error
+{
+    print -u2 "${progname}: ERROR: $*"
+    exit 1
+}
+
 # Path to directory in build tree containing build tools
 BUILD_TOOLS="$(pwd)/open-src/util/build-tools/"
 

--- a/open-src/README	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/README	Mon Aug 30 15:16:59 2010 -0700
@@ -207,6 +207,10 @@
    and for publication in opensolaris.arc_url metadata attributes in packages.
    Must be in the format "ARC/year/case", such as "PSARC/2004/187".
 
+MODULE_LICENSE_PREPEND, MODULE_LICENSE_APPEND
+ - Files to be added to the beginning or end of LICENSE_FILE when generating
+   the license notice placed in the package.
+
 FIX_PC_FILES
  - Names of pkgconfig .pc or .pc.in files in the module, which will be
    "fixed" to add required -R flags for linking libraries with and remove
@@ -414,6 +418,12 @@
    upstream modules with different license texts are delivered into the
    same package, they cannot both have the license name "MIT License", which
    is why our default string includes the package name to disambiguate.
+   The value "Oracle" is a special case, indicating that Oracle owns all the
+   IP in a module, and can choose to release under the license terms of its
+   choice, while others building from this source tree will be using under
+   the MIT license terms that Oracle has offered the sources under.
+   The license used in this case depends on the LICENSE_CHOICE setting
+   in open-src/common/Makefile.options.
    Default: MIT License ($(MODULE_NAME))
 
 MODULE_MTLEVEL
@@ -491,12 +501,82 @@
 
 =============================================================================
 
-Variables you may want to customize for your site/tree:
+Setting builder/distro variables:
+---------------------------------
+
+"make setup" in the top-level directory of the X gate (i.e. the parent of
+this open-src disrectory) makes a open-src/common/Makefile.options symlink
+to one of the Makefile.options.* files to set variables for options that
+differ depending on who is building, such as distro branding, licensing,
+and network access.
+
+To force a specific configuration, specify X_BUILD_OPTIONS when running
+"make setup", such as:
+      make setup X_BUILD_OPTIONS=opensolaris
+
+Otherwise it will strip the last two components of the output of domainname,
+lowercase them and look for a matching file - for instance, if building on
+a machine with a domainname of it.SFBay.Sun.COM, make setup will check for
+a file named Makefile.options.sun.com.
+
+If X_BUILD_OPTIONS is not found, and a domainname match is not found, then
+Makefile.options.opensolaris as a final fallback.
+
+Required settings in Makefile.options.*:
+
+DISTRO_NAME
+- String used when a reference to the distro name is needed.  Mostly used
+  in man pages at the moment, such as open-src/xserver/xorg/sun-manpage.patch
+
+VENDOR_NAME
+- Vendor name string reported by the X server in the log & protocol.
+  The vendor name needs to include "X.Org Foundation" for software
+  like cairo that does strstr on VendorName to detect servers built
+  from the X.Org source tree for bug workarounds/compatibility tweaks,
+  or for xdpyinfo to convert the vendor version integer to a human-friendly
+  string.
 
-XORG_RELEASES_URL & SF_DOWNLOADS_URL (set in open-src/common/Makefile.init)
+VENDOR_SUPPORT_URL
+- URL printed by the X server for Xorg -version, in the Xorg.0.log, and
+  in crash messages, for where to get help or check you have the latest
+  version.
+
+Optional, with empty default:
+
+GPL_CHOICE_FILE
+- file containing a notice prepended to package license notices for modules
+  containing GPL licensed sources, for builders who wish to specify choice
+  of licenses in modules that are dual-licensed or "GPLv2 or later".
+
+PKG_BRANDING_TRANSFORMS
+- name of a file in pkg/transforms that is added to the list passed to
+  pkgmogrify when building packages, for setting distribution-specific
+  metadata.
+
+TARBALL_ARCHIVE
+- url for a mirror site containing all the upstream tarballs needed during
+  the build - can be any protocol supported by wget.   If not set, then
+  "make download" will wget directly from the upstream sites on the internet.
+
+Optional, with non-empty default:
+
+* Important, for these, to override the default values, you must not only
+  set the variable, but set another variable <variable>_SET=yes before the
+  Makefile.inc is included to prevent the default from being set.
+
+LICENSE_CHOICE
+- For modules with MODULE_LICENSE="Oracle", this controls which license 
+  terms are published in the package.  This must be set to "Oracle" for
+  builds done for Oracle Solaris.   If not set, it defaults to "open",
+  which is the value that all others must use, unless they have obtained
+  special permission from Oracle to license the sources under something
+  other than the standard MIT license terms used for X11 software.
+  Default: open
+
+XORG_RELEASES_URL & SF_DOWNLOADS_URL
 - urls for X.Org & sourceforge mirrors to download tarballs from
 
-FDO_GIT_URL (set in open-src/common/Makefile.init)
+FDO_GIT_URL & XORG_GIT_URL
 - url for git repositories hosted on freedesktop.org, including
   X.Org, Mesa, pixman, etc.  - defaults to anonymous git over http, can 
   change to use another protocol if needed

--- a/open-src/app/fbconsole/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/fbconsole/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -35,6 +35,10 @@
 MODULE_PKGCLASS=System/Hardware
 MODULE_PKGCLASS_SET=yes
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # ARC cases that covered this module
 MODULE_ARC_CASES = PSARC/1992/130 LSARC/2005/590
 

--- a/open-src/app/fbconsole/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/fbconsole/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 1992, 2005, 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.

--- a/open-src/app/kbd_mode/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/kbd_mode/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -35,6 +35,10 @@
 MODULE_PKGCLASS=System/Hardware
 MODULE_PKGCLASS_SET=yes
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/app/kbd_mode/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/kbd_mode/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 1987, 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, 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.

--- a/open-src/app/synergy/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/synergy/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -43,6 +43,7 @@
 
 MODULE_LICENSE		= GPLv2
 MODULE_LICENSE_SET	= yes
+MODULE_LICENSE_PREPEND	= $(GPL_CHOICE_FILE)
 
 # Version number (used in path names)
 MODULE_VERSION=1.3.1

--- a/open-src/app/winsysck/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/winsysck/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -32,6 +32,10 @@
 MODULE_PKGNAME=x11/session/$(MODULE_NAME)
 MODULE_PKGNAME_SET=yes
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources for these files, since they're Solaris-specific
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/app/winsysck/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/winsysck/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
-Copyright (c) 2008, 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.
+Copyright (c) 1990, 2008, Oracle and/or its affiliates. All rights reserved.

--- a/open-src/app/xhost/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/xhost/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -45,6 +45,7 @@
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY=Committed
+MODULE_SUNTOUCH_MAN_FLAGS=-r '{__distroname__, $(DISTRO_NAME)}'
 
 # ARC cases that covered this module
 # PSARC/2001/108 X11 Over IPv6

--- a/open-src/app/xhost/manual.patch	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/app/xhost/manual.patch	Mon Aug 30 15:16:59 2010 -0700
@@ -15,7 +15,7 @@
  using a network-address based form of authentication, \fIxhost\fP must
  be used to add the new address and/or remove the old address.
 +.SH WARNINGS
-+Solaris is secure by default.  See Xserver(1) which details how to re-enable
++__distroname__ is secure by default.  See Xserver(1) which details how to re-enable
 +remote connections to the X server as in previous releases.
  .SH AUTHORS
  Bob Scheifler, MIT Laboratory for Computer Science,

--- a/open-src/common/Makefile.inc	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/common/Makefile.inc	Mon Aug 30 15:16:59 2010 -0700
@@ -215,10 +215,7 @@
 SOURCE_TARBALL=$(TARBALLDIR)/$(SOURCE_TARBALL_NAME)
 
 # Allow downloading from local archive/mirror
-TARBALL_ARCHIVE_sun.com		= http://xserver.sfbay.sun.com/tarballs
-TARBALL_ARCHIVE_DEFAULT		= $(TARBALL_ARCHIVE_SET:yes=$(POUND_SIGN))
-$(TARBALL_ARCHIVE_DEFAULT)	ARCHIVE_DOMAIN = domainname | awk -F. '{if (NF > 1) {printf "%s.%s", $$(NF-1), $$NF}}'
-$(TARBALL_ARCHIVE_DEFAULT)	TARBALL_ARCHIVE = $(TARBALL_ARCHIVE_$(ARCHIVE_DOMAIN:sh))
+# TARBALL_ARCHIVE is now set in Makefile.options
 ARCHIVE_URL=$(TARBALL_ARCHIVE)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
 
 GIT_CLONE_DIR=$(MODULE_NAME)-$(MODULE_VERSION)
@@ -816,27 +813,58 @@
 LICENSE_FILE_DEFAULT	= $(LICENSE_FILE_SET:yes=$(POUND_SIGN))
 $(LICENSE_FILE_DEFAULT)	LICENSE_FILE=COPYING
 
+# Default is the MIT/X11 license
+MIT_LICENSE_NAME = MIT License ($(MODULE_NAME))
+MIT_LICENSE_FILE = $(PKG_SRC_DIR)/license_files/lic_X11
+
+MODULE_LICENSE_DEFAULT		= $(MODULE_LICENSE_SET:yes=$(POUND_SIGN))
+$(MODULE_LICENSE_DEFAULT)	MODULE_LICENSE = $(MIT_LICENSE_NAME)
+
+# Some packages contain only code that Oracle owns all the rights to.
+# For these, Makefile.options.oracle.com chooses to omit the license
+# notice when Oracle is building its distros.   Everyone else gets the
+# notice required by open source license Oracle released the code under.
+LICENSE_CHOICE_DEFAULT		= $(LICENSE_CHOICE_SET:yes=$(POUND_SIGN))
+$(LICENSE_CHOICE_DEFAULT)	LICENSE_CHOICE=open
+
+ORACLE_LICENSE_NAME_open	= $(MIT_LICENSE_NAME)
+ORACLE_LICENSE_APPEND_open	= $(MIT_LICENSE_FILE)
+
+ORACLE_LICENSE_NAME_Oracle	= Oracle Copyright Notice ($(MODULE_NAME))
+ORACLE_LICENSE_APPEND_Oracle 	= # Nothing to append to copyright notice
+
+ORACLE_LICENSE_NAME 		= $(ORACLE_LICENSE_NAME_$(LICENSE_CHOICE))
+ORACLE_LICENSE_PREPEND	 	= # Nothing to prepend to copyright notice
+ORACLE_LICENSE_APPEND		= $(ORACLE_LICENSE_APPEND_$(LICENSE_CHOICE))
+
+# Use default license info unless MODULE_LICENSE = "Oracle"
+LICENSE_NAME			= $(MODULE_LICENSE)
+LICENSE_PREPEND 		= $(MODULE_LICENSE_PREPEND)
+LICENSE_APPEND 			= $(MODULE_LICENSE_APPEND)
+
+LICENSE_OVERRIDE_1		= $(POUND_SIGN)$(MODULE_LICENSE)
+LICENSE_OVERRIDE		= $(LICENSE_OVERRIDE_1:$(POUND_SIGN)Oracle%=)
+$(LICENSE_OVERRIDE)		LICENSE_NAME = $(ORACLE_LICENSE_NAME)
+$(LICENSE_OVERRIDE)		LICENSE_PREPEND = $(ORACLE_LICENSE_PREPEND)
+$(LICENSE_OVERRIDE)		LICENSE_APPEND = $(ORACLE_LICENSE_APPEND)
+
 LICENSE_FILE_NAME = license_$(MODULE_NAME)
 LICENSE_FILE_DEST = $(MODULE_PKG_METADATA_DIR)/$(LICENSE_FILE_NAME)
 LICENSE_ATTR_FILE = $(MODULE_PKG_METADATA_DIR)/$(LICENSE_FILE_NAME).mf
 
-MODULE_LICENSE_DEFAULT		= $(MODULE_LICENSE_SET:yes=$(POUND_SIGN))
-$(MODULE_LICENSE_DEFAULT)	MODULE_LICENSE = MIT License ($(MODULE_NAME))
-
 install_license: $(LICENSE_FILE_DEST)
 METADATA_TARGETS += $(LICENSE_FILE_DEST)
 
 %/$(LICENSE_FILE_NAME): % $(SOURCE_TARGETS)
 	@ $(START_CMD_ECHO) ; \
 	if [[ -f "$(LICENSE_FILE)" ]] ; then \
-	    LICENSE_TO_COPY="$(LICENSE_FILE)" ; \
+	    license_to_copy="$(LICENSE_FILE)" ; \
 	elif [[ -f "$(SOURCE_DIR)/$(LICENSE_FILE)" ]] ; then \
-	    LICENSE_TO_COPY="$(SOURCE_DIR)/$(LICENSE_FILE)" ; \
+	    license_to_copy="$(SOURCE_DIR)/$(LICENSE_FILE)" ; \
 	fi ; \
-	if [[ "$${LICENSE_TO_COPY}" != "" ]] ; then \
-	    rm -f $@ ; \
-	    cp -pf $${LICENSE_TO_COPY} $@ ; \
-	    print 'license license_$(MODULE_NAME) license="$(MODULE_LICENSE)"' > [email protected] ; \
+	if [[ -n "$${license_to_copy}" ]] ; then \
+	    cat $(LICENSE_PREPEND) "$${license_to_copy}" $(LICENSE_APPEND) > "$@" ; \
+	    print 'license $(LICENSE_FILE_NAME) license="$(LICENSE_NAME)"' > "[email protected]" ; \
 	fi
 
 install_metadata: $(METADATA_TARGETS)

--- a/open-src/common/Makefile.init	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/common/Makefile.init	Mon Aug 30 15:16:59 2010 -0700
@@ -45,6 +45,15 @@
 # The infrastructure in the main tree requires Solaris make
 $(error You must use Solaris make, not GNU make in this build - make sure /usr/ccs/bin or /usr/bin is ahead of /usr/gnu/bin in $$PATH)
 
+### Build options
+
+# Different builders want different settings for various options such
+# as branding or download sites.  The top-level "make setup" command
+# sets the Makefile.options link to point to a included Makefile to
+# set these up.
+
+include "Makefile.options"
+
 ###  Machine architecture macros
 
 # MACH will be either "sparc" or "i386"
@@ -308,17 +317,22 @@
 WGET=/usr/sfw/bin/wget --no-check-certificate
 GIT=git
 
-# If you need to use a closer mirror for X.Org or SourceForge, change these
-XORG_RELEASES_URL=http://xorg.freedesktop.org/releases/individual
-SF_DOWNLOADS_URL=http://easynews.dl.sourceforge.net/sourceforge
+# If you need to use a closer mirror for X.Org or SourceForge, override
+# these in your Makefile.options file
+XRU_DEFAULT	= $(XORG_RELEASES_URL_SET:yes=$(POUND_SIGN))
+$(XRU_DEFAULT)	XORG_RELEASES_URL=http://xorg.freedesktop.org/releases/individual
+SFU_DEFAULT	= $(SF_DOWNLOADS_URL_SET:yes=$(POUND_SIGN))
+$(SFU_DEFAULT)	SF_DOWNLOADS_URL=http://easynews.dl.sourceforge.net/sourceforge
 
 # Git repositories hosted on freedesktop.org (X.Org, Mesa, pixman, etc.)
-FDO_GIT_URL=http://anongit.freedesktop.org/git
-XORG_GIT_URL=$(FDO_GIT_URL)/xorg
+FDO_GIT_DEFAULT		= $(FDO_GIT_URL_SET:yes=$(POUND_SIGN))
+$(FDO_GIT_DEFAULT)	FDO_GIT_URL=http://anongit.freedesktop.org/git
+XORG_GIT_DEFAULT	= $(XORG_GIT_URL_SET:yes=$(POUND_SIGN))
+$(XORG_GIT_DEFAULT)	XORG_GIT_URL=$(FDO_GIT_URL)/xorg
 
 # Target created when sources are unpacked
 UNPACK_FILE = .unpack_done
-UNPACK_TARGET = $(SOURCE_DIR)/$(UNPACK_FILE) 
+UNPACK_TARGET = $(SOURCE_DIR)/$(UNPACK_FILE)
 
 ### Misc rules
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/Makefile.options.opensolaris	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,41 @@
+# X build options for OpenSolaris sources
+#
+# Copyright (c) 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, 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.
+#
+#
+###############################################################################
+#
+
+# These defaults should be sufficient for people building OpenSolaris
+# sources for their own use.   Distro makers will probably want to copy
+# this file or the oracle.com file to customize/brand for their distro.
+
+# Local mirror/archive of tarballs used to build - default: none
+# TARBALL_ARCHIVE = http://...
+# TARBALL_ARCHIVE_SET=yes
+
+# OS/Distro name for use in documentation
+DISTRO_NAME = OpenSolaris
+
+# Xserver configuration options for vendor name & support URL
+VENDOR_NAME = OpenSolaris, based on X.Org Foundation sources
+VENDOR_SUPPORT_URL = http://hub.opensolaris.org/bin/view/Community+Group+x_win/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/Makefile.options.oracle.com	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,58 @@
+# X build options for Oracle Solaris
+#
+# Copyright (c) 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, 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.
+#
+#
+###############################################################################
+#
+
+# Settings for building X with Oracle Solaris branding and access to
+# sites behind the Oracle firewall.   If you're not at Oracle, you 
+# probably want to either use the generic Makefile.options.opensolaris
+# or make a customized options file for your site/distro/build.
+
+# Oracle internal mirror/archive of tarballs used to build
+TARBALL_ARCHIVE = http://xserver.sfbay.sun.com/tarballs
+TARBALL_ARCHIVE_SET=yes
+
+# OS/Distro name for use in documentation
+DISTRO_NAME = Oracle Solaris
+
+# When packages contain only code to which Oracle owns the rights, Oracle 
+# doesn't need to publish the open source license notice, and can just let
+# the distro's top-level license notice apply.
+LICENSE_CHOICE = Oracle
+LICENSE_CHOICE_SET = yes
+
+# When packages contain code covered by GPL/LGPL, Oracle prepends to the GPL
+# a notice specifying the version Oracle is publishing the software under.
+GPL_CHOICE_FILE = $(PKG_SRC_DIR)/license_files/gpl_choice_Oracle
+
+# Xserver configuration options for vendor name & support URL
+# The vendor name needs to include "X.Org Foundation" for software
+# like cairo that does strstr on VendorName to detect servers built
+# from the X.Org source tree for bug workarounds/compatibility tweaks.
+VENDOR_NAME = Oracle Corporation, based on X.Org Foundation sources
+VENDOR_SUPPORT_URL = http://support.oracle.com/
+
+# Additional pkg transforms to set Oracle Solaris branding
+PKG_BRANDING_TRANSFORMS = branding_Oracle

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/Makefile.options.sun.com	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,1 @@
+include "Makefile.options.oracle.com"

--- a/open-src/common/Makefile.subdirs	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/common/Makefile.subdirs	Mon Aug 30 15:16:59 2010 -0700
@@ -24,8 +24,9 @@
 #
 #
 
-# Need to set $MACH
-include $(TOP)/open-src/common/Makefile.init
+# MACH will be either "sparc" or "i386"
+MACH=$(TARGET_ARCH:-%=%)
+START_CMD_ECHO = PS4="" ; set -x
 
 OS_SUBDIRS=$(OS_SUBDIRS_$(MACH))
 

--- a/open-src/common/suntouch-manpages.pl	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/common/suntouch-manpages.pl	Mon Aug 30 15:16:59 2010 -0700
@@ -32,6 +32,7 @@
 #					Attributes section table
 #	-l libname		     - add library line to synopsis
 #	-p path			     - add path to command in synopsis
+#	-r '{text, replacement}'     - replace text with replacement
 
 use Getopt::Long;
 use integer;
@@ -39,18 +40,29 @@
 
 my @attributes;
 my @overrides;
+my @replacements;
 my $library;
 my $synpath;
 
 my $result = GetOptions('a|attribute=s' => \@attributes,
 			'o|override=s'  => \@overrides,
+			'r|replace=s'	=> \@replacements,
 			'l|library=s'	=> \$library,
 			'p|path=s'	=> \$synpath);
 
 my $add_attributes = 0;
+my $attributes_table;
 
 if (scalar(@attributes) + scalar(@overrides) > 0) {
   $add_attributes = 1;
+  $attributes_table = &get_attributes_table(\@attributes, \@overrides);
+}
+
+# Reference to generated function to substitute text replacements
+my $text_subref;
+
+if (scalar(@replacements) > 0) {
+  $text_subref = &get_text_substitutions(\@replacements);
 }
 
 my $add_library_to_synopsis = 0;
@@ -99,6 +111,9 @@
 
   my $nextline;
   while ($nextline = <IN>) {
+    if ($text_subref) {
+      $nextline = &$text_subref($nextline);
+    }
     print OUT $nextline;
 
     if ($nextline =~ m/.SH[\s "]*(SYNOPSIS|SYNTAX)/) {
@@ -117,7 +132,7 @@
   }
 
   if ($add_attributes) {
-    print OUT &get_attributes_table(\@attributes, \@overrides);
+    print OUT $attributes_table;
   }
 
   close(IN);
@@ -191,3 +206,27 @@
   }
   return @attrib_pairs;
 }
+
+sub get_text_substitutions {
+  my ($replacements_ref) = @_;
+
+  my @replacement_pairs = parse_attributes_list($replacements_ref);
+
+  my @subst_pattern_list = ();
+
+  foreach my $r (@replacement_pairs) {
+    my ($text_in, $text_out) = @{$r};
+    push @subst_pattern_list, " s{$text_in}{$text_out}go;";
+  }
+
+  my $subst_function = join("\n",
+			    'sub {',
+			    ' $_ = $_[0]; ',
+			    @subst_pattern_list, 
+			    ' return $_;',
+			    '}');
+
+  print $subst_function;
+
+  return eval $subst_function;
+}

--- a/open-src/data/ogl-select/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/data/ogl-select/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 2004, 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, 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.

--- a/open-src/data/ogl-select/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/data/ogl-select/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -36,6 +36,10 @@
 # LSARC 2005/700 OpenGL boot time selection of libraries and headers
 MODULE_ARC_CASES = LSARC/2005/700
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources for these files, since they're Solaris-specific
 MODULE_VERSION=NONE
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/data/rasterfile/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/data/rasterfile/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 1989, 1994, 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.

--- a/open-src/data/rasterfile/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/data/rasterfile/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -31,6 +31,10 @@
 MODULE_PKGCLASS=Development/X11
 MODULE_PKGCLASS_SET=yes
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources for these files, since they're Solaris-specific
 MODULE_VERSION=NONE
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/data/workspace-patterns/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/data/workspace-patterns/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,23 +1,1 @@
-The image files in this directory are covered by the following copyright
-notice & license:
-
- Copyright (c) 1993, 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.
+Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved.

--- a/open-src/data/workspace-patterns/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/data/workspace-patterns/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -24,6 +24,10 @@
 
 MODULE_NAME=workspace-patterns
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources for these files, since they're Solaris-specific
 MODULE_VERSION=NONE
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/doc/docbook-utils/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/doc/docbook-utils/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -33,6 +33,7 @@
 
 MODULE_LICENSE          = GPLv2
 MODULE_LICENSE_SET      = yes
+MODULE_LICENSE_PREPEND	= $(GPL_CHOICE_FILE)
 
 # Version number (used in path names)
 MODULE_VERSION=0.6.14

--- a/open-src/doc/xorg-docs/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/doc/xorg-docs/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -37,6 +37,12 @@
 SOURCE_PATCHES=	\
 	solaris-manpages.patch
 
+# Man pages to apply distro customizations to
+# Normal attributes table not added, since these aren't simple interfaces
+SUNTOUCHED_MANPAGES=man/general/*.man
+SUNTOUCH_MAN_FLAGS=-r '{__distroname__, $(DISTRO_NAME)}'
+SUNTOUCH_MAN_FLAGS_SET=yes
+
 # Makefiles require gmake -i to build all targets
 MODULE_MAKE=$(GNUMAKE)
 MODULE_MAKE_SET=yes

--- a/open-src/doc/xorg-docs/solaris-manpages.patch	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/doc/xorg-docs/solaris-manpages.patch	Mon Aug 30 15:16:59 2010 -0700
@@ -5,7 +5,7 @@
  an RX MIME-type helper program, \fIxrx\fP;
  and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP.
  .PP
-+Many, but not all, of these programs are included in Solaris and OpenSolaris.
++Many, but not all, of these programs are included in __distroname__.
 +.PP
  Many other utilities, window managers, games, toolkits, etc. are included
  as user-contributed software in the X.Org Foundation distribution, or are
@@ -19,7 +19,7 @@
 -or \fIkdm\fP.  This program
 -is typically started by the system at boot time and takes care of keeping the
 -server running and getting users logged in.  If you are running one of these
-+The default configuration of Solaris and OpenSolaris start X at boot time via
++The default configuration of __distroname__ starts X at boot time via
 +the \fIgdm\fP(1m) display manager.   The \fIxdm\fP(1) display manager is also
 +provided as an option the system administrator can configure.
 +If you are running one of these
@@ -30,7 +30,7 @@
  The hostname part of the display name should be the server machine's
  nodename, followed by two colons instead of one.
  For example:  \fImyws::0\fP, \fIbig::1\fP, and \fIhydra::0.1\fP.
-+Note that DECnet connections are not supported on Solaris or OpenSolaris.
++Note that DECnet connections are not supported on __distroname__.
  .PP
  .SH "ACCESS CONTROL"
  An X server can use several types of access control.  Mechanisms provided
@@ -43,12 +43,12 @@
 -popup menus, point-and-click or click-to-type input models, title bars, nice
 -icons (and an icon manager for those who don't like separate icon windows).
 +a variety of different user interfaces can be built.
-+Solaris and OpenSolaris include several window managers, including the 
++__distroname__ includes several window managers, including the
 +GNOME window manager
 +.IR metacity (1),
 +the compositing effects manager
 +.IR compiz (1),
-+and the X.Org Foundation distributed
++and the X.Org classic window manager
 +.IR twm (1).
  .PP
  See the user-contributed software in the X.Org Foundation distribution for other

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-input-hotkey/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,1 @@
+Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

--- a/open-src/driver/xf86-input-hotkey/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/driver/xf86-input-hotkey/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -27,6 +27,10 @@
 # Package name used in tarballs
 MODULE_NAME=xf86-input-hotkey
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # Version number (used in path names)
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/font/liberation/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/font/liberation/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -35,6 +35,7 @@
 
 MODULE_LICENSE          = Liberation Font Software License Agreement
 MODULE_LICENSE_SET      = yes
+MODULE_LICENSE_PREPEND	= $(GPL_CHOICE_FILE)
 
 # Version number (used in path names)
 MODULE_VERSION=1.04

--- a/open-src/lib/hwc/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/hwc/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -41,6 +41,10 @@
 MODULE_PKGCLASS=System/Hardware
 MODULE_PKGCLASS_SET=yes
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE
 SOURCE_TARBALL_NAME_SET=yes

--- a/open-src/lib/hwc/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/hwc/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright 1999, 2002, 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.

--- a/open-src/lib/libXtsol/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libXtsol/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -32,6 +32,10 @@
 MODULE_PKGCLASS=System/Trusted
 MODULE_PKGCLASS_SET=yes
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/lib/libXtsol/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libXtsol/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 2004, 2007, 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.

--- a/open-src/lib/libdga/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libdga/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -27,6 +27,10 @@
 
 MODULE_NAME=libdga
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/lib/libdga/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libdga/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 1993, 2004, 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.

--- a/open-src/lib/libowconfig/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libowconfig/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -30,6 +30,10 @@
 
 MODULE_NAME=libowconfig
 
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE

--- a/open-src/lib/libowconfig/sun-src/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libowconfig/sun-src/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,20 +1,1 @@
 Copyright (c) 1993, 1996, 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.

--- a/open-src/lib/libpciaccess/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libpciaccess/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -93,9 +93,10 @@
 	 $(PERL) $(TOP)/open-src/common/suntouch-manpages.pl \
 		$(COMMON_SUNTOUCH_MAN_FLAGS) \
 		-p $(MODULE_PREFIX)/bin/ \
+		-r '{__distroname__, $(DISTRO_NAME)}' \
+		-r '{__xorgversion__, "$(MODULE_NAME) $(MODULE_VERSION)"}' \
 		src/scanpci.man && \
-	 sed -e 's/__xorgversion__/"$(MODULE_NAME) $(MODULE_VERSION)"/' \
-		src/scanpci.man > src/scanpci.1 )
+	 cp src/scanpci.man src/scanpci.1 )
 
 # We want to install scanpci, even though the upstream Makefile doesn't
 install_scanpci: default_install $(SCANPCI_MAN_OUT)

--- a/open-src/lib/libpciaccess/scanpci.man.patch	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/libpciaccess/scanpci.man.patch	Mon Aug 30 15:16:59 2010 -0700
@@ -5,7 +5,7 @@
  On most platforms,
  .I scanpci
  can only be run by the root user.
-+On OpenSolaris and Solaris it may also be run using the 
++On __distroname__ it may also be run using the 
 +.I "Desktop Configuration"
 +rights profile.  See \fBrbac\fR(5) and \fBuser_attr\fR(4).
  .SH OPTIONS

--- a/open-src/lib/mesa/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/mesa/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,12 +1,3 @@
-For the avoidance of doubt, except that if any license choice other
-than LGPL is available it will apply instead, Sun elects to use only
-the Lesser General Public License version 2 (LGPLv2) at this time
-for any software where a choice of LGPL license versions is made
-available with the language indicating that LGPLv2 or any later
-version may be used, or where a choice of which version of the LGPL
-is applied is otherwise unspecified.
-
-    ----------------------------------------------------------------------
 
                                   Disclaimer
 

--- a/open-src/lib/mesa/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/lib/mesa/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -33,6 +33,7 @@
 
 MODULE_LICENSE          = Mesa License (Mixed: MIT, LGPLv2, others)
 MODULE_LICENSE_SET      = yes
+MODULE_LICENSE_PREPEND	= $(GPL_CHOICE_FILE)
 
 # ARC cases that covered this module
 # LSARC/2005/109 MESA, Open Source OpenGL clone

--- a/open-src/util/build-tools/xmake	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/util/build-tools/xmake	Mon Aug 30 15:16:59 2010 -0700
@@ -74,18 +74,10 @@
 my $osdepth;
 
 for my $n (1..$#dirtree) {
-  if ($dirtree[$n] eq 'open-src') {
-    if (-f File::Spec->catfile( @dirtree[0..$n], 'common/Makefile.inc')) {
-      $osdepth = $n;
-      last;
-    }
-  }
-  if (($dirtree[$n] eq 'pkg') || ($dirtree[$n] eq 'closed-src')) {
-    if (-f File::Spec->catfile( @dirtree[0..($n-1)],
-				'open-src/common/Makefile.inc')) {
-      $osdepth = $n;
-      last;
-    }
+  if (-f File::Spec->catfile( @dirtree[0..$n],
+			      'open-src/common/Makefile.inc')) {
+    $osdepth = $n + 1;
+    last;
   }
 }
 

--- a/open-src/xserver/Makefile.inc	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/xserver/Makefile.inc	Mon Aug 30 15:16:59 2010 -0700
@@ -59,8 +59,8 @@
 	--enable-glx --enable-dri2 \
 	--disable-xsdl --disable-xwin --disable-xnest \
 	--disable-install-setuid \
-	--with-vendor-name='Sun Microsystems, Inc., based on X.Org Foundation sources' \
-	--with-vendor-web='http://sunsolve.sun.com/' \
+	--with-vendor-name='$(VENDOR_NAME)' \
+	--with-vendor-web='$(VENDOR_SUPPORT_URL)' \
 	--with-builderstring='Solaris ABI: $(BUILD_TYPE)-bit' \
 	--with-os-name="`uname -srm`" \
 	--with-log-dir=/var/log --with-xkb-output=/var/run/xkb \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/COPYING.tsol	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,1 @@
+Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.

--- a/open-src/xserver/xorg/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/xserver/xorg/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -94,6 +94,10 @@
 SUNTOUCH_MAN_FLAGS_Xephyr = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xephyr)}'
 SUNTOUCH_MAN_FLAGS_Xvfb = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xvfb)}'
 
+# Used in sun-manpage.patch to set distro name in Xserver man page
+# DISTRO_NAME is set in open-src/common/Makefile.options.*
+MODULE_BUILD_ENV = DISTRO_NAME="$(DISTRO_NAME)"
+
 # Binary built in tree
 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg
 XSERVERS = Xorg Xephyr Xvfb
@@ -273,6 +277,12 @@
 $(EXTRA_METADATA_DIRS):
 	mkdir -p $@
 
+# Xtsol module is covered only by Oracle copyright/license
+XTSOL_LICENSE = $(XTSOL_PKG_METADATA_DIR)/$(LICENSE_FILE_NAME)
+$(XTSOL_LICENSE):=	LICENSE_NAME	= $(ORACLE_LICENSE_NAME)
+$(XTSOL_LICENSE):=	LICENSE_FILE	= COPYING.tsol
+$(XTSOL_LICENSE):=	LICENSE_APPEND  = $(ORACLE_LICENSE_APPEND)
+
 # Special compatibility link from /usr/X11/bin/i386 to /usr/bin/i86
 install_i386_bincompat_link: $(X11_BINCOMPAT_DIR)/i386
 

--- a/open-src/xserver/xorg/sun-manpage.patch	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/xserver/xorg/sun-manpage.patch	Mon Aug 30 15:16:59 2010 -0700
@@ -7,7 +7,7 @@
    XSERVERNAME = Xorg
  
 -MANDEFS = \
-+MANDEFS = -D__SUNSOFT__ \
++MANDEFS = -D__SUNSOFT__ -D__distroname__="$${DISTRO_NAME}" \
          -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
          -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
  	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
@@ -54,7 +54,7 @@
  frequently a link or a copy of the appropriate server binary for
  driving the most frequently used server on a given machine.
 +#ifdef __SUNSOFT__
-+In this release of Solaris and OpenSolaris, /usr/bin/X is a link to the 
++In this release of __distroname__, /usr/bin/X is a link to the 
 +Xserver program which starts the appropriate X server based on properties
 +set for the service management facility, under the service identifier
 +\fIsvc:/application/x11/x11-server\fP.  The properties are described in the
@@ -62,7 +62,7 @@
 +#endif
  .SH "STARTING THE SERVER"
 +#ifdef __SUNSOFT__
-+On Solaris and OpenSolaris, the X server is usually started from the GNOME
++On __distroname__, the X server is usually started from the GNOME
 +Display Manager program \fIgdm\fP(1m).   This role may also be performed
 +by the X Display Manager program \fIxdm\fP(1), or another display manager. 
 +#else

--- a/open-src/xserver/xvnc/COPYING	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/xserver/xvnc/COPYING	Mon Aug 30 15:16:59 2010 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
 This distribution of VNC software incorporates changes distributed by 
 the Fedora Project under the GNU General Public License version 2.
 

--- a/open-src/xserver/xvnc/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/open-src/xserver/xvnc/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -37,6 +37,7 @@
 
 MODULE_LICENSE          = GPLv2
 MODULE_LICENSE_SET      = yes
+MODULE_LICENSE_PREPEND	= $(GPL_CHOICE_FILE)
 
 # Version number (used in path names)
 MODULE_VERSION=1.0.1

--- a/pkg/Makefile	Thu Aug 26 16:31:52 2010 -0700
+++ b/pkg/Makefile	Mon Aug 30 15:16:59 2010 -0700
@@ -206,7 +206,8 @@
 	ARC_URL='$(ARC_URL)'
 
 # Default transformations to apply
-PM_TRANSFORMS = common_actions publish restart_fmri facets \
+PM_TRANSFORMS = $(PKG_BRANDING_TRANSFORMS) \
+		common_actions publish restart_fmri facets \
 		licenses $(PDIR)/versions extract_metadata
 PM_INC = transforms
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/license_files/gpl_choice_Oracle	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,11 @@
+Oracle elects to use only the GNU Lesser General Public License version 
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software 
+where a choice of LGPL/GPL license versions are made available with the 
+language indicating that LGPLv2.1/GPLv2 or any later version may be 
+used, or where a choice of which version of the LGPL/GPL is applied is 
+unspecified.  Unless specifically stated otherwise, where a choice 
+exists between another license and either the GPL or the LGPL, Oracle 
+chooses the other license.
+
+--------------------------------------------------------------------
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/transforms/branding_Oracle	Mon Aug 30 15:16:59 2010 -0700
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 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, 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.
+#
+
+#
+# This file sets branding for Oracle Solaris releases that differs 
+# from other distros
+#
+
+#
+# Defaults for legacy metadata for SVR4 package information
+#
+<transform legacy -> default vendor "Oracle Corporation">
+
+#
+# Add distro maintainer URL in addition to OpenSolaris community
+#
+<transform set name=info.maintainer_url -> \
+    add value "http://www.oracle.com/solaris/">

--- a/pkg/transforms/common_actions	Thu Aug 26 16:31:52 2010 -0700
+++ b/pkg/transforms/common_actions	Mon Aug 30 15:16:59 2010 -0700
@@ -45,6 +45,8 @@
 	value="http://hub.opensolaris.org/bin/view/Community+Group+x_win/"
 set name=info.repository_url \
 	value="ssh://[email protected]/hg/x-cons/xnv-clone"
+set name=info.defect_tracker.url \
+	value="http://bugs.opensolaris.org/"
 
 #
 # Indicate that the package was published in a zones aware

--- a/pkg/transforms/defaults	Thu Aug 26 16:31:52 2010 -0700
+++ b/pkg/transforms/defaults	Mon Aug 30 15:16:59 2010 -0700
@@ -56,7 +56,7 @@
 #
 # Defaults for legacy metadata for SVR4 package information
 #
-<transform legacy -> default vendor "Oracle Corporation">
+<transform legacy -> default vendor "OpenSolaris">
 <transform legacy -> default hotline \
 	"Please contact your local service provider">
 <transform legacy -> default arch $(ARCH)>