changeset 13010:c0270875939a

6929502 packages are missing some license files 6930656 license action improvements
author Mark J. Nelson <Mark.J.Nelson@Oracle.COM>
date Mon, 02 Aug 2010 16:37:22 -0600
parents 8a64f7a86f03
children be78c44bc4ea
files exception_lists/packaging usr/src/Makefile usr/src/README.license-files usr/src/cmd/acpihpd/Makefile usr/src/cmd/acpihpd/THIRDPARTYLICENSE.descrip usr/src/cmd/cmd-inet/usr.bin/pppdump/LICENSE.top.descrip usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE.descrip usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd.descrip usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.descrip usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd.descrip usr/src/cmd/dtrace/demo/Makefile usr/src/cmd/hwdata/Makefile usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.descrip usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.tmpl usr/src/cmd/powertop/common/COPYING usr/src/cmd/powertop/common/COPYING.descrip usr/src/common/bzip2/LICENSE.descrip usr/src/grub/grub-0.97/AUTHORS.descrip usr/src/lib/librstp/Makefile usr/src/lib/librstp/THIRDPARTYLICENSE.descrip usr/src/lib/librstp/common/COPYING.descrip usr/src/lib/sasl_plugins/gssapi/Makefile usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE.descrip usr/src/pkg/Makefile usr/src/pkg/Makefile.lic usr/src/pkg/license_files/cr_Intel.SUNWfipe usr/src/pkg/license_files/cr_Intel.SUNWintgige usr/src/pkg/license_files/cr_Intel.hotplug usr/src/pkg/license_files/grubcredits usr/src/pkg/license_files/lic_AMD usr/src/pkg/license_files/lic_Emulex usr/src/pkg/license_files/lic_GPLv2 usr/src/pkg/license_files/lic_HP usr/src/pkg/license_files/lic_Qlogic usr/src/pkg/license_files/lic_SUNWhwdata usr/src/pkg/license_files/lic_SUNWroute usr/src/pkg/license_files/lic_gss usr/src/pkg/license_files/lic_iprb usr/src/pkg/manifests/SUNWcs.mf usr/src/pkg/manifests/compatibility-ucb.mf usr/src/pkg/manifests/developer-astdev.mf usr/src/pkg/manifests/developer-build-onbld.mf usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf usr/src/pkg/manifests/developer-debug-mdb.mf usr/src/pkg/manifests/developer-dtrace.mf usr/src/pkg/manifests/developer-object-file.mf usr/src/pkg/manifests/diagnostic-cpu-counters.mf usr/src/pkg/manifests/diagnostic-powertop.mf usr/src/pkg/manifests/driver-audio-audiosolo.mf usr/src/pkg/manifests/driver-graphics-agpgart.mf usr/src/pkg/manifests/driver-graphics-drm.mf usr/src/pkg/manifests/driver-i86pc-fipe.mf usr/src/pkg/manifests/driver-network-afe.mf usr/src/pkg/manifests/driver-network-amd8111s.mf usr/src/pkg/manifests/driver-network-arn.mf usr/src/pkg/manifests/driver-network-ath.mf usr/src/pkg/manifests/driver-network-atu.mf usr/src/pkg/manifests/driver-network-bge.mf usr/src/pkg/manifests/driver-network-bpf.mf usr/src/pkg/manifests/driver-network-chxge.mf usr/src/pkg/manifests/driver-network-e1000g.mf usr/src/pkg/manifests/driver-network-elxl.mf usr/src/pkg/manifests/driver-network-emlxs.mf usr/src/pkg/manifests/driver-network-ipw.mf usr/src/pkg/manifests/driver-network-iwh.mf usr/src/pkg/manifests/driver-network-iwi.mf usr/src/pkg/manifests/driver-network-iwk.mf usr/src/pkg/manifests/driver-network-iwp.mf usr/src/pkg/manifests/driver-network-ixgb.mf usr/src/pkg/manifests/driver-network-ixgbe.mf usr/src/pkg/manifests/driver-network-mwl.mf usr/src/pkg/manifests/driver-network-mxfe.mf usr/src/pkg/manifests/driver-network-myri10ge.mf usr/src/pkg/manifests/driver-network-ntxn.mf usr/src/pkg/manifests/driver-network-ofk.mf usr/src/pkg/manifests/driver-network-pcan.mf usr/src/pkg/manifests/driver-network-pcwl.mf usr/src/pkg/manifests/driver-network-platform.mf usr/src/pkg/manifests/driver-network-qlc.mf usr/src/pkg/manifests/driver-network-ral.mf usr/src/pkg/manifests/driver-network-rds.mf usr/src/pkg/manifests/driver-network-rdsv3.mf usr/src/pkg/manifests/driver-network-rtw.mf usr/src/pkg/manifests/driver-network-rum.mf usr/src/pkg/manifests/driver-network-rwd.mf usr/src/pkg/manifests/driver-network-rwn.mf usr/src/pkg/manifests/driver-network-sfe.mf usr/src/pkg/manifests/driver-network-uath.mf usr/src/pkg/manifests/driver-network-ural.mf usr/src/pkg/manifests/driver-network-urtw.mf usr/src/pkg/manifests/driver-network-wpi.mf usr/src/pkg/manifests/driver-network-yge.mf usr/src/pkg/manifests/driver-network-zyd.mf usr/src/pkg/manifests/driver-storage-aac.mf usr/src/pkg/manifests/driver-storage-amr.mf usr/src/pkg/manifests/driver-storage-cpqary3.mf usr/src/pkg/manifests/driver-storage-mega_sas.mf usr/src/pkg/manifests/driver-storage-mr_sas.mf usr/src/pkg/manifests/driver-storage-pmcs.mf usr/src/pkg/manifests/driver-usb.mf usr/src/pkg/manifests/library-libtecla.mf usr/src/pkg/manifests/library-print-open-printing-ipp.mf usr/src/pkg/manifests/library-security-tcp-wrapper.mf usr/src/pkg/manifests/naming-ldap.mf usr/src/pkg/manifests/network-bridging.mf usr/src/pkg/manifests/network-ftp.mf usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf usr/src/pkg/manifests/network-ipfilter.mf usr/src/pkg/manifests/network-netcat.mf usr/src/pkg/manifests/network-ssh-ssh-key.mf usr/src/pkg/manifests/network-ssh.mf usr/src/pkg/manifests/network-telnet.mf usr/src/pkg/manifests/package-svr4.mf usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf usr/src/pkg/manifests/runtime-perl-584-extra.mf usr/src/pkg/manifests/runtime-perl-584.mf usr/src/pkg/manifests/service-hal.mf usr/src/pkg/manifests/service-network-dhcp.mf usr/src/pkg/manifests/service-network-dns-mdns.mf usr/src/pkg/manifests/service-network-ftp.mf usr/src/pkg/manifests/service-network-network-clients.mf usr/src/pkg/manifests/service-network-network-servers.mf usr/src/pkg/manifests/service-network-smtp-sendmail.mf usr/src/pkg/manifests/service-network-ssh.mf usr/src/pkg/manifests/service-network-uucp.mf usr/src/pkg/manifests/service-network-wpa.mf usr/src/pkg/manifests/service-security-kerberos-5.mf usr/src/pkg/manifests/service-storage-ndmp.mf usr/src/pkg/manifests/source-demo-system.mf usr/src/pkg/manifests/source-network-pppdump.mf usr/src/pkg/manifests/source-security-tcp-wrapper.mf usr/src/pkg/manifests/source-system-grub.mf usr/src/pkg/manifests/system-boot-grub.mf usr/src/pkg/manifests/system-boot-wanboot.mf usr/src/pkg/manifests/system-compatibility-sunos4.mf usr/src/pkg/manifests/system-data-hardware-registry.mf usr/src/pkg/manifests/system-data-terminfo.mf usr/src/pkg/manifests/system-extended-system-utilities.mf usr/src/pkg/manifests/system-file-system-ntfsprogs.mf usr/src/pkg/manifests/system-file-system-smb.mf usr/src/pkg/manifests/system-file-system-udfs.mf usr/src/pkg/manifests/system-header-header-agp.mf usr/src/pkg/manifests/system-header.mf usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf usr/src/pkg/manifests/system-kernel-platform.mf usr/src/pkg/manifests/system-kernel-security-gss.mf usr/src/pkg/manifests/system-kernel.mf usr/src/pkg/manifests/system-library-policykit.mf usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf usr/src/pkg/manifests/system-library-security-gss.mf usr/src/pkg/manifests/system-library-security-libsasl.mf usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf usr/src/pkg/manifests/system-library-storage-ima.mf usr/src/pkg/manifests/system-library-storage-libmpapi.mf usr/src/pkg/manifests/system-library.mf usr/src/pkg/manifests/system-management-intel-amt.mf usr/src/pkg/manifests/system-management-snmp-sea.mf usr/src/pkg/manifests/system-network-ppp-pppdump.mf usr/src/pkg/manifests/system-network-ppp.mf usr/src/pkg/manifests/system-network-routing.mf usr/src/pkg/manifests/system-security-kerberos-5.mf usr/src/pkg/manifests/system-storage-parted.mf usr/src/pkg/manifests/system-storage-sasinfo.mf usr/src/pkg/manifests/text-doctools.mf usr/src/pkg/transforms/extract_metadata usr/src/tools/findunref/exception_list.common usr/src/tools/findunref/exception_list.open usr/src/tools/onbld/Makefile usr/src/tools/onbld/THIRDPARTYLICENSE usr/src/tools/onbld/THIRDPARTYLICENSE.descrip usr/src/tools/opensolaris/license-list usr/src/tools/req.flg usr/src/tools/scripts/nightly.sh usr/src/uts/common/io/bpf/BPF.LICENCE.descrip usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE.descrip usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE.descrip usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE.descrip usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE.descrip usr/src/uts/common/io/ib/clients/of/lic_of usr/src/uts/common/io/ib/clients/of/lic_of.descrip usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE.descrip
diffstat 193 files changed, 1916 insertions(+), 2435 deletions(-) [+]
line wrap: on
line diff
--- a/exception_lists/packaging	Mon Aug 02 16:35:58 2010 -0600
+++ b/exception_lists/packaging	Mon Aug 02 16:37:22 2010 -0600
@@ -934,3 +934,10 @@
 # Private socket filter API
 #
 usr/include/sys/sockfilter.h
+#
+# We don't actually validate license action payloads, and the license
+# staging area is provided as a separate basedir for package
+# publication.  The net result is that everything therein should be
+# ignored for packaging validation.
+#
+licenses
--- a/usr/src/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -92,10 +92,25 @@
 
 all: mapfiles closedbins sgs .WAIT $(SUBDIRS) pkg
 
-install: install1 install2 _msg
+#
+# The _msg build is a two-step process.  First, the _msg dependency
+# causes recursive makes in $(MSGSUBDIRS), which stages raw message
+# files in $(ROOT)/catalog.  Second, the action from the install
+# target rule causes those messages to be post-processed from where
+# they were staged in $(ROOT)/catalog, and the results placed into the
+# proto area.
+#
+# The stage-licenses target causes the license files needed for
+# packaging to be pulled from $(SRC) and $(CLOSED) and staged in
+# $(ROOT)/licenses.
+#
+install: install1 install2 _msg stage-licenses
 	@cd msg; pwd; $(MAKE) _msg
 	@rm -rf "$(ROOT)/catalog"
 
+stage-licenses: install2
+	@cd pkg; pwd; $(MAKE) stage-licenses
+
 install1: mapfiles closedbins sgs
 
 install2: install1 $(SUBDIRS)
--- a/usr/src/README.license-files	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/README.license-files	Mon Aug 02 16:37:22 2010 -0600
@@ -18,21 +18,25 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 OK, so you've got approval to integrate code, and you want to know how to
 properly communicate the license terms.  What do you do next?
 
-0. Determine whether your code should be covered by Sun copyright,
-   CDDL, and/or a third party license.  If only Sun copyright and/or
-   CDDL, then skip to step 4.
+0. Determine whether your code should be covered by Oracle copyright,
+   CDDL, and/or a third party license.  If only Oracle copyright and/or
+   CDDL, then skip to step 3.
 
 1. Scan the source code and extract all of the third party licenses
    into one or more separate files.
 
+   This information may be present in comments in source code, or may
+   already be provided as separate files.  For example, GPL license
+   terms are often found in files named "COPYING."
+
    A. In general, you'll name these files "THIRDPARTYLICENSE," and
       you'll put one in each source directory (i.e. one per library,
       or one per command, or one per kernel module.)
@@ -52,21 +56,21 @@
 
       EXAMPLE: usr/src/cmd/perl/Makefile
 
-      This approach is usually overkill.  But if the third party license
-      will remain unchanged while the corresponding copyright will change
-      dates frequently, then this approach can work well, because you won't
-      need to update the license files manually.                                        
+      If the corresponding copyright will change dates frequently,
+      then this approach can work well, because you won't need to
+      update the license files manually.                                        
+
+      If you do this, then your license file should be a dependency of
+      both the all and install targets, and should be removed via
+      clobber, usually by way of CLOBBERFILES.
 
 2. Give each of the license files a corresponding ".descrip" file with
-   an extremely terse explanation of the contents.  Something like
-   "MJN DRIVER" or "PORTIONS OF ARCANE FUNCTIONALITY" is sufficient.
+   a terse explanation of the contents.  Something like "MJN DRIVER"
+   or "PORTIONS OF ARCANE FUNCTIONALITY" is sufficient.
 
    EXAMPLE: usr/src/cmd/refer/THIRDPARTYLICENSE.descrip
 
-3. Edit usr/src/tools/opensolaris/license-list and add the full path
-   of your new license file(s).
-
-4. Figure out which packages deliver objects that are built using the
+3. Figure out which packages deliver objects that are built using the
    new source, and add license actions to the package manifest(s).
 
    A. It's extremely rare for a package NOT to include a Sun copyright
@@ -81,11 +85,13 @@
       copyrights or licenses, you can use
 
           license license_in_headers license=license_in_headers
-	  license path/to/most/common/copyright/file license=path/to/most/common/copyright/file
-	  license path/to/most/common/license/file license=path/to/most/common/license/file
+	  license path/to/most/common/copyright/file \
+	      license=path/to/most/common/copyright/file
+	  license path/to/most/common/license/file \
+	      license=path/to/most/common/license/file
 
    C. For your new license files, the path you use in your license
-      actions should be relative to ${SRC}.
+      actions should be relative to ${CODEMGR_WS}.
 
    D. Empty packages: if your package delivers nothing (or, more strictly
       speaking, nothing besides directories) you should include the Sun
@@ -94,3 +100,7 @@
    E. As with any other action that is architecture dependent, license
       actions may be preceded by $(blah_ONLY), where "blah" corresponds
       to $(uname -p).
+
+   If you don't add the appropriate license actions to package
+   manifests, then your license and description files will show up as
+   unreferenced in the build.
--- a/usr/src/cmd/acpihpd/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/cmd/acpihpd/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -18,13 +18,17 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
 #
 # Copyright (c) 2010, Intel Corporation.
 # All rights reserved.
 #
+
+#
 # cmd/acpihpd/Makefile
 #
 
@@ -46,10 +50,17 @@
 
 .KEEP_STATE:
 
+CLOBBERFILES += THIRDPARTYLICENSE
+
 all:	$(SUBDIRS)
 
 install:	$(SUBDIRS) $(ROOTMANIFEST) $(ROOTSVCMETHOD)
 
+all install: THIRDPARTYLICENSE
+
+THIRDPARTYLICENSE: acpihpd.c
+	$(SED) -e '/sys\/param.h/,$$ d' acpihpd.c > $@
+
 clean clobber lint:	$(SUBDIRS)
 
 check:	$(CHKMANIFEST)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/acpihpd/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+INTEL ACPI HOTPLUG DAEMON
--- a/usr/src/cmd/cmd-inet/usr.bin/pppdump/LICENSE.top.descrip	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-PPPDUMP UTILITY
--- a/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -1,8 +1,5 @@
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # cmd/cmd-inet/usr.bin/pppdump/Makefile
 #
@@ -21,6 +18,14 @@
 
 all: $(PROG)
 
+CLOBBERFILES += THIRDPARTYLICENSE
+
+all install: THIRDPARTYLICENSE
+
+THIRDPARTYLICENSE: LICENSE.top COPYING.top
+	$(RM) $@
+	$(CAT) LICENSE.top COPYING.top > $@
+
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+PPPDUMP UTILITY
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-Copyright (c) 1982,1983,1986,1988,1989,1993,1995 
-  Regents of the University of California.  
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above
-       copyright notice, this list of conditions and the following
-       disclaimer in the documentation and/or other materials provided
-       with the distribution.
-    3. All advertising materials mentioning features or use of this
-       software must display the following acknowledgement:
-           This product includes software developed by the University
-           of California, Berkeley and its contributors.
-    4. Neither the name of the University nor the names of its
-       contributors may be used to endorse or promote products derived
-       from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,33 @@
+Copyright (c) 1982,1983,1986,1988,1989,1993,1995 
+  Regents of the University of California.  
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+    3. All advertising materials mentioning features or use of this
+       software must display the following acknowledgement:
+           This product includes software developed by the University
+           of California, Berkeley and its contributors.
+    4. Neither the name of the University nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+PORTIONS OF ROUTED COMMAND FUNCTIONALITY
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-PORTIONS OF ROUTED COMMAND FUNCTIONALITY
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,30 @@
+Copyright 1994-2001 FreeBSD, Inc.  All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided with
+      the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation
+are those of the authors and should not be interpreted as representing
+official policies, either expressed or implied, of the FreeBSD Project
+or FreeBSD, Inc.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+PORTIONS OF ROUTED COMMAND FUNCTIONALITY
--- a/usr/src/cmd/dtrace/demo/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/cmd/dtrace/demo/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -24,6 +24,9 @@
 
 include ../../Makefile.cmd
 
+i386_DFILES = \
+	iprb.d
+
 DFILES = \
 	applicat.d \
 	badopen.d \
@@ -53,7 +56,6 @@
 	ipio.d \
 	ipproto.d \
 	tcprst.d \
-	iprb.d \
 	kstat.d \
 	ksyms.d \
 	libc.d \
@@ -121,7 +123,8 @@
 	writetimeq.d \
 	xioctl.d \
 	xterm.d \
-	xwork.d
+	xwork.d \
+	$($(MACH)_DFILES)
 
 HTMLFILES = index.html
 
--- a/usr/src/cmd/hwdata/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/cmd/hwdata/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -18,9 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.cmd
@@ -31,7 +31,14 @@
 
 $(ROOTHWDATA) :=	FILEMODE = 444
 
-all:
+CLOBBERFILES += THIRDPARTYLICENSE.pciids
+
+all install: THIRDPARTYLICENSE.pciids
+
+THIRDPARTYLICENSE.pciids: pci.ids THIRDPARTYLICENSE.pciids.tmpl
+	$(RM) $@
+	$(SED) -e '/^$$/,$$ d' < pci.ids > $@
+	$(CAT) THIRDPARTYLICENSE.pciids.tmpl >> $@
 
 install: $(ROOTHWDATA)
 
@@ -42,3 +49,4 @@
 
 FRC:
 
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+PCIIDS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.tmpl	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,30 @@
+
+Sun chooses to license this file under the 3-clause BSD license, reproduced
+below.  For the purposes of this license, "copyright holder" should be
+considered to be Martin Mares and other volunteers from the Linux PCI ID's 
+Project, and "year" should be as copyrighted above.
+
+* Copyright (c) <year>, <copyright holder>
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the <organization> nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/powertop/common/COPYING	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/powertop/common/COPYING.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+POWERTOP
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/bzip2/LICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+BZIP2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/grub/grub-0.97/AUTHORS.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+GRUB SOFTWARE
--- a/usr/src/lib/librstp/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/lib/librstp/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -18,9 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -39,14 +39,6 @@
 
 all clean clobber install lint: $(SUBDIRS)
 
-install: THIRDPARTYLICENSE
-
-THIRDPARTYLICENSE: common/COPYING
-	$(RM) $@
-	$(CP) $? $@
-
-CLOBBERFILES +=	THIRDPARTYLICENSE
-
 install_h:	$(ROOTHDRS)
 
 check:
@@ -56,5 +48,4 @@
 
 FRC:
 
-include $(SRC)/Makefile.msg.targ
 include $(SRC)/lib/Makefile.targ
--- a/usr/src/lib/librstp/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-SPANNING TREE SOFTWARE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/librstp/common/COPYING.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+SPANNING TREE SOFTWARE
--- a/usr/src/lib/sasl_plugins/gssapi/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/lib/sasl_plugins/gssapi/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -1,7 +1,14 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 include		../Makefile.subdirs
+
+all install: THIRDPARTYLICENSE
+
+THIRDPARTYLICENSE: gssapi.c
+	$(SED) -e '/GSSAPI SASL plugin/,/^$$/ p' -e 'd' gssapi.c > $@
+
+CLOBBERFILES += THIRDPARTYLICENSE
+
+include $(SRC)/lib/Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+GSSAPI SASL PLUGIN
--- a/usr/src/pkg/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -66,20 +66,15 @@
 #      is unable to find the required binaries.
 #   2. You need the desired tools proto area, which you can get in the
 #      same ways as the normal proto area.  If you don't do this, you
-#      will get packaging failures building SUNWonbld, because pkgsend is
+#      will get packaging failures building onbld, because pkgsend is
 #      unable to find the tools binaries.
-#   3. You need to have built the appropriate third party license
-#      files in $SRC, which generally means you should override SRC in
-#      your build environment.  If you don't do this, you will get
-#      packaging failures because pkgsend is unable to find various
-#      THIRDPARTYLICENSE files.
-#   4. The remainder of this Makefile should never refer directly to
+#   3. The remainder of this Makefile should never refer directly to
 #      $(MACH).  Instead, $(PKGMACH) should be used whenever an
 #      architecture-specific path or token is needed.  If this is done
 #      incorrectly, then packaging will fail, and you will see the
 #      value of $(uname -p) instead of the value of $(PKGMACH) in the
 #      commands that fail.
-#   5. Each time a rule in this Makefile invokes $(MAKE), it should
+#   4. Each time a rule in this Makefile invokes $(MAKE), it should
 #      pass PKGMACH=$(PKGMACH) explicitly on the command line.  If
 #      this is done incorrectly, then packaging will fail, and you
 #      will see the value of $(uname -p) instead of the value of
@@ -212,7 +207,6 @@
 	PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 	PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
 	PKGVERS=$(PKGVERS) \
-	SRC=$(SRC) \
 	CLOSED_BUILD=$(CLOSED_BUILD) \
 	OPEN_BUILD=$(OPEN_ONLY_BUILD) \
 	USE_INTERNAL_CRYPTO=$(USE_INTERNAL_CRYPTO) \
@@ -379,6 +373,7 @@
 #					|
 #				processed manifests
 # 
+
 ALL_TARGETS= $(PROC_SYNTH_PKGS) proto_list_$(PKGMACH)
 
 all: $(ALL_TARGETS)
@@ -443,7 +438,12 @@
 #
 publish_pkgs: $(REPOS:%=$(PKGDEST)/repo.%) $(PDIR)/gendeps .WAIT $(PUB_PKGS)
 
-$(PUB_PKGS): FRC
+#
+# Before publishing, we want to pull the license files from $CODEMGR_WS
+# into the proto area.  This allows us to NOT pass $SRC (or
+# $CODEMGR_WS) as a basedir for publication.
+#
+$(PUB_PKGS): stage-licenses
 
 #
 # Initialize the empty on-disk repositories
@@ -521,7 +521,7 @@
 	@print "Processing manifest $(<F)"
 	@pkgfmt -c $<
 	$(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \
-		$(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars
+		$(@:%.mog=%.lics) $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars
 	$(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \
 		$(PKGMOG_DEFINES:%=-D %) -P $(@).vars -O $(@) \
 		$(<) $(PM_TRANSFORMS)
@@ -537,8 +537,9 @@
 		     \( "$$PKGSTAT" = "renamed" \) ]; \
 			then print $(PKGDEP_INCORP) >> $(@); \
 		fi; \
+		print $$LICS > $(@:%.mog=%.lics); \
 	else \
-		$(TOUCH) $(@); \
+		$(TOUCH) $(@) $(@:%.mog=%.lics); \
 	fi
 	$(PKGDEBUG)$(RM) $(@).vars
 
@@ -564,8 +565,9 @@
 	if [ -s $(<) ]; then \
 		print "Publishing $(@F:%.pub=%) to $$r repository"; \
 		pkgsend -s file://$(PKGDEST)/repo.$$r publish \
-		    -d $(PKGROOT) -d $(TOOLSROOT) -d $(SRC)/pkg/license_files \
-		    -d $(SRC) --fmri-in-manifest --no-index --no-catalog $(<) \
+		    -d $(PKGROOT) -d $(TOOLSROOT) \
+		    -d license_files -d $(PKGROOT)/licenses \
+		    --fmri-in-manifest --no-index --no-catalog $(<) \
 		    > /dev/null; \
 	fi; \
 	$(TOUCH) $(@);
@@ -671,6 +673,30 @@
 	@$(MAKE) -e $(PROC_PKGS) PKGMACH=$(PKGMACH) \
 		SUPPRESSPKGDEP=$(SUPPRESSPKGDEP) > /dev/null
 
+#
+# The .lics files were created during pkgmogrification, and list the
+# set of licenses to pull from $SRC for each package.  Because
+# licenses may be duplicated between packages, we uniquify them as
+# well as aggregating them here.
+#
+license-list: makesilent
+	$(PKGDEBUG)( for l in `cat $(PROC_PKGS:%.mog=%.lics)`; \
+		do print $$l; done ) | sort -u > $@
+
+#
+# Staging the license and description files in the proto area allows
+# us to do proper unreferenced file checking of both license and
+# description files without blanket exceptions, and to pull license
+# content without reference to $CODEMGR_WS during publication.
+#
+stage-licenses: license-list FRC
+	$(PKGDEBUG)$(MAKE) -e -f Makefile.lic \
+		PKGDEBUG=$(PKGDEBUG) LICROOT=$(PKGROOT)/licenses \
+		`$(NAWK) '{ \
+			print "$(PKGROOT)/licenses/" $$0; \
+			print "$(PKGROOT)/licenses/" $$0 ".descrip"; \
+		}' license-list` > /dev/null;
+
 protocmp: makesilent
 	@validate_pkg -a $(PKGMACH) -v \
 		$(EXCEPTIONS:%=-e $(CODEMGR_WS)/exception_lists/%) \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/Makefile.lic	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,63 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# PKGDEBUG and LICROOT should be defined on the command line or in
+# the environment when using this Makefile, as they generally come
+# from usr/src/pkg/Makefile.  The remaining env vars should already
+# be part of a working build environment.
+#
+
+include $(SRC)/Makefile.master
+
+#
+# For license files in the open source tree, always copy them from src
+# into the license staging directory in the proto area
+#
+$(LICROOT)/usr/src/%: $(CODEMGR_WS)/usr/src/%
+	$(PKGDEBUG)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi
+	$(PKGDEBUG)$(INS.file)
+
+#
+# For license files in the closed source tree, the desired action
+# depends on the type of build.
+#
+# 1. For a normal build, with closed source present, simply copy the
+#    file into the license staging directory.
+#
+# 2. For a Tonic build, copy the file into both open and closed
+#    license staging directories.
+#
+# 3. For a build without closed source, rely on closed-bins extraction
+#    to stage the license file, and do nothing here.
+#
+$(TONICBUILD)INS= install -O
+$(LICROOT)/usr/closed/%: $(CLOSED_BUILD) $(CODEMGR_WS)/usr/closed/%
+	$(CLOSED_BUILD)$(PKGDEBUG) \
+	if [ ! -d $(@D) ]; then \
+		mkdir -p $(@D); \
+	fi; \
+	$(TONICBUILD) $(RM) $(@:$(ROOT)/%=$(CLOSEDROOT)/%)
+	$(CLOSED_BUILD)$(PKGDEBUG)$(INS.file)
--- a/usr/src/pkg/license_files/cr_Intel.SUNWfipe	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- * Copyright(c) 2009 Intel Corporation. All rights reserved.
--- a/usr/src/pkg/license_files/cr_Intel.SUNWintgige	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- * Copyright(c) 1999 - 2008 Intel Corporation. All rights reserved.
--- a/usr/src/pkg/license_files/cr_Intel.hotplug	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- * Copyright(c) 2009 - 2010 Intel Corporation. All rights reserved.
--- a/usr/src/pkg/license_files/grubcredits	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-Solaris VTOC and UFS support added by Sun Microsystems.
-
-Graphics/splashimage patch originally written by Paulo Cesar Pereira de Andrade
-(see http://ruslug.rutgers.edu/~mcgrof/grub-images/).
-
-GRUB 0.95 diskless patches by Feng Shuo.
-
-===============================================================================
-VaX#n8 (real name unknown) wrote shared_src/fsys_ext2fs.c.
-
-Heiko Schroeder rewrote shared_src/stage1.S to be more readable.
-
-The following authors assigned copyright on their work to the Free
-Software Foundation:
-
-Erich Stefan Boleyn originally designed and implemented GRUB.
-
-Gordon Matzigkeit adopted GRUB into the GNU Project.  He fixed several
-bugs, added symbolic link support to shared_src/fsys_ext2fs.c, and
-began the implementation of /sbin/grub. He was an official maintainer.
-
-Yoshinori K. Okuji contributed many bugfixes and new features, such as
-working LBA support, /sbin/grub support for configuration files, the
-script /sbin/grub-install, the utility /bin/mbchk, the new engine for
-builtin commands, disk swapping support, keyboard configuration support,
-network support, online help support, command-line history support,
-hidden menu support, the new Linux loader, serial terminal support,
-single-line editing support, the utility /sbin/grub-md5-crypt, the new
-GRUB manual, and several new commands. He is the current official
-maintainer.
-
-Peter Astrand added support for a color menu.
-
-Pavel Roskin contributed many bugfixes and new features, such as FreeBSD
-support for the grub shell, and configure process cleanups.
-
-Klaus Reichl wrote stage2/fsys_minix.c.
-
-Per Lundberg added graphics support to the Multiboot Specification.
-
-Jochen Hoenicke rewrote stage2/fsys_fat.c and wrote
-stage2/fsys_reiserfs.c and stage2/md5.c.
-
-Christoph Plattner added support for Net Boot Image Proposal.
-
-Frank Mehnert added support for hercules console.
-
-Kristoffer Branemyr added VSTa filesystem support.
-
-Serguei Tzukanov added JFS and XFS support.
-
-Jason Thomas added Linux DAC960 support and support for hiding/unhiding
-logical partitions, and did a significant bugfix for the terminal stuff.
-
-Tilmann Bubeck added support for vt100-incompatible terminals.
-
-KB Sriram added a better detection of FAT filesystem and fixed a
-network device completion.
-
-Eric Kvaalen fixed a lot of problems in the GRUB manual.
-
-Leonid Lisovskiy added El Torito support.
--- a/usr/src/pkg/license_files/lic_AMD	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-Copyright (c) 2002 Advanced Micro Devices, Inc.
-
-All rights reserved.
-
-Redistribution and  use in source and binary  forms, with or
-without  modification,  are   permitted  provided  that  the
-following conditions are met:
-
-+ Redistributions  of source  code  must  retain  the  above
-  copyright  notice,   this  list  of   conditions  and  the
-  following disclaimer.
-
-+ Redistributions  in binary  form must reproduce  the above
-  copyright  notice,   this  list  of   conditions  and  the
-  following  disclaimer in  the  documentation and/or  other
-  materials provided with the distribution.
-
-+ Neither the  name of Advanced Micro Devices,  Inc. nor the
-  names  of  its contributors  may  be  used  to endorse  or
-  promote  products  derived   from  this  software  without
-  specific prior written permission.
-
-THIS  SOFTWARE  IS PROVIDED  BY  THE  COPYRIGHT HOLDERS  AND
-CONTRIBUTORS AS IS AND  ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING,  BUT NOT  LIMITED TO,  THE IMPLIED  WARRANTIES OF
-MERCHANTABILITY  AND FITNESS  FOR A  PARTICULAR  PURPOSE ARE
-DISCLAIMED.  IN  NO  EVENT  SHALL  ADVANCED  MICRO  DEVICES,
-INC.  OR CONTRIBUTORS  BE LIABLE  FOR ANY  DIRECT, INDIRECT,
-INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR CONSEQUENTIAL  DAMAGES
-(INCLUDING,  BUT NOT LIMITED  TO, PROCUREMENT  OF SUBSTITUTE
-GOODS  OR  SERVICES;  LOSS  OF  USE, DATA,  OR  PROFITS;  OR
-BUSINESS INTERRUPTION)  HOWEVER CAUSED AND ON  ANY THEORY OF
-LIABILITY,  WHETHER IN CONTRACT,  STRICT LIABILITY,  OR TORT
-(INCLUDING NEGLIGENCE  OR OTHERWISE) ARISING IN  ANY WAY OUT
-OF THE  USE  OF  THIS  SOFTWARE, EVEN  IF  ADVISED  OF  THE
-POSSIBILITY OF SUCH DAMAGE.
-
-It is  licensee's responsibility  to comply with  any export
-regulations applicable in licensee's jurisdiction.
--- a/usr/src/pkg/license_files/lic_Emulex	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,501 +0,0 @@
---------------------------------------------------------------------
-
-CDDL HEADER START
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
-
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
-
-CDDL HEADER END
-
---------------------------------------------------------------------
-
-COPYRIGHT (c) 2004-2008 Emulex.
-Emulex Leadville emlxs HBA device driver
-
-This program includes a StorEdge SAN foundation Software (SFS) FCA device
-driver ("Leadville") and Emulex hardware-specific firmware binary files.  You
-may modify and redistribute the device driver code (but not the firmware
-binary files) under License 1, version 1.0 of the Common Development and
-Distribution License ("CDDL") as published by Sun Microsystems, Inc., and
-reproduced below. The Emulex firmware binary files are licensed under License
-2.
-
-REGARDLESS OF THE LICENSING MECHANISM USED OR APPLICABLE, THIS PROGRAM IS
-PROVIDED BY EMULEX  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING
-WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE, ARE DISCLAIMED.  IN NO EVENT SHALL EMULEX BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS PROGRAM, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-LICENSEE ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT CREATE OR
-GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY
-INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR
-OTHER PROPRIETARY RIGHT) EMBODIED IN ANY EMULEX HARDWARE OR FIRMWARE, EITHER
-SOLELY OR IN COMBINATION WITH THIS PROGRAM.
-
-If Licensee uses or distributes only the device driver (without the firmware
-binary files), only License #1 must accompany such device driver.  Licensee
-must include this entire file when Licensee uses or distributes both the
-device driver and firmware binary files.
-
-
-
-LICENSE #1
-
-		COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-				Version 1.0
-
-1. 	Definitions.
-
-1.1.	"Contributor" means each individual or entity that creates or
-contributes to the creation of Modifications.
-
-1.2.	"Contributor Version" means the combination of the Original Software,
-prior Modifications used by a Contributor (if any), and the Modifications
-made by that particular Contributor.
-
-1.3.	"Covered Software" means (a) the Original Software, or (b)
-Modifications, or (c) the combination of files containing Original Software
-with files containing Modifications, in each case including portions thereof.
-
-1.4.	"Executable" means the Covered Software in any form other than Source
-Code.
-
-1.5.	"Initial Developer" means the individual or entity that first makes
-Original Software available under this License.
-
-1.6.	"Larger Work" means a work which combines Covered Software or
-portions thereof with code not governed by the terms of this License.
-
-1.7.	"License" means this document.
-
-1.8.	"Licensable" means having the right to grant, to the maximum extent
-possible, whether at the time of the initial grant or subsequently acquired,
-any and all of the rights conveyed herein.
-
-1.9.	"Modifications" means the Source Code and Executable form of any of
-the following:
-
-	A.	Any file that results from an addition to, deletion from or
-	modification of the contents of a file containing Original Software
-	or previous Modifications;
-
-	B.	Any new file that contains any part of the Original Software
-	or previous Modification; or
-
-	C.	Any new file that is contributed or otherwise made available
-	under the terms of this License.
-
-1.10.	"Original Software" means the Source Code and Executable form of
-computer software code that is originally released under this License.
-
-1.11.	"Patent Claims" means any patent claim(s), now owned or hereafter
-acquired, including without limitation, method, process, and apparatus
-claims, in any patent Licensable by grantor.
-
-1.12.	"Source Code" means (a) the common form of computer software code in
-which modifications are made and (b) associated documentation included in or
-with such code.
-
-1.13.	"You" (or "Your") means an individual or a legal entity exercising
-rights under, and complying with all of the terms of, this License. For legal
-entities, "You" includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this definition, "control"
-means (a) the power, direct or indirect, to cause the direction or management
-of such entity, whether by contract or otherwise, or (b) ownership of more
-than fifty percent (50%) of the outstanding shares or beneficial ownership of
-such entity.
-
-2.	License Grants.
-
-2.1.	The Initial Developer Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and subject to third
-party intellectual property claims, the Initial Developer hereby grants You a
-world-wide, royalty-free, non-exclusive license:
-
-	(a)	under intellectual property rights (other than patent or
-	trademark) Licensable by Initial Developer, to use, reproduce,
-	modify, display, perform, sublicense and distribute the Original
-	Software (or portions thereof), with or without Modifications, and/or
-	as part of a Larger Work; and
-
-	(b)	under Patent Claims infringed by the making, using or selling
-	of Original Software, to make, have made, use, practice, sell, and
-	offer for sale, and/or otherwise dispose of the Original Software (or
-	portions thereof).
-
-	(c)	The licenses granted in Sections 2.1(a) and (b) are effective
-	on the date Initial Developer first distributes or otherwise makes
-	the Original Software available to a third party under the terms of
-	this License.
-
-	(d)	Notwithstanding Section 2.1(b) above, no patent license is
-	granted: (1) for code that You delete from the Original Software, or
-	(2) for infringements caused by: (i) the modification of the Original
-	Software, or (ii) the combination of the Original Software with other
-	software or devices.
-
-2.2.	Contributor Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and subject to third
-party intellectual property claims, each Contributor hereby grants You a
-world-wide, royalty-free, non-exclusive license:
-
-	(a)	under intellectual property rights (other than patent or
-	trademark) Licensable by Contributor to use, reproduce, modify,
-	display, perform, sublicense and distribute the Modifications created
-	by such Contributor (or portions thereof), either on an unmodified
-	basis, with other Modifications, as Covered Software and/or as part
-	of a Larger Work; and
-
-	(b)	under Patent Claims infringed by the making, using, or
-	selling of Modifications made by that Contributor either alone and/or
-	in combination with its Contributor Version (or portions of such
-	combination), to make, use, sell, offer for sale, have made, and/or
-	otherwise dispose of: (1) Modifications made by that Contributor (or
-	portions thereof); and (2) the combination of Modifications made by
-	that Contributor with its Contributor Version (or portions of such
-	combination).
-
-	(c)	The licenses granted in Sections 2.2(a) and 2.2(b) are
-	effective on the date Contributor first distributes or otherwise
-	makes the Modifications available to a third party.
-
-	(d)	Notwithstanding Section 2.2(b) above, no patent license is
-	granted: (1) for any code that Contributor has deleted from the
-	Contributor Version; (2) for infringements caused by: (i) third party
-	modifications of Contributor Version, or (ii) the combination of
-	Modifications made by that Contributor with other software (except as
-	part of the Contributor Version) or other devices; or (3) under
-	Patent Claims infringed by Covered Software in the absence of
-	Modifications made by that Contributor.
-
-3.	Distribution Obligations.
-
-3.1.	Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make available in
-Executable form must also be made available in Source Code form and that
-Source Code form must be distributed only under the terms of this License.
-You must include a copy of this License with every copy of the Source Code
-form of the Covered Software You distribute or otherwise make available. You
-must inform recipients of any such Covered Software in Executable form as to
-how they can obtain such Covered Software in Source Code form in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-3.2.	Modifications.
-
-The Modifications that You create or to which You contribute are governed by
-the terms of this License. You represent that You believe Your Modifications
-are Your original creation(s) and/or You have sufficient rights to grant the
-rights conveyed by this License.
-
-3.3.	Required Notices.
-
-You must include a notice in each of Your Modifications that identifies You
-as the Contributor of the Modification. You may not remove or alter any
-copyright, patent or trademark notices contained within the Covered Software,
-or any notices of licensing or any descriptive text giving attribution to any
-Contributor or the Initial Developer.
-
-3.4.	Application of Additional Terms.
-
-You may not offer or impose any terms on any Covered Software in Source Code
-form that alters or restricts the applicable version of this License or the
-recipients' rights hereunder. You may choose to offer, and to charge a fee
-for, warranty, support, indemnity or liability obligations to one or more
-recipients of Covered Software. However, you may do so only on Your own
-behalf, and not on behalf of the Initial Developer or any Contributor. You
-must make it absolutely clear that any such warranty, support, indemnity or
-liability obligation is offered by You alone, and You hereby agree to
-indemnify the Initial Developer and every Contributor for any liability
-incurred by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
-3.5.	Distribution of Executable Versions.
-
-You may distribute the Executable form of the Covered Software under the
-terms of this License or under the terms of a license of Your choice, which
-may contain terms different from this License, provided that You are in
-compliance with the terms of this License and that the license for the
-Executable form does not attempt to limit or alter the recipient's rights in
-the Source Code form from the rights set forth in this License. If You
-distribute the Covered Software in Executable form under a different license,
-You must make it absolutely clear that any terms which differ from this
-License are offered by You alone, not by the Initial Developer or
-Contributor. You hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial Developer or such
-Contributor as a result of any such terms You offer.
-
-3.6.	Larger Works.
-
-You may create a Larger Work by combining Covered Software with other code
-not governed by the terms of this License and distribute the Larger Work as a
-single product. In such a case, You must make sure the requirements of this
-License are fulfilled for the Covered Software.
-
-4.	Versions of the License.
-
-4.1.	New Versions.
-
-Sun Microsystems, Inc. is the initial license steward and may publish revised
-and/or new versions of this License from time to time. Each version will be
-given a distinguishing version number. Except as provided in Section 4.3, no
-one other than the license steward has the right to modify this License.
-
-4.2.	Effect of New Versions.
-
-You may always continue to use, distribute or otherwise make the Covered
-Software available under the terms of the version of the License under which
-You originally received the Covered Software. If the Initial Developer
-includes a notice in the Original Software prohibiting it from being
-distributed or otherwise made available under any subsequent version of the
-License, You must distribute and make the Covered Software available under
-the terms of the version of the License under which You originally received
-the Covered Software. Otherwise, You may also choose to use, distribute or
-otherwise make the Covered Software available under the terms of any
-subsequent version of the License published by the license steward.
-
-4.3.	Modified Versions.
-
-When You are an Initial Developer and You want to create a new license for
-Your Original Software, You may create and use a modified version of this
-License if You: (a) rename the license and remove any references to the name
-of the license steward (except to note that the license differs from this
-License); and (b) otherwise make it clear that the license contains terms
-which differ from this License.
-
-5.	DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
-MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK
-AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD
-ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
-DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6.	TERMINATION.
-
-6.1.	This License and the rights granted hereunder will terminate
-automatically if You fail to comply with terms herein and fail to cure such
-breach within 30 days of becoming aware of the breach. Provisions which, by
-their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-6.2.	If You assert a patent infringement claim (excluding declaratory
-judgment actions) against Initial Developer or a Contributor (the Initial
-Developer or Contributor against whom You assert such claim is referred to as
-"Participant") alleging that the Participant Software (meaning the
-Contributor Version where the Participant is a Contributor or the Original
-Software where the Participant is the Initial Developer) directly or
-indirectly infringes any patent, then any and all rights granted directly or
-indirectly to You by such Participant, the Initial Developer (if the Initial
-Developer is not the Participant) and all Contributors under Sections 2.1
-and/or 2.2 of this License shall, upon 60 days notice from Participant
-terminate prospectively and automatically at the expiration of such 60 day
-notice period, unless if within such 60 day period You withdraw Your claim
-with respect to the Participant Software against such Participant either
-unilaterally or pursuant to a written agreement with Participant.
-
-6.3.	In the event of termination under Sections 6.1 or 6.2 above, all end
-user licenses that have been validly granted by You or any distributor
-hereunder prior to termination (excluding licenses granted to You by any
-distributor) shall survive termination.
-
-7.	LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
-OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
-ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
-INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE,
-COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
-SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR
-DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8.	U.S. GOVERNMENT END USERS.
-
-The Covered Software is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as
-that term is defined at 48 C.F.R.  252.227-7014(a)(1)) and "commercial
-computer software documentation" as such terms are used in 48 C.F.R. 12.212
-(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered
-Software with only those rights set forth herein. This U.S. Government Rights
-clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or
-provision that addresses Government rights in computer software under this
-License.
-
-9.	MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter
-hereof. If any provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it
-enforceable. This License shall be governed by the law of the jurisdiction
-specified in a notice contained within the Original Software (except to the
-extent applicable law, if any, provides otherwise), excluding such
-jurisdiction's conflict-of-law provisions. Any litigation relating to this
-License shall be subject to the jurisdiction of the courts located in the
-jurisdiction and venue specified in a notice contained within the Original
-Software, with the losing party responsible for costs, including, without
-limitation, court costs and reasonable attorneys' fees and expenses. The
-application of the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded. Any law or regulation
-which provides that the language of a contract shall be construed against the
-drafter shall not apply to this License. You agree that You alone are
-responsible for compliance with the United States export administration
-regulations (and the export control laws and regulation of any other
-countries) when You use, distribute or otherwise make available any Covered
-Software.
-
-10.	RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible
-for claims and damages arising, directly or indirectly, out of its
-utilization of rights under this License and You agree to work with Initial
-Developer and Contributors to distribute such responsibility on an equitable
-basis. Nothing herein is intended or shall be deemed to constitute any
-admission of liability.
-
------------------------------------------------------------------------------
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-LICENSE (CDDL)
-The OpenSolaris code released under the CDDL shall be governed by the laws of
-the State of California (excluding conflict-of-law provisions). Any
-litigation relating to this License shall be subject to the jurisdiction of
-the Federal Courts of the Northern District of California and the state
-courts of the State of California, with venue lying in Santa Clara County,
-California.
-
-
-
-LICENSE #2
-
-THIS PRODUCT CONTAINS FIRMWARE ("EMULEX FIRMWARE") THAT BELONGS TO EMULEX
-CORPORATION ("EMULEX"), THE USE OF WHICH IS SUBJECT TO THIS LICENSE AGREEMENT
-("AGREEMENT") UNLESS OTHERWISE AGREED TO IN WRITING BY EMULEX.  INSTALLING OR
-USING THE EMULEX FIRMWARE CONSTITUTES ACCEPTANCE OF ALL THE TERMS AND
-CONDITIONS OF THIS AGREEMENT UNLESS OTHERWISE AGREED TO IN WRITING BY EMULEX.
-IF LICENSEE DOES NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT,
-LICENSEE SHALL NOT INSTALL OR USE THE EMULEX FIRMWARE.  WRITTEN APPROVAL IS
-NOT A PREREQUISITE TO THE VALIDITY OR ENFORCEABILITY OF THIS AGREEMENT.
-
-1.  Limited Licenses
-
-1.1  Derivatives.  Emulex hereby grants Licensee the personal,
-nontransferable, nonexclusive, royalty-free right and license to include the
-Emulex Firmware in derivative works that Licensee may create under the terms
-and conditions of License #1.  For avoidance of doubt, Licensee acknowledges
-that the Emulex Firmware is not licensed under nor otherwise subject to the
-terms and conditions of License #1.
-
-1.2  Distribution.  Emulex hereby grants Licensee the personal,
-nontransferable, nonexclusive, royalty free, right and license to use,
-distribute, and sublicense copies of Emulex Firmware solely for use with
-Emulex hardware products for which the Emulex Firmware was written and that
-Licensee has purchased from Sun Microsystems or its authorized distributors
-or resellers.  Such distribution may be on electronic media or via download
-from Licensee's website or other electronic means.  Licensee shall grant each
-sublicensee a nonexclusive, nontransferable license to use the Emulex
-Firmware in Object Code only and shall authorize such sublicensees to make
-one archival copy of the Emulex Firmware.  Licensee shall not use, reproduce,
-duplicate, copy, or otherwise sublicense, disclose, distribute, or
-disseminate the Emulex Firmware except as permitted under this Agreement.
-
-1.3  End User.  Emulex grants Licensee a personal, worldwide,
-nontransferable, nonexclusive, royalty-free right and license to use the
-Emulex Firmware only with Emulex hardware products and without circumventing
-any security or rights management features.
-
-1.4  Restrictions.  Licensee agrees to maintain intact and not modify or
-delete Emulex's copyright notice that is contained with each copy of the
-Emulex Firmware.  Licensee shall not (1) reverse engineer, reverse compile or
-reverse assemble all or any part of the Emulex Firmware, (2) disseminate
-performance information or analysis to any third party, other than solely for
-product support purposes, from any source relating to the Emulex Firmware, or
-cause or permit others to do either of both of the foregoing.  Licensee
-agrees to prevent any unauthorized copying of the Emulex Firmware.
-
-2.  Intellectual Property Rights.  The Emulex Firmware is licensed, not sold.
-Emulex or its licensors retain all right, title and interest, including
-without limitation all intellectual property rights, in and to all copies,
-regardless of form or media, of the Emulex Firmware.  The Emulex Firmware
-contains trade secrets of Emulex and Licensee agrees that it shall employ
-reasonable security precautions to maintain the confidentiality of such trade
-secrets.
-
-3.  Indemnity.  Licensee shall defend, indemnify and hold Emulex harmless
-from and against any and all claims, damages, liabilities, costs and expenses
-(including, without limitation, attorneys' fees) arising out of Licensee's
-breach of its obligations under this Agreement.
-
-4.  Term and termination.  The term of this Agreement shall continue until
-Licensee (a) ceases exercising its rights under Section 1 of this Agreement,
-(b) breaches a material term of this Agreement, or (c) gives written notice
-of termination to Emulex.  Upon termination of this Agreement, all copies of
-the Emulex Firmware in the possession of Licensee shall be either returned to
-Emulex or destroyed by Licensee.
-
-5.  Warranty Disclaimer.  Emulex makes no warranties whatsoever, express or
-implied, with respect to the Emulex Firmware.  Licensee agrees that the
-Emulex Firmware is accepted and utilized "AS IS."  EMULEX DISCLAIMS ANY AND
-ALL PROMISES, REPRESENTATIONS, AND WARRANTIES, EXCEPT AS EXPRESSLY SET FORTH
-IN THIS AGREEMENT, WITH RESPECT TO THE EMULEX FIRMWARE; ANY DATA,
-INFORMATION, OR OTHER MATERIAL FURNISHED TO THE LICENSEE HEREUNDER, INCLUDING
-THEIR CONDITION; CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION; THE
-EXISTENCE OF ANY LATENT OR PATENT DEFECTS; AND TITLE, MERCHANTABILITY, OR
-FITNESS FOR A PARTICULAR PURPOSE OR USE.
-
-6.  Limitation of Liability.  Emulex shall have no liability to Licensee, or
-any third party, whether in contract, tort, negligence or products liability
-for any claim, loss of use, business interruption, lost data, lost files, or
-for any indirect, special, incidental, or consequential damages of any kind
-or nature whatsoever arising out of or in connection with the use of or
-inability to use the Emulex Firmware or the performance or operation of the
-Emulex Firmware, even if Emulex has been advised of the possibility of such
-damages occurring.
-
-8.  Miscellaneous.  The laws of the state of California, without regard to
-its choice of law rules, shall govern the interpretation and enforcement of
-this Agreement.  The parties are independent contractors of one another.
-Nothing herein shall be deemed to create any relationship of agency,
-partnership, or joint venture between the parties.  Licensee represents that
-it is acting on its own behalf and is not acting as an agent for or on behalf
-of any third party, and further agrees that it may not assign its rights or
-obligations under this Agreement without prior written consent of Emulex.
-Both parties shall adhere to all applicable laws, regulations, and rules
-relating to the export of Emulex Firmware and any other information provided
-hereunder.  If any term or condition of this Agreement is held invalid,
-illegal or unenforceable by a court of competent jurisdiction, all the other
-terms and conditions shall survive.  The Emulex Firmware may be provided to
-units or agencies of the U.S. government only as "commercial computer
-firmware," "restricted computer firmware," or with "restricted rights" as
-defined in applicable regulations, and may not be provided as source code.
-Manufacturer is Emulex Design & Manufacturing Corporation, 3333 Susan St.,
-Costa Mesa, CA 92626.
--- a/usr/src/pkg/license_files/lic_GPLv2	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
--- a/usr/src/pkg/license_files/lic_HP	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright 2010 Hewlett-Packard Development Company, L.P.
--- a/usr/src/pkg/license_files/lic_Qlogic	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,594 +0,0 @@
---------------------------------------------------------------------
-
-Copyright (c) 2003-2008 QLogic Corporation
-QLogic Leadville qlc HBA device driver
-
-This program includes a device driver for the QLogic Leadville qlc HBA
-device driver distributed with QLogic hardware specific firmware binary 
-files. You may modify and redistribute the device driver code (but not 
-the firmware binary files) under License "A", version 1.0 of the Common 
-Development and Distribution License ("CDDL") as published by Sun 
-Microsystems, Inc. and reproduced below. The hardware binary files are 
-licensed under License "B".
-
-	REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE, 
-THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS" AND ANY EXPRESS 
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
-	USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT 
-CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR 
-OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT, TRADE 
-SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN ANY OTHER 
-QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN COMBINATION WITH THIS 
-PROGRAM.	
-
-
-License A:
-
-            COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-                               Version 1.0
-
-1. Definitions.
-
-1.1. "Contributor" means each individual or entity that creates or 
-     contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the Original 
-     Software, prior Modifications used by a Contributor (if any),
-     and the Modifications made by that particular Contributor.
-
-1.3. "Covered Software" means (a) the Original Software, or (b) 
-     Modifications, or (c) the combination of files containing 
-     Original Software with files containing Modifications, in 
-     each case including portions thereof.
-
-1.4. "Executable" means the Covered Software in any form other than 
-     Source Code.
-
-1.5. "Initial Developer" means the individual or entity that first
-      makes Original Software available under this License.
-
-1.6. "Larger Work" means a work which combines Covered Software or 
-      portions thereof with code not governed by the terms of this 
-      License.
-
-1.7. "License" means this document.
-
-1.8. "Licensable" means having the right to grant, to the maximum 
-     extent possible, whether at the time of the initial grant or 
-     subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. "Modifications" means the Source Code and Executable form of any 
-      of the following:
-
-      A. Any file that results from an addition to, deletion from or 
-         modification of the contents of a file containing Original 
-         Software or previous Modifications;
-
-      B. Any new file that contains any part of the Original Software 
-         or previous Modification; or
-
-      C. Any new file that is contributed or otherwise made available 
-         under the terms of this License.
-
-1.10. "Original Software" means the Source Code and Executable form of 
-      computer software code that is originally released under this 
-      license.
-
-1.11. "Patent Claims" means any patent claim(s), now owned or hereafter
-      acquired, including without limitation, method, process, and 
-      apparatus claims, in any patent Licensable by grantor.
-
-1.12. "Source Code" means (a) the common form of computer software code 
-      in which modifications are made and (b) associated documentation 
-      included in or with such code.
-
-1.13. "You" (or "Your") means an individual or a legal entity 
-      exercising rights under, and complying with all of the terms of, 
-      this License. For legal entities, "You" includes any entity which 
-      controls, is controlled by, or is under common control with You. 
-      For purposes of this definition, "control" means (a) the power, 
-      direct or indirect, to cause the direction or management of such 
-      entity, whether by contract or otherwise, or (b) ownership of 
-      more than fifty percent (50%) of the outstanding shares or 
-      beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-
-     Conditioned upon Your compliance with Section 3.1 below and 
-     subject to third party intellectual property claims, the Initial 
-     Developer hereby grants You a world-wide, royalty-free, non-
-     exclusive license:
-
-     (a) under intellectual property rights (other than patent or 
-         trademark) Licensable by Initial Developer, to use, reproduce,
-         modify, display, perform, sublicense and distribute the 
-         Original Software (or portions thereof), with or without 
-         Modifications, and/or as part of a Larger Work; and
-
-     (b) under Patent Claims infringed by the making, using or selling 
-         of Original Software, to make, have made, use, practice, sell, 
-         and offer for sale, and/or otherwise dispose of the Original 
-         Software (or portions thereof).
-
-     (c) The licenses granted in Sections 2.1(a) and (b) are effective 
-         on the date Initial Developer first distributes or otherwise 
-         makes the Original Software available to a third party under 
-         the terms of this License.
-
-     (d) Notwithstanding Section 2.1(b) above, no patent license is 
-         granted: (1) for code that You delete from the Original 
-         Software, or (2) for infringements caused by: (i) the 
-         modification of the Original Software, or (ii) the combination 
-         of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and subject to
-third party intellectual property claims, each Contributor hereby 
-grants You a world-wide, royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark) 
-    Licensable by Contributor to use, reproduce, modify, display, 
-    perform, sublicense and distribute the Modifications created by 
-    such Contributor (or portions thereof), either on an unmodified 
-    basis, with other Modifications, as Covered Software and/or as part 
-    of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using, or selling of 
-    Modifications made by that Contributor either alone and/or in 
-    combination with its Contributor Version (or portions of such 
-    combination), to make, use, sell, offer for sale, have made, and/or 
-    otherwise dispose of: (1) Modifications made by that Contributor 
-    (or portions thereof); and (2) the combination of Modifications 
-    made by that Contributor with its Contributor Version (or portions 
-    of such combination).
-
-(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on 
-    the date Contributor first distributes or otherwise makes the 
-    Modifications available to a third party.
-
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 
-    (1) for any code that Contributor has deleted from the Contributor
-    Version; (2) for infringements caused by: (i) third party 
-    modifications of Contributor Version, or (ii) the combination of 
-    Modifications made by that Contributor with other software (except 
-    as part of the Contributor Version) or other devices; or (3) under 
-    Patent Claims infringed by Covered Software in the absence of 
-    Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-     Any Covered Software that You distribute or otherwise make 
-     available in Executable form must also be made available in Source 
-     Code form and that Source Code form must be distributed only under 
-     the terms of this License. You must include a copy of this License 
-     with every copy of the Source Code form of the Covered Software
-     You distribute or otherwise make available. You must inform 
-     recipients of any such Covered Software in xecutable form as to 
-     how they can obtain such Covered Software in Source Code form in a 
-     reasonable manner on or through a medium customarily used for 
-     software exchange.
-
-3.2. Modifications.
-
-     The Modifications that You create or to which You contribute are 
-     governed by the terms of this License. You represent that You 
-     believe Your Modifications are Your original creation(s) and/or 
-     You have sufficient rights to grant the rights conveyed by this 
-     License.
-
-3.3. Required Notices.
-
-     You must include a notice in each of Your Modifications that 
-     identifies You as the Contributor of the Modification. You may not 
-     remove or alter any copyright, patent or trademark notices 
-     contained within the Covered Software, or any notices of licensing 
-     or any descriptive text giving attribution to any Contributor or 
-     the Initial Developer.
-
-3.4. Application of Additional Terms.
-
-     You may not offer or impose any terms on any Covered Software in 
-     Source Code form that alters or restricts the applicable version 
-     of this License or the recipients' rights hereunder. You may 
-     choose to offer, and to charge a fee for, warranty, support, 
-     indemnity or liability obligations to one or more recipients of 
-     Covered Software. However, you may do so only on Your own behalf, 
-     and not on behalf of the Initial Developer or any Contributor. You 
-     must make it absolutely clear that any such warranty, support, 
-     indemnity or liability obligation is offered by You alone, and You 
-     hereby agree to indemnify the Initial Developer and every 
-     Contributor for any liability incurred by the Initial Developer or
-     such Contributor as a result of warranty, support, indemnity or 
-     liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-
-     You may distribute the Executable form of the Covered Software 
-     under the terms of this License or under the terms of a license of 
-     Your choice, which may contain terms different from this License, 
-     provided that You are in compliance with the terms of this License 
-     and that the license for the Executable form does not attempt to 
-     limit or alter the recipient's rights in the Source Code form from 
-     the rights set forth in this License. If You distribute the 
-     Covered Software in Executable form under a different license, You 
-     must make it absolutely clear that any terms which differ from 
-     this License are offered by You alone, not by the Initial 
-     Developer or Contributor. You hereby agree to indemnify the 
-     Initial Developer and every Contributor for any liability incurred 
-     by the Initial Developer or such Contributor as a result of any 
-     such terms You offer.
-
-3.6. Larger Works.
-
-     You may create a Larger Work by combining Covered Software with 
-     other code not governed by the terms of this License and 
-     distribute the Larger Work as a single product. In such a case, 
-     You must make sure the requirements of this License are fulfilled 
-     for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-
-     Sun Microsystems, Inc. is the initial license steward and may 
-     publish revised and/or new versions of this License from time to 
-     time. Each version will be given a distinguishing version number. 
-     Except as provided in Section 4.3, no one other than the license 
-     steward has the right to modify this License.
-
-4.2. Effect of New Versions.
-
-     You may always continue to use, distribute or otherwise make the 
-     Covered Software available under the terms of the version of the 
-     License under which You originally received the Covered Software. 
-     If the Initial Developer includes a notice in the Original 
-     Software prohibiting it from being distributed or otherwise made 
-     available under any subsequent version of the License, You must 
-     distribute and make the Covered Software available under the terms 
-     of the version of the License under which You originally received 
-     the Covered Software. Otherwise, You may also choose to use, 
-     distribute or otherwise make the 
-     Covered Software available under the terms of any subsequent 
-     version of the License published by the license steward.
-
-4.3. Modified Versions.
-
-     When You are an Initial Developer and You want to create a new 
-     license for Your Original Software, You may create and use a 
-     modified version of this License if You: (a) rename the license 
-     and remove any references to the name of the license steward
-     (except to note that the license differs from this License); and 
-     (b) otherwise make it clear that the license contains terms which 
-     differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-   COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" 
-   BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
-   INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED 
-   SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR 
-   PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND 
-   PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY 
-   COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE 
-   INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY 
-   NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF 
-   WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. 
-   NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT 
-   UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate 
-     automatically if You fail to comply with terms herein and fail to 
-     cure such breach within 30 days of becoming aware of the breach. 
-     Provisions which, by their nature, must remain in effect beyond 
-     the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory 
-     judgment actions) against Initial Developer or a Contributor (the 
-     Initial Developer or Contributor against whom You assert such 
-     claim is referred to as "Participant") alleging that the 
-     Participant Software (meaning the Contributor Version where the 
-     Participant is a Contributor or the Original Software where the 
-     Participant is the Initial Developer) directly or indirectly 
-     infringes any patent, then any and all rights granted directly or 
-     indirectly to You by such Participant, the Initial Developer (if 
-     the Initial Developer is not the Participant) and all Contributors 
-     under Sections 2.1 and/or 2.2 of this License 
-     shall, upon 60 days notice from Participant terminate 
-     prospectively and automatically at the expiration of such 60 day 
-     notice period, unless if within such 60 day period You withdraw 
-     Your claim with respect to the Participant Software against such 
-     Participant either unilaterally or pursuant to a written agreement 
-     with Participant.
-
-6.3. If You assert a patent infringement claim against Participant 
-     alleging that the Participant Software directly or indirectly 
-     infringes any patent where such claim is resolved (such as by 
-     license or settlement) prior to the initiation of patent 
-     infringement litigation, then the reasonable value of the licenses 
-     granted by such Participant under Sections 2.1 or 2.2 shall be 
-     taken into account in determining the amount or value of any 
-     payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2 above, all 
-     end user licenses that have been validly granted by You or any 
-     distributor hereunder prior to termination (excluding licenses 
-     granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-   (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
-   INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
-   COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE 
-   LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR 
-   CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT 
-   LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER 
-   FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR 
-   LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE 
-   POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL 
-   NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM 
-   SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS 
-   SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR 
-   LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS 
-   EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-   The Covered Software is a "commercial item" as that term is defined 
-   in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer 
-   software" (as that term is defined at 48 C.F.R. " 252.227-7014(a)
-   (1)) and "commercial computer software documentation" as such terms 
-   are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 
-   12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all 
-   U.S. Government End Users acquire Covered Software with only those 
-   rights set forth herein. This U.S. Government Rights clause is in 
-   lieu of, and supersedes, any other FAR, DFAR, or other clause or 
-   provision that addresses Government rights in computer software 
-   under this License.
-
-9. MISCELLANEOUS.
-
-   This License represents the complete agreement concerning subject 
-   matter hereof. If any provision of this License is held to be 
-   unenforceable, such provision shall be reformed only to the extent 
-   necessary to make it enforceable. This License shall be governed by 
-   the law of the jurisdiction specified in a notice contained within 
-   the Original Software (except to the extent applicable law, if any, 
-   provides otherwise), excluding such jurisdiction's conflict-of-law 
-   provisions. Any litigation relating to this License shall be subject 
-   to the jurisdiction of the courts located in the jurisdiction and 
-   venue specified in a notice contained within the Original Software, 
-   with the losing party responsible for costs, including, without 
-   limitation, court costs and reasonable attorneys' fees and expenses. 
-   The application of the United Nations Convention on Contracts for 
-   the International Sale of Goods is expressly excluded. Any law or 
-   regulation which provides that the language of a contract shall be 
-   construed against the drafter shall not apply to this License. You 
-   agree that You alone are responsible for compliance with the United 
-   States export administration regulations (and the export control 
-   laws and regulation of any other countries) when You use, distribute
-   or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-   As between Initial Developer and the Contributors, each party is 
-   responsible for claims and damages arising, directly or indirectly, 
-   out of its utilization of rights under this License and You agree to 
-   work with Initial Developer and Contributors to distribute such 
-   responsibility on an equitable basis. Nothing herein is intended or 
-   shall be deemed to constitute any admission of liability.
-
-
-----------------------------------------------------------------------
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND 
-DISTRIBUTION LICENSE (CDDL)
-
-The OpenSolaris code released under the CDDL shall be governed by the 
-laws of the State of California (excluding conflict-of-law provisions). 
-Any litigation relating to this License shall be subject to the 
-jurisdiction of the Federal Courts of the Northern District of 
-California and the state courts of the State of California, with venue 
-lying in Santa Clara County, California.
-
-
-
-License B:
-
-THIS PRODUCT CONTAINS COMPUTER PROGRAMS AND RELATED DOCUMENTATION 
-("SOFTWARE") THAT BELONG TO QLOGIC CORPORATION ("QLOGIC"), THE USE OF WHICH
-IS SUBJECT TO THIS END USER SOFTWARE LICENSE AGREEMENT ("AGREEMENT") UNLESS
-OTHERWISE AGREED TO IN WRITING BY QLOGIC.  CLICKING ON THE "AGREE" BUTTON
-BELOW, INSTALLING/USING THE SOFTWARE OR ENTERING A LICENSE KEY CONSTITUTES
-ACCEPTANCE BY LICENSEE ("LICENSEE" MEANS YOU OR THE BUSINESS ENTITY ON WHOSE
-BEHALF YOU USE OR INSTALL THE SOFTWARE, AS APPLICABLE) OF ALL THE TERMS AND
-CONDITIONS OF THIS AGREEMENT UNLESS OTHERWISE AGREED TO IN WRITING BY QLOGIC.
-IF LICENSEE DOES NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT,
-LICENSEE SHALL NOT INSTALL/USE THE SOFTWARE OR ENTER A LICENSE KEY.  WRITTEN
-APPROVAL IS NOT A PREREQUISITE TO THE VALIDITY OR ENFORCEABILITY OF THIS 
-AGREEMENT. 
-
-1. License Grant.  Subject to the terms and conditions of this 
-   Agreement, QLogic grants Licensee a limited, non-exclusive license 
-   to redistribute, install, download and/or use the Software (in 
-   object code form only) with certain approved products manufactured 
-   by or for QLogic and approved products manufactured by or for an OEM 
-   customer of QLogic ("QLogic Approved Products").  This license is 
-   only available to original end user purchasers of QLogic Approved 
-   Products that have been purchased through QLogic authorized 
-   distribution channels or approved OEM distribution channels.  This 
-   license is not available to any end users of QLogic products who 
-   have purchased QLogic products, which have previously been used and 
-   the license is not available to any purchaser of QLogic application 
-   specific integrated circuits ("ASICs") or any product incorporating 
-   an ASIC, unless the product incorporating the ASIC is a QLogic 
-   Approved Product.  No rights or licenses in the Software are granted 
-   to Licensee other than those rights expressly granted in this 
-   Agreement.  Nothing in this License entitles Licensee to any 
-   upgrades or updates to, or future releases of, the Software. If 
-   Licensee redistributes the Software, then Licensee shall reproduce 
-   all copyright notices and must include this Agreement or an 
-   agreement which is at least as restrictive as this Agreement.
-
-2. Permitted Use.  Licensee may only install and use the Software in 
-   accordance with the documentation provided with the Software and 
-   with QLogic Approved Products.  
-
-3. Intellectual Property Rights.  The Software contains or embodies 
-   intellectual property of QLogic (or any of its licensors). The 
-   structure, organization and code are valuable trade secrets of 
-   QLogic (or its licensors). QLogic and/or its licensors do not grant, 
-   convey or license to Licensee any rights under any patents, 
-   copyrights, trademarks or any other intellectual property except as 
-   specifically granted herein. The Software is protected under U.S. 
-   copyright laws, international treaty provisions and applicable laws 
-   (including patent laws, if applicable) of the country in which it is 
-   being used. Any unauthorized duplication of the Software is 
-   expressly forbidden.
-
-4. Ownership of Software. Notwithstanding anything to the contrary, 
-   QLogic and its licensors retain all title to and, except as 
-   expressly and unambiguously licensed herein, all rights and interest 
-   in (i) the Software, all copies and derivative works thereof (by 
-   whomever produced), and (ii) all copyright rights, patent rights, 
-   trade secret rights, moral rights and all other intellectual 
-   property and proprietary rights anywhere in the world in the 
-   Software.  The Software is only licensed to Licensee and is not 
-   sold. 
-
-5. Restrictions and Cooperation.  Licensee shall not (and shall not 
-   allow any third party to) (i) decompile, disassemble, or otherwise 
-   reverse engineer or attempt to reconstruct or discover any source 
-   code, or underlying ideas or algorithms of the Software (except to 
-   the extent expressly permitted under applicable law); (ii) provide, 
-   lease, lend, use for timesharing or otherwise use or allow others to 
-   use the Software to or for the benefit of third parties; (iii) 
-   except as specified in the applicable user documentation, modify, 
-   incorporate into or with other hardware or software, or create a 
-   derivative work of any part of the Software; (iv) disseminate 
-   performance information or analysis from any source relating to the 
-   Software; (v) make any copies of the Software except as required to 
-   use the Software as licensed hereunder, except for one (1) copy 
-   solely for archival and back-up purposes,  or (vi) remove any 
-   product identification, copyright notice or other proprietary legend 
-   from the Software.  Licensee agrees to cooperate with QLogic and its 
-   licensors in connection with their efforts to protect their 
-   copyright/patent rights and other legal rights in the Software.  
-   QLogic may, from time to time, implement additional security 
-   measures for the Software, and Licensee shall cooperate with 
-   such measures and be responsible for installing upgrades that 
-   include such measures.
-
-6. Further Obligations.  Licensee shall defend, indemnify and hold 
-   QLogic harmless from and against any and all claims, damages, 
-   liabilities, costs and expenses (including, without limitation, 
-   attorneys" fees) arising out of Licensee"s breach of its obligations 
-   under this Agreement.
-
-7. Term and Termination.  This Agreement will become effective on the 
-   date Licensee clicks on the "Agree" button below or otherwise uses 
-   the Software and will remain in force until terminated.  Licensee 
-   may terminate this Agreement at any time, and QLogic may terminate 
-   this Agreement if Licensee breaches any of the terms or conditions 
-   hereunder.  Licensee agrees to destroy or return to QLogic the 
-   original and all copies of the Software immediately upon any 
-   termination of this Agreement.
-
-8. Confidentiality.  Licensee acknowledges that the Software contains 
-   valuable trade secrets of QLogic and other information proprietary 
-   to QLogic and its licensors.  Licensee shall: (i)"keep confidential 
-   such trade secrets and proprietary information, including without 
-   limitation all information concerning ideas and algorithms related 
-   to the Software, (ii)"disclose such information only to its 
-   employees and agents to the extent required to use the Software 
-   under the terms of this Agreement and (iii)"bind its employees, 
-   consultants, agents and other third parties in writing to maintain 
-   the confidentiality of such trade secrets and proprietary 
-   information and not use or disclose such information except as 
-   permitted in this Agreement.
-
-9. Limited Warranty and Disclaimer. THE SOFTWARE IS PROVIDED "AS IS" 
-   WITHOUT ANY WARRANTY OF ANY KIND INCLUDING, WITHOUT LIMITATION, ANY 
-   WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-   NON-INFRINGEMENT.  QLOGIC DOES NOT WARRANT THAT THE SOFTWARE IS 
-   ERROR-FREE OR THAT IT WILL OPERATE WITHOUT INTERRUPTION.  QLOGIC 
-   DOES NOT WARRANT, GUARANTEE OR MAKE ANY REPRESENTATION REGARDING THE 
-   USE, OR THE RESULTS OF THE USE OF THE SOFTWARE INCLUDING, WITHOUT 
-   LIMITATION, THE CORRECTNESS, ACCURACY OR RELIABILITY OF SUCH USE OR 
-   RESULTS.  
-
-10. Limitation of Liability.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, 
-    IN NO EVENT WILL QLOGIC BE LIABLE TO LICENSEE OR ANY THIRD PARTY 
-    FOR ANY CONSEQUENTIAL, INCIDENTAL OR SPECIAL DAMAGES, INCLUDING, 
-    WITHOUT LIMITATION, LOST PROFITS, LOST DATA OR LOST SAVINGS, OR FOR 
-    THE COST OF PROCUREMENT OF SUBSTITUTE GOODS, SERVICES OR TECHNOLOGY 
-    EVEN IF QLOGIC HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, 
-    OR FOR ANY CLAIM BY ANY THIRD PARTY.  
-
-11. Export.  Licensee represents, warrants and agrees that it will not, 
-    directly or indirectly, export, re-export or transmit the Software 
-    or any part thereof to any country in which such export, re-export 
-    or transmission is restricted by any applicable U.S. regulation or 
-    statute, without the prior written consent of both QLogic and, if 
-    required, of the Bureau of Export Administration of the U.S. 
-    Department of Commerce, or such other governmental entity as may 
-    have jurisdiction over such export or transmission. In addition to 
-    the above, Software may not, in the absence of authorization by 
-    U.S. and local law and regulations, as required, be used by or 
-    exported or reexported to (i) any U.S. sanctioned or embargoed 
-    country, or to nationals or residents of such countries; or (ii) 
-    any person, entity, organization or other party identified on the 
-    U.S. Department of Commerce's Denied Persons or Entity List, the 
-    U.S. Department of Treasury's Specially Designated Nationals or 
-    Blocked Persons Lists, or the Department of State's Debarred 
-    Parties List, as published and revised from time to time; or 
-    (iii) any party where the end-use involves nuclear, 
-    chemical/biological weapons, rocket systems or unmanned air 
-    vehicles.
-
-12. Miscellaneous.  A party"s failure to exercise or its delay in 
-    exercising any rights hereunder will not be deemed to be a waiver 
-    of such right.  If any provision of this Agreement shall be held by 
-    any court of competent jurisdiction to be unenforceable or invalid, 
-    that provision shall be limited or eliminated to the minimum extent 
-    necessary so that this Agreement shall otherwise remain in full 
-    force and effect and enforceable.  This Agreement shall be 
-    construed pursuant to the laws of the State of California and the 
-    United States without regard to conflicts of laws provisions 
-    thereof and without regard to the United Nations Convention on 
-    Authority for the International Sale of Goods.  Licensee 
-    irrevocably submits to the jurisdiction of any state or federal 
-    court sitting in the State of California, United States of America, 
-    and consents to venue in such forum with respect to any action or 
-    proceeding that relates to this Agreement.  No amendment 
-    to or modification of this Agreement will be binding unless in 
-    writing and signed by a duly authorized officer of QLogic.  The 
-    provisions of Sections 3-11 shall survive termination of this 
-    Agreement.  This Agreement is in the English language only, which 
-    language shall be controlling and any revision of this Agreement in 
-    any other language shall not be binding.  Both parties agree that 
-    this Agreement is the complete and exclusive statement of the 
-    mutual understanding of the parties and supersedes and cancels all 
-    previous written and oral agreements and communications relating to 
-    the subject matter of this Agreement.  NO VENDOR, DISTRIBUTOR, 
-    DEALER, RETAILER, SALES PERSON OR OTHER PERSON IS AUTHORIZED TO 
-    MODIFY THIS AGREEMENT OR TO MAKE ANY WARRANTY, REPRESENTATION OR 
-    PROMISE WHICH IS DIFFERENT THAN, OR IN ADDITION TO, THE 
-    REPRESENTATIONS OR PROMISES IN THIS AGREEMENT.
-
--- a/usr/src/pkg/license_files/lic_SUNWhwdata	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#	List of PCI ID's
-#
-#	Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
-#	Linux PCI ID's Project at http://pciids.sf.net/.
-#
-#	New data are always welcome, especially if accurate. If you have
-#	anything to contribute, please follow the instructions at the web site
-#	or send a diff -u against the most recent pci.ids to pci-ids@ucw.cz.
-#
-#	This file can be distributed under either the GNU General Public License
-#	(version 2 or higher) or the 3-clause BSD License.
-#
-#	Daily snapshot on Fri 2006-08-04 01:05:03
-
-Sun chooses to license this file under the 3-clause BSD license, reproduced
-below.  For the purposes of this license, "copyright holder" should be
-considered to be Martin Mares and other volunteers from the Linux PCI ID's 
-Project, and "year" should be 2006
-
-* Copyright (c) <year>, <copyright holder>
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/usr/src/pkg/license_files/lic_SUNWroute	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-Copyright 1994-2001 FreeBSD, Inc.  All rights reserved. 
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided with
-      the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation
-are those of the authors and should not be interpreted as representing
-official policies, either expressed or implied, of the FreeBSD Project
-or FreeBSD, Inc.
--- a/usr/src/pkg/license_files/lic_gss	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
- Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
- 3. The name "Carnegie Mellon University" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For permission or any other legal
-    details, please contact  
-      Office of Technology Transfer
-      Carnegie Mellon University
-      5000 Forbes Avenue
-      Pittsburgh, PA  15213-3890
-      (412) 268-4387, fax: (412) 268-7395
-      tech-transfer@andrew.cmu.edu
-
- 4. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by Computing Services
-     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-
- CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/usr/src/pkg/license_files/lic_iprb	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-Copyright (c) 1999-2001, Intel Corporation 
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, 
-    this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
-
- 3. Neither the name of Intel Corporation nor the names of its contributors 
-    may be used to endorse or promote products derived from this software 
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
--- a/usr/src/pkg/manifests/SUNWcs.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/SUNWcs.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -2552,33 +2552,45 @@
     hotline="Please contact your local service provider" \
     name="FTP Server, (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license ../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \
-    license=../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE
-license cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE
-license cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE
-license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp \
-    license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp
-license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route \
-    license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route
-license cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE
-license cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE
-license cmd/csh/THIRDPARTYLICENSE license=cmd/csh/THIRDPARTYLICENSE
-license cmd/eeprom/THIRDPARTYLICENSE license=cmd/eeprom/THIRDPARTYLICENSE
-license cmd/fs.d/ufs/THIRDPARTYLICENSE license=cmd/fs.d/ufs/THIRDPARTYLICENSE
-license cmd/mt/THIRDPARTYLICENSE license=cmd/mt/THIRDPARTYLICENSE
-license cmd/script/THIRDPARTYLICENSE license=cmd/script/THIRDPARTYLICENSE
-license cmd/stat/vmstat/THIRDPARTYLICENSE \
-    license=cmd/stat/vmstat/THIRDPARTYLICENSE
-license cmd/tip/THIRDPARTYLICENSE license=cmd/tip/THIRDPARTYLICENSE
-license cmd/vi/THIRDPARTYLICENSE license=cmd/vi/THIRDPARTYLICENSE
-license cmd/which/THIRDPARTYLICENSE license=cmd/which/THIRDPARTYLICENSE
-license cmd/xstr/THIRDPARTYLICENSE license=cmd/xstr/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE
+license usr/src/cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE
+license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp \
+    license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp
+license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route \
+    license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route
+license usr/src/cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE
+license usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \
+    license=usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE
+license usr/src/cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE
+license usr/src/cmd/cron/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cron/THIRDPARTYLICENSE
+license usr/src/cmd/csh/THIRDPARTYLICENSE \
+    license=usr/src/cmd/csh/THIRDPARTYLICENSE
+license usr/src/cmd/eeprom/THIRDPARTYLICENSE \
+    license=usr/src/cmd/eeprom/THIRDPARTYLICENSE
+license usr/src/cmd/fs.d/ufs/THIRDPARTYLICENSE \
+    license=usr/src/cmd/fs.d/ufs/THIRDPARTYLICENSE
+license usr/src/cmd/mt/THIRDPARTYLICENSE \
+    license=usr/src/cmd/mt/THIRDPARTYLICENSE
+license usr/src/cmd/script/THIRDPARTYLICENSE \
+    license=usr/src/cmd/script/THIRDPARTYLICENSE
+license usr/src/cmd/stat/vmstat/THIRDPARTYLICENSE \
+    license=usr/src/cmd/stat/vmstat/THIRDPARTYLICENSE
+license usr/src/cmd/tip/THIRDPARTYLICENSE \
+    license=usr/src/cmd/tip/THIRDPARTYLICENSE
+license usr/src/cmd/vi/THIRDPARTYLICENSE \
+    license=usr/src/cmd/vi/THIRDPARTYLICENSE
+license usr/src/cmd/which/THIRDPARTYLICENSE \
+    license=usr/src/cmd/which/THIRDPARTYLICENSE
+license usr/src/cmd/xstr/THIRDPARTYLICENSE \
+    license=usr/src/cmd/xstr/THIRDPARTYLICENSE
+license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE
 link path=bin target=./usr/bin
 link path=etc/TIMEZONE target=./default/init
 link path=etc/autopush target=../sbin/autopush
--- a/usr/src/pkg/manifests/compatibility-ucb.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/compatibility-ucb.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -99,28 +99,36 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license ucbcmd/basename/THIRDPARTYLICENSE \
-    license=ucbcmd/basename/THIRDPARTYLICENSE
-license ucbcmd/echo/THIRDPARTYLICENSE license=ucbcmd/echo/THIRDPARTYLICENSE
-license ucbcmd/from/THIRDPARTYLICENSE license=ucbcmd/from/THIRDPARTYLICENSE
-license ucbcmd/groups/THIRDPARTYLICENSE \
-    license=ucbcmd/groups/THIRDPARTYLICENSE
-license ucbcmd/ln/THIRDPARTYLICENSE license=ucbcmd/ln/THIRDPARTYLICENSE
-license ucbcmd/ls/THIRDPARTYLICENSE license=ucbcmd/ls/THIRDPARTYLICENSE
-license ucbcmd/sum/THIRDPARTYLICENSE license=ucbcmd/sum/THIRDPARTYLICENSE
-license ucbcmd/test/THIRDPARTYLICENSE license=ucbcmd/test/THIRDPARTYLICENSE
-license ucbcmd/tset/THIRDPARTYLICENSE license=ucbcmd/tset/THIRDPARTYLICENSE
-license ucbcmd/users/THIRDPARTYLICENSE license=ucbcmd/users/THIRDPARTYLICENSE
-license ucbcmd/whereis/THIRDPARTYLICENSE \
-    license=ucbcmd/whereis/THIRDPARTYLICENSE
-license ucbcmd/whoami/THIRDPARTYLICENSE \
-    license=ucbcmd/whoami/THIRDPARTYLICENSE
-license ucblib/libcurses/THIRDPARTYLICENSE \
-    license=ucblib/libcurses/THIRDPARTYLICENSE
-license ucblib/libtermcap/THIRDPARTYLICENSE \
-    license=ucblib/libtermcap/THIRDPARTYLICENSE
-license ucblib/libucb/THIRDPARTYLICENSE \
-    license=ucblib/libucb/THIRDPARTYLICENSE
+license usr/src/ucbcmd/basename/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/basename/THIRDPARTYLICENSE
+license usr/src/ucbcmd/echo/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/echo/THIRDPARTYLICENSE
+license usr/src/ucbcmd/from/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/from/THIRDPARTYLICENSE
+license usr/src/ucbcmd/groups/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/groups/THIRDPARTYLICENSE
+license usr/src/ucbcmd/ln/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/ln/THIRDPARTYLICENSE
+license usr/src/ucbcmd/ls/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/ls/THIRDPARTYLICENSE
+license usr/src/ucbcmd/sum/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/sum/THIRDPARTYLICENSE
+license usr/src/ucbcmd/test/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/test/THIRDPARTYLICENSE
+license usr/src/ucbcmd/tset/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/tset/THIRDPARTYLICENSE
+license usr/src/ucbcmd/users/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/users/THIRDPARTYLICENSE
+license usr/src/ucbcmd/whereis/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/whereis/THIRDPARTYLICENSE
+license usr/src/ucbcmd/whoami/THIRDPARTYLICENSE \
+    license=usr/src/ucbcmd/whoami/THIRDPARTYLICENSE
+license usr/src/ucblib/libcurses/THIRDPARTYLICENSE \
+    license=usr/src/ucblib/libcurses/THIRDPARTYLICENSE
+license usr/src/ucblib/libtermcap/THIRDPARTYLICENSE \
+    license=usr/src/ucblib/libtermcap/THIRDPARTYLICENSE
+license usr/src/ucblib/libucb/THIRDPARTYLICENSE \
+    license=usr/src/ucblib/libucb/THIRDPARTYLICENSE
 link path=etc/chroot target=../usr/sbin/chroot
 link path=etc/fuser target=../usr/sbin/fuser
 link path=etc/link target=../usr/sbin/link
--- a/usr/src/pkg/manifests/developer-astdev.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/developer-astdev.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -48,6 +48,8 @@
     hotline="Please contact your local service provider" \
     name="AT&T AST development utilities" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ast/THIRDPARTYLICENSE license=cmd/ast/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
-license lib/libpp/THIRDPARTYLICENSE license=lib/libpp/THIRDPARTYLICENSE
+license usr/src/cmd/ast/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ast/THIRDPARTYLICENSE
+license usr/src/lib/libpp/THIRDPARTYLICENSE \
+    license=usr/src/lib/libpp/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/developer-build-onbld.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -279,7 +279,8 @@
     version=11.11,REV=2009.10.22
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license tools/ctf/dwarf/THIRDPARTYLICENSE \
-    license=tools/ctf/dwarf/THIRDPARTYLICENSE
-license tools/onbld/THIRDPARTYLICENSE license=tools/onbld/THIRDPARTYLICENSE
+license usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE \
+    license=usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE
+license usr/src/tools/onbld/THIRDPARTYLICENSE \
+    license=usr/src/tools/onbld/THIRDPARTYLICENSE
 link path=opt/onbld/lib/python target=python2.4
--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -44,4 +44,3 @@
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license lic_Qlogic license=lic_Qlogic
--- a/usr/src/pkg/manifests/developer-debug-mdb.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/developer-debug-mdb.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -373,6 +373,11 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE
+license usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE
+license usr/src/uts/common/zmod/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/zmod/THIRDPARTYLICENSE
 $(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/niumx target=intr
 $(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcipsy target=intr
 $(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcisch target=intr
--- a/usr/src/pkg/manifests/developer-dtrace.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/developer-dtrace.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -94,7 +94,7 @@
 file path=usr/demo/dtrace/iotime.d
 file path=usr/demo/dtrace/ipio.d
 file path=usr/demo/dtrace/ipproto.d
-file path=usr/demo/dtrace/iprb.d
+$(i386_ONLY)file path=usr/demo/dtrace/iprb.d
 file path=usr/demo/dtrace/kstat.d
 file path=usr/demo/dtrace/ksyms.d
 file path=usr/demo/dtrace/libc.d
@@ -638,7 +638,6 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license lic_iprb license=lic_iprb
 link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1
 link path=usr/lib/$(ARCH64)/libdtrace_jni.so target=libdtrace_jni.so.1
 link path=usr/lib/libdtrace.so target=libdtrace.so.1
--- a/usr/src/pkg/manifests/developer-object-file.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/developer-object-file.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -105,10 +105,10 @@
     hotline="Please contact your local service provider" \
     name="CCS tools bundled with SunOS" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/backup/dump/THIRDPARTYLICENSE \
-    license=cmd/backup/dump/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/backup/dump/THIRDPARTYLICENSE \
+    license=usr/src/cmd/backup/dump/THIRDPARTYLICENSE
 link path=usr/ccs/bin/$(ARCH64)/ar target=../../../bin/$(ARCH64)/ar
 link path=usr/ccs/bin/$(ARCH64)/dump target=../../../bin/$(ARCH64)/dump
 link path=usr/ccs/bin/$(ARCH64)/elfdump target=../../../bin/$(ARCH64)/elfdump
--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -85,8 +85,10 @@
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/intel/pcbe/THIRDPARTYLICENSE \
-    license=uts/intel/pcbe/THIRDPARTYLICENSE
+$(i386_ONLY)license usr/src/uts/intel/pcbe/THIRDPARTYLICENSE \
+    license=usr/src/uts/intel/pcbe/THIRDPARTYLICENSE
+$(sparc_ONLY)license usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE \
+    license=usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE
 $(i386_ONLY)link path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.23 \
     target=pcbe.GenuineIntel.6.15
 $(i386_ONLY)link path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.26 \
--- a/usr/src/pkg/manifests/diagnostic-powertop.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/diagnostic-powertop.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -39,4 +39,5 @@
 legacy pkg=SUNWpowertop arch=$(ARCH) category=system desc="PowerTOP tool" \
     hotline="Please contact your local service provider" name="PowerTOP tool" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license lic_GPLv2 license=lic_GPLv2
+license usr/src/cmd/powertop/common/COPYING \
+    license=usr/src/cmd/powertop/common/COPYING
--- a/usr/src/pkg/manifests/driver-audio-audiosolo.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiosolo.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -46,5 +46,5 @@
     name="ESS Solo-1 Audio Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE \
-    license=uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE
+license usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -88,5 +88,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/sys/THIRDPARTYLICENSE.agpgart \
-    license=uts/common/sys/THIRDPARTYLICENSE.agpgart
+license usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart \
+    license=usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart
--- a/usr/src/pkg/manifests/driver-graphics-drm.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-drm.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -78,5 +78,5 @@
     name="DRM Kernel Drivers, (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/drm/THIRDPARTYLICENSE \
-    license=uts/common/io/drm/THIRDPARTYLICENSE
+license usr/src/uts/common/io/drm/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/drm/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-i86pc-fipe.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-i86pc-fipe.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -52,6 +52,5 @@
     hotline="Please contact your local service provider" \
     name="Intel 5000/7300 memory power management driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cr_Intel.SUNWfipe license=cr_Intel
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
+license usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE \
+    license=usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-afe.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-afe.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -59,5 +59,5 @@
     name="ADMtek Ethernet Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/afe/THIRDPARTYLICENSE \
-    license=uts/common/io/afe/THIRDPARTYLICENSE
+license usr/src/uts/common/io/afe/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/afe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-amd8111s.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-amd8111s.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -47,5 +47,5 @@
     name="AMD8111 Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s \
-    license=uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s
+license usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s \
+    license=usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s
--- a/usr/src/pkg/manifests/driver-network-arn.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-arn.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -49,4 +49,5 @@
     name="Atheros IEEE 802.11 Wireless NIC Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/arn/LICENSE license=uts/common/io/arn/LICENSE
+license usr/src/uts/common/io/arn/LICENSE \
+    license=usr/src/uts/common/io/arn/LICENSE
--- a/usr/src/pkg/manifests/driver-network-ath.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ath.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -55,4 +55,5 @@
     name="Atheros 802.11b/g Wireless NIC Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/ath/LICENSE license=uts/common/io/ath/LICENSE
+license usr/src/uts/common/io/ath/LICENSE \
+    license=usr/src/uts/common/io/ath/LICENSE
--- a/usr/src/pkg/manifests/driver-network-atu.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-atu.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -50,5 +50,5 @@
     name="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/atu/THIRDPARTYLICENSE \
-    license=uts/common/io/atu/THIRDPARTYLICENSE
+license usr/src/uts/common/io/atu/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/atu/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-bge.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bge.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -130,5 +130,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/bge/THIRDPARTYLICENSE \
-    license=uts/common/io/bge/THIRDPARTYLICENSE
+license usr/src/uts/common/io/bge/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/bge/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-bpf.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bpf.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -58,6 +58,8 @@
     hotline="Please contact your local service provider" \
     name="Solaris Kernel Packet (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ipf/tools/IPFILTER.LICENCE license=cmd/ipf/tools/IPFILTER.LICENCE
 license cr_Sun license=cr_Sun
-license uts/common/io/bpf/BPF.LICENCE license=uts/common/io/bpf/BPF.LICENCE
+license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \
+    license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE
+license usr/src/uts/common/io/bpf/BPF.LICENCE \
+    license=usr/src/uts/common/io/bpf/BPF.LICENCE
--- a/usr/src/pkg/manifests/driver-network-chxge.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-chxge.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,5 +51,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/chxge/com/THIRDPARTYLICENSE \
-    license=uts/common/io/chxge/com/THIRDPARTYLICENSE
+license usr/src/uts/common/io/chxge/com/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/chxge/com/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-e1000g.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-e1000g.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -192,6 +192,5 @@
     hotline="Please contact your local service provider" \
     name="Intel(R) PRO/1000 Server Adapter Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cr_Intel.SUNWintgige license=cr_Intel
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
+license usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-elxl.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-elxl.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -61,7 +61,5 @@
     hotline="Please contact your local service provider" \
     name="3Com Etherlink XL Ethernet Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-license uts/common/io/elxl/THIRDPARTYLICENSE \
-    license=uts/common/io/elxl/THIRDPARTYLICENSE
+license usr/src/uts/common/io/elxl/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/elxl/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-emlxs.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-emlxs.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -91,4 +91,6 @@
     hotline="Please contact your local service provider" \
     name="Emulex-Sun LightPulse Fibre Channel Adapter Utilties (usr)" \
     vendor="Emulex Corporation" version=11.11,REV=2009.11.11
-license lic_Emulex license=lic_Emulex
+license lic_CDDL license=lic_CDDL
+license usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE \
+    license=usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE
--- a/usr/src/pkg/manifests/driver-network-ipw.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ipw.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -48,7 +48,7 @@
     name="Intel Pro. Wireless 802.11b IPW2100B Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/ipw/THIRDPARTYLICENSE \
-    license=uts/common/io/ipw/THIRDPARTYLICENSE
-license uts/common/io/ipw/fw-ipw2100/LICENSE \
-    license=uts/common/io/ipw/fw-ipw2100/LICENSE
+license usr/src/uts/common/io/ipw/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ipw/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ipw/fw-ipw2100/LICENSE \
+    license=usr/src/uts/common/io/ipw/fw-ipw2100/LICENSE
--- a/usr/src/pkg/manifests/driver-network-iwh.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwh.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -56,9 +56,9 @@
     name="Intel(R) WiFi Link 5100/5300 driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/iwh/THIRDPARTYLICENSE \
-    license=uts/common/io/iwh/THIRDPARTYLICENSE
-license uts/common/io/iwh/fw-iw/fw_5000/LICENSE \
-    license=uts/common/io/iwh/fw-iw/fw_5000/LICENSE
-license uts/common/io/iwh/fw-iw/fw_5150/LICENSE \
-    license=uts/common/io/iwh/fw-iw/fw_5150/LICENSE
+license usr/src/uts/common/io/iwh/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/iwh/THIRDPARTYLICENSE
+license usr/src/uts/common/io/iwh/fw-iw/fw_5000/LICENSE \
+    license=usr/src/uts/common/io/iwh/fw-iw/fw_5000/LICENSE
+license usr/src/uts/common/io/iwh/fw-iw/fw_5150/LICENSE \
+    license=usr/src/uts/common/io/iwh/fw-iw/fw_5150/LICENSE
--- a/usr/src/pkg/manifests/driver-network-iwi.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwi.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -56,7 +56,7 @@
     name="Intel Pro. Wireless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/iwi/THIRDPARTYLICENSE \
-    license=uts/common/io/iwi/THIRDPARTYLICENSE
-license uts/common/io/iwi/fw-ipw2200/LICENSE \
-    license=uts/common/io/iwi/fw-ipw2200/LICENSE
+license usr/src/uts/common/io/iwi/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/iwi/THIRDPARTYLICENSE
+license usr/src/uts/common/io/iwi/fw-ipw2200/LICENSE \
+    license=usr/src/uts/common/io/iwi/fw-ipw2200/LICENSE
--- a/usr/src/pkg/manifests/driver-network-iwk.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwk.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -49,7 +49,7 @@
     name="Intel(R) PRO/Wireless 4965AGN driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/iwk/THIRDPARTYLICENSE \
-    license=uts/common/io/iwk/THIRDPARTYLICENSE
-license uts/common/io/iwk/fw-iw/LICENSE \
-    license=uts/common/io/iwk/fw-iw/LICENSE
+license usr/src/uts/common/io/iwk/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/iwk/THIRDPARTYLICENSE
+license usr/src/uts/common/io/iwk/fw-iw/LICENSE \
+    license=usr/src/uts/common/io/iwk/fw-iw/LICENSE
--- a/usr/src/pkg/manifests/driver-network-iwp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -53,7 +53,7 @@
     name="Intel(R) WiFi Link 6000 series driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/iwp/THIRDPARTYLICENSE \
-    license=uts/common/io/iwp/THIRDPARTYLICENSE
-license uts/common/io/iwp/fw-iw/LICENSE \
-    license=uts/common/io/iwp/fw-iw/LICENSE
+license usr/src/uts/common/io/iwp/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/iwp/THIRDPARTYLICENSE
+license usr/src/uts/common/io/iwp/fw-iw/LICENSE \
+    license=usr/src/uts/common/io/iwp/fw-iw/LICENSE
--- a/usr/src/pkg/manifests/driver-network-ixgb.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ixgb.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -54,5 +54,5 @@
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble
-license uts/common/io/ixgbe/THIRDPARTYLICENSE \
-    license=uts/common/io/ixgbe/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-ixgbe.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ixgbe.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -71,5 +71,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/ixgbe/THIRDPARTYLICENSE \
-    license=uts/common/io/ixgbe/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-mwl.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-mwl.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -54,7 +54,7 @@
     hotline="Please contact your local service provider" \
     name="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license uts/common/io/mwl/THIRDPARTYLICENSE \
-    license=uts/common/io/mwl/THIRDPARTYLICENSE
-license uts/common/io/mwl/mwl_fw/LICENSE \
-    license=uts/common/io/mwl/mwl_fw/LICENSE
+license usr/src/uts/common/io/mwl/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/mwl/THIRDPARTYLICENSE
+license usr/src/uts/common/io/mwl/mwl_fw/LICENSE \
+    license=usr/src/uts/common/io/mwl/mwl_fw/LICENSE
--- a/usr/src/pkg/manifests/driver-network-mxfe.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-mxfe.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,5 +51,5 @@
     name="Macronix Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/mxfe/THIRDPARTYLICENSE \
-    license=uts/common/io/mxfe/THIRDPARTYLICENSE
+license usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-myri10ge.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-myri10ge.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -53,5 +53,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/myri10ge/THIRDPARTYLICENSE \
-    license=uts/common/io/myri10ge/THIRDPARTYLICENSE
+license usr/src/uts/common/io/myri10ge/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/myri10ge/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-ntxn.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ntxn.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -57,5 +57,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/ntxn/THIRDPARTYLICENSE \
-    license=uts/common/io/ntxn/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ntxn/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ntxn/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-ofk.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ofk.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -57,5 +57,5 @@
 $(i386_ONLY)file path=kernel/misc/sol_ofs group=sys mode=0755
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/ib/clients/of/lic_of \
-    license=uts/common/io/ib/clients/of/lic_of
+license usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-pcan.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-pcan.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -50,5 +50,5 @@
     hotline="Please contact your local service provider" \
     name="Cisco-Aironet 802.11b driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license uts/common/io/pcan/THIRDPARTYLICENSE \
-    license=uts/common/io/pcan/THIRDPARTYLICENSE
+license usr/src/uts/common/io/pcan/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/pcan/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-pcwl.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-pcwl.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -52,5 +52,5 @@
     hotline="Please contact your local service provider" \
     name="Lucent/PRISM-II 802.11b driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license uts/common/io/pcwl/THIRDPARTYLICENSE \
-    license=uts/common/io/pcwl/THIRDPARTYLICENSE
+license usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-platform.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-platform.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -190,5 +190,7 @@
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble
+license usr/closed/uts/intel/io/iprb/THIRDPARTYLICENSE \
+    license=usr/closed/uts/intel/io/iprb/THIRDPARTYLICENSE
 # elxl moved out of this package, so create a dependency for upgraded systems
 depend fmri=driver/network/elxl type=require
--- a/usr/src/pkg/manifests/driver-network-qlc.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-qlc.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -90,4 +90,5 @@
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license lic_Qlogic license=lic_Qlogic
+license usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE \
+    license=usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE
--- a/usr/src/pkg/manifests/driver-network-ral.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ral.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -47,5 +47,5 @@
     hotline="Please contact your local service provider" \
     name="Ralink RT2500 802.11b/g Wireless Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license uts/common/io/ral/THIRDPARTYLICENSE \
-    license=uts/common/io/ral/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ral/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ral/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-rds.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rds.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,5 +51,5 @@
     hotline="Please contact your local service provider" \
     name="Sun Reliable Datagram Sockets" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license uts/common/io/ib/clients/rds/THIRDPARTYLICENSE \
-    license=uts/common/io/ib/clients/rds/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-rdsv3.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rdsv3.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -54,5 +54,5 @@
 file path=usr/lib/rcm/scripts/SUNW,rdsv3u.sh group=bin mode=0555
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/ib/clients/rdsv3/LICENSE \
-    license=uts/common/io/ib/clients/rdsv3/LICENSE
+license usr/src/uts/common/io/ib/clients/rdsv3/LICENSE \
+    license=usr/src/uts/common/io/ib/clients/rdsv3/LICENSE
--- a/usr/src/pkg/manifests/driver-network-rtw.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rtw.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -47,5 +47,5 @@
     hotline="Please contact your local service provider" \
     name="realtek 8180L 802.11b driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license uts/common/io/rtw/THIRDPARTYLICENSE \
-    license=uts/common/io/rtw/THIRDPARTYLICENSE
+license usr/src/uts/common/io/rtw/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/rtw/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-rum.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rum.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -56,5 +56,5 @@
     name="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/rum/THIRDPARTYLICENSE \
-    license=uts/common/io/rum/THIRDPARTYLICENSE
+license usr/src/uts/common/io/rum/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/rum/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-rwd.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rwd.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -49,5 +49,5 @@
     hotline="Please contact your local service provider" \
     name="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license uts/common/io/rwd/THIRDPARTYLICENSE \
-    license=uts/common/io/rwd/THIRDPARTYLICENSE
+license usr/src/uts/common/io/rwd/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/rwd/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-rwn.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rwn.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -49,7 +49,7 @@
     hotline="Please contact your local service provider" \
     name="Ralink RT2700/2800 IEEE802.11 a/b/g/n Wireless Network Device" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license uts/common/io/rwn/THIRDPARTYLICENSE \
-    license=uts/common/io/rwn/THIRDPARTYLICENSE
-license uts/common/io/rwn/fw-rt2860/LICENSE \
-    license=uts/common/io/rwn/fw-rt2860/LICENSE
+license usr/src/uts/common/io/rwn/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/rwn/THIRDPARTYLICENSE
+license usr/src/uts/common/io/rwn/fw-rt2860/LICENSE \
+    license=usr/src/uts/common/io/rwn/fw-rt2860/LICENSE
--- a/usr/src/pkg/manifests/driver-network-sfe.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-sfe.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -50,5 +50,5 @@
     hotline="Please contact your local service provider" \
     name="SiS900 Ethernet Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license uts/common/io/sfe/THIRDPARTYLICENSE \
-    license=uts/common/io/sfe/THIRDPARTYLICENSE
+license usr/src/uts/common/io/sfe/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/sfe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-uath.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-uath.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -56,7 +56,7 @@
     hotline="Please contact your local service provider" \
     name="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license uts/common/io/uath/THIRDPARTYLICENSE \
-    license=uts/common/io/uath/THIRDPARTYLICENSE
-license uts/common/io/uath/uath_fw/LICENSE \
-    license=uts/common/io/uath/uath_fw/LICENSE
+license usr/src/uts/common/io/uath/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/uath/THIRDPARTYLICENSE
+license usr/src/uts/common/io/uath/uath_fw/LICENSE \
+    license=usr/src/uts/common/io/uath/uath_fw/LICENSE
--- a/usr/src/pkg/manifests/driver-network-ural.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ural.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,5 +51,5 @@
     name="Ralink RT2500USB 802.11b/g Wireless Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/ural/THIRDPARTYLICENSE \
-    license=uts/common/io/ural/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ural/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ural/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-urtw.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-urtw.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -60,5 +60,5 @@
     name="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/urtw/THIRDPARTYLICENSE \
-    license=uts/common/io/urtw/THIRDPARTYLICENSE
+license usr/src/uts/common/io/urtw/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/urtw/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-wpi.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-wpi.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -61,7 +61,7 @@
     name="Intel(R) PRO/Wireless 3945ABG driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/wpi/THIRDPARTYLICENSE \
-    license=uts/common/io/wpi/THIRDPARTYLICENSE
-license uts/common/io/wpi/fw-wpi/LICENSE \
-    license=uts/common/io/wpi/fw-wpi/LICENSE
+license usr/src/uts/common/io/wpi/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/wpi/THIRDPARTYLICENSE
+license usr/src/uts/common/io/wpi/fw-wpi/LICENSE \
+    license=usr/src/uts/common/io/wpi/fw-wpi/LICENSE
--- a/usr/src/pkg/manifests/driver-network-yge.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-yge.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -55,4 +55,5 @@
     name="Marvell Yukon 2 Gigabit Ethernet Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
+license usr/src/uts/common/io/yge/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/yge/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-network-zyd.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-zyd.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -49,5 +49,5 @@
     name="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/zyd/THIRDPARTYLICENSE \
-    license=uts/common/io/zyd/THIRDPARTYLICENSE
+license usr/src/uts/common/io/zyd/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/zyd/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-storage-aac.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-aac.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -55,5 +55,5 @@
     name="Adaptec AdvanceRaid Controller SCSI HBA Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/common/io/aac/THIRDPARTYLICENSE \
-    license=uts/common/io/aac/THIRDPARTYLICENSE
+license usr/src/uts/common/io/aac/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/aac/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-storage-amr.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-amr.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -53,5 +53,5 @@
     name="LSI MegaRAID SCSI HBA Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license uts/intel/io/amr/THIRDPARTYLICENSE \
-    license=uts/intel/io/amr/THIRDPARTYLICENSE
+license usr/src/uts/intel/io/amr/THIRDPARTYLICENSE \
+    license=usr/src/uts/intel/io/amr/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-cpqary3.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -73,5 +73,4 @@
     name="HP Smart Array HBA Driver 2.2.0.1" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lic_HP license=lic_HP
 license lic_OSBL license=lic_OSBL
--- a/usr/src/pkg/manifests/driver-storage-mega_sas.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-mega_sas.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -150,7 +150,5 @@
     hotline="Please contact your local service provider" \
     name="LSI MegaSAS RAID Controller HBA Driver" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-license uts/common/io/mega_sas/THIRDPARTYLICENSE \
-    license=uts/common/io/mega_sas/THIRDPARTYLICENSE
+license usr/src/uts/common/io/mega_sas/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/mega_sas/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-mr_sas.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -55,4 +55,5 @@
     name="LSI MegaRAID SAS2.0 HBA Driver" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
+license usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/driver-storage-pmcs.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-pmcs.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -72,5 +72,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/scsi/adapters/pmcs/LICENSE \
-    license=uts/common/io/scsi/adapters/pmcs/LICENSE
+license usr/src/uts/common/io/scsi/adapters/pmcs/LICENSE \
+    license=usr/src/uts/common/io/scsi/adapters/pmcs/LICENSE
--- a/usr/src/pkg/manifests/driver-usb.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/driver-usb.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -134,3 +134,5 @@
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license license_in_headers license=license_in_headers
+license usr/src/uts/common/io/usb/clients/hwa1480_fw/i1480/LICENSE \
+    license=usr/src/uts/common/io/usb/clients/hwa1480_fw/i1480/LICENSE
--- a/usr/src/pkg/manifests/library-libtecla.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/library-libtecla.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -47,6 +47,7 @@
     hotline="Please contact your local service provider" \
     name="Tecla command-line editing library" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license lib/libtecla/THIRDPARTYLICENSE license=lib/libtecla/THIRDPARTYLICENSE
+license usr/src/lib/libtecla/THIRDPARTYLICENSE \
+    license=usr/src/lib/libtecla/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libtecla.so target=libtecla.so.1
 link path=usr/lib/libtecla.so target=libtecla.so.1
--- a/usr/src/pkg/manifests/library-print-open-printing-ipp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/library-print-open-printing-ipp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -41,9 +41,9 @@
     name="FSG Open Printing API IPP Print Service Module" \
     vendor="Sun Microsystems, Inc." version=11.11.0,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/print/libhttp-core/common/LICENSE.txt \
-    license=lib/print/libhttp-core/common/LICENSE.txt
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/print/libhttp-core/common/LICENSE.txt \
+    license=usr/src/lib/print/libhttp-core/common/LICENSE.txt
 link path=usr/lib/print/libhttp-core.so target=./libhttp-core.so.1
 link path=usr/lib/print/psm-http.so target=./psm-ipp.so
 link path=usr/lib/print/psm-ipp.so target=./psm-ipp.so.1
--- a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -57,4 +57,5 @@
     hotline="Please contact your local service provider" \
     name="tcpd - access control facility for internet services" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/tcpd/THIRDPARTYLICENSE license=cmd/tcpd/THIRDPARTYLICENSE
+license usr/src/cmd/tcpd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/tcpd/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/naming-ldap.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/naming-ldap.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -42,5 +42,6 @@
     hotline="Please contact your local service provider" \
     name="LDAP Libraries" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ldap/THIRDPARTYLICENSE license=cmd/ldap/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/ldap/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ldap/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/network-bridging.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-bridging.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,5 +51,6 @@
     name="IEEE 802 Bridging Support (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/librstp/THIRDPARTYLICENSE license=lib/librstp/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/librstp/common/COPYING \
+    license=usr/src/lib/librstp/common/COPYING
--- a/usr/src/pkg/manifests/network-ftp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-ftp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -48,8 +48,8 @@
     hotline="Please contact your local service provider" \
     name="Basic IP commands (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE
 license cr_ATT license=cr_ATT
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -55,5 +55,6 @@
     hotline="Please contact your local service provider" \
     name="IP Filter header files" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ipf/tools/IPFILTER.LICENCE license=cmd/ipf/tools/IPFILTER.LICENCE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \
+    license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE
--- a/usr/src/pkg/manifests/network-ipfilter.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-ipfilter.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -120,5 +120,6 @@
     hotline="Please contact your local service provider" \
     name="IP Filter utilities, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ipf/tools/IPFILTER.LICENCE license=cmd/ipf/tools/IPFILTER.LICENCE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \
+    license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE
--- a/usr/src/pkg/manifests/network-netcat.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-netcat.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -36,5 +36,5 @@
     hotline="Please contact your local service provider" \
     name="Netcat Command" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE
+license usr/src/cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/network-ssh-ssh-key.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-ssh-ssh-key.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -41,4 +41,5 @@
     hotline="Please contact your local service provider" \
     name="SSH Common, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ssh/THIRDPARTYLICENSE license=cmd/ssh/THIRDPARTYLICENSE
+license usr/src/cmd/ssh/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ssh/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/network-ssh.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-ssh.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -57,4 +57,5 @@
     hotline="Please contact your local service provider" \
     name="SSH Client and utilities, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ssh/THIRDPARTYLICENSE license=cmd/ssh/THIRDPARTYLICENSE
+license usr/src/cmd/ssh/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ssh/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/network-telnet.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/network-telnet.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -37,6 +37,6 @@
     hotline="Please contact your local service provider" \
     name="Telnet Command (client)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/package-svr4.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/package-svr4.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -93,6 +93,7 @@
     version=11.11.1,REV=2009.11.11
 license cr_ATT license=cr_ATT
 license cr_Sun license=cr_Sun
-license lib/libpkg/THIRDPARTYLICENSE license=lib/libpkg/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libpkg/THIRDPARTYLICENSE \
+    license=usr/src/lib/libpkg/THIRDPARTYLICENSE
 link path=usr/lib/libpkg.so target=./libpkg.so.1
--- a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -37,10 +37,10 @@
     hotline="Please contact your local service provider" \
     name="Solaris Print - Source Compatibility, (Usr)" \
     vendor="Sun Microsystems, Inc." version=13.1,REV=2009.11.11
-license cmd/lp/cmd/lptest/THIRDPARTYLICENSE \
-    license=cmd/lp/cmd/lptest/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/lp/cmd/lptest/THIRDPARTYLICENSE \
+    license=usr/src/cmd/lp/cmd/lptest/THIRDPARTYLICENSE
 link path=usr/ucb/lpc target=../bin/lpc
 link path=usr/ucb/lpq target=../bin/lpq
 link path=usr/ucb/lpr target=../bin/lpr
--- a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -134,7 +134,8 @@
     path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so
 file path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM/_BSMparse.pm
 file path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc/Config.pm
-license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/perl/THIRDPARTYLICENSE \
+    license=usr/src/cmd/perl/THIRDPARTYLICENSE
 depend fmri=runtime/perl-510 type=require
 depend fmri=runtime/perl-510/extra type=require
--- a/usr/src/pkg/manifests/runtime-perl-584-extra.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/runtime-perl-584-extra.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -1513,6 +1513,7 @@
     hotline="Please contact your local service provider" \
     name="Perl 5.8.4 (non-core)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/perl/THIRDPARTYLICENSE \
+    license=usr/src/cmd/perl/THIRDPARTYLICENSE
 link path=usr/perl5/pod target=./5.8.4/lib/pod
--- a/usr/src/pkg/manifests/runtime-perl-584.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/runtime-perl-584.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -1974,8 +1974,9 @@
     hotline="Please contact your local service provider" \
     name="Perl 5.8.4 (core)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/perl/THIRDPARTYLICENSE \
+    license=usr/src/cmd/perl/THIRDPARTYLICENSE
 link path=usr/bin/perl target=../perl5/5.8.4/bin/perl
 $(i386_ONLY)link path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/libperl.so \
     target=./libperl.so.1
--- a/usr/src/pkg/manifests/service-hal.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-hal.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -175,9 +175,9 @@
     hotline="Please contact your local service provider" \
     name="Hardware Abstraction Layer (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/hal/LICENSE license=cmd/hal/LICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE
 link path=usr/lib/$(ARCH64)/libhal-storage.so target=./libhal-storage.so.1.0.0
 link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \
     target=./libhal-storage.so.1.0.0
--- a/usr/src/pkg/manifests/service-network-dhcp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-dhcp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -76,6 +76,8 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/THIRDPARTYLICENSE
 link path=usr/lib/inet/dhcp/svc/ds_SUNWfiles.so target=./ds_SUNWfiles.so.1
 depend fmri=network/dhcp/dhcpmgr type=require
 depend fmri=network/ftp type=require
--- a/usr/src/pkg/manifests/service-network-dns-mdns.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -144,12 +144,12 @@
     hotline="Please contact your local service provider" \
     name="Multicast DNS and Service Discovery (Usr)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
-license lib/libdns_sd/THIRDPARTYLICENSE \
-    license=lib/libdns_sd/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE
+license usr/src/lib/libdns_sd/THIRDPARTYLICENSE \
+    license=usr/src/lib/libdns_sd/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libdns_sd.so target=libdns_sd.so.1
 link path=usr/lib/$(ARCH64)/libjdns_sd.so target=libjdns_sd.so.1
 link path=usr/lib/libdns_sd.so target=libdns_sd.so.1
--- a/usr/src/pkg/manifests/service-network-ftp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-ftp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -67,6 +67,6 @@
     hotline="Please contact your local service provider" \
     name="FTP Server, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license ../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \
-    license=../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \
+    license=usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE
--- a/usr/src/pkg/manifests/service-network-network-clients.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-network-clients.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -52,15 +52,15 @@
     hotline="Please contact your local service provider" \
     name="Remote Network Client Commands" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/THIRDPARTYLICENSE.kcmd \
-    license=cmd/cmd-inet/THIRDPARTYLICENSE.kcmd
-license cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp \
-    license=cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp
-license cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh \
-    license=cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh
-license cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/THIRDPARTYLICENSE.kcmd \
+    license=usr/src/cmd/cmd-inet/THIRDPARTYLICENSE.kcmd
+license usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp \
+    license=usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp
+license usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh \
+    license=usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh
+license usr/src/cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE
 link path=usr/bin/remsh target=./rsh
 link path=usr/lib/sunw,rcp target=../bin/rcp
--- a/usr/src/pkg/manifests/service-network-network-servers.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-network-servers.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -78,10 +78,10 @@
     hotline="Please contact your local service provider" \
     name="Remote Network Server Commands (Usr)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat \
-    license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat
-license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind \
-    license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat \
+    license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat
+license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind \
+    license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind
 link path=etc/rmt target=../usr/sbin/rmt
--- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -192,9 +192,10 @@
     hotline="Please contact your local service provider" \
     name="Sendmail (/usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/sendmail/THIRDPARTYLICENSE license=cmd/sendmail/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/sendmail/THIRDPARTYLICENSE \
+    license=usr/src/cmd/sendmail/THIRDPARTYLICENSE
 link path=etc/aliases target=./mail/aliases
 link path=etc/mail/cf/cf/main.cf target=sendmail.cf
 link path=etc/mail/cf/cf/main.mc target=sendmail.mc
--- a/usr/src/pkg/manifests/service-network-ssh.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-ssh.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -55,5 +55,6 @@
     hotline="Please contact your local service provider" \
     name="SSH Server, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/ssh/THIRDPARTYLICENSE license=cmd/ssh/THIRDPARTYLICENSE
+license usr/src/cmd/ssh/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ssh/THIRDPARTYLICENSE
 depend fmri=text/locale type=require
--- a/usr/src/pkg/manifests/service-network-uucp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-uucp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -119,9 +119,10 @@
     hotline="Please contact your local service provider" \
     name="Networking UUCP Utilities, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/bnu/THIRDPARTYLICENSE license=cmd/bnu/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/bnu/THIRDPARTYLICENSE \
+    license=usr/src/cmd/bnu/THIRDPARTYLICENSE
 link path=etc/uucp/remote.unknown target=../../usr/lib/uucp/remote.unknown
 link path=var/spool/uucp/.Admin target=../../uucp/.Admin
 link path=var/spool/uucp/.Log target=../../uucp/.Log
--- a/usr/src/pkg/manifests/service-network-wpa.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-network-wpa.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -49,7 +49,7 @@
     hotline="Please contact your local service provider" \
     name="Wireless WPA Supplicant, (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/service-security-kerberos-5.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-security-kerberos-5.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -89,9 +89,9 @@
     name="Kerberos version 5 support (Usr)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE \
-    license=lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE \
+    license=usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/gss/mech_krb5.so target=./mech_krb5.so.1
 link path=usr/lib/$(ARCH64)/libkrb5.so target=./libkrb5.so.1
 link path=usr/lib/gss/mech_krb5.so target=./mech_krb5.so.1
--- a/usr/src/pkg/manifests/service-storage-ndmp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/service-storage-ndmp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -68,9 +68,9 @@
     hotline="Please contact your local service provider" \
     name="Network Data Management Protocol Service (User)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/ndmpd/LICENSE license=cmd/ndmpd/LICENSE
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble
+license usr/src/cmd/ndmpd/LICENSE license=usr/src/cmd/ndmpd/LICENSE
 link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1
 link path=usr/lib/libndmp.so target=libndmp.so.1
--- a/usr/src/pkg/manifests/source-demo-system.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/source-demo-system.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -286,5 +286,6 @@
     name="OS demo source" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/libshell/THIRDPARTYLICENSE license=lib/libshell/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libshell/THIRDPARTYLICENSE \
+    license=usr/src/lib/libshell/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/source-network-pppdump.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/source-network-pppdump.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -59,10 +59,10 @@
     hotline="Please contact your local service provider" \
     name="Source for the GNU utilities for PPP" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \
-    license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect
-license cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \
-    license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd
-license cmd/cmd-inet/usr.bin/pppdump/LICENSE.top \
-    license=cmd/cmd-inet/usr.bin/pppdump/LICENSE.top
 license cr_Sun license=cr_Sun
+license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect
+license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd
+license usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -112,4 +112,5 @@
     hotline="Please contact your local service provider" \
     name="tcpd - access control facility for internet services (Source)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/tcpd/THIRDPARTYLICENSE license=cmd/tcpd/THIRDPARTYLICENSE
+license usr/src/cmd/tcpd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/tcpd/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/source-system-grub.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/source-system-grub.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -294,5 +294,5 @@
     name="Source for GNU GRUB - GNU GRand Unified Bootloader" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license grubcredits license=grubcredits
-license lic_GPLv2 license=lic_GPLv2
+license usr/src/grub/grub-0.97/AUTHORS license=usr/src/grub/grub-0.97/AUTHORS
+license usr/src/grub/grub-0.97/COPYING license=usr/src/grub/grub-0.97/COPYING
--- a/usr/src/pkg/manifests/system-boot-grub.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-boot-grub.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -79,7 +79,7 @@
     hotline="Please contact your local service provider" name="GRUB (Root)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license grubcredits license=grubcredits
 license lic_CDDL license=lic_CDDL
-license lic_GPLv2 license=lic_GPLv2
+license usr/src/grub/grub-0.97/AUTHORS license=usr/src/grub/grub-0.97/AUTHORS
+license usr/src/grub/grub-0.97/COPYING license=usr/src/grub/grub-0.97/COPYING
 link path=lib/libgrubmgmt.so target=libgrubmgmt.so.1
--- a/usr/src/pkg/manifests/system-boot-wanboot.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-boot-wanboot.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -52,6 +52,6 @@
     hotline="Please contact your local service provider" \
     name="WAN boot support" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license common/openssl/LICENSE license=common/openssl/LICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/common/openssl/LICENSE license=usr/src/common/openssl/LICENSE
--- a/usr/src/pkg/manifests/system-compatibility-sunos4.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-compatibility-sunos4.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -41,4 +41,6 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libbc/THIRDPARTYLICENSE \
+    license=usr/src/lib/libbc/THIRDPARTYLICENSE
 link path=usr/4lib/libdl.so.1.0 target=../../lib/libdl.so.1
--- a/usr/src/pkg/manifests/system-data-hardware-registry.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -40,4 +40,5 @@
     hotline="Please contact your local service provider" \
     name="Hardware data files" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license lic_SUNWhwdata license=lic_SUNWhwdata
+license usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids \
+    license=usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids
--- a/usr/src/pkg/manifests/system-data-terminfo.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-data-terminfo.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -2310,5 +2310,6 @@
     hotline="Please contact your local service provider" \
     name="Terminal Information" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/terminfo/THIRDPARTYLICENSE license=cmd/terminfo/THIRDPARTYLICENSE
+license usr/src/cmd/terminfo/THIRDPARTYLICENSE \
+    license=usr/src/cmd/terminfo/THIRDPARTYLICENSE
 link path=usr/lib/tabset target=../share/lib/tabset
--- a/usr/src/pkg/manifests/system-extended-system-utilities.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -185,12 +185,16 @@
     hotline="Please contact your local service provider" \
     name="Extended System Utilities" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/compress/THIRDPARTYLICENSE license=cmd/compress/THIRDPARTYLICENSE
-license cmd/lastcomm/THIRDPARTYLICENSE license=cmd/lastcomm/THIRDPARTYLICENSE
-license cmd/look/THIRDPARTYLICENSE license=cmd/look/THIRDPARTYLICENSE
-license cmd/units/THIRDPARTYLICENSE license=cmd/units/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/compress/THIRDPARTYLICENSE \
+    license=usr/src/cmd/compress/THIRDPARTYLICENSE
+license usr/src/cmd/lastcomm/THIRDPARTYLICENSE \
+    license=usr/src/cmd/lastcomm/THIRDPARTYLICENSE
+license usr/src/cmd/look/THIRDPARTYLICENSE \
+    license=usr/src/cmd/look/THIRDPARTYLICENSE
+license usr/src/cmd/units/THIRDPARTYLICENSE \
+    license=usr/src/cmd/units/THIRDPARTYLICENSE
 link path=usr/bin/dmesg target=../sbin/dmesg
 link path=usr/bin/pcat target=./unpack
 link path=usr/bin/strace target=../sbin/strace
--- a/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -54,4 +54,8 @@
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/ntfsprogs/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ntfsprogs/THIRDPARTYLICENSE
+license usr/src/lib/libntfs/THIRDPARTYLICENSE \
+    license=usr/src/lib/libntfs/THIRDPARTYLICENSE
 link path=usr/lib/libntfs.so target=./libntfs.so.10
--- a/usr/src/pkg/manifests/system-file-system-smb.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-file-system-smb.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -98,15 +98,15 @@
     name="SMB/CIFS File System client support (Usr)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/libsmbfs/smb/THIRDPARTYLICENSE.apple \
-    license=lib/libsmbfs/smb/THIRDPARTYLICENSE.apple
-license lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov \
-    license=lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov
-license lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \
-    license=lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4
-license lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \
-    license=lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple \
+    license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple
+license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov \
+    license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov
+license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \
+    license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4
+license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \
+    license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft
 link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \
     target=pam_smbfs_login.so.1
 link path=usr/lib/security/pam_smbfs_login.so target=pam_smbfs_login.so.1
--- a/usr/src/pkg/manifests/system-file-system-udfs.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-file-system-udfs.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -54,7 +54,7 @@
     hotline="Please contact your local service provider" \
     name="Universal Disk Format 1.50" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE \
-    license=cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE \
+    license=usr/src/cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/system-header-header-agp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-header-header-agp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -46,5 +46,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/sys/THIRDPARTYLICENSE.agpgart \
-    license=uts/common/sys/THIRDPARTYLICENSE.agpgart
+license usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart \
+    license=usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart
--- a/usr/src/pkg/manifests/system-header.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-header.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -1856,6 +1856,8 @@
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license license_in_headers license=license_in_headers
+license usr/src/lib/pkcs11/include/THIRDPARTYLICENSE \
+    license=usr/src/lib/pkcs11/include/THIRDPARTYLICENSE
 link path=usr/include/iso/assert_iso.h target=../assert.h
 link path=usr/include/iso/errno_iso.h target=../errno.h
 link path=usr/include/iso/float_iso.h target=../float.h
--- a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -69,3 +69,5 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE \
+    license=usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -66,9 +66,10 @@
 file path=usr/platform/i86pc/lib/acpihpd group=sys mode=0755
 file path=usr/platform/i86pc/lib/cfgadm/$(ARCH64)/sbd.so.1
 file path=usr/platform/i86pc/lib/cfgadm/sbd.so.1
-license cr_Intel.hotplug license=cr_Intel
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/acpihpd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/acpihpd/THIRDPARTYLICENSE
 link path=usr/platform/i86pc/lib/cfgadm/$(ARCH64)/sbd.so target=./sbd.so.1
 link path=usr/platform/i86pc/lib/cfgadm/sbd.so target=./sbd.so.1
 depend fmri=pkg:/system/kernel/power type=require
--- a/usr/src/pkg/manifests/system-kernel-platform.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-kernel-platform.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -1194,9 +1194,17 @@
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/sys/THIRDPARTYLICENSE.unicode \
-    license=uts/common/sys/THIRDPARTYLICENSE.unicode
-license uts/intel/THIRDPARTYLICENSE license=uts/intel/THIRDPARTYLICENSE
+license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \
+    license=usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE
+license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE
+$(sparc_ONLY)license usr/src/stand/lib/tcp/THIRDPARTYLICENSE \
+    license=usr/src/stand/lib/tcp/THIRDPARTYLICENSE
+license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \
+    license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode
+license usr/src/uts/common/zmod/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/zmod/THIRDPARTYLICENSE
+$(i386_ONLY)license usr/src/uts/intel/THIRDPARTYLICENSE \
+    license=usr/src/uts/intel/THIRDPARTYLICENSE
 $(sparc_ONLY)link path=platform/SUNW,A70/kernel/crypto/$(ARCH64)/aes \
     target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
 $(sparc_ONLY)link path=platform/SUNW,Netra-CP3010/kernel/crypto/$(ARCH64)/aes \
--- a/usr/src/pkg/manifests/system-kernel-security-gss.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-kernel-security-gss.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -50,5 +50,5 @@
     hotline="Please contact your local service provider" \
     name="kernel GSSAPI V2" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \
-    license=uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
+license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/system-kernel.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-kernel.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -837,31 +837,35 @@
     hotline="Please contact your local service provider" \
     name="Core Solaris Kernel (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license common/crypto/THIRDPARTYLICENSE.cryptogams \
-    license=common/crypto/THIRDPARTYLICENSE.cryptogams
-license common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \
-    license=common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman
-license common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \
-    license=common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl
-license common/crypto/ecc/THIRDPARTYLICENSE \
-    license=common/crypto/ecc/THIRDPARTYLICENSE
-license common/crypto/md5/amd64/THIRDPARTYLICENSE \
-    license=common/crypto/md5/amd64/THIRDPARTYLICENSE
-license common/mpi/THIRDPARTYLICENSE license=common/mpi/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/inet/ip/THIRDPARTYLICENSE.rts \
-    license=uts/common/inet/ip/THIRDPARTYLICENSE.rts
-license uts/common/inet/tcp/THIRDPARTYLICENSE \
-    license=uts/common/inet/tcp/THIRDPARTYLICENSE
-license uts/common/io/THIRDPARTYLICENSE.etheraddr \
-    license=uts/common/io/THIRDPARTYLICENSE.etheraddr
-license uts/common/sys/THIRDPARTYLICENSE.icu \
-    license=uts/common/sys/THIRDPARTYLICENSE.icu
-license uts/common/sys/THIRDPARTYLICENSE.unicode \
-    license=uts/common/sys/THIRDPARTYLICENSE.unicode
-license uts/intel/io/acpica/THIRDPARTYLICENSE \
-    license=uts/intel/io/acpica/THIRDPARTYLICENSE
+license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \
+    license=usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE
+license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE
+license usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams \
+    license=usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams
+$(i386_ONLY)license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \
+    license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman
+$(i386_ONLY)license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \
+    license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl
+license usr/src/common/crypto/ecc/THIRDPARTYLICENSE \
+    license=usr/src/common/crypto/ecc/THIRDPARTYLICENSE
+$(i386_ONLY)license usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE \
+    license=usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE
+license usr/src/common/mpi/THIRDPARTYLICENSE \
+    license=usr/src/common/mpi/THIRDPARTYLICENSE
+license usr/src/uts/common/inet/ip/THIRDPARTYLICENSE.rts \
+    license=usr/src/uts/common/inet/ip/THIRDPARTYLICENSE.rts
+license usr/src/uts/common/inet/tcp/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/inet/tcp/THIRDPARTYLICENSE
+license usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr \
+    license=usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr
+license usr/src/uts/common/sys/THIRDPARTYLICENSE.icu \
+    license=usr/src/uts/common/sys/THIRDPARTYLICENSE.icu
+license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \
+    license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode
+$(i386_ONLY)license usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE \
+    license=usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE
 $(i386_ONLY)link path=boot/solaris/bin/root_archive \
     target=../../../usr/sbin/root_archive
 link path=dev/dld target=../devices/pseudo/dld@0:ctl
--- a/usr/src/pkg/manifests/system-library-policykit.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-policykit.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -43,7 +43,7 @@
     desc="Toolkit for controlling privileges (freedesktop.org)" \
     hotline="Please contact your local service provider" name=PolicyKit \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/hal/LICENSE license=cmd/hal/LICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE
 link path=usr/lib/libpolkit.so target=./libpolkit.so.0.0.0
 link path=usr/lib/libpolkit.so.0 target=./libpolkit.so.0.0.0
--- a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -41,8 +41,8 @@
 file path=usr/lib/security/$(ARCH64)/pkcs11_kms.so.1
 file path=usr/lib/security/pkcs11_kms.so.1
 license cr_Sun license=cr_Sun
-license lib/libkmsagent/THIRDPARTYLICENSE \
-    license=lib/libkmsagent/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libkmsagent/THIRDPARTYLICENSE \
+    license=usr/src/lib/libkmsagent/THIRDPARTYLICENSE
 link path=usr/lib/security/$(ARCH64)/pkcs11_kms.so target=pkcs11_kms.so.1
 link path=usr/lib/security/pkcs11_kms.so target=pkcs11_kms.so.1
--- a/usr/src/pkg/manifests/system-library-security-gss.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-security-gss.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -50,10 +50,12 @@
     hotline="Please contact your local service provider" name="GSSAPI V2" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/libgss/THIRDPARTYLICENSE license=lib/libgss/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
-license lic_gss license=lic_gss
-license uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \
-    license=uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
+license usr/src/lib/libgss/THIRDPARTYLICENSE \
+    license=usr/src/lib/libgss/THIRDPARTYLICENSE
+license usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE \
+    license=usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE
+license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libgss.so target=libgss.so.1
 link path=usr/lib/libgss.so target=libgss.so.1
--- a/usr/src/pkg/manifests/system-library-security-libsasl.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-security-libsasl.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -50,6 +50,7 @@
     name="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/libsasl/THIRDPARTYLICENSE license=lib/libsasl/THIRDPARTYLICENSE
+license usr/src/lib/libsasl/THIRDPARTYLICENSE \
+    license=usr/src/lib/libsasl/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libsasl.so target=libsasl.so.1
 link path=usr/lib/libsasl.so target=libsasl.so.1
--- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,8 +51,9 @@
     name="Common Fibre Channel HBA API Library (Root)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/hbaapi/THIRDPARTYLICENSE license=lib/hbaapi/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/hbaapi/THIRDPARTYLICENSE \
+    license=usr/src/lib/hbaapi/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1
 link path=usr/lib/libHBAAPI.so target=libHBAAPI.so.1
 depend fmri=system/library/storage/fibre-channel/libsun_fc type=require
--- a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -51,8 +51,9 @@
     name="Solaris IMA Common Library (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/libima/THIRDPARTYLICENSE license=lib/libima/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libima/THIRDPARTYLICENSE \
+    license=usr/src/lib/libima/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libima.so target=libima.so.1
 link path=usr/lib/libima.so target=libima.so.1
 depend fmri=system/library/storage/ima type=require
--- a/usr/src/pkg/manifests/system-library-storage-ima.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-storage-ima.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -53,7 +53,8 @@
     name="Solaris IMA Software Initiator Plugin (Root)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/libima/THIRDPARTYLICENSE license=lib/libima/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libima/THIRDPARTYLICENSE \
+    license=usr/src/lib/libima/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libsun_ima.so target=libsun_ima.so.1
 link path=usr/lib/libsun_ima.so target=libsun_ima.so.1
--- a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -54,9 +54,9 @@
     name="SNIA Multipath Management API Common Library (Root)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/mpapi/libmpapi/THIRDPARTYLICENSE \
-    license=lib/mpapi/libmpapi/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE \
+    license=usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE
 link path=lib/$(ARCH64)/libMPAPI.so target=libMPAPI.so.1 \
     variant.opensolaris.zone=global
 link path=lib/libMPAPI.so target=libMPAPI.so.1 variant.opensolaris.zone=global
--- a/usr/src/pkg/manifests/system-library.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-library.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -457,48 +457,62 @@
     hotline="Please contact your local service provider" \
     name="Core Solaris Libraries (Root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license common/crypto/THIRDPARTYLICENSE.cryptogams \
-    license=common/crypto/THIRDPARTYLICENSE.cryptogams
-license common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \
-    license=common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman
-license common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \
-    license=common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl
-license common/crypto/ecc/THIRDPARTYLICENSE \
-    license=common/crypto/ecc/THIRDPARTYLICENSE
-license common/crypto/md5/amd64/THIRDPARTYLICENSE \
-    license=common/crypto/md5/amd64/THIRDPARTYLICENSE
-license common/mpi/THIRDPARTYLICENSE license=common/mpi/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
-license lib/libast/THIRDPARTYLICENSE license=lib/libast/THIRDPARTYLICENSE
-license lib/libbsdmalloc/THIRDPARTYLICENSE \
-    license=lib/libbsdmalloc/THIRDPARTYLICENSE
-license lib/libcmd/THIRDPARTYLICENSE license=lib/libcmd/THIRDPARTYLICENSE
-license lib/libdll/THIRDPARTYLICENSE license=lib/libdll/THIRDPARTYLICENSE
-license lib/libinetutil/common/THIRDPARTYLICENSE \
-    license=lib/libinetutil/common/THIRDPARTYLICENSE
-license lib/libkmf/THIRDPARTYLICENSE license=lib/libkmf/THIRDPARTYLICENSE
-license lib/libldap5/THIRDPARTYLICENSE license=lib/libldap5/THIRDPARTYLICENSE
-license lib/libmp/common/THIRDPARTYLICENSE \
-    license=lib/libmp/common/THIRDPARTYLICENSE
-license lib/libresolv/THIRDPARTYLICENSE \
-    license=lib/libresolv/THIRDPARTYLICENSE
-license lib/libresolv2/THIRDPARTYLICENSE \
-    license=lib/libresolv2/THIRDPARTYLICENSE
-license lib/libshell/THIRDPARTYLICENSE license=lib/libshell/THIRDPARTYLICENSE
-license lib/libsum/THIRDPARTYLICENSE license=lib/libsum/THIRDPARTYLICENSE
-license lib/libwrap/THIRDPARTYLICENSE license=lib/libwrap/THIRDPARTYLICENSE
-license lib/pam_modules/authtok_check/THIRDPARTYLICENSE \
-    license=lib/pam_modules/authtok_check/THIRDPARTYLICENSE
-license lib/passwdutil/THIRDPARTYLICENSE \
-    license=lib/passwdutil/THIRDPARTYLICENSE
-license lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE \
-    license=lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE
-license lic_AMD license=lic_AMD
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble
-license uts/common/sys/THIRDPARTYLICENSE.unicode \
-    license=uts/common/sys/THIRDPARTYLICENSE.unicode
+license usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams \
+    license=usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams
+license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \
+    license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman
+license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \
+    license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl
+license usr/src/common/crypto/ecc/THIRDPARTYLICENSE \
+    license=usr/src/common/crypto/ecc/THIRDPARTYLICENSE
+license usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE \
+    license=usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE
+license usr/src/common/mpi/THIRDPARTYLICENSE \
+    license=usr/src/common/mpi/THIRDPARTYLICENSE
+license usr/src/lib/libast/THIRDPARTYLICENSE \
+    license=usr/src/lib/libast/THIRDPARTYLICENSE
+license usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE \
+    license=usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE
+$(i386_ONLY)license usr/src/lib/libc/$(ARCH64)/gen/THIRDPARTYLICENSE \
+    license=usr/src/lib/libc/$(ARCH64)/gen/THIRDPARTYLICENSE
+license usr/src/lib/libc/port/fp/THIRDPARTYLICENSE \
+    license=usr/src/lib/libc/port/fp/THIRDPARTYLICENSE
+license usr/src/lib/libcmd/THIRDPARTYLICENSE \
+    license=usr/src/lib/libcmd/THIRDPARTYLICENSE
+license usr/src/lib/libdll/THIRDPARTYLICENSE \
+    license=usr/src/lib/libdll/THIRDPARTYLICENSE
+license usr/src/lib/libinetutil/common/THIRDPARTYLICENSE \
+    license=usr/src/lib/libinetutil/common/THIRDPARTYLICENSE
+license usr/src/lib/libkmf/THIRDPARTYLICENSE \
+    license=usr/src/lib/libkmf/THIRDPARTYLICENSE
+license usr/src/lib/libldap4/THIRDPARTYLICENSE \
+    license=usr/src/lib/libldap4/THIRDPARTYLICENSE
+license usr/src/lib/libldap5/THIRDPARTYLICENSE \
+    license=usr/src/lib/libldap5/THIRDPARTYLICENSE
+license usr/src/lib/libmp/common/THIRDPARTYLICENSE \
+    license=usr/src/lib/libmp/common/THIRDPARTYLICENSE
+license usr/src/lib/libresolv/THIRDPARTYLICENSE \
+    license=usr/src/lib/libresolv/THIRDPARTYLICENSE
+license usr/src/lib/libresolv2/THIRDPARTYLICENSE \
+    license=usr/src/lib/libresolv2/THIRDPARTYLICENSE
+license usr/src/lib/libshell/THIRDPARTYLICENSE \
+    license=usr/src/lib/libshell/THIRDPARTYLICENSE
+license usr/src/lib/libsum/THIRDPARTYLICENSE \
+    license=usr/src/lib/libsum/THIRDPARTYLICENSE
+license usr/src/lib/libwrap/THIRDPARTYLICENSE \
+    license=usr/src/lib/libwrap/THIRDPARTYLICENSE
+license usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE \
+    license=usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE
+license usr/src/lib/passwdutil/THIRDPARTYLICENSE \
+    license=usr/src/lib/passwdutil/THIRDPARTYLICENSE
+license usr/src/lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE \
+    license=usr/src/lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE
+license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \
+    license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode
 link path=lib/$(ARCH64)/libadm.so target=libadm.so.1
 link path=lib/$(ARCH64)/libaio.so target=libaio.so.1
 link path=lib/$(ARCH64)/libbsm.so target=libbsm.so.1
--- a/usr/src/pkg/manifests/system-management-intel-amt.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-management-intel-amt.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -72,3 +72,7 @@
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/lms/THIRDPARTYLICENSE \
+    license=usr/src/cmd/lms/THIRDPARTYLICENSE
+license usr/src/uts/intel/io/heci/THIRDPARTYLICENSE \
+    license=usr/src/uts/intel/io/heci/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/system-management-snmp-sea.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-management-snmp-sea.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -47,10 +47,10 @@
     hotline="Please contact your local service provider" \
     name="Solstice Enterprise Agents 1.0.3 Simple Network Management Protocol" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/agents/snmp/THIRDPARTYLICENSE \
-    license=cmd/agents/snmp/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/agents/snmp/THIRDPARTYLICENSE \
+    license=usr/src/cmd/agents/snmp/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libssagent.so target=./libssagent.so.1
 link path=usr/lib/$(ARCH64)/libssasnmp.so target=./libssasnmp.so.1
 link path=usr/lib/libssagent.so target=./libssagent.so.1
--- a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -46,10 +46,10 @@
     hotline="Please contact your local service provider" \
     name="GNU utilities for PPP" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \
-    license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect
-license cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \
-    license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd
-license cmd/cmd-inet/usr.bin/pppdump/LICENSE.top \
-    license=cmd/cmd-inet/usr.bin/pppdump/LICENSE.top
 license cr_Sun license=cr_Sun
+license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect
+license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd
+license usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/system-network-ppp.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-network-ppp.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -95,9 +95,9 @@
     hotline="Please contact your local service provider" \
     name="Solaris PPP daemon and utilities" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license uts/common/io/ppp/THIRDPARTYLICENSE \
-    license=uts/common/io/ppp/THIRDPARTYLICENSE
+license usr/src/cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE
+license usr/src/uts/common/io/ppp/THIRDPARTYLICENSE \
+    license=usr/src/uts/common/io/ppp/THIRDPARTYLICENSE
--- a/usr/src/pkg/manifests/system-network-routing.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-network-routing.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -61,10 +61,11 @@
     hotline="Please contact your local service provider" \
     name="Network Routing daemons/commands (Root)" \
     vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE
-license cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE \
-    license=cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license lic_SUNWroute license=lic_SUNWroute
+license usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE \
+    license=usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE
+license usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd \
+    license=usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd
+license usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd \
+    license=usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd
--- a/usr/src/pkg/manifests/system-security-kerberos-5.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-security-kerberos-5.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -102,8 +102,9 @@
     name="Kerberos V5 Master KDC (user)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/krb5/THIRDPARTYLICENSE license=lib/krb5/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/krb5/THIRDPARTYLICENSE \
+    license=usr/src/lib/krb5/THIRDPARTYLICENSE
 link path=usr/lib/krb5/db2.so target=db2.so.1
 link path=usr/lib/krb5/kldap.so target=kldap.so.1
 link path=usr/lib/krb5/libdb2.so target=libdb2.so.1
--- a/usr/src/pkg/manifests/system-storage-parted.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-storage-parted.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -59,5 +59,9 @@
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+license usr/src/cmd/parted/THIRDPARTYLICENSE \
+    license=usr/src/cmd/parted/THIRDPARTYLICENSE
+license usr/src/lib/libparted/THIRDPARTYLICENSE \
+    license=usr/src/lib/libparted/THIRDPARTYLICENSE
 link path=usr/lib/libparted.so target=./libparted.so.8
 depend fmri=system/file-system/ntfsprogs type=require
--- a/usr/src/pkg/manifests/system-storage-sasinfo.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/system-storage-sasinfo.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -64,8 +64,9 @@
     name="SM-HBA Libraries and CLI (root)" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
 license cr_Sun license=cr_Sun
-license lib/smhba/THIRDPARTYLICENSE license=lib/smhba/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/smhba/THIRDPARTYLICENSE \
+    license=usr/src/lib/smhba/THIRDPARTYLICENSE
 link path=usr/lib/$(ARCH64)/libSMHBAAPI.so target=libSMHBAAPI.so.1
 link path=usr/lib/$(ARCH64)/libsun_sas.so target=libsun_sas.so.1
 link path=usr/lib/libSMHBAAPI.so target=libSMHBAAPI.so.1
--- a/usr/src/pkg/manifests/text-doctools.mf	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/manifests/text-doctools.mf	Mon Aug 02 16:37:22 2010 -0600
@@ -361,24 +361,33 @@
     hotline="Please contact your local service provider" \
     name="Documentation Tools" vendor="Sun Microsystems, Inc." \
     version=11.11,REV=2009.11.11
-license cmd/checkeq/THIRDPARTYLICENSE license=cmd/checkeq/THIRDPARTYLICENSE
-license cmd/checknr/THIRDPARTYLICENSE license=cmd/checknr/THIRDPARTYLICENSE
-license cmd/eqn/THIRDPARTYLICENSE license=cmd/eqn/THIRDPARTYLICENSE
-license cmd/man/src/THIRDPARTYLICENSE license=cmd/man/src/THIRDPARTYLICENSE
-license cmd/man/src/util/THIRDPARTYLICENSE \
-    license=cmd/man/src/util/THIRDPARTYLICENSE
-license cmd/man/src/util/instant.src/THIRDPARTYLICENSE \
-    license=cmd/man/src/util/instant.src/THIRDPARTYLICENSE
-license cmd/man/src/util/nsgmls.src/COPYING \
-    license=cmd/man/src/util/nsgmls.src/COPYING
-license cmd/man/src/util/solbookv2/THIRDPARTYLICENSE \
-    license=cmd/man/src/util/solbookv2/THIRDPARTYLICENSE
-license cmd/refer/THIRDPARTYLICENSE license=cmd/refer/THIRDPARTYLICENSE
-license cmd/soelim/THIRDPARTYLICENSE license=cmd/soelim/THIRDPARTYLICENSE
-license cmd/tbl/THIRDPARTYLICENSE license=cmd/tbl/THIRDPARTYLICENSE
-license cmd/ul/THIRDPARTYLICENSE license=cmd/ul/THIRDPARTYLICENSE
-license cmd/vgrind/THIRDPARTYLICENSE license=cmd/vgrind/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
+license usr/src/cmd/checkeq/THIRDPARTYLICENSE \
+    license=usr/src/cmd/checkeq/THIRDPARTYLICENSE
+license usr/src/cmd/checknr/THIRDPARTYLICENSE \
+    license=usr/src/cmd/checknr/THIRDPARTYLICENSE
+license usr/src/cmd/eqn/THIRDPARTYLICENSE \
+    license=usr/src/cmd/eqn/THIRDPARTYLICENSE
+license usr/src/cmd/man/src/THIRDPARTYLICENSE \
+    license=usr/src/cmd/man/src/THIRDPARTYLICENSE
+license usr/src/cmd/man/src/util/THIRDPARTYLICENSE \
+    license=usr/src/cmd/man/src/util/THIRDPARTYLICENSE
+license usr/src/cmd/man/src/util/instant.src/THIRDPARTYLICENSE \
+    license=usr/src/cmd/man/src/util/instant.src/THIRDPARTYLICENSE
+license usr/src/cmd/man/src/util/nsgmls.src/COPYING \
+    license=usr/src/cmd/man/src/util/nsgmls.src/COPYING
+license usr/src/cmd/man/src/util/solbookv2/THIRDPARTYLICENSE \
+    license=usr/src/cmd/man/src/util/solbookv2/THIRDPARTYLICENSE
+license usr/src/cmd/refer/THIRDPARTYLICENSE \
+    license=usr/src/cmd/refer/THIRDPARTYLICENSE
+license usr/src/cmd/soelim/THIRDPARTYLICENSE \
+    license=usr/src/cmd/soelim/THIRDPARTYLICENSE
+license usr/src/cmd/tbl/THIRDPARTYLICENSE \
+    license=usr/src/cmd/tbl/THIRDPARTYLICENSE
+license usr/src/cmd/ul/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ul/THIRDPARTYLICENSE
+license usr/src/cmd/vgrind/THIRDPARTYLICENSE \
+    license=usr/src/cmd/vgrind/THIRDPARTYLICENSE
 link path=usr/lib/tmac target=../share/lib/tmac
 link path=usr/man target=./share/man
 depend fmri=text/less type=require
--- a/usr/src/pkg/transforms/extract_metadata	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/pkg/transforms/extract_metadata	Mon Aug 02 16:37:22 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -31,6 +30,13 @@
 <transform set name=org.opensolaris.redist value=nonredist|internal -> print REPO=extra>
 
 #
+# Pull out the license paths for staging in the proto area.  Ignore
+# those with no path separators, as that indicates a file kept in
+# $SRC/pkg/license_files, rather than alongside the associated source.
+#
+<transform license license=.*/.+ -> print LICS="${LICS} %(license)">
+
+#
 # Ordering is important here, and the last line wins.
 #
 # The default of "current" is provided by the calling environment,
--- a/usr/src/tools/findunref/exception_list.common	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/tools/findunref/exception_list.common	Mon Aug 02 16:37:22 2010 -0600
@@ -20,10 +20,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -76,16 +73,25 @@
 */tools
 
 #
-# Ignore license files. This should be temporary, and these lines
-# should be removed once we start generating the opensolaris.org
-# deliverables from the nightly gate builds.
-#
-*/COPYING*
-*/LICENSE*
-*/THIRDPARTYLICENSE*
-*/OPENSOLARIS.LICENSE
-
-#
 # Ignore file list generators
 #
 *.flg
+
+#
+# Legitimately unreferenced license/copying files.  Please include
+# explanatory comments when adding items here.
+#
+# Though "COPYING" is usually used as a filename for GPL, the license
+# information for openssh is actually found in usr/src/cmd/ssh/doc/LICENSE.
+# The COPYING.Ylonen file is merely additional information.
+#
+usr/src/cmd/ssh/doc/COPYING.Ylonen
+#
+# The GPL terms for libntfs are included in the corresponding
+# THIRDPARTYLICENSE file.
+#
+usr/src/lib/libntfs/COPYING
+#
+# This covers header files that are not delivered.
+#
+usr/src/uts/common/xen/public/COPYING
--- a/usr/src/tools/findunref/exception_list.open	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/tools/findunref/exception_list.open	Mon Aug 02 16:37:22 2010 -0600
@@ -256,11 +256,3 @@
 #
 ./usr/src/cmd/dfs.cmds/sharemgr/amd64/Makefile
 ./usr/src/cmd/dfs.cmds/sharemgr/sparcv9/Makefile
-
-#
-# Ignore the license description file for Open Fabrics Alliance
-# license file (lic_of). This exception is needed because the
-# name of the license file does not have a prefix of :
-# 	THIRDPARTYLICENSE
-#
-./usr/src/uts/common/io/ib/clients/of/lic_of.descrip
--- a/usr/src/tools/onbld/Makefile	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/tools/onbld/Makefile	Mon Aug 02 16:37:22 2010 -0600
@@ -43,13 +43,11 @@
 clean	:= TARGET = clean
 clobber := TARGET = clobber
 
-CLOBBERFILES += THIRDPARTYLICENSE
-
 include ../Makefile.python
 
 .KEEP_STATE:
 
-all: $(PYVERSOBJS) $(SUBDIRS) THIRDPARTYLICENSE
+all: $(PYVERSOBJS) $(SUBDIRS)
 
 install: all $(ROOTPYFILES) $(SUBDIRS)
 
@@ -57,10 +55,6 @@
 
 clobber: clean pyclobber $(SUBDIRS)
 
-THIRDPARTYLICENSE: $(SRC)/pkg/license_files/lic_GPLv2
-	$(RM) $@
-	$(CAT) $? > $@
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/tools/onbld/THIRDPARTYLICENSE	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- a/usr/src/tools/onbld/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/tools/onbld/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -1,1 +1,1 @@
-SUNWonbld tools requiring use of Mercurial internals
+ONBLD TOOLS THAT REFER TO MERCURIAL INTERNALS
--- a/usr/src/tools/opensolaris/license-list	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-usr/closed/uts/intel/io/iprb/THIRDPARTYLICENSE
-usr/src/cmd/agents/snmp/THIRDPARTYLICENSE
-usr/src/cmd/ast/THIRDPARTYLICENSE
-usr/src/cmd/backup/dump/THIRDPARTYLICENSE
-usr/src/cmd/bnu/THIRDPARTYLICENSE
-usr/src/cmd/checkeq/THIRDPARTYLICENSE
-usr/src/cmd/checknr/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/THIRDPARTYLICENSE.kcmd
-usr/src/cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp
-usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh
-usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect
-usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd
-usr/src/cmd/cmd-inet/usr.bin/pppdump/LICENSE.top
-usr/src/cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp
-usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat
-usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind
-usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route
-usr/src/cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE
-usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE
-usr/src/cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE
-usr/src/cmd/compress/THIRDPARTYLICENSE
-usr/src/cmd/csh/THIRDPARTYLICENSE
-usr/src/cmd/eeprom/THIRDPARTYLICENSE
-usr/src/cmd/eqn/THIRDPARTYLICENSE
-usr/src/cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE
-usr/src/cmd/fs.d/ufs/THIRDPARTYLICENSE
-usr/src/cmd/hal/LICENSE
-usr/src/cmd/ipf/tools/IPFILTER.LICENCE
-usr/src/cmd/lastcomm/THIRDPARTYLICENSE
-usr/src/cmd/ldap/THIRDPARTYLICENSE
-usr/src/cmd/look/THIRDPARTYLICENSE
-usr/src/cmd/lp/cmd/lptest/THIRDPARTYLICENSE
-usr/src/cmd/man/src/THIRDPARTYLICENSE
-usr/src/cmd/man/src/util/THIRDPARTYLICENSE
-usr/src/cmd/man/src/util/instant.src/THIRDPARTYLICENSE
-usr/src/cmd/man/src/util/nsgmls.src/COPYING
-usr/src/cmd/man/src/util/solbookv2/THIRDPARTYLICENSE
-usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE
-usr/src/cmd/mt/THIRDPARTYLICENSE
-usr/src/cmd/ndmpd/LICENSE
-usr/src/cmd/ntfsprogs/THIRDPARTYLICENSE
-usr/src/cmd/parted/THIRDPARTYLICENSE
-usr/src/cmd/perl/5.8.4/distrib/ext/Cwd/THIRDPARTYLICENSE
-usr/src/cmd/perl/THIRDPARTYLICENSE
-usr/src/cmd/refer/THIRDPARTYLICENSE
-usr/src/cmd/script/THIRDPARTYLICENSE
-usr/src/cmd/sendmail/THIRDPARTYLICENSE
-usr/src/cmd/soelim/THIRDPARTYLICENSE
-usr/src/cmd/ssh/THIRDPARTYLICENSE
-usr/src/cmd/stat/vmstat/THIRDPARTYLICENSE
-usr/src/cmd/tbl/THIRDPARTYLICENSE
-usr/src/cmd/tcpd/THIRDPARTYLICENSE
-usr/src/cmd/terminfo/THIRDPARTYLICENSE
-usr/src/cmd/tip/THIRDPARTYLICENSE
-usr/src/cmd/ul/THIRDPARTYLICENSE
-usr/src/cmd/units/THIRDPARTYLICENSE
-usr/src/cmd/vgrind/THIRDPARTYLICENSE
-usr/src/cmd/vi/THIRDPARTYLICENSE
-usr/src/cmd/which/THIRDPARTYLICENSE
-usr/src/cmd/xstr/THIRDPARTYLICENSE
-usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams
-usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman
-usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl
-usr/src/common/crypto/ecc/THIRDPARTYLICENSE
-usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE
-usr/src/common/mpi/THIRDPARTYLICENSE
-usr/src/common/openssl/LICENSE
-usr/src/grub/grub-0.97/COPYING
-usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE
-usr/src/lib/hbaapi/THIRDPARTYLICENSE
-usr/src/lib/krb5/THIRDPARTYLICENSE
-usr/src/lib/libast/THIRDPARTYLICENSE
-usr/src/lib/libbc/THIRDPARTYLICENSE
-usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE
-usr/src/lib/libcmd/THIRDPARTYLICENSE
-usr/src/lib/libdll/THIRDPARTYLICENSE
-usr/src/lib/libdns_sd/THIRDPARTYLICENSE
-usr/src/lib/libgss/THIRDPARTYLICENSE
-usr/src/lib/libima/THIRDPARTYLICENSE
-usr/src/lib/libinetutil/common/THIRDPARTYLICENSE
-usr/src/lib/libkmf/THIRDPARTYLICENSE
-usr/src/lib/libkmsagent/THIRDPARTYLICENSE
-usr/src/lib/libldap5/THIRDPARTYLICENSE
-usr/src/lib/libmp/common/THIRDPARTYLICENSE
-usr/src/lib/libntfs/THIRDPARTYLICENSE
-usr/src/lib/libparted/THIRDPARTYLICENSE
-usr/src/lib/libpkg/THIRDPARTYLICENSE
-usr/src/lib/libpp/THIRDPARTYLICENSE
-usr/src/lib/libresolv/THIRDPARTYLICENSE
-usr/src/lib/libresolv2/THIRDPARTYLICENSE
-usr/src/lib/librstp/THIRDPARTYLICENSE
-usr/src/lib/libsasl/THIRDPARTYLICENSE
-usr/src/lib/libshell/THIRDPARTYLICENSE
-usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple
-usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov
-usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4
-usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft
-usr/src/lib/libsum/THIRDPARTYLICENSE
-usr/src/lib/libtecla/THIRDPARTYLICENSE
-usr/src/lib/libwrap/THIRDPARTYLICENSE
-usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE
-usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE
-usr/src/lib/passwdutil/THIRDPARTYLICENSE
-usr/src/lib/pkcs11/include/THIRDPARTYLICENSE
-usr/src/lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE
-usr/src/lib/print/libhttp-core/common/LICENSE.txt
-usr/src/lib/smhba/THIRDPARTYLICENSE
-usr/src/stand/lib/tcp/THIRDPARTYLICENSE
-usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE
-usr/src/tools/onbld/THIRDPARTYLICENSE
-usr/src/ucbcmd/basename/THIRDPARTYLICENSE
-usr/src/ucbcmd/echo/THIRDPARTYLICENSE
-usr/src/ucbcmd/from/THIRDPARTYLICENSE
-usr/src/ucbcmd/groups/THIRDPARTYLICENSE
-usr/src/ucbcmd/ln/THIRDPARTYLICENSE
-usr/src/ucbcmd/ls/THIRDPARTYLICENSE
-usr/src/ucbcmd/sum/THIRDPARTYLICENSE
-usr/src/ucbcmd/test/THIRDPARTYLICENSE
-usr/src/ucbcmd/tset/THIRDPARTYLICENSE
-usr/src/ucbcmd/users/THIRDPARTYLICENSE
-usr/src/ucbcmd/whereis/THIRDPARTYLICENSE
-usr/src/ucbcmd/whoami/THIRDPARTYLICENSE
-usr/src/ucblib/libcurses/THIRDPARTYLICENSE
-usr/src/ucblib/libtermcap/THIRDPARTYLICENSE
-usr/src/ucblib/libucb/THIRDPARTYLICENSE
-usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
-usr/src/uts/common/inet/ip/THIRDPARTYLICENSE.rts
-usr/src/uts/common/inet/tcp/THIRDPARTYLICENSE
-usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr
-usr/src/uts/common/io/aac/THIRDPARTYLICENSE
-usr/src/uts/common/io/afe/THIRDPARTYLICENSE
-usr/src/uts/common/io/arn/LICENSE
-usr/src/uts/common/io/ath/LICENSE
-usr/src/uts/common/io/atu/THIRDPARTYLICENSE
-usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE
-usr/src/uts/common/io/chxge/com/THIRDPARTYLICENSE
-usr/src/uts/common/io/drm/THIRDPARTYLICENSE
-usr/src/uts/common/io/elxl/THIRDPARTYLICENSE
-usr/src/uts/common/io/ib/clients/of/lic_of
-usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE
-usr/src/uts/common/io/ib/clients/rdsv3/LICENSE
-usr/src/uts/common/io/ipw/THIRDPARTYLICENSE
-usr/src/uts/common/io/ipw/fw-ipw2100/LICENSE
-usr/src/uts/common/io/iwh/THIRDPARTYLICENSE
-usr/src/uts/common/io/iwh/fw-iw/fw_5000/LICENSE
-usr/src/uts/common/io/iwh/fw-iw/fw_5150/LICENSE
-usr/src/uts/common/io/iwi/THIRDPARTYLICENSE
-usr/src/uts/common/io/iwi/fw-ipw2200/LICENSE
-usr/src/uts/common/io/iwk/THIRDPARTYLICENSE
-usr/src/uts/common/io/iwk/fw-iw/LICENSE
-usr/src/uts/common/io/iwp/THIRDPARTYLICENSE
-usr/src/uts/common/io/iwp/fw-iw/LICENSE
-usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE
-usr/src/uts/common/io/mega_sas/THIRDPARTYLICENSE
-usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE
-usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE
-usr/src/uts/common/io/ntxn/THIRDPARTYLICENSE
-usr/src/uts/common/io/myri10ge/THIRDPARTYLICENSE
-usr/src/uts/common/io/mwl/THIRDPARTYLICENSE
-usr/src/uts/common/io/mwl/mwl_fw/LICENSE
-usr/src/uts/common/io/pcan/THIRDPARTYLICENSE
-usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE
-usr/src/uts/common/io/ppp/THIRDPARTYLICENSE
-usr/src/uts/common/io/ral/THIRDPARTYLICENSE
-usr/src/uts/common/io/rtw/THIRDPARTYLICENSE
-usr/src/uts/common/io/rum/THIRDPARTYLICENSE
-usr/src/uts/common/io/rwd/THIRDPARTYLICENSE
-usr/src/uts/common/io/rwn/THIRDPARTYLICENSE
-usr/src/uts/common/io/rwn/fw-rt2860/LICENSE
-usr/src/uts/common/io/scsi/adapters/pmcs/LICENSE
-usr/src/uts/common/io/sfe/THIRDPARTYLICENSE
-usr/src/uts/common/io/uath/THIRDPARTYLICENSE
-usr/src/uts/common/io/uath/uath_fw/LICENSE
-usr/src/uts/common/io/ural/THIRDPARTYLICENSE
-usr/src/uts/common/io/urtw/THIRDPARTYLICENSE
-usr/src/uts/common/io/usb/clients/hwa1480_fw/i1480/LICENSE
-usr/src/uts/common/io/wpi/THIRDPARTYLICENSE
-usr/src/uts/common/io/wpi/fw-wpi/LICENSE
-usr/src/uts/common/io/yge/THIRDPARTYLICENSE
-usr/src/uts/common/io/zyd/THIRDPARTYLICENSE
-usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart
-usr/src/uts/common/sys/THIRDPARTYLICENSE.icu
-usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode
-usr/src/uts/common/zmod/THIRDPARTYLICENSE
-usr/src/uts/intel/THIRDPARTYLICENSE
-usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE
-usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s
-usr/src/uts/intel/io/amr/THIRDPARTYLICENSE
-usr/src/uts/intel/pcbe/THIRDPARTYLICENSE
-usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE
-usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE
--- a/usr/src/tools/req.flg	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/tools/req.flg	Mon Aug 02 16:37:22 2010 -0600
@@ -21,15 +21,12 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-
 echo_file usr/src/lib/Makefile.lib
 echo_file usr/src/lib/Makefile.targ
 echo_file usr/src/lib/libctf/common/libctf.h
-echo_file usr/src/pkg/license_files/lic_GPLv2
 echo_file usr/src/tools/Makefile
 echo_file usr/src/tools/Makefile.targ
 echo_file usr/src/tools/Makefile.tools
--- a/usr/src/tools/scripts/nightly.sh	Mon Aug 02 16:35:58 2010 -0600
+++ b/usr/src/tools/scripts/nightly.sh	Mon Aug 02 16:37:22 2010 -0600
@@ -139,12 +139,18 @@
 	# both DEBUG and non-DEBUG, but it's a cheap operation and not
 	# worth the complexity to only do once.
 	#
-	mktpl -c usr/src/tools/opensolaris/license-list >> "$LOGFILE" 2>&1
-	if (( $? != 0 )) ; then
-		echo "Couldn't create crypto THIRDPARTYLICENSE file." |
+	if [ -d $ROOT/licenses/usr ]; then
+		( cd $ROOT/licenses ; \
+		    mktpl -c $SRC/pkg/license-list ) >> "$LOGFILE" 2>&1
+		if (( $? != 0 )) ; then
+			echo "Couldn't create crypto THIRDPARTYLICENSE files" |
+			    tee -a "$mail_msg_file" >> "$LOGFILE"
+			build_ok=n
+			return
+		fi
+	else
+		echo "No licenses found under $ROOT/licenses" |
 		    tee -a "$mail_msg_file" >> "$LOGFILE"
-		build_ok=n
-		return
 	fi
 
 	to=$(cryptodest "$suffix")
@@ -2871,9 +2877,15 @@
 	echo "\n==== Generating THIRDPARTYLICENSE files ====\n" |
 	    tee -a "$mail_msg_file" >> "$LOGFILE"
 
-	mktpl usr/src/tools/opensolaris/license-list >> "$LOGFILE" 2>&1
-	if (( $? != 0 )) ; then
-		echo "Couldn't create THIRDPARTYLICENSE files" |
+	if [ -d $ROOT/licenses/usr ]; then
+		( cd $ROOT/licenses ; \
+		    mktpl $SRC/pkg/license-list ) >> "$LOGFILE" 2>&1
+		if (( $? != 0 )) ; then
+			echo "Couldn't create THIRDPARTYLICENSE files" |
+			    tee -a "$mail_msg_file" >> "$LOGFILE"
+		fi
+	else
+		echo "No licenses found under $ROOT/licenses" |
 		    tee -a "$mail_msg_file" >> "$LOGFILE"
 	fi
 fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/bpf/BPF.LICENCE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+BERKELEY PACKET FILTER
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,21 @@
+#
+# This file is provided under a CDDLv1 license.  When using or
+# redistributing this file, you may do so under this license.
+# In redistributing this file this license must be included
+# and no other modification of this header file is permitted.
+#
+# CDDL LICENSE SUMMARY
+#
+# Copyright(c) 1999 - 2009 Intel Corporation. All rights reserved.
+#
+# The contents of this file are subject to the terms of Version
+# 1.0 of the Common Development and Distribution License (the "License").
+#
+# You should have received a copy of the License with this software.
+# You can obtain a copy of the License at
+#	http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+INTEL E1000G DRIVER
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,105 @@
+This license applies to the firmware binary files associated with Emulex
+drivers.
+
+THIS PRODUCT CONTAINS FIRMWARE ("EMULEX FIRMWARE") THAT BELONGS TO EMULEX
+CORPORATION ("EMULEX"), THE USE OF WHICH IS SUBJECT TO THIS LICENSE AGREEMENT
+("AGREEMENT") UNLESS OTHERWISE AGREED TO IN WRITING BY EMULEX.  INSTALLING OR
+USING THE EMULEX FIRMWARE CONSTITUTES ACCEPTANCE OF ALL THE TERMS AND
+CONDITIONS OF THIS AGREEMENT UNLESS OTHERWISE AGREED TO IN WRITING BY EMULEX.
+IF LICENSEE DOES NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT,
+LICENSEE SHALL NOT INSTALL OR USE THE EMULEX FIRMWARE.  WRITTEN APPROVAL IS
+NOT A PREREQUISITE TO THE VALIDITY OR ENFORCEABILITY OF THIS AGREEMENT.
+
+1.  Limited Licenses
+
+1.1  Derivatives.  Emulex hereby grants Licensee the personal,
+nontransferable, nonexclusive, royalty-free right and license to include the
+Emulex Firmware in derivative works that Licensee may create under the terms
+and conditions of License #1.  For avoidance of doubt, Licensee acknowledges
+that the Emulex Firmware is not licensed under nor otherwise subject to the
+terms and conditions of License #1.
+
+1.2  Distribution.  Emulex hereby grants Licensee the personal,
+nontransferable, nonexclusive, royalty free, right and license to use,
+distribute, and sublicense copies of Emulex Firmware solely for use with
+Emulex hardware products for which the Emulex Firmware was written and that
+Licensee has purchased from Sun Microsystems or its authorized distributors
+or resellers.  Such distribution may be on electronic media or via download
+from Licensee's website or other electronic means.  Licensee shall grant each
+sublicensee a nonexclusive, nontransferable license to use the Emulex
+Firmware in Object Code only and shall authorize such sublicensees to make
+one archival copy of the Emulex Firmware.  Licensee shall not use, reproduce,
+duplicate, copy, or otherwise sublicense, disclose, distribute, or
+disseminate the Emulex Firmware except as permitted under this Agreement.
+
+1.3  End User.  Emulex grants Licensee a personal, worldwide,
+nontransferable, nonexclusive, royalty-free right and license to use the
+Emulex Firmware only with Emulex hardware products and without circumventing
+any security or rights management features.
+
+1.4  Restrictions.  Licensee agrees to maintain intact and not modify or
+delete Emulex's copyright notice that is contained with each copy of the
+Emulex Firmware.  Licensee shall not (1) reverse engineer, reverse compile or
+reverse assemble all or any part of the Emulex Firmware, (2) disseminate
+performance information or analysis to any third party, other than solely for
+product support purposes, from any source relating to the Emulex Firmware, or
+cause or permit others to do either of both of the foregoing.  Licensee
+agrees to prevent any unauthorized copying of the Emulex Firmware.
+
+2.  Intellectual Property Rights.  The Emulex Firmware is licensed, not sold.
+Emulex or its licensors retain all right, title and interest, including
+without limitation all intellectual property rights, in and to all copies,
+regardless of form or media, of the Emulex Firmware.  The Emulex Firmware
+contains trade secrets of Emulex and Licensee agrees that it shall employ
+reasonable security precautions to maintain the confidentiality of such trade
+secrets.
+
+3.  Indemnity.  Licensee shall defend, indemnify and hold Emulex harmless
+from and against any and all claims, damages, liabilities, costs and expenses
+(including, without limitation, attorneys' fees) arising out of Licensee's
+breach of its obligations under this Agreement.
+
+4.  Term and termination.  The term of this Agreement shall continue until
+Licensee (a) ceases exercising its rights under Section 1 of this Agreement,
+(b) breaches a material term of this Agreement, or (c) gives written notice
+of termination to Emulex.  Upon termination of this Agreement, all copies of
+the Emulex Firmware in the possession of Licensee shall be either returned to
+Emulex or destroyed by Licensee.
+
+5.  Warranty Disclaimer.  Emulex makes no warranties whatsoever, express or
+implied, with respect to the Emulex Firmware.  Licensee agrees that the
+Emulex Firmware is accepted and utilized "AS IS."  EMULEX DISCLAIMS ANY AND
+ALL PROMISES, REPRESENTATIONS, AND WARRANTIES, EXCEPT AS EXPRESSLY SET FORTH
+IN THIS AGREEMENT, WITH RESPECT TO THE EMULEX FIRMWARE; ANY DATA,
+INFORMATION, OR OTHER MATERIAL FURNISHED TO THE LICENSEE HEREUNDER, INCLUDING
+THEIR CONDITION; CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION; THE
+EXISTENCE OF ANY LATENT OR PATENT DEFECTS; AND TITLE, MERCHANTABILITY, OR
+FITNESS FOR A PARTICULAR PURPOSE OR USE.
+
+6.  Limitation of Liability.  Emulex shall have no liability to Licensee, or
+any third party, whether in contract, tort, negligence or products liability
+for any claim, loss of use, business interruption, lost data, lost files, or
+for any indirect, special, incidental, or consequential damages of any kind
+or nature whatsoever arising out of or in connection with the use of or
+inability to use the Emulex Firmware or the performance or operation of the
+Emulex Firmware, even if Emulex has been advised of the possibility of such
+damages occurring.
+
+8.  Miscellaneous.  The laws of the state of California, without regard to
+its choice of law rules, shall govern the interpretation and enforcement of
+this Agreement.  The parties are independent contractors of one another.
+Nothing herein shall be deemed to create any relationship of agency,
+partnership, or joint venture between the parties.  Licensee represents that
+it is acting on its own behalf and is not acting as an agent for or on behalf
+of any third party, and further agrees that it may not assign its rights or
+obligations under this Agreement without prior written consent of Emulex.
+Both parties shall adhere to all applicable laws, regulations, and rules
+relating to the export of Emulex Firmware and any other information provided
+hereunder.  If any term or condition of this Agreement is held invalid,
+illegal or unenforceable by a court of competent jurisdiction, all the other
+terms and conditions shall survive.  The Emulex Firmware may be provided to
+units or agencies of the U.S. government only as "commercial computer
+firmware," "restricted computer firmware," or with "restricted rights" as
+defined in applicable regulations, and may not be provided as source code.
+Manufacturer is Emulex Design & Manufacturing Corporation, 3333 Susan St.,
+Costa Mesa, CA 92626.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+EMULEX FIRMWARE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,184 @@
+This license applies to the firmware binary files associated with the
+QLogic qlc hba driver.
+
+THIS PRODUCT CONTAINS COMPUTER PROGRAMS AND RELATED DOCUMENTATION 
+("SOFTWARE") THAT BELONG TO QLOGIC CORPORATION ("QLOGIC"), THE USE OF WHICH
+IS SUBJECT TO THIS END USER SOFTWARE LICENSE AGREEMENT ("AGREEMENT") UNLESS
+OTHERWISE AGREED TO IN WRITING BY QLOGIC.  CLICKING ON THE "AGREE" BUTTON
+BELOW, INSTALLING/USING THE SOFTWARE OR ENTERING A LICENSE KEY CONSTITUTES
+ACCEPTANCE BY LICENSEE ("LICENSEE" MEANS YOU OR THE BUSINESS ENTITY ON WHOSE
+BEHALF YOU USE OR INSTALL THE SOFTWARE, AS APPLICABLE) OF ALL THE TERMS AND
+CONDITIONS OF THIS AGREEMENT UNLESS OTHERWISE AGREED TO IN WRITING BY QLOGIC.
+IF LICENSEE DOES NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT,
+LICENSEE SHALL NOT INSTALL/USE THE SOFTWARE OR ENTER A LICENSE KEY.  WRITTEN
+APPROVAL IS NOT A PREREQUISITE TO THE VALIDITY OR ENFORCEABILITY OF THIS 
+AGREEMENT. 
+
+1. License Grant.  Subject to the terms and conditions of this 
+   Agreement, QLogic grants Licensee a limited, non-exclusive license 
+   to redistribute, install, download and/or use the Software (in 
+   object code form only) with certain approved products manufactured 
+   by or for QLogic and approved products manufactured by or for an OEM 
+   customer of QLogic ("QLogic Approved Products").  This license is 
+   only available to original end user purchasers of QLogic Approved 
+   Products that have been purchased through QLogic authorized 
+   distribution channels or approved OEM distribution channels.  This 
+   license is not available to any end users of QLogic products who 
+   have purchased QLogic products, which have previously been used and 
+   the license is not available to any purchaser of QLogic application 
+   specific integrated circuits ("ASICs") or any product incorporating 
+   an ASIC, unless the product incorporating the ASIC is a QLogic 
+   Approved Product.  No rights or licenses in the Software are granted 
+   to Licensee other than those rights expressly granted in this 
+   Agreement.  Nothing in this License entitles Licensee to any 
+   upgrades or updates to, or future releases of, the Software. If 
+   Licensee redistributes the Software, then Licensee shall reproduce 
+   all copyright notices and must include this Agreement or an 
+   agreement which is at least as restrictive as this Agreement.
+
+2. Permitted Use.  Licensee may only install and use the Software in 
+   accordance with the documentation provided with the Software and 
+   with QLogic Approved Products.  
+
+3. Intellectual Property Rights.  The Software contains or embodies 
+   intellectual property of QLogic (or any of its licensors). The 
+   structure, organization and code are valuable trade secrets of 
+   QLogic (or its licensors). QLogic and/or its licensors do not grant, 
+   convey or license to Licensee any rights under any patents, 
+   copyrights, trademarks or any other intellectual property except as 
+   specifically granted herein. The Software is protected under U.S. 
+   copyright laws, international treaty provisions and applicable laws 
+   (including patent laws, if applicable) of the country in which it is 
+   being used. Any unauthorized duplication of the Software is 
+   expressly forbidden.
+
+4. Ownership of Software. Notwithstanding anything to the contrary, 
+   QLogic and its licensors retain all title to and, except as 
+   expressly and unambiguously licensed herein, all rights and interest 
+   in (i) the Software, all copies and derivative works thereof (by 
+   whomever produced), and (ii) all copyright rights, patent rights, 
+   trade secret rights, moral rights and all other intellectual 
+   property and proprietary rights anywhere in the world in the 
+   Software.  The Software is only licensed to Licensee and is not 
+   sold. 
+
+5. Restrictions and Cooperation.  Licensee shall not (and shall not 
+   allow any third party to) (i) decompile, disassemble, or otherwise 
+   reverse engineer or attempt to reconstruct or discover any source 
+   code, or underlying ideas or algorithms of the Software (except to 
+   the extent expressly permitted under applicable law); (ii) provide, 
+   lease, lend, use for timesharing or otherwise use or allow others to 
+   use the Software to or for the benefit of third parties; (iii) 
+   except as specified in the applicable user documentation, modify, 
+   incorporate into or with other hardware or software, or create a 
+   derivative work of any part of the Software; (iv) disseminate 
+   performance information or analysis from any source relating to the 
+   Software; (v) make any copies of the Software except as required to 
+   use the Software as licensed hereunder, except for one (1) copy 
+   solely for archival and back-up purposes,  or (vi) remove any 
+   product identification, copyright notice or other proprietary legend 
+   from the Software.  Licensee agrees to cooperate with QLogic and its 
+   licensors in connection with their efforts to protect their 
+   copyright/patent rights and other legal rights in the Software.  
+   QLogic may, from time to time, implement additional security 
+   measures for the Software, and Licensee shall cooperate with 
+   such measures and be responsible for installing upgrades that 
+   include such measures.
+
+6. Further Obligations.  Licensee shall defend, indemnify and hold 
+   QLogic harmless from and against any and all claims, damages, 
+   liabilities, costs and expenses (including, without limitation, 
+   attorneys" fees) arising out of Licensee"s breach of its obligations 
+   under this Agreement.
+
+7. Term and Termination.  This Agreement will become effective on the 
+   date Licensee clicks on the "Agree" button below or otherwise uses 
+   the Software and will remain in force until terminated.  Licensee 
+   may terminate this Agreement at any time, and QLogic may terminate 
+   this Agreement if Licensee breaches any of the terms or conditions 
+   hereunder.  Licensee agrees to destroy or return to QLogic the 
+   original and all copies of the Software immediately upon any 
+   termination of this Agreement.
+
+8. Confidentiality.  Licensee acknowledges that the Software contains 
+   valuable trade secrets of QLogic and other information proprietary 
+   to QLogic and its licensors.  Licensee shall: (i)"keep confidential 
+   such trade secrets and proprietary information, including without 
+   limitation all information concerning ideas and algorithms related 
+   to the Software, (ii)"disclose such information only to its 
+   employees and agents to the extent required to use the Software 
+   under the terms of this Agreement and (iii)"bind its employees, 
+   consultants, agents and other third parties in writing to maintain 
+   the confidentiality of such trade secrets and proprietary 
+   information and not use or disclose such information except as 
+   permitted in this Agreement.
+
+9. Limited Warranty and Disclaimer. THE SOFTWARE IS PROVIDED "AS IS" 
+   WITHOUT ANY WARRANTY OF ANY KIND INCLUDING, WITHOUT LIMITATION, ANY 
+   WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+   NON-INFRINGEMENT.  QLOGIC DOES NOT WARRANT THAT THE SOFTWARE IS 
+   ERROR-FREE OR THAT IT WILL OPERATE WITHOUT INTERRUPTION.  QLOGIC 
+   DOES NOT WARRANT, GUARANTEE OR MAKE ANY REPRESENTATION REGARDING THE 
+   USE, OR THE RESULTS OF THE USE OF THE SOFTWARE INCLUDING, WITHOUT 
+   LIMITATION, THE CORRECTNESS, ACCURACY OR RELIABILITY OF SUCH USE OR 
+   RESULTS.  
+
+10. Limitation of Liability.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, 
+    IN NO EVENT WILL QLOGIC BE LIABLE TO LICENSEE OR ANY THIRD PARTY 
+    FOR ANY CONSEQUENTIAL, INCIDENTAL OR SPECIAL DAMAGES, INCLUDING, 
+    WITHOUT LIMITATION, LOST PROFITS, LOST DATA OR LOST SAVINGS, OR FOR 
+    THE COST OF PROCUREMENT OF SUBSTITUTE GOODS, SERVICES OR TECHNOLOGY 
+    EVEN IF QLOGIC HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, 
+    OR FOR ANY CLAIM BY ANY THIRD PARTY.  
+
+11. Export.  Licensee represents, warrants and agrees that it will not, 
+    directly or indirectly, export, re-export or transmit the Software 
+    or any part thereof to any country in which such export, re-export 
+    or transmission is restricted by any applicable U.S. regulation or 
+    statute, without the prior written consent of both QLogic and, if 
+    required, of the Bureau of Export Administration of the U.S. 
+    Department of Commerce, or such other governmental entity as may 
+    have jurisdiction over such export or transmission. In addition to 
+    the above, Software may not, in the absence of authorization by 
+    U.S. and local law and regulations, as required, be used by or 
+    exported or reexported to (i) any U.S. sanctioned or embargoed 
+    country, or to nationals or residents of such countries; or (ii) 
+    any person, entity, organization or other party identified on the 
+    U.S. Department of Commerce's Denied Persons or Entity List, the 
+    U.S. Department of Treasury's Specially Designated Nationals or 
+    Blocked Persons Lists, or the Department of State's Debarred 
+    Parties List, as published and revised from time to time; or 
+    (iii) any party where the end-use involves nuclear, 
+    chemical/biological weapons, rocket systems or unmanned air 
+    vehicles.
+
+12. Miscellaneous.  A party"s failure to exercise or its delay in 
+    exercising any rights hereunder will not be deemed to be a waiver 
+    of such right.  If any provision of this Agreement shall be held by 
+    any court of competent jurisdiction to be unenforceable or invalid, 
+    that provision shall be limited or eliminated to the minimum extent 
+    necessary so that this Agreement shall otherwise remain in full 
+    force and effect and enforceable.  This Agreement shall be 
+    construed pursuant to the laws of the State of California and the 
+    United States without regard to conflicts of laws provisions 
+    thereof and without regard to the United Nations Convention on 
+    Authority for the International Sale of Goods.  Licensee 
+    irrevocably submits to the jurisdiction of any state or federal 
+    court sitting in the State of California, United States of America, 
+    and consents to venue in such forum with respect to any action or 
+    proceeding that relates to this Agreement.  No amendment 
+    to or modification of this Agreement will be binding unless in 
+    writing and signed by a duly authorized officer of QLogic.  The 
+    provisions of Sections 3-11 shall survive termination of this 
+    Agreement.  This Agreement is in the English language only, which 
+    language shall be controlling and any revision of this Agreement in 
+    any other language shall not be binding.  Both parties agree that 
+    this Agreement is the complete and exclusive statement of the 
+    mutual understanding of the parties and supersedes and cancels all 
+    previous written and oral agreements and communications relating to 
+    the subject matter of this Agreement.  NO VENDOR, DISTRIBUTOR, 
+    DEALER, RETAILER, SALES PERSON OR OTHER PERSON IS AUTHORIZED TO 
+    MODIFY THIS AGREEMENT OR TO MAKE ANY WARRANTY, REPRESENTATION OR 
+    PROMISE WHICH IS DIFFERENT THAN, OR IN ADDITION TO, THE 
+    REPRESENTATIONS OR PROMISES IN THIS AGREEMENT.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+QLOGIC QLC FIRMWARE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,40 @@
+DO NOT TRANSLATE OR LOCALIZE.
+
+This package includes software from the OpenFabrics SW Stack.
+Use of any of this software is governed by the terms of the license below:
+
+OpenIB BSD License
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+The Oracle components of this package are licensed under version 1.0 of
+the Common Development and Distribution License ("CDDL").
+You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or
+http://www.opensolaris.org/os/licensing. See the License for the
+specific language governing permissions and limitations under the License.
+
+When distributing Covered Code, include this CDDL HEADER in each
+file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+If applicable, add the following below this CDDL HEADER, with the
+fields enclosed by brackets "[]" replaced with your own identifying
+information: Portions Copyright [yyyy] [name of copyright owner]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,2 @@
+Support for the Open Fabrics Enterprise Distribution (OFED) Userland stack,
+kernel verbs KPI, and kernel RDMA CM KPI.
--- a/usr/src/uts/common/io/ib/clients/of/lic_of	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-DO NOT TRANSLATE OR LOCALIZE.
-
-This package includes software from the OpenFabrics SW Stack.
-Use of any of this software is governed by the terms of the license below:
-
-OpenIB BSD License
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The Oracle components of this package are licensed under version 1.0 of
-the Common Development and Distribution License ("CDDL").
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or
-http://www.opensolaris.org/os/licensing. See the License for the
-specific language governing permissions and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
--- a/usr/src/uts/common/io/ib/clients/of/lic_of.descrip	Mon Aug 02 16:35:58 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Support for the Open Fabrics Enterprise Distribution (OFED) Userland stack,
-kernel verbs KPI, and kernel RDMA CM KPI.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,24 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright (c) 2009, Intel Corporation.
+ * All rights reserved.
+ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE.descrip	Mon Aug 02 16:37:22 2010 -0600
@@ -0,0 +1,1 @@
+INTEL FIPE DRIVER