1125 pkg(5) packages could be free of lint

Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Garret D'Amore <garrett@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

43 files changed, 50 insertions, 134 deletions

diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index 013f19e083..fca9829a3c 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -237,12 +237,12 @@ dir path=usr/sadm/sysadm/bin
 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
diff --git a/usr/src/pkg/manifests/SUNWperl584core.mf b/usr/src/pkg/manifests/SUNWperl584core.mf
deleted file mode 100644
index c2ea18888a..0000000000
--- a/usr/src/pkg/manifests/SUNWperl584core.mf
+++ /dev/null
@@ -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:/SUNWperl584core@5.8.4,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/runtime/perl-584@5.8.4,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWperl584usr.mf b/usr/src/pkg/manifests/SUNWperl584usr.mf
deleted file mode 100644
index bbd3062db4..0000000000
--- a/usr/src/pkg/manifests/SUNWperl584usr.mf
+++ /dev/null
@@ -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:/SUNWperl584usr@5.8.4,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/runtime/perl-584/extra@5.8.4,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
index d71b969f94..cd9fd8743e 100644
--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
@@ -46,8 +46,8 @@ dir path=usr/lib/locale
 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
diff --git a/usr/src/pkg/manifests/crypto-ca-certificates.mf b/usr/src/pkg/manifests/crypto-ca-certificates.mf
index bd3f579982..e1741a5b21 100644
--- a/usr/src/pkg/manifests/crypto-ca-certificates.mf
+++ b/usr/src/pkg/manifests/crypto-ca-certificates.mf
@@ -31,7 +31,6 @@ set name=pkg.summary \
 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
diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf
index d8eac84188..2b1d42fa27 100644
--- a/usr/src/pkg/manifests/developer-dtrace.mf
+++ b/usr/src/pkg/manifests/developer-dtrace.mf
@@ -48,8 +48,8 @@ dir path=usr/lib/mdb/raw/$(ARCH64) group=sys
 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
diff --git a/usr/src/pkg/manifests/developer-object-file.mf b/usr/src/pkg/manifests/developer-object-file.mf
index 1c7fdfa043..8ef4a09898 100644
--- a/usr/src/pkg/manifests/developer-object-file.mf
+++ b/usr/src/pkg/manifests/developer-object-file.mf
@@ -40,8 +40,8 @@ dir path=usr/lib
 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
diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.mf
index 94907dc676..1051079159 100644
--- a/usr/src/pkg/manifests/driver-usb.mf
+++ b/usr/src/pkg/manifests/driver-usb.mf
@@ -52,7 +52,7 @@ dir path=lib/svc/manifest/system group=sys
 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
diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.mf
index 09b65f21cb..c31c2abd99 100644
--- a/usr/src/pkg/manifests/install-beadm.mf
+++ b/usr/src/pkg/manifests/install-beadm.mf
@@ -36,7 +36,7 @@ dir path=usr/lib/python2.6
 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
diff --git a/usr/src/pkg/manifests/library-demo-audio-samples.mf b/usr/src/pkg/manifests/library-demo-audio-samples.mf
index 153679dc34..e1232cfeb3 100644
--- a/usr/src/pkg/manifests/library-demo-audio-samples.mf
+++ b/usr/src/pkg/manifests/library-demo-audio-samples.mf
@@ -31,7 +31,7 @@ set name=variant.arch value=$(ARCH)
 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
diff --git a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf
index 5cd98aa2d8..c1bee96a62 100644
--- a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf
+++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf
@@ -33,7 +33,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/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
diff --git a/usr/src/pkg/manifests/locale-en-extra.mf b/usr/src/pkg/manifests/locale-en-extra.mf
index 213a24feb7..030f965b3f 100644
--- a/usr/src/pkg/manifests/locale-en-extra.mf
+++ b/usr/src/pkg/manifests/locale-en-extra.mf
@@ -113,7 +113,6 @@ file path=usr/lib/locale/en_IE.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 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
diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf
index b7c33a07a3..2af86b92df 100644
--- a/usr/src/pkg/manifests/network-ipfilter.mf
+++ b/usr/src/pkg/manifests/network-ipfilter.mf
@@ -47,7 +47,7 @@ dir path=usr/lib/ipf/$(ARCH64) group=sys
 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
diff --git a/usr/src/pkg/manifests/print-lp-print-client-commands.mf b/usr/src/pkg/manifests/print-lp-print-client-commands.mf
index cd6f930019..94fa5d31bc 100644
--- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf
+++ b/usr/src/pkg/manifests/print-lp-print-client-commands.mf
@@ -36,7 +36,7 @@ dir path=usr/lib
 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
diff --git a/usr/src/pkg/manifests/print-lp.mf b/usr/src/pkg/manifests/print-lp.mf
index 4b05b632eb..2e8347afa3 100644
--- a/usr/src/pkg/manifests/print-lp.mf
+++ b/usr/src/pkg/manifests/print-lp.mf
@@ -54,8 +54,8 @@ dir path=usr/lib/lp/local group=lp
 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
diff --git a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf
index 4ded6c4db0..e3899310ef 100644
--- a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf
+++ b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf
@@ -34,7 +34,6 @@ set name=pkg.summary value="Perl 5.10.0 Sun::Solaris Modules"
 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 @@ file path=usr/share/man/man3perl/Ucred.3perl
 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
diff --git a/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf b/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf
index b005a71430..d44967e0f6 100644
--- a/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf
+++ b/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf
@@ -30,7 +30,6 @@ set name=pkg.summary value="Email Notification Daemon for System Events"
 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/process_msg_template.sh mode=0555
 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
diff --git a/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf b/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf
index e09d091f19..c7a4d8f865 100644
--- a/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf
+++ b/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf
@@ -30,7 +30,6 @@ set name=pkg.summary value="SNMP Notification Daemon for System Events"
 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=lib/svc/manifest/system/fm/snmp-notify.xml group=sys mode=0444
 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
diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf
index 6a4999993b..a3ae7d36d2 100644
--- a/usr/src/pkg/manifests/service-fault-management.mf
+++ b/usr/src/pkg/manifests/service-fault-management.mf
@@ -229,8 +229,8 @@ $(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo/plugins
 # 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
diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf
index 3bd6949f36..0b8c73b9b4 100644
--- a/usr/src/pkg/manifests/service-hal.mf
+++ b/usr/src/pkg/manifests/service-hal.mf
@@ -61,8 +61,8 @@ dir path=usr/lib/hal
 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
diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf
index 843a88057e..a9015d9bf8 100644
--- a/usr/src/pkg/manifests/service-network-dns-mdns.mf
+++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf
@@ -41,8 +41,8 @@ dir path=usr/include
 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
diff --git a/usr/src/pkg/manifests/service-network-slp.mf b/usr/src/pkg/manifests/service-network-slp.mf
index a11b69679b..c8161f2009 100644
--- a/usr/src/pkg/manifests/service-network-slp.mf
+++ b/usr/src/pkg/manifests/service-network-slp.mf
@@ -43,8 +43,8 @@ dir path=usr/include
 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
diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.mf
index f0120060fa..171d61263c 100644
--- a/usr/src/pkg/manifests/service-resource-pools.mf
+++ b/usr/src/pkg/manifests/service-resource-pools.mf
@@ -44,8 +44,8 @@ dir path=usr/lib/$(ARCH64)
 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
diff --git a/usr/src/pkg/manifests/source-network-pppdump.mf b/usr/src/pkg/manifests/source-network-pppdump.mf
index 658e2aca67..dd194f773b 100644
--- a/usr/src/pkg/manifests/source-network-pppdump.mf
+++ b/usr/src/pkg/manifests/source-network-pppdump.mf
@@ -31,7 +31,7 @@ set name=info.classification \
     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
diff --git a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
index 4ecc4aea82..a197e5148a 100644
--- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
+++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
@@ -32,7 +32,7 @@ set name=pkg.summary \
 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
diff --git a/usr/src/pkg/manifests/source-system-grub.mf b/usr/src/pkg/manifests/source-system-grub.mf
index 45d3e506b7..848c313594 100644
--- a/usr/src/pkg/manifests/source-system-grub.mf
+++ b/usr/src/pkg/manifests/source-system-grub.mf
@@ -31,7 +31,7 @@ set name=pkg.summary \
 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
diff --git a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
index 6701f6e47b..f3b55e3b04 100644
--- a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
+++ b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
@@ -100,4 +100,3 @@ link path=usr/sbin/iiadm target=../bin/iiadm
 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
diff --git a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
index f2cc16d952..f89a81bb6c 100644
--- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
+++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
@@ -119,4 +119,3 @@ license cr_Sun license=cr_Sun
 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
diff --git a/usr/src/pkg/manifests/storage-metassist.mf b/usr/src/pkg/manifests/storage-metassist.mf
index 507499cbb8..183f489cf1 100644
--- a/usr/src/pkg/manifests/storage-metassist.mf
+++ b/usr/src/pkg/manifests/storage-metassist.mf
@@ -38,8 +38,8 @@ dir path=etc group=sys
 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
diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.mf b/usr/src/pkg/manifests/system-data-hardware-registry.mf
index b818f28a02..477eac8da0 100644
--- a/usr/src/pkg/manifests/system-data-hardware-registry.mf
+++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf
@@ -31,7 +31,7 @@ set name=info.classification \
     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
diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf
index 898c5eb461..82319803ef 100644
--- a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf
+++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf
@@ -32,8 +32,8 @@ set name=info.classification \
 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
diff --git a/usr/src/pkg/manifests/system-data-terminfo.mf b/usr/src/pkg/manifests/system-data-terminfo.mf
index 9b2fd441b0..e624311dd6 100644
--- a/usr/src/pkg/manifests/system-data-terminfo.mf
+++ b/usr/src/pkg/manifests/system-data-terminfo.mf
@@ -31,8 +31,8 @@ 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/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
diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf
index bb4b2bf308..8c2409569a 100644
--- a/usr/src/pkg/manifests/system-extended-system-utilities.mf
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf
@@ -44,8 +44,8 @@ dir path=usr/proc
 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
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf
index 85586eeab8..ddc527f31b 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.mf
@@ -173,7 +173,7 @@ $(sparc_ONLY)dir path=usr/platform/sun4v group=sys
 $(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
diff --git a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf
index dc53f77492..77688afa3d 100644
--- a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf
+++ b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf
@@ -28,7 +28,6 @@ set name=pkg.summary value=pkcs11_kms
 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
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index e851c5e7f9..846962beac 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -1265,7 +1265,6 @@ link path=usr/lib/straddr.so target=./straddr.so.2
 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
diff --git a/usr/src/pkg/manifests/system-management-wbem-data-management.mf b/usr/src/pkg/manifests/system-management-wbem-data-management.mf
index da59020572..cd111be704 100644
--- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf
+++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf
@@ -41,5 +41,4 @@ legacy pkg=SUNWdmgtu desc="software for WBEM/CIM data device management" \
 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
diff --git a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf
index d87aa4c18b..95da6439aa 100644
--- a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf
+++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf
@@ -34,7 +34,7 @@ dir path=usr/bin
 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
diff --git a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
index db151bca78..be65a7f85e 100644
--- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
+++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
@@ -44,7 +44,7 @@ dir path=kernel/drv/$(ARCH64) group=sys
 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 \
diff --git a/usr/src/pkg/manifests/system-security-kerberos-5.mf b/usr/src/pkg/manifests/system-security-kerberos-5.mf
index 861eda0f30..add692c6cb 100644
--- a/usr/src/pkg/manifests/system-security-kerberos-5.mf
+++ b/usr/src/pkg/manifests/system-security-kerberos-5.mf
@@ -43,8 +43,8 @@ dir path=usr/lib/krb5
 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
diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.mf
index 8684186433..de67c46f80 100644
--- a/usr/src/pkg/manifests/system-zones.mf
+++ b/usr/src/pkg/manifests/system-zones.mf
@@ -49,8 +49,8 @@ dir path=usr/lib/brand/ipkg group=bin
 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
diff --git a/usr/src/pkg/manifests/text-doctools.mf b/usr/src/pkg/manifests/text-doctools.mf
index 3513334bbe..aa1f6318ab 100644
--- a/usr/src/pkg/manifests/text-doctools.mf
+++ b/usr/src/pkg/manifests/text-doctools.mf
@@ -39,8 +39,8 @@ dir path=usr/lib/font/devpost/charlib group=lp
 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
diff --git a/usr/src/pkg/transforms/defaults b/usr/src/pkg/transforms/defaults
index 9bbf75561d..b62738c664 100644
--- a/usr/src/pkg/transforms/defaults
+++ b/usr/src/pkg/transforms/defaults
@@ -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
 #