--- a/usr/src/pkg/manifests/SUNWcs.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/SUNWcs.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -237,12 +237,12 @@
 dir path=usr/sbin
 $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
 dir path=usr/sbin/$(ARCH64)
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/doc group=other
 dir path=usr/share/doc/ksh
 dir path=usr/share/doc/ksh/images
 dir path=usr/share/doc/ksh/images/callouts
-dir path=usr/share/lib group=sys
+dir path=usr/share/lib
 dir path=usr/share/lib/mailx
 dir path=usr/share/lib/pub
 dir path=usr/share/lib/tabset

--- a/usr/src/pkg/manifests/SUNWperl584core.mf	Tue Jul 19 10:35:32 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/runtime/[email protected],5.11-0.133 type=require

--- a/usr/src/pkg/manifests/SUNWperl584usr.mf	Tue Jul 19 10:35:32 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/runtime/perl-584/[email protected],5.11-0.133 type=require

--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -46,8 +46,8 @@
 dir path=usr/lib/locale/C
 dir path=usr/lib/locale/C/LC_MESSAGES
 dir path=usr/lib/locale/C/LC_TIME
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/locale
 dir path=usr/share/lib/locale/com
 dir path=usr/share/lib/locale/com/sun

--- a/usr/src/pkg/manifests/crypto-ca-certificates.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/crypto-ca-certificates.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -31,7 +31,6 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Security
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=etc group=sys
 dir path=etc/certs group=sys
 dir path=etc/certs/CA group=sys

--- a/usr/src/pkg/manifests/developer-dtrace.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/developer-dtrace.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -48,8 +48,8 @@
 dir path=usr/sbin
 dir path=usr/sbin/$(ARCH32)
 dir path=usr/sbin/$(ARCH64)
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/java group=sys
 dir path=usr/share/lib/java/javadoc group=other
 dir path=usr/share/lib/java/javadoc/dtrace group=other

--- a/usr/src/pkg/manifests/developer-object-file.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/developer-object-file.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -40,8 +40,8 @@
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/elfedit
 dir path=usr/lib/elfedit/$(ARCH64)
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/ccs
 dir path=usr/share/man/man1
 file path=usr/bin/$(ARCH64)/ar mode=0555

--- a/usr/src/pkg/manifests/driver-usb.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/driver-usb.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -52,7 +52,7 @@
 dir path=lib/svc/method
 dir path=sbin group=sys
 dir path=usr group=sys
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man7m
 dir path=usr/share/man/man9f

--- a/usr/src/pkg/manifests/install-beadm.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/install-beadm.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -36,7 +36,7 @@
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/beadm
 dir path=usr/sbin
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 file path=sbin/beadm mode=0555

--- a/usr/src/pkg/manifests/library-demo-audio-samples.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/library-demo-audio-samples.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -31,7 +31,7 @@
 dir path=usr group=sys
 dir path=usr/demo
 dir path=usr/demo/SOUND
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/audio
 dir path=usr/share/audio/samples
 dir path=usr/share/audio/samples/au

--- a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -33,7 +33,7 @@
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/sbin
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man3

--- a/usr/src/pkg/manifests/locale-en-extra.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/locale-en-extra.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -113,7 +113,6 @@
 file path=usr/lib/locale/en_IE.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/en_IE.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 file path=usr/lib/locale/en_NZ.ISO8859-1/LC_COLLATE/LCL_DATA mode=0444
-file path=usr/lib/locale/en_NZ.ISO8859-1/LC_COLLATE/LCL_DATA mode=0444
 file path=usr/lib/locale/en_NZ.ISO8859-1/LC_CTYPE/LCL_DATA mode=0444
 file path=usr/lib/locale/en_NZ.ISO8859-1/LC_MESSAGES/LCL_DATA mode=0444
 file path=usr/lib/locale/en_NZ.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444

--- a/usr/src/pkg/manifests/network-ipfilter.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/network-ipfilter.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -47,7 +47,7 @@
 dir path=usr/sbin
 $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
 dir path=usr/sbin/$(ARCH64)
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/ipfilter
 dir path=usr/share/ipfilter/examples
 dir path=usr/share/man

--- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/print-lp-print-client-commands.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -36,7 +36,7 @@
 dir path=usr/lib/lp group=lp
 dir path=usr/lib/lp/bin group=lp
 dir path=usr/sbin
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/applications group=other
 dir path=usr/share/gnome group=other
 dir path=usr/share/gnome/autostart

--- a/usr/src/pkg/manifests/print-lp.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/print-lp.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -54,8 +54,8 @@
 dir path=usr/lib/lp/model group=lp
 dir path=usr/lib/print group=lp
 dir path=usr/sbin
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/terminfo
 dir path=usr/share/lib/terminfo/4
 dir path=usr/share/lib/terminfo/5

--- a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -34,7 +34,6 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Perl
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/perl5
@@ -153,5 +152,4 @@
 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/service-fault-management-smtp-notify.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -30,7 +30,6 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=lib/svc/manifest/system group=sys
 dir path=lib/svc/manifest/system/fm group=sys
 dir path=usr/lib
@@ -41,12 +40,3 @@
 file path=usr/lib/fm/notify/smtp-notify mode=0555
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-#
-# snmp-notify depends on libraries delivered in this package
-#
-depend fmri=service/fault-management type=require
-#
-# snmp-notify requires the sendmail-client service in order to be able to send
-# email notifications.
-#
-depend fmri=service/network/smtp/sendmail type=require

--- a/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -30,7 +30,6 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=lib/svc/manifest/system group=sys
 dir path=lib/svc/manifest/system/fm group=sys
 dir path=usr/lib
@@ -40,12 +39,3 @@
 file path=usr/lib/fm/notify/snmp-notify mode=0555
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-#
-# snmp-notify depends on libraries delivered in this package
-#
-depend fmri=service/fault-management type=require
-#
-# snmp-notify requires the net-snmp service in order to be able to send
-# SNMP notifications.
-#
-depend fmri=system/management/snmp/net-snmp type=require

--- a/usr/src/pkg/manifests/service-fault-management.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-fault-management.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -229,8 +229,8 @@
 # Some directories common to both global and non-global zones:
 #
 dir path=usr/sbin variant.opensolaris.zone=__NODEFAULT
-dir path=usr/share group=sys variant.opensolaris.zone=__NODEFAULT
-dir path=usr/share/lib group=sys variant.opensolaris.zone=__NODEFAULT
+dir path=usr/share variant.opensolaris.zone=__NODEFAULT
+dir path=usr/share/lib variant.opensolaris.zone=__NODEFAULT
 dir path=usr/share/lib/xml group=sys variant.opensolaris.zone=__NODEFAULT
 dir path=usr/share/lib/xml/dtd group=sys variant.opensolaris.zone=__NODEFAULT
 dir path=usr/share/man/man1m

--- a/usr/src/pkg/manifests/service-hal.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-hal.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -61,8 +61,8 @@
 dir path=usr/lib/hal/sunos
 dir path=usr/lib/pkgconfig group=other
 dir path=usr/sbin
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/xml group=sys
 dir path=usr/share/lib/xml/dtd group=sys
 dir path=usr/share/man

--- a/usr/src/pkg/manifests/service-network-dns-mdns.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -41,8 +41,8 @@
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/inet
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/java group=sys
 dir path=usr/share/lib/java/javadoc group=other
 dir path=usr/share/lib/java/javadoc/dnssd group=other

--- a/usr/src/pkg/manifests/service-network-slp.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-network-slp.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -43,8 +43,8 @@
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/inet
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/slp
 dir path=usr/share/man
 dir path=usr/share/man/man1m

--- a/usr/src/pkg/manifests/service-resource-pools.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/service-resource-pools.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -44,8 +44,8 @@
 dir path=usr/lib/rcm
 dir path=usr/lib/rcm/modules
 dir path=usr/sbin
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/xml group=sys
 dir path=usr/share/lib/xml/dtd group=sys
 dir path=usr/share/man

--- a/usr/src/pkg/manifests/source-network-pppdump.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/source-network-pppdump.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -31,7 +31,7 @@
     value=org.opensolaris.category.2008:Development/GNU
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/src group=sys
 dir path=usr/share/src/ppputil
 dir path=usr/share/src/ppputil/plugins

--- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -32,7 +32,7 @@
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/src group=sys
 dir path=usr/share/src/tcp_wrappers
 file path=usr/share/src/tcp_wrappers/BLURB

--- a/usr/src/pkg/manifests/source-system-grub.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/source-system-grub.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -31,7 +31,7 @@
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=i386
 dir path=usr group=sys
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/src group=sys
 dir path=usr/share/src/grub
 dir path=usr/share/src/grub/docs

--- a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -100,4 +100,3 @@
 link path=usr/sbin/iiboot target=../bin/iiboot
 link path=usr/sbin/iicpbmp target=../bin/iicpbmp
 link path=usr/sbin/iicpshd target=../bin/iicpshd
-depend fmri=driver/storage/sv type=require

--- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -119,4 +119,3 @@
 license lic_CDDL license=lic_CDDL
 link path=usr/cluster/lib/dscfg/start/10rdc target=../../../sbin/rdc
 link path=usr/cluster/lib/dscfg/stop/15rdc target=../../../sbin/rdc
-depend fmri=driver/storage/sv type=require

--- a/usr/src/pkg/manifests/storage-metassist.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/storage-metassist.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -38,8 +38,8 @@
 dir path=etc/default group=sys
 dir path=usr group=sys
 dir path=usr/sbin
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/xml group=sys
 dir path=usr/share/lib/xml/dtd group=sys
 dir path=usr/share/lib/xml/style group=sys

--- a/usr/src/pkg/manifests/system-data-hardware-registry.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -31,7 +31,7 @@
     value=org.opensolaris.category.2008:System/Hardware
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/hwdata group=sys
 file path=usr/share/hwdata/pci.ids
 file path=usr/share/hwdata/usb.ids

--- a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -32,8 +32,8 @@
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/lib
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/keytables
 dir path=usr/share/lib/keytables/type_101
 $(sparc_ONLY)dir path=usr/share/lib/keytables/type_4

--- a/usr/src/pkg/manifests/system-data-terminfo.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-data-terminfo.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -31,8 +31,8 @@
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/lib
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/terminfo
 dir path=usr/share/lib/terminfo/1
 dir path=usr/share/lib/terminfo/2

--- a/usr/src/pkg/manifests/system-extended-system-utilities.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -44,8 +44,8 @@
 dir path=usr/proc/bin
 dir path=usr/sbin
 dir path=usr/sbin/$(ARCH64)
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/dict
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m

--- a/usr/src/pkg/manifests/system-header.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-header.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -173,7 +173,7 @@
 $(sparc_ONLY)dir path=usr/platform/sun4v/include
 $(sparc_ONLY)dir path=usr/platform/sun4v/include/sys
 $(sparc_ONLY)dir path=usr/platform/sun4v/include/vm
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man3head
 dir path=usr/share/man/man4

--- a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -28,7 +28,6 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Security
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib

--- a/usr/src/pkg/manifests/system-library.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-library.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -1265,7 +1265,6 @@
 link path=usr/xpg4/lib/$(ARCH64)/libcurses.so target=libcurses.so.2
 link path=usr/xpg4/lib/64 target=$(ARCH64)
 link path=usr/xpg4/lib/libcurses.so target=./libcurses.so.2
-depend fmri=runtime/python-26 type=require
 #
 # libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/,
 # a dependency which cannot be automatically derived

--- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -41,5 +41,4 @@
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=usr/lib/libfsmgt.so target=./libfsmgt.so.1
-depend fmri=system/library type=require
 depend fmri=system/library/libdiskmgt type=require

--- a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -34,7 +34,7 @@
 dir path=usr/lib
 dir path=usr/lib/inet
 dir path=usr/lib/inet/ppp
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 file path=usr/bin/pppdump mode=0555

--- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -44,7 +44,7 @@
 dir path=usr group=sys
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
-dir path=usr/share group=sys
+dir path=usr/share
 dir path=usr/share/dat group=sys
 driver name=daplt perms="* 0644 root sys"
 file path=etc/init.d/dodatadm.udaplt group=sys mode=0744 \

--- a/usr/src/pkg/manifests/system-security-kerberos-5.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-security-kerberos-5.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -43,8 +43,8 @@
 dir path=usr/lib/krb5/ListResourceBundle
 dir path=usr/lib/security
 dir path=usr/sbin
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/ldif group=sys
 dir path=usr/share/man
 dir path=usr/share/man/man1m

--- a/usr/src/pkg/manifests/system-zones.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/system-zones.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -49,8 +49,8 @@
 dir path=usr/lib/brand/shared group=sys
 dir path=usr/lib/zones
 dir path=usr/sbin
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/xml group=sys
 dir path=usr/share/lib/xml/dtd group=sys
 dir path=usr/share/man

--- a/usr/src/pkg/manifests/text-doctools.mf	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/manifests/text-doctools.mf	Mon Jul 18 18:18:03 2011 +0100
@@ -39,8 +39,8 @@
 dir path=usr/lib/refer
 dir path=usr/lib/refer/papers
 dir path=usr/lib/sgml
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys
+dir path=usr/share
+dir path=usr/share/lib
 dir path=usr/share/lib/nterm
 dir path=usr/share/lib/pub
 dir path=usr/share/lib/sgml

--- a/usr/src/pkg/transforms/defaults	Tue Jul 19 10:35:32 2011 -0700
+++ b/usr/src/pkg/transforms/defaults	Mon Jul 18 18:18:03 2011 +0100
@@ -78,6 +78,9 @@
 <transform file path=usr/share/.+ -> default mode 0444>
 <transform file path=usr/has/man/.+ -> default mode 0444>
 
+<transform dir path=usr/share$ -> default group sys>
+<transform dir path=usr/share/lib$ -> default group sys>
+
 #
 # For what's left, go with root:bin 0644, +x for directories
 #