--- old/usr/src/pkg/manifests/service-storage-avs-cache-management.mf	Fri Jul 27 15:35:50 2018
+++ new/usr/src/pkg/manifests/service-storage-avs-cache-management.mf	Fri Jul 27 15:35:50 2018
@@ -23,112 +23,6 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#
-# The default for payload-bearing actions in this package is to appear in the
-# global zone only.  See the include file for greater detail, as well as
-# information about overriding the defaults.
-#
-<include global_zone_only_component>
 set name=pkg.fmri value=pkg:/service/storage/avs/cache-management@$(PKGVERS)
-set name=pkg.description \
-    value="Storage Cache Management of read-only bitmap volumes"
-set name=pkg.summary \
-    value="Sun StorageTek Availability Suite Cache Management"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir path=etc group=sys
-dir path=etc/init.d group=sys
-dir path=kernel group=sys
-dir path=kernel/kmdb group=sys
-dir path=kernel/kmdb/$(ARCH64) group=sys
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/system group=sys
-dir path=lib/svc/method
-dir path=usr group=sys
-dir path=usr/bin
-dir path=usr/cluster group=sys
-dir path=usr/cluster/lib
-dir path=usr/cluster/lib/start
-dir path=usr/cluster/lib/stop
-dir path=usr/cluster/sbin group=other
-dir path=usr/kernel group=sys
-dir path=usr/kernel/drv group=sys
-dir path=usr/kernel/drv/$(ARCH64) group=sys
-dir path=usr/kernel/misc group=sys
-dir path=usr/kernel/misc/$(ARCH64) group=sys
-dir path=usr/lib
-dir path=usr/lib/mdb group=sys
-dir path=usr/lib/mdb/kvm group=sys
-dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
-dir path=usr/sbin
-dir path=usr/share/man
-dir path=usr/share/man/man1m
-dir path=usr/share/man/man4
-driver name=ncall devlink=type=ddi_pseudo;name=ncall\t\D \
-    perms="* 0666 root sys" privs=sys_config privs=sys_devices
-driver name=nsctl devlink=type=ddi_pseudo;name=nsctl\t\D \
-    perms="* 0666 root sys" privs=sys_config privs=sys_devices
-driver name=nskern devlink=type=ddi_pseudo;name=nskern\t\D \
-    perms="* 0666 root sys" privs=sys_config privs=sys_devices
-driver name=sdbc devlink=type=ddi_pseudo;name=sdbc\t\D perms="* 0666 root sys" \
-    privs=sys_config privs=sys_devices
-file path=etc/dscfg_format group=sys mode=0744
-file path=etc/init.d/scm mode=0744
-file path=kernel/kmdb/$(ARCH64)/nsctl group=sys mode=0555
-file path=kernel/kmdb/$(ARCH64)/sdbc group=sys mode=0555
-file path=lib/svc/manifest/system/nws_scm.xml group=sys mode=0444
-file path=usr/bin/dsbitmap mode=0555
-file path=usr/bin/dscfg mode=0555
-file path=usr/bin/dscfg_reconfigure.cluster mode=0555
-file path=usr/bin/dscfgadm mode=0555
-file path=usr/bin/dscfglockd mode=0555
-file path=usr/bin/dsstat mode=0555
-file path=usr/bin/ncalladm mode=0555
-file path=usr/bin/nscadm mode=0555
-file path=usr/bin/nskernd mode=0555
-file path=usr/bin/scmadm mode=0555
-file path=usr/kernel/drv/$(ARCH64)/ncall group=sys
-file path=usr/kernel/drv/$(ARCH64)/nsctl group=sys
-file path=usr/kernel/drv/$(ARCH64)/nskern group=sys
-file path=usr/kernel/drv/$(ARCH64)/sdbc group=sys
-file path=usr/kernel/drv/ncall.conf group=sys
-file path=usr/kernel/drv/nsctl.conf group=sys
-file path=usr/kernel/drv/nskern.conf group=sys
-file path=usr/kernel/drv/sdbc.conf group=sys
-file path=usr/kernel/misc/$(ARCH64)/spuni group=sys mode=0755
-file path=usr/lib/libdscfg.so.1
-file path=usr/lib/libnsctl.so.1
-file path=usr/lib/libunistat.so.1
-file path=usr/lib/mdb/kvm/$(ARCH64)/nsctl.so group=sys mode=0555
-file path=usr/lib/mdb/kvm/$(ARCH64)/sdbc.so group=sys mode=0555
-file path=usr/share/man/man1m/dsbitmap.1m
-file path=usr/share/man/man1m/dscfg.1m
-file path=usr/share/man/man1m/dscfgadm.1m
-file path=usr/share/man/man1m/dscfglockd.1m
-file path=usr/share/man/man1m/dsstat.1m
-file path=usr/share/man/man1m/nscadm.1m
-file path=usr/share/man/man1m/scmadm.1m
-file path=usr/share/man/man4/ds.log.4
-hardlink path=lib/svc/method/svc-scm target=../../../etc/init.d/scm
-hardlink path=usr/cluster/sbin/dscfg_reconfigure \
-    target=../../bin/dscfg_reconfigure.cluster
-hardlink path=usr/lib/dscfglockd target=../bin/dscfglockd
-hardlink path=usr/lib/ncalladm target=../bin/ncalladm
-hardlink path=usr/lib/nskernd target=../bin/nskernd
-hardlink path=usr/sbin/dsbitmap target=../bin/dsbitmap
-hardlink path=usr/sbin/dscfg target=../bin/dscfg
-hardlink path=usr/sbin/dscfgadm target=../bin/dscfgadm
-hardlink path=usr/sbin/dsstat target=../bin/dsstat
-hardlink path=usr/sbin/nscadm target=../bin/nscadm
-hardlink path=usr/sbin/scmadm target=../bin/scmadm
-legacy pkg=SUNWscmr \
-    desc="Storage Cache Management of read-only bitmap volumes" \
-    name="Sun StorageTek Availability Suite Cache Management (root)"
-legacy pkg=SUNWscmu \
-    desc="Storage Cache Management of read-only bitmap volumes" \
-    name="Sun StorageTek Availability Suite Cache Management (usr)"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
