14220 Package manifests should be named .p5m and not .mf

Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Approved by: Rich Lowe <richlowe@richlowe.net>

594 files changed, 21 insertions, 21 deletions

diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 4debff754e..2ab875af91 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -249,21 +249,21 @@ CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH) install-$(PKGMACH).out \
 # SUNW.* as one useful example.
 #
 SPECIAL_MANIFESTS = system-library-python-.*
-LIST_MANIFESTS_CMD = (cd manifests ; /usr/bin/ls -1 *.mf |\
+LIST_MANIFESTS_CMD = (cd manifests ; /usr/bin/ls -1 *.p5m |\
 	$(SED) $(SPECIAL_MANIFESTS:%=-e '/^%$$/d') )
 MANIFESTS = $(LIST_MANIFESTS_CMD:sh)
 
 # Conditionally add back python modules
 $(BUILDPY2) MANIFESTS += \
-	system-library-python-libbe-2.mf \
-	system-library-python-solaris-2.mf \
-	system-library-python-zfs-2.mf
+	system-library-python-libbe-2.p5m \
+	system-library-python-solaris-2.p5m \
+	system-library-python-zfs-2.p5m
 $(BUILDPY3) MANIFESTS += \
-	system-library-python-libbe-3.mf \
-	system-library-python-solaris-3.mf \
-	system-library-python-zfs-3.mf
+	system-library-python-libbe-3.p5m \
+	system-library-python-solaris-3.p5m \
+	system-library-python-zfs-3.p5m
 
-PKGS= $(MANIFESTS:%.mf=%)
+PKGS= $(MANIFESTS:%.p5m=%)
 DEP_PKGS= $(PKGS:%=$(PDIR)/%.dep)
 PROC_PKGS= $(PKGS:%=$(PDIR)/%.mog)
 FIN_PKGS= $(PKGS:%=$(PDIR)/%.fin)
@@ -326,7 +326,7 @@ PKGLISTS= \
 #
 # For a single manifest, the dependency chain looks like this:
 #
-#	raw manifest (mypkg.mf)
+#	raw manifest (mypkg.p5m)
 #		|
 #		| use pkgmogrify to process raw manifest
 #		|
@@ -532,9 +532,9 @@ $(REPOS:%=$(PKGDEST)/repo.%):
 #   pkgmogrify encounters an abort in the publish transforms.
 #
 
-.SUFFIXES: .mf .mog .dep .res .fin .pub
+.SUFFIXES: .p5m .mog .dep .res .fin .pub
 
-$(PDIR)/%.mog: manifests/%.mf
+$(PDIR)/%.mog: manifests/%.p5m
 	@print "Processing manifest $(<F)"
 	@pkgfmt -fv2 -c $<
 	$(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \
@@ -611,12 +611,12 @@ $(PDIR)/%.pub: $(PDIR)/%.fin
 # The implementation notes from the previous rule are applicable
 # here, too.
 #
-$(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.mf)
-	@print "Processing synthetic manifest $(@F:%.mog=%.mf)"
+$(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.p5m)
+	@print "Processing synthetic manifest $(@F:%.mog=%.p5m)"
 	$(PKGDEBUG)$(RM) $(@) $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars
 	$(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) -I transforms -I $(PDIR) \
 		$(PKGMOG_DEFINES:%=-D %) -D PKGDEP_TYPE=$(PKGDEP_TYPE) \
-		-P $(@).vars -O $(@) $(@F:%.mog=%.mf) \
+		-P $(@).vars -O $(@) $(@F:%.mog=%.p5m) \
 		$(PM_TRANSFORMS) synthetic
 	$(PKGDEBUG)eval REPO=redist PKGSTAT=current `$(CAT) -s $(@).vars`; \
 	if [ -f $(@) ]; then \
diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg
index 1910c3adeb..6edf5f8465 100644
--- a/usr/src/pkg/README.pkg
+++ b/usr/src/pkg/README.pkg
@@ -114,7 +114,7 @@ Incremental Builds
    make command line and specify the "all" target.  If you want to process
    them all, simply specify the "all" target.
 
-   	% dmake -e PKGS="BRCMbnx BRCMbnxe" all
+	% dmake -e PKGS="BRCMbnx BRCMbnxe" all
 	% dmake -e all
 
    If you want to publish a subset of packages, simply set PKGS on the
@@ -124,7 +124,7 @@ Incremental Builds
    system.  If you want to publish them all, simply specify the
    "install" target.
 
-   	% dmake -e PKGS="BRCMbnx BRCMbnxe" install
+	% dmake -e PKGS="BRCMbnx BRCMbnxe" install
 	% dmake -e install
 
    You can also use package names, or package names with ".pub"
@@ -365,13 +365,13 @@ For example, to find rename ancestors of 'system/zones', do the following:
 
     $ cd usr/src/pkg/manifests
     $ mypkgname=system/zones
-    $ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.mf` /dev/null
-    SUNWzone.mf
+    $ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.p5m` /dev/null
+    SUNWzone.p5m
 
 Make sure to check that the package has not undergone multiple renames!
 
     $ mypkgname=SUNWzone
-    $ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.mf` /dev/null
+    $ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.p5m` /dev/null
     $
 
 Once you have the renamed ancestor list, for *each* of the packages (the
@@ -402,13 +402,13 @@ to system/foobar in build 140, and then later obsoleted in build 150.
 Note that in all cases the package FMRI is updated to the obsoletion
 build, 150.
 
-    SUNWfoobar.mf:
+    SUNWfoobar.p5m:
         # Was renamed to system/foobar, both now obsolete.
         set name=pkg.fmri value=pkg:/SUNWfoobar@0.5.11,5.11-0.150
         set name=pkg.obsolete value=true
         set name=variant.arch value=$(ARCH)
 
-    system-foobar.mf:
+    system-foobar.p5m:
 	set name=pkg.fmri value=pkg:/system/foobar@0.5.11,5.11-0.150
 	set name=pkg.obsolete value=true
 	set name=variant.arch value=$(ARCH)
diff --git a/usr/src/pkg/manifests/SUNWbcp.mf b/usr/src/pkg/manifests/SUNWbcp.p5m
index 1f4864e93f..1f4864e93f 100644
--- a/usr/src/pkg/manifests/SUNWbcp.mf
+++ b/usr/src/pkg/manifests/SUNWbcp.p5m
diff --git a/usr/src/pkg/manifests/SUNWcg6.mf b/usr/src/pkg/manifests/SUNWcg6.p5m
index 24f883a3b5..24f883a3b5 100644
--- a/usr/src/pkg/manifests/SUNWcg6.mf
+++ b/usr/src/pkg/manifests/SUNWcg6.p5m
diff --git a/usr/src/pkg/manifests/SUNWcg6h.mf b/usr/src/pkg/manifests/SUNWcg6h.p5m
index 0eace2fc93..0eace2fc93 100644
--- a/usr/src/pkg/manifests/SUNWcg6h.mf
+++ b/usr/src/pkg/manifests/SUNWcg6h.p5m
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.p5m
index e1286feddc..e1286feddc 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.p5m
diff --git a/usr/src/pkg/manifests/SUNWcsd.mf b/usr/src/pkg/manifests/SUNWcsd.p5m
index ba6b528f25..ba6b528f25 100644
--- a/usr/src/pkg/manifests/SUNWcsd.mf
+++ b/usr/src/pkg/manifests/SUNWcsd.p5m
diff --git a/usr/src/pkg/manifests/SUNWcti2.mf b/usr/src/pkg/manifests/SUNWcti2.p5m
index 743e4fd714..743e4fd714 100644
--- a/usr/src/pkg/manifests/SUNWcti2.mf
+++ b/usr/src/pkg/manifests/SUNWcti2.p5m
diff --git a/usr/src/pkg/manifests/SUNWdcs.mf b/usr/src/pkg/manifests/SUNWdcs.p5m
index abd9422a46..abd9422a46 100644
--- a/usr/src/pkg/manifests/SUNWdcs.mf
+++ b/usr/src/pkg/manifests/SUNWdcs.p5m
diff --git a/usr/src/pkg/manifests/SUNWdrr.mf b/usr/src/pkg/manifests/SUNWdrr.p5m
index 3856f1635b..3856f1635b 100644
--- a/usr/src/pkg/manifests/SUNWdrr.mf
+++ b/usr/src/pkg/manifests/SUNWdrr.p5m
diff --git a/usr/src/pkg/manifests/SUNWdscp.mf b/usr/src/pkg/manifests/SUNWdscp.p5m
index e9a1930fc5..e9a1930fc5 100644
--- a/usr/src/pkg/manifests/SUNWdscp.mf
+++ b/usr/src/pkg/manifests/SUNWdscp.p5m
diff --git a/usr/src/pkg/manifests/SUNWefc.mf b/usr/src/pkg/manifests/SUNWefc.p5m
index 036d4fdfa5..036d4fdfa5 100644
--- a/usr/src/pkg/manifests/SUNWefc.mf
+++ b/usr/src/pkg/manifests/SUNWefc.p5m
diff --git a/usr/src/pkg/manifests/SUNWerid.mf b/usr/src/pkg/manifests/SUNWerid.p5m
index 278618c816..278618c816 100644
--- a/usr/src/pkg/manifests/SUNWerid.mf
+++ b/usr/src/pkg/manifests/SUNWerid.p5m
diff --git a/usr/src/pkg/manifests/SUNWfs.mf b/usr/src/pkg/manifests/SUNWfs.p5m
index 33a42f3137..33a42f3137 100644
--- a/usr/src/pkg/manifests/SUNWfs.mf
+++ b/usr/src/pkg/manifests/SUNWfs.p5m
diff --git a/usr/src/pkg/manifests/SUNWhmdu.mf b/usr/src/pkg/manifests/SUNWhmdu.p5m
index 78583bbdc3..78583bbdc3 100644
--- a/usr/src/pkg/manifests/SUNWhmdu.mf
+++ b/usr/src/pkg/manifests/SUNWhmdu.p5m
diff --git a/usr/src/pkg/manifests/SUNWidn.mf b/usr/src/pkg/manifests/SUNWidn.p5m
index 107a3597d9..107a3597d9 100644
--- a/usr/src/pkg/manifests/SUNWidn.mf
+++ b/usr/src/pkg/manifests/SUNWidn.p5m
diff --git a/usr/src/pkg/manifests/SUNWiopc.mf b/usr/src/pkg/manifests/SUNWiopc.p5m
index 3aa626f212..3aa626f212 100644
--- a/usr/src/pkg/manifests/SUNWiopc.mf
+++ b/usr/src/pkg/manifests/SUNWiopc.p5m
diff --git a/usr/src/pkg/manifests/SUNWldom.mf b/usr/src/pkg/manifests/SUNWldom.p5m
index 48ee7da0d8..48ee7da0d8 100644
--- a/usr/src/pkg/manifests/SUNWldom.mf
+++ b/usr/src/pkg/manifests/SUNWldom.p5m
diff --git a/usr/src/pkg/manifests/SUNWluxd.mf b/usr/src/pkg/manifests/SUNWluxd.p5m
index 3e3da4e4f5..3e3da4e4f5 100644
--- a/usr/src/pkg/manifests/SUNWluxd.mf
+++ b/usr/src/pkg/manifests/SUNWluxd.p5m
diff --git a/usr/src/pkg/manifests/SUNWluxl.mf b/usr/src/pkg/manifests/SUNWluxl.p5m
index 6b32fb72a3..6b32fb72a3 100644
--- a/usr/src/pkg/manifests/SUNWluxl.mf
+++ b/usr/src/pkg/manifests/SUNWluxl.p5m
diff --git a/usr/src/pkg/manifests/SUNWluxopr.mf b/usr/src/pkg/manifests/SUNWluxopr.p5m
index 8d93f409a0..8d93f409a0 100644
--- a/usr/src/pkg/manifests/SUNWluxopr.mf
+++ b/usr/src/pkg/manifests/SUNWluxopr.p5m
diff --git a/usr/src/pkg/manifests/SUNWn2cp.mf b/usr/src/pkg/manifests/SUNWn2cp.p5m
index b4e62d9d8e..b4e62d9d8e 100644
--- a/usr/src/pkg/manifests/SUNWn2cp.mf
+++ b/usr/src/pkg/manifests/SUNWn2cp.p5m
diff --git a/usr/src/pkg/manifests/SUNWniumx.mf b/usr/src/pkg/manifests/SUNWniumx.p5m
index 57662be832..57662be832 100644
--- a/usr/src/pkg/manifests/SUNWniumx.mf
+++ b/usr/src/pkg/manifests/SUNWniumx.p5m
diff --git a/usr/src/pkg/manifests/SUNWpdu.mf b/usr/src/pkg/manifests/SUNWpdu.p5m
index 925c89e2a1..925c89e2a1 100644
--- a/usr/src/pkg/manifests/SUNWpdu.mf
+++ b/usr/src/pkg/manifests/SUNWpdu.p5m
diff --git a/usr/src/pkg/manifests/SUNWpstl.mf b/usr/src/pkg/manifests/SUNWpstl.p5m
index dd1e01aec3..dd1e01aec3 100644
--- a/usr/src/pkg/manifests/SUNWpstl.mf
+++ b/usr/src/pkg/manifests/SUNWpstl.p5m
diff --git a/usr/src/pkg/manifests/SUNWqfed.mf b/usr/src/pkg/manifests/SUNWqfed.p5m
index 700f4d4ca7..700f4d4ca7 100644
--- a/usr/src/pkg/manifests/SUNWqfed.mf
+++ b/usr/src/pkg/manifests/SUNWqfed.p5m
diff --git a/usr/src/pkg/manifests/SUNWsckm.mf b/usr/src/pkg/manifests/SUNWsckm.p5m
index 1a0671814a..1a0671814a 100644
--- a/usr/src/pkg/manifests/SUNWsckm.mf
+++ b/usr/src/pkg/manifests/SUNWsckm.p5m
diff --git a/usr/src/pkg/manifests/SUNWsfdr.mf b/usr/src/pkg/manifests/SUNWsfdr.p5m
index 7824896b07..7824896b07 100644
--- a/usr/src/pkg/manifests/SUNWsfdr.mf
+++ b/usr/src/pkg/manifests/SUNWsfdr.p5m
diff --git a/usr/src/pkg/manifests/SUNWssad.mf b/usr/src/pkg/manifests/SUNWssad.p5m
index e10f3dcb93..e10f3dcb93 100644
--- a/usr/src/pkg/manifests/SUNWssad.mf
+++ b/usr/src/pkg/manifests/SUNWssad.p5m
diff --git a/usr/src/pkg/manifests/SUNWstc.mf b/usr/src/pkg/manifests/SUNWstc.p5m
index 276f058384..276f058384 100644
--- a/usr/src/pkg/manifests/SUNWstc.mf
+++ b/usr/src/pkg/manifests/SUNWstc.p5m
diff --git a/usr/src/pkg/manifests/SUNWus.mf b/usr/src/pkg/manifests/SUNWus.p5m
index 8dc9f8ef16..8dc9f8ef16 100644
--- a/usr/src/pkg/manifests/SUNWus.mf
+++ b/usr/src/pkg/manifests/SUNWus.p5m
diff --git a/usr/src/pkg/manifests/SUNWust.mf b/usr/src/pkg/manifests/SUNWust.p5m
index d27ba36e5c..d27ba36e5c 100644
--- a/usr/src/pkg/manifests/SUNWust.mf
+++ b/usr/src/pkg/manifests/SUNWust.p5m
diff --git a/usr/src/pkg/manifests/SUNWwbsd.mf b/usr/src/pkg/manifests/SUNWwbsd.p5m
index bf1b59b389..bf1b59b389 100644
--- a/usr/src/pkg/manifests/SUNWwbsd.mf
+++ b/usr/src/pkg/manifests/SUNWwbsd.p5m
diff --git a/usr/src/pkg/manifests/audio-audio-utilities.mf b/usr/src/pkg/manifests/audio-audio-utilities.p5m
index e5d4dc266c..e5d4dc266c 100644
--- a/usr/src/pkg/manifests/audio-audio-utilities.mf
+++ b/usr/src/pkg/manifests/audio-audio-utilities.p5m
diff --git a/usr/src/pkg/manifests/benchmark-filebench.mf b/usr/src/pkg/manifests/benchmark-filebench.p5m
index d24d193b44..d24d193b44 100644
--- a/usr/src/pkg/manifests/benchmark-filebench.mf
+++ b/usr/src/pkg/manifests/benchmark-filebench.p5m
diff --git a/usr/src/pkg/manifests/compatibility-ucb.mf b/usr/src/pkg/manifests/compatibility-ucb.p5m
index 154f725d2f..154f725d2f 100644
--- a/usr/src/pkg/manifests/compatibility-ucb.mf
+++ b/usr/src/pkg/manifests/compatibility-ucb.p5m
diff --git a/usr/src/pkg/manifests/consolidation-l10n-l10n-incorporation.mf b/usr/src/pkg/manifests/consolidation-l10n-l10n-incorporation.p5m
index 96a23f12f1..96a23f12f1 100644
--- a/usr/src/pkg/manifests/consolidation-l10n-l10n-incorporation.mf
+++ b/usr/src/pkg/manifests/consolidation-l10n-l10n-incorporation.p5m
diff --git a/usr/src/pkg/manifests/consolidation-man-man-incorporation.mf b/usr/src/pkg/manifests/consolidation-man-man-incorporation.p5m
index b667deeb4f..b667deeb4f 100644
--- a/usr/src/pkg/manifests/consolidation-man-man-incorporation.mf
+++ b/usr/src/pkg/manifests/consolidation-man-man-incorporation.p5m
diff --git a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.p5m
index b050630dfa..b050630dfa 100644
--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.p5m
diff --git a/usr/src/pkg/manifests/consolidation-sunpro-sunpro-incorporation.mf b/usr/src/pkg/manifests/consolidation-sunpro-sunpro-incorporation.p5m
index 422653755f..422653755f 100644
--- a/usr/src/pkg/manifests/consolidation-sunpro-sunpro-incorporation.mf
+++ b/usr/src/pkg/manifests/consolidation-sunpro-sunpro-incorporation.p5m
diff --git a/usr/src/pkg/manifests/developer-acpi.mf b/usr/src/pkg/manifests/developer-acpi.p5m
index cfb7452ca8..cfb7452ca8 100644
--- a/usr/src/pkg/manifests/developer-acpi.mf
+++ b/usr/src/pkg/manifests/developer-acpi.p5m
diff --git a/usr/src/pkg/manifests/developer-appcert.mf b/usr/src/pkg/manifests/developer-appcert.p5m
index 294215bdf7..294215bdf7 100644
--- a/usr/src/pkg/manifests/developer-appcert.mf
+++ b/usr/src/pkg/manifests/developer-appcert.p5m
diff --git a/usr/src/pkg/manifests/developer-apptrace-platform.mf b/usr/src/pkg/manifests/developer-apptrace-platform.p5m
index 77bc4b3b1f..77bc4b3b1f 100644
--- a/usr/src/pkg/manifests/developer-apptrace-platform.mf
+++ b/usr/src/pkg/manifests/developer-apptrace-platform.p5m
diff --git a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf b/usr/src/pkg/manifests/developer-apptrace-ucblib.p5m
index 18810c3af8..18810c3af8 100644
--- a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf
+++ b/usr/src/pkg/manifests/developer-apptrace-ucblib.p5m
diff --git a/usr/src/pkg/manifests/developer-apptrace.mf b/usr/src/pkg/manifests/developer-apptrace.p5m
index ca9b288a28..ca9b288a28 100644
--- a/usr/src/pkg/manifests/developer-apptrace.mf
+++ b/usr/src/pkg/manifests/developer-apptrace.p5m
diff --git a/usr/src/pkg/manifests/developer-astdev.mf b/usr/src/pkg/manifests/developer-astdev.p5m
index b600dfcdba..b600dfcdba 100644
--- a/usr/src/pkg/manifests/developer-astdev.mf
+++ b/usr/src/pkg/manifests/developer-astdev.p5m
diff --git a/usr/src/pkg/manifests/developer-build-make.mf b/usr/src/pkg/manifests/developer-build-make.p5m
index fe293ebe4b..fe293ebe4b 100644
--- a/usr/src/pkg/manifests/developer-build-make.mf
+++ b/usr/src/pkg/manifests/developer-build-make.p5m
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.p5m
index efa509a89b..efa509a89b 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.p5m
diff --git a/usr/src/pkg/manifests/developer-debug-ctf.mf b/usr/src/pkg/manifests/developer-debug-ctf.p5m
index 708fc58711..708fc58711 100644
--- a/usr/src/pkg/manifests/developer-debug-ctf.mf
+++ b/usr/src/pkg/manifests/developer-debug-ctf.p5m
diff --git a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.p5m
index fd24a2be5b..fd24a2be5b 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.p5m
diff --git a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.p5m
index 7cfbc85a35..7cfbc85a35 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.p5m
diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.p5m
index 78bc40c02d..78bc40c02d 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb.p5m
diff --git a/usr/src/pkg/manifests/developer-driver-ftsafe.mf b/usr/src/pkg/manifests/developer-driver-ftsafe.p5m
index da3ca4ea3b..da3ca4ea3b 100644
--- a/usr/src/pkg/manifests/developer-driver-ftsafe.mf
+++ b/usr/src/pkg/manifests/developer-driver-ftsafe.p5m
diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.p5m
index 23aec2e023..23aec2e023 100644
--- a/usr/src/pkg/manifests/developer-dtrace.mf
+++ b/usr/src/pkg/manifests/developer-dtrace.p5m
diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.p5m
index ed375ca578..ed375ca578 100644
--- a/usr/src/pkg/manifests/developer-library-lint.mf
+++ b/usr/src/pkg/manifests/developer-library-lint.p5m
diff --git a/usr/src/pkg/manifests/developer-library-profiled-libc.mf b/usr/src/pkg/manifests/developer-library-profiled-libc.p5m
index f1b4d0acb3..f1b4d0acb3 100644
--- a/usr/src/pkg/manifests/developer-library-profiled-libc.mf
+++ b/usr/src/pkg/manifests/developer-library-profiled-libc.p5m
diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.p5m
index c13a9d4e7d..c13a9d4e7d 100644
--- a/usr/src/pkg/manifests/developer-linker.mf
+++ b/usr/src/pkg/manifests/developer-linker.p5m
diff --git a/usr/src/pkg/manifests/developer-object-file.mf b/usr/src/pkg/manifests/developer-object-file.p5m
index e80006c2bd..e80006c2bd 100644
--- a/usr/src/pkg/manifests/developer-object-file.mf
+++ b/usr/src/pkg/manifests/developer-object-file.p5m
diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.p5m
index 9106668756..9106668756 100644
--- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
+++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.p5m
diff --git a/usr/src/pkg/manifests/developer-tnf.mf b/usr/src/pkg/manifests/developer-tnf.p5m
index 44e7799b09..44e7799b09 100644
--- a/usr/src/pkg/manifests/developer-tnf.mf
+++ b/usr/src/pkg/manifests/developer-tnf.p5m
diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
index 4184e511f4..4184e511f4 100644
--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
diff --git a/usr/src/pkg/manifests/diagnostic-diskinfo.mf b/usr/src/pkg/manifests/diagnostic-diskinfo.p5m
index 9dc4b370b7..9dc4b370b7 100644
--- a/usr/src/pkg/manifests/diagnostic-diskinfo.mf
+++ b/usr/src/pkg/manifests/diagnostic-diskinfo.p5m
diff --git a/usr/src/pkg/manifests/diagnostic-latencytop.mf b/usr/src/pkg/manifests/diagnostic-latencytop.p5m
index ad2b418f03..ad2b418f03 100644
--- a/usr/src/pkg/manifests/diagnostic-latencytop.mf
+++ b/usr/src/pkg/manifests/diagnostic-latencytop.p5m
diff --git a/usr/src/pkg/manifests/diagnostic-pci.mf b/usr/src/pkg/manifests/diagnostic-pci.p5m
index ba88998955..ba88998955 100644
--- a/usr/src/pkg/manifests/diagnostic-pci.mf
+++ b/usr/src/pkg/manifests/diagnostic-pci.p5m
diff --git a/usr/src/pkg/manifests/diagnostic-powertop.mf b/usr/src/pkg/manifests/diagnostic-powertop.p5m
index f20ba8b7be..f20ba8b7be 100644
--- a/usr/src/pkg/manifests/diagnostic-powertop.mf
+++ b/usr/src/pkg/manifests/diagnostic-powertop.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audio810.mf b/usr/src/pkg/manifests/driver-audio-audio810.p5m
index 77a26d0fdd..77a26d0fdd 100644
--- a/usr/src/pkg/manifests/driver-audio-audio810.mf
+++ b/usr/src/pkg/manifests/driver-audio-audio810.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiocmi.mf b/usr/src/pkg/manifests/driver-audio-audiocmi.p5m
index 1ef7eaf2d8..1ef7eaf2d8 100644
--- a/usr/src/pkg/manifests/driver-audio-audiocmi.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiocmi.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiocmihd.mf b/usr/src/pkg/manifests/driver-audio-audiocmihd.p5m
index b4293e8432..b4293e8432 100644
--- a/usr/src/pkg/manifests/driver-audio-audiocmihd.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiocmihd.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf b/usr/src/pkg/manifests/driver-audio-audioemu10k.p5m
index ab9c9192ba..ab9c9192ba 100644
--- a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf
+++ b/usr/src/pkg/manifests/driver-audio-audioemu10k.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiohd.mf b/usr/src/pkg/manifests/driver-audio-audiohd.p5m
index 0693f1844c..0693f1844c 100644
--- a/usr/src/pkg/manifests/driver-audio-audiohd.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiohd.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audioixp.mf b/usr/src/pkg/manifests/driver-audio-audioixp.p5m
index cc7b2f2f6a..cc7b2f2f6a 100644
--- a/usr/src/pkg/manifests/driver-audio-audioixp.mf
+++ b/usr/src/pkg/manifests/driver-audio-audioixp.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiols.mf b/usr/src/pkg/manifests/driver-audio-audiols.p5m
index 9fbf893317..9fbf893317 100644
--- a/usr/src/pkg/manifests/driver-audio-audiols.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiols.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiop16x.mf b/usr/src/pkg/manifests/driver-audio-audiop16x.p5m
index 8b07fb2ce9..8b07fb2ce9 100644
--- a/usr/src/pkg/manifests/driver-audio-audiop16x.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiop16x.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiosolo.mf b/usr/src/pkg/manifests/driver-audio-audiosolo.p5m
index 21471eac19..21471eac19 100644
--- a/usr/src/pkg/manifests/driver-audio-audiosolo.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiosolo.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf b/usr/src/pkg/manifests/driver-audio-audiovia823x.p5m
index 4d6483aa8f..4d6483aa8f 100644
--- a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiovia823x.p5m
diff --git a/usr/src/pkg/manifests/driver-audio-audiovia97.mf b/usr/src/pkg/manifests/driver-audio-audiovia97.p5m
index a89ffb2c27..a89ffb2c27 100644
--- a/usr/src/pkg/manifests/driver-audio-audiovia97.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiovia97.p5m
diff --git a/usr/src/pkg/manifests/driver-audio.mf b/usr/src/pkg/manifests/driver-audio.p5m
index 47890255cd..47890255cd 100644
--- a/usr/src/pkg/manifests/driver-audio.mf
+++ b/usr/src/pkg/manifests/driver-audio.p5m
diff --git a/usr/src/pkg/manifests/driver-cpu-amd-zen.mf b/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m
index 7cb6a8bf78..7cb6a8bf78 100644
--- a/usr/src/pkg/manifests/driver-cpu-amd-zen.mf
+++ b/usr/src/pkg/manifests/driver-cpu-amd-zen.p5m
diff --git a/usr/src/pkg/manifests/driver-cpu-mc.mf b/usr/src/pkg/manifests/driver-cpu-mc.p5m
index d8e6016674..d8e6016674 100644
--- a/usr/src/pkg/manifests/driver-cpu-mc.mf
+++ b/usr/src/pkg/manifests/driver-cpu-mc.p5m
diff --git a/usr/src/pkg/manifests/driver-cpu-sensor.mf b/usr/src/pkg/manifests/driver-cpu-sensor.p5m
index 1cf50b2e5c..1cf50b2e5c 100644
--- a/usr/src/pkg/manifests/driver-cpu-sensor.mf
+++ b/usr/src/pkg/manifests/driver-cpu-sensor.p5m
diff --git a/usr/src/pkg/manifests/driver-cpu-us.mf b/usr/src/pkg/manifests/driver-cpu-us.p5m
index 0bac6d0bdd..0bac6d0bdd 100644
--- a/usr/src/pkg/manifests/driver-cpu-us.mf
+++ b/usr/src/pkg/manifests/driver-cpu-us.p5m
diff --git a/usr/src/pkg/manifests/driver-crypto-dca.mf b/usr/src/pkg/manifests/driver-crypto-dca.p5m
index b6ef633d5f..b6ef633d5f 100644
--- a/usr/src/pkg/manifests/driver-crypto-dca.mf
+++ b/usr/src/pkg/manifests/driver-crypto-dca.p5m
diff --git a/usr/src/pkg/manifests/driver-crypto-dprov.mf b/usr/src/pkg/manifests/driver-crypto-dprov.p5m
index 05e47f8fca..05e47f8fca 100644
--- a/usr/src/pkg/manifests/driver-crypto-dprov.mf
+++ b/usr/src/pkg/manifests/driver-crypto-dprov.p5m
diff --git a/usr/src/pkg/manifests/driver-crypto-n2cp.mf b/usr/src/pkg/manifests/driver-crypto-n2cp.p5m
index 9262345791..9262345791 100644
--- a/usr/src/pkg/manifests/driver-crypto-n2cp.mf
+++ b/usr/src/pkg/manifests/driver-crypto-n2cp.p5m
diff --git a/usr/src/pkg/manifests/driver-crypto-tpm.mf b/usr/src/pkg/manifests/driver-crypto-tpm.p5m
index 3b0a6e685d..3b0a6e685d 100644
--- a/usr/src/pkg/manifests/driver-crypto-tpm.mf
+++ b/usr/src/pkg/manifests/driver-crypto-tpm.p5m
diff --git a/usr/src/pkg/manifests/driver-developer-amd-zen.mf b/usr/src/pkg/manifests/driver-developer-amd-zen.p5m
index 86254e3fd5..86254e3fd5 100644
--- a/usr/src/pkg/manifests/driver-developer-amd-zen.mf
+++ b/usr/src/pkg/manifests/driver-developer-amd-zen.p5m
diff --git a/usr/src/pkg/manifests/driver-firewire.mf b/usr/src/pkg/manifests/driver-firewire.p5m
index ad61cc55c1..ad61cc55c1 100644
--- a/usr/src/pkg/manifests/driver-firewire.mf
+++ b/usr/src/pkg/manifests/driver-firewire.p5m
diff --git a/usr/src/pkg/manifests/driver-graphics-atiatom.mf b/usr/src/pkg/manifests/driver-graphics-atiatom.p5m
index d99efe7eb0..d99efe7eb0 100644
--- a/usr/src/pkg/manifests/driver-graphics-atiatom.mf
+++ b/usr/src/pkg/manifests/driver-graphics-atiatom.p5m
diff --git a/usr/src/pkg/manifests/driver-graphics-av1394.mf b/usr/src/pkg/manifests/driver-graphics-av1394.p5m
index 36c30481cb..36c30481cb 100644
--- a/usr/src/pkg/manifests/driver-graphics-av1394.mf
+++ b/usr/src/pkg/manifests/driver-graphics-av1394.p5m
diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m
index 7c6a39a2b4..7c6a39a2b4 100644
--- a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf
+++ b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.p5m
diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf b/usr/src/pkg/manifests/driver-graphics-dcam1394.p5m
index b44739b71f..b44739b71f 100644
--- a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf
+++ b/usr/src/pkg/manifests/driver-graphics-dcam1394.p5m
diff --git a/usr/src/pkg/manifests/driver-graphics-usbvc.mf b/usr/src/pkg/manifests/driver-graphics-usbvc.p5m
index fdb71e29f5..fdb71e29f5 100644
--- a/usr/src/pkg/manifests/driver-graphics-usbvc.mf
+++ b/usr/src/pkg/manifests/driver-graphics-usbvc.p5m
diff --git a/usr/src/pkg/manifests/driver-i86pc-fipe.mf b/usr/src/pkg/manifests/driver-i86pc-fipe.p5m
index 43352b4cdb..43352b4cdb 100644
--- a/usr/src/pkg/manifests/driver-i86pc-fipe.mf
+++ b/usr/src/pkg/manifests/driver-i86pc-fipe.p5m
diff --git a/usr/src/pkg/manifests/driver-i86pc-ioat.mf b/usr/src/pkg/manifests/driver-i86pc-ioat.p5m
index a295e2bbe2..a295e2bbe2 100644
--- a/usr/src/pkg/manifests/driver-i86pc-ioat.mf
+++ b/usr/src/pkg/manifests/driver-i86pc-ioat.p5m
diff --git a/usr/src/pkg/manifests/driver-i86pc-platform.mf b/usr/src/pkg/manifests/driver-i86pc-platform.p5m
index 6f8a1a071a..6f8a1a071a 100644
--- a/usr/src/pkg/manifests/driver-i86pc-platform.mf
+++ b/usr/src/pkg/manifests/driver-i86pc-platform.p5m
diff --git a/usr/src/pkg/manifests/driver-ipmi.mf b/usr/src/pkg/manifests/driver-ipmi.p5m
index 6c19e586a2..6c19e586a2 100644
--- a/usr/src/pkg/manifests/driver-ipmi.mf
+++ b/usr/src/pkg/manifests/driver-ipmi.p5m
diff --git a/usr/src/pkg/manifests/driver-misc-ccid.mf b/usr/src/pkg/manifests/driver-misc-ccid.p5m
index 7cf6cad363..7cf6cad363 100644
--- a/usr/src/pkg/manifests/driver-misc-ccid.mf
+++ b/usr/src/pkg/manifests/driver-misc-ccid.p5m
diff --git a/usr/src/pkg/manifests/driver-misc-virtio.mf b/usr/src/pkg/manifests/driver-misc-virtio.p5m
index dfe4ad0e8a..dfe4ad0e8a 100644
--- a/usr/src/pkg/manifests/driver-misc-virtio.mf
+++ b/usr/src/pkg/manifests/driver-misc-virtio.p5m
diff --git a/usr/src/pkg/manifests/driver-network-afe.mf b/usr/src/pkg/manifests/driver-network-afe.p5m
index 46d491aac1..46d491aac1 100644
--- a/usr/src/pkg/manifests/driver-network-afe.mf
+++ b/usr/src/pkg/manifests/driver-network-afe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-amd8111s.mf b/usr/src/pkg/manifests/driver-network-amd8111s.p5m
index abe7f15e6c..abe7f15e6c 100644
--- a/usr/src/pkg/manifests/driver-network-amd8111s.mf
+++ b/usr/src/pkg/manifests/driver-network-amd8111s.p5m
diff --git a/usr/src/pkg/manifests/driver-network-arbel.mf b/usr/src/pkg/manifests/driver-network-arbel.p5m
index 74aa9065c8..74aa9065c8 100644
--- a/usr/src/pkg/manifests/driver-network-arbel.mf
+++ b/usr/src/pkg/manifests/driver-network-arbel.p5m
diff --git a/usr/src/pkg/manifests/driver-network-arn.mf b/usr/src/pkg/manifests/driver-network-arn.p5m
index 0f2652e4c2..0f2652e4c2 100644
--- a/usr/src/pkg/manifests/driver-network-arn.mf
+++ b/usr/src/pkg/manifests/driver-network-arn.p5m
diff --git a/usr/src/pkg/manifests/driver-network-atge.mf b/usr/src/pkg/manifests/driver-network-atge.p5m
index 6dc9c9c238..6dc9c9c238 100644
--- a/usr/src/pkg/manifests/driver-network-atge.mf
+++ b/usr/src/pkg/manifests/driver-network-atge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ath.mf b/usr/src/pkg/manifests/driver-network-ath.p5m
index 0732fa5baa..0732fa5baa 100644
--- a/usr/src/pkg/manifests/driver-network-ath.mf
+++ b/usr/src/pkg/manifests/driver-network-ath.p5m
diff --git a/usr/src/pkg/manifests/driver-network-atu.mf b/usr/src/pkg/manifests/driver-network-atu.p5m
index b1dd610af0..b1dd610af0 100644
--- a/usr/src/pkg/manifests/driver-network-atu.mf
+++ b/usr/src/pkg/manifests/driver-network-atu.p5m
diff --git a/usr/src/pkg/manifests/driver-network-axf.mf b/usr/src/pkg/manifests/driver-network-axf.p5m
index 12f3854fc8..12f3854fc8 100644
--- a/usr/src/pkg/manifests/driver-network-axf.mf
+++ b/usr/src/pkg/manifests/driver-network-axf.p5m
diff --git a/usr/src/pkg/manifests/driver-network-bfe.mf b/usr/src/pkg/manifests/driver-network-bfe.p5m
index 1ce4612c68..1ce4612c68 100644
--- a/usr/src/pkg/manifests/driver-network-bfe.mf
+++ b/usr/src/pkg/manifests/driver-network-bfe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-bge.mf b/usr/src/pkg/manifests/driver-network-bge.p5m
index a1a309bcd2..a1a309bcd2 100644
--- a/usr/src/pkg/manifests/driver-network-bge.mf
+++ b/usr/src/pkg/manifests/driver-network-bge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-bnx.mf b/usr/src/pkg/manifests/driver-network-bnx.p5m
index d20c4ebd7a..d20c4ebd7a 100644
--- a/usr/src/pkg/manifests/driver-network-bnx.mf
+++ b/usr/src/pkg/manifests/driver-network-bnx.p5m
diff --git a/usr/src/pkg/manifests/driver-network-bnxe.mf b/usr/src/pkg/manifests/driver-network-bnxe.p5m
index 538022fce9..538022fce9 100644
--- a/usr/src/pkg/manifests/driver-network-bnxe.mf
+++ b/usr/src/pkg/manifests/driver-network-bnxe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-bpf.mf b/usr/src/pkg/manifests/driver-network-bpf.p5m
index 9ed08babc2..9ed08babc2 100644
--- a/usr/src/pkg/manifests/driver-network-bpf.mf
+++ b/usr/src/pkg/manifests/driver-network-bpf.p5m
diff --git a/usr/src/pkg/manifests/driver-network-chxge.mf b/usr/src/pkg/manifests/driver-network-chxge.p5m
index afe0df7a10..afe0df7a10 100644
--- a/usr/src/pkg/manifests/driver-network-chxge.mf
+++ b/usr/src/pkg/manifests/driver-network-chxge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-cxgbe.mf b/usr/src/pkg/manifests/driver-network-cxgbe.p5m
index e303cce7de..e303cce7de 100644
--- a/usr/src/pkg/manifests/driver-network-cxgbe.mf
+++ b/usr/src/pkg/manifests/driver-network-cxgbe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-dmfe.mf b/usr/src/pkg/manifests/driver-network-dmfe.p5m
index 070f7308e4..070f7308e4 100644
--- a/usr/src/pkg/manifests/driver-network-dmfe.mf
+++ b/usr/src/pkg/manifests/driver-network-dmfe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-e1000g.mf b/usr/src/pkg/manifests/driver-network-e1000g.p5m
index 8eb5247e29..8eb5247e29 100644
--- a/usr/src/pkg/manifests/driver-network-e1000g.mf
+++ b/usr/src/pkg/manifests/driver-network-e1000g.p5m
diff --git a/usr/src/pkg/manifests/driver-network-efe.mf b/usr/src/pkg/manifests/driver-network-efe.p5m
index 555fb0692e..555fb0692e 100644
--- a/usr/src/pkg/manifests/driver-network-efe.mf
+++ b/usr/src/pkg/manifests/driver-network-efe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-elxl.mf b/usr/src/pkg/manifests/driver-network-elxl.p5m
index c80ca32ffa..c80ca32ffa 100644
--- a/usr/src/pkg/manifests/driver-network-elxl.mf
+++ b/usr/src/pkg/manifests/driver-network-elxl.p5m
diff --git a/usr/src/pkg/manifests/driver-network-emlxs.mf b/usr/src/pkg/manifests/driver-network-emlxs.p5m
index 382cc2ec21..382cc2ec21 100644
--- a/usr/src/pkg/manifests/driver-network-emlxs.mf
+++ b/usr/src/pkg/manifests/driver-network-emlxs.p5m
diff --git a/usr/src/pkg/manifests/driver-network-eoib.mf b/usr/src/pkg/manifests/driver-network-eoib.p5m
index 1bdb0ec33b..1bdb0ec33b 100644
--- a/usr/src/pkg/manifests/driver-network-eoib.mf
+++ b/usr/src/pkg/manifests/driver-network-eoib.p5m
diff --git a/usr/src/pkg/manifests/driver-network-eri.mf b/usr/src/pkg/manifests/driver-network-eri.p5m
index 2d9d50a675..2d9d50a675 100644
--- a/usr/src/pkg/manifests/driver-network-eri.mf
+++ b/usr/src/pkg/manifests/driver-network-eri.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fcip.mf b/usr/src/pkg/manifests/driver-network-fcip.p5m
index 55bc38c4c3..55bc38c4c3 100644
--- a/usr/src/pkg/manifests/driver-network-fcip.mf
+++ b/usr/src/pkg/manifests/driver-network-fcip.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fcoe.mf b/usr/src/pkg/manifests/driver-network-fcoe.p5m
index 62574789c8..62574789c8 100644
--- a/usr/src/pkg/manifests/driver-network-fcoe.mf
+++ b/usr/src/pkg/manifests/driver-network-fcoe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fcoei.mf b/usr/src/pkg/manifests/driver-network-fcoei.p5m
index 648a679262..648a679262 100644
--- a/usr/src/pkg/manifests/driver-network-fcoei.mf
+++ b/usr/src/pkg/manifests/driver-network-fcoei.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fcoet.mf b/usr/src/pkg/manifests/driver-network-fcoet.p5m
index 2116a3044d..2116a3044d 100644
--- a/usr/src/pkg/manifests/driver-network-fcoet.mf
+++ b/usr/src/pkg/manifests/driver-network-fcoet.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fcp.mf b/usr/src/pkg/manifests/driver-network-fcp.p5m
index 6e5e38885e..6e5e38885e 100644
--- a/usr/src/pkg/manifests/driver-network-fcp.mf
+++ b/usr/src/pkg/manifests/driver-network-fcp.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fcsm.mf b/usr/src/pkg/manifests/driver-network-fcsm.p5m
index b4339cd83d..b4339cd83d 100644
--- a/usr/src/pkg/manifests/driver-network-fcsm.mf
+++ b/usr/src/pkg/manifests/driver-network-fcsm.p5m
diff --git a/usr/src/pkg/manifests/driver-network-fp.mf b/usr/src/pkg/manifests/driver-network-fp.p5m
index 88d8aab2c8..88d8aab2c8 100644
--- a/usr/src/pkg/manifests/driver-network-fp.mf
+++ b/usr/src/pkg/manifests/driver-network-fp.p5m
diff --git a/usr/src/pkg/manifests/driver-network-hermon.mf b/usr/src/pkg/manifests/driver-network-hermon.p5m
index 69db8f548f..69db8f548f 100644
--- a/usr/src/pkg/manifests/driver-network-hermon.mf
+++ b/usr/src/pkg/manifests/driver-network-hermon.p5m
diff --git a/usr/src/pkg/manifests/driver-network-hme.mf b/usr/src/pkg/manifests/driver-network-hme.p5m
index fc1e7180ae..fc1e7180ae 100644
--- a/usr/src/pkg/manifests/driver-network-hme.mf
+++ b/usr/src/pkg/manifests/driver-network-hme.p5m
diff --git a/usr/src/pkg/manifests/driver-network-hxge.mf b/usr/src/pkg/manifests/driver-network-hxge.p5m
index 2952b8ff9b..2952b8ff9b 100644
--- a/usr/src/pkg/manifests/driver-network-hxge.mf
+++ b/usr/src/pkg/manifests/driver-network-hxge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-i40e.mf b/usr/src/pkg/manifests/driver-network-i40e.p5m
index c5418b36f0..c5418b36f0 100644
--- a/usr/src/pkg/manifests/driver-network-i40e.mf
+++ b/usr/src/pkg/manifests/driver-network-i40e.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ib.mf b/usr/src/pkg/manifests/driver-network-ib.p5m
index dea467c7e3..dea467c7e3 100644
--- a/usr/src/pkg/manifests/driver-network-ib.mf
+++ b/usr/src/pkg/manifests/driver-network-ib.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ibdma.mf b/usr/src/pkg/manifests/driver-network-ibdma.p5m
index 6dc6b1397f..6dc6b1397f 100644
--- a/usr/src/pkg/manifests/driver-network-ibdma.mf
+++ b/usr/src/pkg/manifests/driver-network-ibdma.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ibp.mf b/usr/src/pkg/manifests/driver-network-ibp.p5m
index df238d5512..df238d5512 100644
--- a/usr/src/pkg/manifests/driver-network-ibp.mf
+++ b/usr/src/pkg/manifests/driver-network-ibp.p5m
diff --git a/usr/src/pkg/manifests/driver-network-igb.mf b/usr/src/pkg/manifests/driver-network-igb.p5m
index ccf4bee7e4..ccf4bee7e4 100644
--- a/usr/src/pkg/manifests/driver-network-igb.mf
+++ b/usr/src/pkg/manifests/driver-network-igb.p5m
diff --git a/usr/src/pkg/manifests/driver-network-iprb.mf b/usr/src/pkg/manifests/driver-network-iprb.p5m
index 68bb6f654e..68bb6f654e 100644
--- a/usr/src/pkg/manifests/driver-network-iprb.mf
+++ b/usr/src/pkg/manifests/driver-network-iprb.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ipw.mf b/usr/src/pkg/manifests/driver-network-ipw.p5m
index b94c786da9..b94c786da9 100644
--- a/usr/src/pkg/manifests/driver-network-ipw.mf
+++ b/usr/src/pkg/manifests/driver-network-ipw.p5m
diff --git a/usr/src/pkg/manifests/driver-network-iwh.mf b/usr/src/pkg/manifests/driver-network-iwh.p5m
index fadc379416..fadc379416 100644
--- a/usr/src/pkg/manifests/driver-network-iwh.mf
+++ b/usr/src/pkg/manifests/driver-network-iwh.p5m
diff --git a/usr/src/pkg/manifests/driver-network-iwi.mf b/usr/src/pkg/manifests/driver-network-iwi.p5m
index c9a1cf26a9..c9a1cf26a9 100644
--- a/usr/src/pkg/manifests/driver-network-iwi.mf
+++ b/usr/src/pkg/manifests/driver-network-iwi.p5m
diff --git a/usr/src/pkg/manifests/driver-network-iwk.mf b/usr/src/pkg/manifests/driver-network-iwk.p5m
index 8d5cc121e5..8d5cc121e5 100644
--- a/usr/src/pkg/manifests/driver-network-iwk.mf
+++ b/usr/src/pkg/manifests/driver-network-iwk.p5m
diff --git a/usr/src/pkg/manifests/driver-network-iwn.mf b/usr/src/pkg/manifests/driver-network-iwn.p5m
index f3497004f3..f3497004f3 100644
--- a/usr/src/pkg/manifests/driver-network-iwn.mf
+++ b/usr/src/pkg/manifests/driver-network-iwn.p5m
diff --git a/usr/src/pkg/manifests/driver-network-iwp.mf b/usr/src/pkg/manifests/driver-network-iwp.p5m
index 2f9b6108ea..2f9b6108ea 100644
--- a/usr/src/pkg/manifests/driver-network-iwp.mf
+++ b/usr/src/pkg/manifests/driver-network-iwp.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ixgb.mf b/usr/src/pkg/manifests/driver-network-ixgb.p5m
index d30f201dd8..d30f201dd8 100644
--- a/usr/src/pkg/manifests/driver-network-ixgb.mf
+++ b/usr/src/pkg/manifests/driver-network-ixgb.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ixgbe.mf b/usr/src/pkg/manifests/driver-network-ixgbe.p5m
index 83cc3e0423..83cc3e0423 100644
--- a/usr/src/pkg/manifests/driver-network-ixgbe.mf
+++ b/usr/src/pkg/manifests/driver-network-ixgbe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-llc2.mf b/usr/src/pkg/manifests/driver-network-llc2.p5m
index d89b715c9c..d89b715c9c 100644
--- a/usr/src/pkg/manifests/driver-network-llc2.mf
+++ b/usr/src/pkg/manifests/driver-network-llc2.p5m
diff --git a/usr/src/pkg/manifests/driver-network-mlxcx.mf b/usr/src/pkg/manifests/driver-network-mlxcx.p5m
index 51712475a4..51712475a4 100644
--- a/usr/src/pkg/manifests/driver-network-mlxcx.mf
+++ b/usr/src/pkg/manifests/driver-network-mlxcx.p5m
diff --git a/usr/src/pkg/manifests/driver-network-mwl.mf b/usr/src/pkg/manifests/driver-network-mwl.p5m
index bd9baf70fc..bd9baf70fc 100644
--- a/usr/src/pkg/manifests/driver-network-mwl.mf
+++ b/usr/src/pkg/manifests/driver-network-mwl.p5m
diff --git a/usr/src/pkg/manifests/driver-network-mxfe.mf b/usr/src/pkg/manifests/driver-network-mxfe.p5m
index 5d589ed131..5d589ed131 100644
--- a/usr/src/pkg/manifests/driver-network-mxfe.mf
+++ b/usr/src/pkg/manifests/driver-network-mxfe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-myri10ge.mf b/usr/src/pkg/manifests/driver-network-myri10ge.p5m
index fa7b4e6bc6..fa7b4e6bc6 100644
--- a/usr/src/pkg/manifests/driver-network-myri10ge.mf
+++ b/usr/src/pkg/manifests/driver-network-myri10ge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-nge.mf b/usr/src/pkg/manifests/driver-network-nge.p5m
index 9f84b090d4..9f84b090d4 100644
--- a/usr/src/pkg/manifests/driver-network-nge.mf
+++ b/usr/src/pkg/manifests/driver-network-nge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-niumx.mf b/usr/src/pkg/manifests/driver-network-niumx.p5m
index dafb3c79a6..dafb3c79a6 100644
--- a/usr/src/pkg/manifests/driver-network-niumx.mf
+++ b/usr/src/pkg/manifests/driver-network-niumx.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ntxn.mf b/usr/src/pkg/manifests/driver-network-ntxn.p5m
index 35fc95965f..35fc95965f 100644
--- a/usr/src/pkg/manifests/driver-network-ntxn.mf
+++ b/usr/src/pkg/manifests/driver-network-ntxn.p5m
diff --git a/usr/src/pkg/manifests/driver-network-nxge.mf b/usr/src/pkg/manifests/driver-network-nxge.p5m
index 43678bafb5..43678bafb5 100644
--- a/usr/src/pkg/manifests/driver-network-nxge.mf
+++ b/usr/src/pkg/manifests/driver-network-nxge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ofk.mf b/usr/src/pkg/manifests/driver-network-ofk.p5m
index e3579bc122..e3579bc122 100644
--- a/usr/src/pkg/manifests/driver-network-ofk.mf
+++ b/usr/src/pkg/manifests/driver-network-ofk.p5m
diff --git a/usr/src/pkg/manifests/driver-network-pcan.mf b/usr/src/pkg/manifests/driver-network-pcan.p5m
index 6e88c16687..6e88c16687 100644
--- a/usr/src/pkg/manifests/driver-network-pcan.mf
+++ b/usr/src/pkg/manifests/driver-network-pcan.p5m
diff --git a/usr/src/pkg/manifests/driver-network-pcn.mf b/usr/src/pkg/manifests/driver-network-pcn.p5m
index 24a5df5c76..24a5df5c76 100644
--- a/usr/src/pkg/manifests/driver-network-pcn.mf
+++ b/usr/src/pkg/manifests/driver-network-pcn.p5m
diff --git a/usr/src/pkg/manifests/driver-network-pcwl.mf b/usr/src/pkg/manifests/driver-network-pcwl.p5m
index aa9bb9ea55..aa9bb9ea55 100644
--- a/usr/src/pkg/manifests/driver-network-pcwl.mf
+++ b/usr/src/pkg/manifests/driver-network-pcwl.p5m
diff --git a/usr/src/pkg/manifests/driver-network-platform.mf b/usr/src/pkg/manifests/driver-network-platform.p5m
index a3cf3ec671..a3cf3ec671 100644
--- a/usr/src/pkg/manifests/driver-network-platform.mf
+++ b/usr/src/pkg/manifests/driver-network-platform.p5m
diff --git a/usr/src/pkg/manifests/driver-network-qede.mf b/usr/src/pkg/manifests/driver-network-qede.p5m
index 586060622e..586060622e 100644
--- a/usr/src/pkg/manifests/driver-network-qede.mf
+++ b/usr/src/pkg/manifests/driver-network-qede.p5m
diff --git a/usr/src/pkg/manifests/driver-network-qfe.mf b/usr/src/pkg/manifests/driver-network-qfe.p5m
index 2fd95e1a7a..2fd95e1a7a 100644
--- a/usr/src/pkg/manifests/driver-network-qfe.mf
+++ b/usr/src/pkg/manifests/driver-network-qfe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-qlc.mf b/usr/src/pkg/manifests/driver-network-qlc.p5m
index 3e2fd7b4f3..3e2fd7b4f3 100644
--- a/usr/src/pkg/manifests/driver-network-qlc.mf
+++ b/usr/src/pkg/manifests/driver-network-qlc.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ral.mf b/usr/src/pkg/manifests/driver-network-ral.p5m
index 0335245f53..0335245f53 100644
--- a/usr/src/pkg/manifests/driver-network-ral.mf
+++ b/usr/src/pkg/manifests/driver-network-ral.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rds.mf b/usr/src/pkg/manifests/driver-network-rds.p5m
index a2387e3d00..a2387e3d00 100644
--- a/usr/src/pkg/manifests/driver-network-rds.mf
+++ b/usr/src/pkg/manifests/driver-network-rds.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rdsv3.mf b/usr/src/pkg/manifests/driver-network-rdsv3.p5m
index 6e43064736..6e43064736 100644
--- a/usr/src/pkg/manifests/driver-network-rdsv3.mf
+++ b/usr/src/pkg/manifests/driver-network-rdsv3.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rge.mf b/usr/src/pkg/manifests/driver-network-rge.p5m
index c1b17d2a64..c1b17d2a64 100644
--- a/usr/src/pkg/manifests/driver-network-rge.mf
+++ b/usr/src/pkg/manifests/driver-network-rge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rpcib.mf b/usr/src/pkg/manifests/driver-network-rpcib.p5m
index 6bdce53429..6bdce53429 100644
--- a/usr/src/pkg/manifests/driver-network-rpcib.mf
+++ b/usr/src/pkg/manifests/driver-network-rpcib.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rtls.mf b/usr/src/pkg/manifests/driver-network-rtls.p5m
index 2556742359..2556742359 100644
--- a/usr/src/pkg/manifests/driver-network-rtls.mf
+++ b/usr/src/pkg/manifests/driver-network-rtls.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rtw.mf b/usr/src/pkg/manifests/driver-network-rtw.p5m
index 6f95b9884a..6f95b9884a 100644
--- a/usr/src/pkg/manifests/driver-network-rtw.mf
+++ b/usr/src/pkg/manifests/driver-network-rtw.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rum.mf b/usr/src/pkg/manifests/driver-network-rum.p5m
index 82f52090ea..82f52090ea 100644
--- a/usr/src/pkg/manifests/driver-network-rum.mf
+++ b/usr/src/pkg/manifests/driver-network-rum.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rwd.mf b/usr/src/pkg/manifests/driver-network-rwd.p5m
index 5e69e857e7..5e69e857e7 100644
--- a/usr/src/pkg/manifests/driver-network-rwd.mf
+++ b/usr/src/pkg/manifests/driver-network-rwd.p5m
diff --git a/usr/src/pkg/manifests/driver-network-rwn.mf b/usr/src/pkg/manifests/driver-network-rwn.p5m
index 6ac9064e28..6ac9064e28 100644
--- a/usr/src/pkg/manifests/driver-network-rwn.mf
+++ b/usr/src/pkg/manifests/driver-network-rwn.p5m
diff --git a/usr/src/pkg/manifests/driver-network-sdp.mf b/usr/src/pkg/manifests/driver-network-sdp.p5m
index 6ac16babce..6ac16babce 100644
--- a/usr/src/pkg/manifests/driver-network-sdp.mf
+++ b/usr/src/pkg/manifests/driver-network-sdp.p5m
diff --git a/usr/src/pkg/manifests/driver-network-sdpib.mf b/usr/src/pkg/manifests/driver-network-sdpib.p5m
index 3980f15e34..3980f15e34 100644
--- a/usr/src/pkg/manifests/driver-network-sdpib.mf
+++ b/usr/src/pkg/manifests/driver-network-sdpib.p5m
diff --git a/usr/src/pkg/manifests/driver-network-sfe.mf b/usr/src/pkg/manifests/driver-network-sfe.p5m
index ecf1c90ec3..ecf1c90ec3 100644
--- a/usr/src/pkg/manifests/driver-network-sfe.mf
+++ b/usr/src/pkg/manifests/driver-network-sfe.p5m
diff --git a/usr/src/pkg/manifests/driver-network-sfxge.mf b/usr/src/pkg/manifests/driver-network-sfxge.p5m
index 95e97c6fdd..95e97c6fdd 100644
--- a/usr/src/pkg/manifests/driver-network-sfxge.mf
+++ b/usr/src/pkg/manifests/driver-network-sfxge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-socal.mf b/usr/src/pkg/manifests/driver-network-socal.p5m
index 09a11e9ff1..09a11e9ff1 100644
--- a/usr/src/pkg/manifests/driver-network-socal.mf
+++ b/usr/src/pkg/manifests/driver-network-socal.p5m
diff --git a/usr/src/pkg/manifests/driver-network-srpt.mf b/usr/src/pkg/manifests/driver-network-srpt.p5m
index 80bd8a361a..80bd8a361a 100644
--- a/usr/src/pkg/manifests/driver-network-srpt.mf
+++ b/usr/src/pkg/manifests/driver-network-srpt.p5m
diff --git a/usr/src/pkg/manifests/driver-network-tavor.mf b/usr/src/pkg/manifests/driver-network-tavor.p5m
index c82844bc94..c82844bc94 100644
--- a/usr/src/pkg/manifests/driver-network-tavor.mf
+++ b/usr/src/pkg/manifests/driver-network-tavor.p5m
diff --git a/usr/src/pkg/manifests/driver-network-uath.mf b/usr/src/pkg/manifests/driver-network-uath.p5m
index 0f113bcd9a..0f113bcd9a 100644
--- a/usr/src/pkg/manifests/driver-network-uath.mf
+++ b/usr/src/pkg/manifests/driver-network-uath.p5m
diff --git a/usr/src/pkg/manifests/driver-network-udmf.mf b/usr/src/pkg/manifests/driver-network-udmf.p5m
index 124f144b28..124f144b28 100644
--- a/usr/src/pkg/manifests/driver-network-udmf.mf
+++ b/usr/src/pkg/manifests/driver-network-udmf.p5m
diff --git a/usr/src/pkg/manifests/driver-network-upf.mf b/usr/src/pkg/manifests/driver-network-upf.p5m
index e0aa9a3a10..e0aa9a3a10 100644
--- a/usr/src/pkg/manifests/driver-network-upf.mf
+++ b/usr/src/pkg/manifests/driver-network-upf.p5m
diff --git a/usr/src/pkg/manifests/driver-network-ural.mf b/usr/src/pkg/manifests/driver-network-ural.p5m
index 9ee0343f58..9ee0343f58 100644
--- a/usr/src/pkg/manifests/driver-network-ural.mf
+++ b/usr/src/pkg/manifests/driver-network-ural.p5m
diff --git a/usr/src/pkg/manifests/driver-network-urf.mf b/usr/src/pkg/manifests/driver-network-urf.p5m
index 734cceb8e5..734cceb8e5 100644
--- a/usr/src/pkg/manifests/driver-network-urf.mf
+++ b/usr/src/pkg/manifests/driver-network-urf.p5m
diff --git a/usr/src/pkg/manifests/driver-network-urtw.mf b/usr/src/pkg/manifests/driver-network-urtw.p5m
index 8aaf00613b..8aaf00613b 100644
--- a/usr/src/pkg/manifests/driver-network-urtw.mf
+++ b/usr/src/pkg/manifests/driver-network-urtw.p5m
diff --git a/usr/src/pkg/manifests/driver-network-usbecm.mf b/usr/src/pkg/manifests/driver-network-usbecm.p5m
index ae5305d27c..ae5305d27c 100644
--- a/usr/src/pkg/manifests/driver-network-usbecm.mf
+++ b/usr/src/pkg/manifests/driver-network-usbecm.p5m
diff --git a/usr/src/pkg/manifests/driver-network-vioif.mf b/usr/src/pkg/manifests/driver-network-vioif.p5m
index 73263bd6cc..73263bd6cc 100644
--- a/usr/src/pkg/manifests/driver-network-vioif.mf
+++ b/usr/src/pkg/manifests/driver-network-vioif.p5m
diff --git a/usr/src/pkg/manifests/driver-network-vmxnet3s.mf b/usr/src/pkg/manifests/driver-network-vmxnet3s.p5m
index 692872fa82..692872fa82 100644
--- a/usr/src/pkg/manifests/driver-network-vmxnet3s.mf
+++ b/usr/src/pkg/manifests/driver-network-vmxnet3s.p5m
diff --git a/usr/src/pkg/manifests/driver-network-vr.mf b/usr/src/pkg/manifests/driver-network-vr.p5m
index 9a962d2ec0..9a962d2ec0 100644
--- a/usr/src/pkg/manifests/driver-network-vr.mf
+++ b/usr/src/pkg/manifests/driver-network-vr.p5m
diff --git a/usr/src/pkg/manifests/driver-network-wpi.mf b/usr/src/pkg/manifests/driver-network-wpi.p5m
index 4538827a6a..4538827a6a 100644
--- a/usr/src/pkg/manifests/driver-network-wpi.mf
+++ b/usr/src/pkg/manifests/driver-network-wpi.p5m
diff --git a/usr/src/pkg/manifests/driver-network-xge.mf b/usr/src/pkg/manifests/driver-network-xge.p5m
index 3b56345492..3b56345492 100644
--- a/usr/src/pkg/manifests/driver-network-xge.mf
+++ b/usr/src/pkg/manifests/driver-network-xge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-yge.mf b/usr/src/pkg/manifests/driver-network-yge.p5m
index e7263d469f..e7263d469f 100644
--- a/usr/src/pkg/manifests/driver-network-yge.mf
+++ b/usr/src/pkg/manifests/driver-network-yge.p5m
diff --git a/usr/src/pkg/manifests/driver-network-zyd.mf b/usr/src/pkg/manifests/driver-network-zyd.p5m
index 10daecb6ec..10daecb6ec 100644
--- a/usr/src/pkg/manifests/driver-network-zyd.mf
+++ b/usr/src/pkg/manifests/driver-network-zyd.p5m
diff --git a/usr/src/pkg/manifests/driver-pcmcia.mf b/usr/src/pkg/manifests/driver-pcmcia.p5m
index 94b220023e..94b220023e 100644
--- a/usr/src/pkg/manifests/driver-pcmcia.mf
+++ b/usr/src/pkg/manifests/driver-pcmcia.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-pcser.mf b/usr/src/pkg/manifests/driver-serial-pcser.p5m
index 8f1b690a6d..8f1b690a6d 100644
--- a/usr/src/pkg/manifests/driver-serial-pcser.mf
+++ b/usr/src/pkg/manifests/driver-serial-pcser.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbftdi.mf b/usr/src/pkg/manifests/driver-serial-usbftdi.p5m
index 34e242c92e..34e242c92e 100644
--- a/usr/src/pkg/manifests/driver-serial-usbftdi.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbftdi.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbsacm.mf b/usr/src/pkg/manifests/driver-serial-usbsacm.p5m
index a9adda2d8c..a9adda2d8c 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsacm.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsacm.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbser.mf b/usr/src/pkg/manifests/driver-serial-usbser.p5m
index 1ac075d6a4..1ac075d6a4 100644
--- a/usr/src/pkg/manifests/driver-serial-usbser.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbser.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf b/usr/src/pkg/manifests/driver-serial-usbser_edge.p5m
index 2da1135e1f..2da1135e1f 100644
--- a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbser_edge.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.p5m
index 2dab0a2c07..2dab0a2c07 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp.mf b/usr/src/pkg/manifests/driver-serial-usbsksp.p5m
index 3cbfdb2d6e..3cbfdb2d6e 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsksp.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp.p5m
diff --git a/usr/src/pkg/manifests/driver-serial-usbsprl.mf b/usr/src/pkg/manifests/driver-serial-usbsprl.p5m
index 53cc372518..53cc372518 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsprl.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsprl.p5m
diff --git a/usr/src/pkg/manifests/driver-sparc-platform.mf b/usr/src/pkg/manifests/driver-sparc-platform.p5m
index a377e47dbb..a377e47dbb 100644
--- a/usr/src/pkg/manifests/driver-sparc-platform.mf
+++ b/usr/src/pkg/manifests/driver-sparc-platform.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-aac.mf b/usr/src/pkg/manifests/driver-storage-aac.p5m
index 0c39ae6542..0c39ae6542 100644
--- a/usr/src/pkg/manifests/driver-storage-aac.mf
+++ b/usr/src/pkg/manifests/driver-storage-aac.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-adpu320.mf b/usr/src/pkg/manifests/driver-storage-adpu320.p5m
index d15fe95836..d15fe95836 100644
--- a/usr/src/pkg/manifests/driver-storage-adpu320.mf
+++ b/usr/src/pkg/manifests/driver-storage-adpu320.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-ahci.mf b/usr/src/pkg/manifests/driver-storage-ahci.p5m
index 81b253154d..81b253154d 100644
--- a/usr/src/pkg/manifests/driver-storage-ahci.mf
+++ b/usr/src/pkg/manifests/driver-storage-ahci.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-amr.mf b/usr/src/pkg/manifests/driver-storage-amr.p5m
index 449a205cd1..449a205cd1 100644
--- a/usr/src/pkg/manifests/driver-storage-amr.mf
+++ b/usr/src/pkg/manifests/driver-storage-amr.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-arcmsr.mf b/usr/src/pkg/manifests/driver-storage-arcmsr.p5m
index ab686dd8cf..ab686dd8cf 100644
--- a/usr/src/pkg/manifests/driver-storage-arcmsr.mf
+++ b/usr/src/pkg/manifests/driver-storage-arcmsr.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-ata.mf b/usr/src/pkg/manifests/driver-storage-ata.p5m
index 3aaf6b04a3..3aaf6b04a3 100644
--- a/usr/src/pkg/manifests/driver-storage-ata.mf
+++ b/usr/src/pkg/manifests/driver-storage-ata.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf b/usr/src/pkg/manifests/driver-storage-bcm_sata.p5m
index 93bbeeef04..93bbeeef04 100644
--- a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf
+++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-blkdev.mf b/usr/src/pkg/manifests/driver-storage-blkdev.p5m
index a37cd90bd8..a37cd90bd8 100644
--- a/usr/src/pkg/manifests/driver-storage-blkdev.mf
+++ b/usr/src/pkg/manifests/driver-storage-blkdev.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-cpqary3.mf b/usr/src/pkg/manifests/driver-storage-cpqary3.p5m
index 36f33d960c..36f33d960c 100644
--- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf
+++ b/usr/src/pkg/manifests/driver-storage-cpqary3.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf b/usr/src/pkg/manifests/driver-storage-fas-header-fas.p5m
index f4acd1c21b..f4acd1c21b 100644
--- a/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf
+++ b/usr/src/pkg/manifests/driver-storage-fas-header-fas.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-glm.mf b/usr/src/pkg/manifests/driver-storage-glm.p5m
index cd5a5516e5..cd5a5516e5 100644
--- a/usr/src/pkg/manifests/driver-storage-glm.mf
+++ b/usr/src/pkg/manifests/driver-storage-glm.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-lsimega.mf b/usr/src/pkg/manifests/driver-storage-lsimega.p5m
index 81f9997e28..81f9997e28 100644
--- a/usr/src/pkg/manifests/driver-storage-lsimega.mf
+++ b/usr/src/pkg/manifests/driver-storage-lsimega.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf b/usr/src/pkg/manifests/driver-storage-marvell88sx.p5m
index 3b331364c3..3b331364c3 100644
--- a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf
+++ b/usr/src/pkg/manifests/driver-storage-marvell88sx.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-mega_sas.mf b/usr/src/pkg/manifests/driver-storage-mega_sas.p5m
index 35cad3b266..35cad3b266 100644
--- a/usr/src/pkg/manifests/driver-storage-mega_sas.mf
+++ b/usr/src/pkg/manifests/driver-storage-mega_sas.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf b/usr/src/pkg/manifests/driver-storage-mpt_sas.p5m
index ab466dfb98..ab466dfb98 100644
--- a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf
+++ b/usr/src/pkg/manifests/driver-storage-mpt_sas.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.mf b/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
index aed758a2d5..aed758a2d5 100644
--- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf
+++ b/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-nv_sata.mf b/usr/src/pkg/manifests/driver-storage-nv_sata.p5m
index c6a51088d7..c6a51088d7 100644
--- a/usr/src/pkg/manifests/driver-storage-nv_sata.mf
+++ b/usr/src/pkg/manifests/driver-storage-nv_sata.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-nvme.mf b/usr/src/pkg/manifests/driver-storage-nvme.p5m
index 5890751ca2..5890751ca2 100644
--- a/usr/src/pkg/manifests/driver-storage-nvme.mf
+++ b/usr/src/pkg/manifests/driver-storage-nvme.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-pcata.mf b/usr/src/pkg/manifests/driver-storage-pcata.p5m
index 6c8b8f7a96..6c8b8f7a96 100644
--- a/usr/src/pkg/manifests/driver-storage-pcata.mf
+++ b/usr/src/pkg/manifests/driver-storage-pcata.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-pmcs.mf b/usr/src/pkg/manifests/driver-storage-pmcs.p5m
index 7d61424a7a..7d61424a7a 100644
--- a/usr/src/pkg/manifests/driver-storage-pmcs.mf
+++ b/usr/src/pkg/manifests/driver-storage-pmcs.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-pvscsi.mf b/usr/src/pkg/manifests/driver-storage-pvscsi.p5m
index 7fa494c305..7fa494c305 100644
--- a/usr/src/pkg/manifests/driver-storage-pvscsi.mf
+++ b/usr/src/pkg/manifests/driver-storage-pvscsi.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-sbp2.mf b/usr/src/pkg/manifests/driver-storage-sbp2.p5m
index 47531dd320..47531dd320 100644
--- a/usr/src/pkg/manifests/driver-storage-sbp2.mf
+++ b/usr/src/pkg/manifests/driver-storage-sbp2.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-scsa1394.mf b/usr/src/pkg/manifests/driver-storage-scsa1394.p5m
index 675adb831f..675adb831f 100644
--- a/usr/src/pkg/manifests/driver-storage-scsa1394.mf
+++ b/usr/src/pkg/manifests/driver-storage-scsa1394.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-sdcard.mf b/usr/src/pkg/manifests/driver-storage-sdcard.p5m
index 884d9c5e71..884d9c5e71 100644
--- a/usr/src/pkg/manifests/driver-storage-sdcard.mf
+++ b/usr/src/pkg/manifests/driver-storage-sdcard.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-ses.mf b/usr/src/pkg/manifests/driver-storage-ses.p5m
index d36db5293b..d36db5293b 100644
--- a/usr/src/pkg/manifests/driver-storage-ses.mf
+++ b/usr/src/pkg/manifests/driver-storage-ses.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-sf.mf b/usr/src/pkg/manifests/driver-storage-sf.p5m
index 20f046c489..20f046c489 100644
--- a/usr/src/pkg/manifests/driver-storage-sf.mf
+++ b/usr/src/pkg/manifests/driver-storage-sf.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-si3124.mf b/usr/src/pkg/manifests/driver-storage-si3124.p5m
index ecbc0c66f8..ecbc0c66f8 100644
--- a/usr/src/pkg/manifests/driver-storage-si3124.mf
+++ b/usr/src/pkg/manifests/driver-storage-si3124.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-skd.mf b/usr/src/pkg/manifests/driver-storage-skd.p5m
index 0681840a20..0681840a20 100644
--- a/usr/src/pkg/manifests/driver-storage-skd.mf
+++ b/usr/src/pkg/manifests/driver-storage-skd.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-smp.mf b/usr/src/pkg/manifests/driver-storage-smp.p5m
index 4aa00acc6e..4aa00acc6e 100644
--- a/usr/src/pkg/manifests/driver-storage-smp.mf
+++ b/usr/src/pkg/manifests/driver-storage-smp.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-ssd.mf b/usr/src/pkg/manifests/driver-storage-ssd.p5m
index 7d8c4b171d..7d8c4b171d 100644
--- a/usr/src/pkg/manifests/driver-storage-ssd.mf
+++ b/usr/src/pkg/manifests/driver-storage-ssd.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-sv.mf b/usr/src/pkg/manifests/driver-storage-sv.p5m
index d5711099e8..d5711099e8 100644
--- a/usr/src/pkg/manifests/driver-storage-sv.mf
+++ b/usr/src/pkg/manifests/driver-storage-sv.p5m
diff --git a/usr/src/pkg/manifests/driver-storage-vioblk.mf b/usr/src/pkg/manifests/driver-storage-vioblk.p5m
index 8535bdc844..8535bdc844 100644
--- a/usr/src/pkg/manifests/driver-storage-vioblk.mf
+++ b/usr/src/pkg/manifests/driver-storage-vioblk.p5m
diff --git a/usr/src/pkg/manifests/driver-usb-ugen.mf b/usr/src/pkg/manifests/driver-usb-ugen.p5m
index 88ffe650ff..88ffe650ff 100644
--- a/usr/src/pkg/manifests/driver-usb-ugen.mf
+++ b/usr/src/pkg/manifests/driver-usb-ugen.p5m
diff --git a/usr/src/pkg/manifests/driver-usb-usbgem.mf b/usr/src/pkg/manifests/driver-usb-usbgem.p5m
index 8cfd782b3c..8cfd782b3c 100644
--- a/usr/src/pkg/manifests/driver-usb-usbgem.mf
+++ b/usr/src/pkg/manifests/driver-usb-usbgem.p5m
diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.p5m
index fc2cf12862..fc2cf12862 100644
--- a/usr/src/pkg/manifests/driver-usb.mf
+++ b/usr/src/pkg/manifests/driver-usb.p5m
diff --git a/usr/src/pkg/manifests/driver-x11-winlock.mf b/usr/src/pkg/manifests/driver-x11-winlock.p5m
index d51d701914..d51d701914 100644
--- a/usr/src/pkg/manifests/driver-x11-winlock.mf
+++ b/usr/src/pkg/manifests/driver-x11-winlock.p5m
diff --git a/usr/src/pkg/manifests/driver-x11-xsvc.mf b/usr/src/pkg/manifests/driver-x11-xsvc.p5m
index 8834ca9ea2..8834ca9ea2 100644
--- a/usr/src/pkg/manifests/driver-x11-xsvc.mf
+++ b/usr/src/pkg/manifests/driver-x11-xsvc.p5m
diff --git a/usr/src/pkg/manifests/driver-xvm-pv.mf b/usr/src/pkg/manifests/driver-xvm-pv.p5m
index 26f03b2043..26f03b2043 100644
--- a/usr/src/pkg/manifests/driver-xvm-pv.mf
+++ b/usr/src/pkg/manifests/driver-xvm-pv.p5m
diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.p5m
index a706906894..a706906894 100644
--- a/usr/src/pkg/manifests/install-beadm.mf
+++ b/usr/src/pkg/manifests/install-beadm.p5m
diff --git a/usr/src/pkg/manifests/library-demo-audio-samples.mf b/usr/src/pkg/manifests/library-demo-audio-samples.p5m
index 0f2c953ebb..0f2c953ebb 100644
--- a/usr/src/pkg/manifests/library-demo-audio-samples.mf
+++ b/usr/src/pkg/manifests/library-demo-audio-samples.p5m
diff --git a/usr/src/pkg/manifests/library-libadt_jni.mf b/usr/src/pkg/manifests/library-libadt_jni.p5m
index 795aeee4b3..795aeee4b3 100644
--- a/usr/src/pkg/manifests/library-libadt_jni.mf
+++ b/usr/src/pkg/manifests/library-libadt_jni.p5m
diff --git a/usr/src/pkg/manifests/library-libtecla.mf b/usr/src/pkg/manifests/library-libtecla.p5m
index 2ff2f6699f..2ff2f6699f 100644
--- a/usr/src/pkg/manifests/library-libtecla.mf
+++ b/usr/src/pkg/manifests/library-libtecla.p5m
diff --git a/usr/src/pkg/manifests/library-print-open-printing-ipp.mf b/usr/src/pkg/manifests/library-print-open-printing-ipp.p5m
index f4a9d85aa7..f4a9d85aa7 100644
--- a/usr/src/pkg/manifests/library-print-open-printing-ipp.mf
+++ b/usr/src/pkg/manifests/library-print-open-printing-ipp.p5m
diff --git a/usr/src/pkg/manifests/library-print-open-printing-lpd.mf b/usr/src/pkg/manifests/library-print-open-printing-lpd.p5m
index 19b6e48de9..19b6e48de9 100644
--- a/usr/src/pkg/manifests/library-print-open-printing-lpd.mf
+++ b/usr/src/pkg/manifests/library-print-open-printing-lpd.p5m
diff --git a/usr/src/pkg/manifests/library-print-open-printing.mf b/usr/src/pkg/manifests/library-print-open-printing.p5m
index 3dd735dd94..3dd735dd94 100644
--- a/usr/src/pkg/manifests/library-print-open-printing.mf
+++ b/usr/src/pkg/manifests/library-print-open-printing.p5m
diff --git a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf b/usr/src/pkg/manifests/library-security-tcp-wrapper.p5m
index c01b684968..c01b684968 100644
--- a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf
+++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.p5m
diff --git a/usr/src/pkg/manifests/locale-af.mf b/usr/src/pkg/manifests/locale-af.p5m
index 188a9e4a34..188a9e4a34 100644
--- a/usr/src/pkg/manifests/locale-af.mf
+++ b/usr/src/pkg/manifests/locale-af.p5m
diff --git a/usr/src/pkg/manifests/locale-ar-extra.mf b/usr/src/pkg/manifests/locale-ar-extra.p5m
index 9396d83ce2..9396d83ce2 100644
--- a/usr/src/pkg/manifests/locale-ar-extra.mf
+++ b/usr/src/pkg/manifests/locale-ar-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-ar.mf b/usr/src/pkg/manifests/locale-ar.p5m
index 33edcc16b3..33edcc16b3 100644
--- a/usr/src/pkg/manifests/locale-ar.mf
+++ b/usr/src/pkg/manifests/locale-ar.p5m
diff --git a/usr/src/pkg/manifests/locale-as.mf b/usr/src/pkg/manifests/locale-as.p5m
index f12e775134..f12e775134 100644
--- a/usr/src/pkg/manifests/locale-as.mf
+++ b/usr/src/pkg/manifests/locale-as.p5m
diff --git a/usr/src/pkg/manifests/locale-az.mf b/usr/src/pkg/manifests/locale-az.p5m
index a56a696143..a56a696143 100644
--- a/usr/src/pkg/manifests/locale-az.mf
+++ b/usr/src/pkg/manifests/locale-az.p5m
diff --git a/usr/src/pkg/manifests/locale-be.mf b/usr/src/pkg/manifests/locale-be.p5m
index 4e047f625a..4e047f625a 100644
--- a/usr/src/pkg/manifests/locale-be.mf
+++ b/usr/src/pkg/manifests/locale-be.p5m
diff --git a/usr/src/pkg/manifests/locale-bg-extra.mf b/usr/src/pkg/manifests/locale-bg-extra.p5m
index 6971bbdccd..6971bbdccd 100644
--- a/usr/src/pkg/manifests/locale-bg-extra.mf
+++ b/usr/src/pkg/manifests/locale-bg-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-bg.mf b/usr/src/pkg/manifests/locale-bg.p5m
index cd118fa7b1..cd118fa7b1 100644
--- a/usr/src/pkg/manifests/locale-bg.mf
+++ b/usr/src/pkg/manifests/locale-bg.p5m
diff --git a/usr/src/pkg/manifests/locale-bn.mf b/usr/src/pkg/manifests/locale-bn.p5m
index 23882c1c3f..23882c1c3f 100644
--- a/usr/src/pkg/manifests/locale-bn.mf
+++ b/usr/src/pkg/manifests/locale-bn.p5m
diff --git a/usr/src/pkg/manifests/locale-bo.mf b/usr/src/pkg/manifests/locale-bo.p5m
index 0121a9deed..0121a9deed 100644
--- a/usr/src/pkg/manifests/locale-bo.mf
+++ b/usr/src/pkg/manifests/locale-bo.p5m
diff --git a/usr/src/pkg/manifests/locale-bs.mf b/usr/src/pkg/manifests/locale-bs.p5m
index eebf613a63..eebf613a63 100644
--- a/usr/src/pkg/manifests/locale-bs.mf
+++ b/usr/src/pkg/manifests/locale-bs.p5m
diff --git a/usr/src/pkg/manifests/locale-ca-extra.mf b/usr/src/pkg/manifests/locale-ca-extra.p5m
index ae645f7f49..ae645f7f49 100644
--- a/usr/src/pkg/manifests/locale-ca-extra.mf
+++ b/usr/src/pkg/manifests/locale-ca-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-ca.mf b/usr/src/pkg/manifests/locale-ca.p5m
index fc51b919b1..fc51b919b1 100644
--- a/usr/src/pkg/manifests/locale-ca.mf
+++ b/usr/src/pkg/manifests/locale-ca.p5m
diff --git a/usr/src/pkg/manifests/locale-cs-extra.mf b/usr/src/pkg/manifests/locale-cs-extra.p5m
index f49bf7d8a1..f49bf7d8a1 100644
--- a/usr/src/pkg/manifests/locale-cs-extra.mf
+++ b/usr/src/pkg/manifests/locale-cs-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-cs.mf b/usr/src/pkg/manifests/locale-cs.p5m
index be5455d186..be5455d186 100644
--- a/usr/src/pkg/manifests/locale-cs.mf
+++ b/usr/src/pkg/manifests/locale-cs.p5m
diff --git a/usr/src/pkg/manifests/locale-da-extra.mf b/usr/src/pkg/manifests/locale-da-extra.p5m
index 70d28b5fee..70d28b5fee 100644
--- a/usr/src/pkg/manifests/locale-da-extra.mf
+++ b/usr/src/pkg/manifests/locale-da-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-da.mf b/usr/src/pkg/manifests/locale-da.p5m
index bb093c1aa7..bb093c1aa7 100644
--- a/usr/src/pkg/manifests/locale-da.mf
+++ b/usr/src/pkg/manifests/locale-da.p5m
diff --git a/usr/src/pkg/manifests/locale-de-extra.mf b/usr/src/pkg/manifests/locale-de-extra.p5m
index eb35eee130..eb35eee130 100644
--- a/usr/src/pkg/manifests/locale-de-extra.mf
+++ b/usr/src/pkg/manifests/locale-de-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-de.mf b/usr/src/pkg/manifests/locale-de.p5m
index b190fea6e6..b190fea6e6 100644
--- a/usr/src/pkg/manifests/locale-de.mf
+++ b/usr/src/pkg/manifests/locale-de.p5m
diff --git a/usr/src/pkg/manifests/locale-el-extra.mf b/usr/src/pkg/manifests/locale-el-extra.p5m
index a7e3153596..a7e3153596 100644
--- a/usr/src/pkg/manifests/locale-el-extra.mf
+++ b/usr/src/pkg/manifests/locale-el-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-el.mf b/usr/src/pkg/manifests/locale-el.p5m
index d8123c6910..d8123c6910 100644
--- a/usr/src/pkg/manifests/locale-el.mf
+++ b/usr/src/pkg/manifests/locale-el.p5m
diff --git a/usr/src/pkg/manifests/locale-en-extra.mf b/usr/src/pkg/manifests/locale-en-extra.p5m
index df02f982f9..df02f982f9 100644
--- a/usr/src/pkg/manifests/locale-en-extra.mf
+++ b/usr/src/pkg/manifests/locale-en-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-en.mf b/usr/src/pkg/manifests/locale-en.p5m
index de1bb7bcc5..de1bb7bcc5 100644
--- a/usr/src/pkg/manifests/locale-en.mf
+++ b/usr/src/pkg/manifests/locale-en.p5m
diff --git a/usr/src/pkg/manifests/locale-es-extra.mf b/usr/src/pkg/manifests/locale-es-extra.p5m
index 8dedfc077e..8dedfc077e 100644
--- a/usr/src/pkg/manifests/locale-es-extra.mf
+++ b/usr/src/pkg/manifests/locale-es-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-es.mf b/usr/src/pkg/manifests/locale-es.p5m
index fa3e74fe99..fa3e74fe99 100644
--- a/usr/src/pkg/manifests/locale-es.mf
+++ b/usr/src/pkg/manifests/locale-es.p5m
diff --git a/usr/src/pkg/manifests/locale-et.mf b/usr/src/pkg/manifests/locale-et.p5m
index be90a3acf4..be90a3acf4 100644
--- a/usr/src/pkg/manifests/locale-et.mf
+++ b/usr/src/pkg/manifests/locale-et.p5m
diff --git a/usr/src/pkg/manifests/locale-fi-extra.mf b/usr/src/pkg/manifests/locale-fi-extra.p5m
index e0ea627475..e0ea627475 100644
--- a/usr/src/pkg/manifests/locale-fi-extra.mf
+++ b/usr/src/pkg/manifests/locale-fi-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-fi.mf b/usr/src/pkg/manifests/locale-fi.p5m
index 7b3d0c0f7f..7b3d0c0f7f 100644
--- a/usr/src/pkg/manifests/locale-fi.mf
+++ b/usr/src/pkg/manifests/locale-fi.p5m
diff --git a/usr/src/pkg/manifests/locale-fil.mf b/usr/src/pkg/manifests/locale-fil.p5m
index 4f9b45edfd..4f9b45edfd 100644
--- a/usr/src/pkg/manifests/locale-fil.mf
+++ b/usr/src/pkg/manifests/locale-fil.p5m
diff --git a/usr/src/pkg/manifests/locale-fr-extra.mf b/usr/src/pkg/manifests/locale-fr-extra.p5m
index b095ac0275..b095ac0275 100644
--- a/usr/src/pkg/manifests/locale-fr-extra.mf
+++ b/usr/src/pkg/manifests/locale-fr-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-fr.mf b/usr/src/pkg/manifests/locale-fr.p5m
index b0c3fde250..b0c3fde250 100644
--- a/usr/src/pkg/manifests/locale-fr.mf
+++ b/usr/src/pkg/manifests/locale-fr.p5m
diff --git a/usr/src/pkg/manifests/locale-ga.mf b/usr/src/pkg/manifests/locale-ga.p5m
index 3986ee0f5a..3986ee0f5a 100644
--- a/usr/src/pkg/manifests/locale-ga.mf
+++ b/usr/src/pkg/manifests/locale-ga.p5m
diff --git a/usr/src/pkg/manifests/locale-gu.mf b/usr/src/pkg/manifests/locale-gu.p5m
index 1db90a2563..1db90a2563 100644
--- a/usr/src/pkg/manifests/locale-gu.mf
+++ b/usr/src/pkg/manifests/locale-gu.p5m
diff --git a/usr/src/pkg/manifests/locale-he.mf b/usr/src/pkg/manifests/locale-he.p5m
index 3bfc96a920..3bfc96a920 100644
--- a/usr/src/pkg/manifests/locale-he.mf
+++ b/usr/src/pkg/manifests/locale-he.p5m
diff --git a/usr/src/pkg/manifests/locale-hi.mf b/usr/src/pkg/manifests/locale-hi.p5m
index 858e1a35dd..858e1a35dd 100644
--- a/usr/src/pkg/manifests/locale-hi.mf
+++ b/usr/src/pkg/manifests/locale-hi.p5m
diff --git a/usr/src/pkg/manifests/locale-hr-extra.mf b/usr/src/pkg/manifests/locale-hr-extra.p5m
index c6ad3a958d..c6ad3a958d 100644
--- a/usr/src/pkg/manifests/locale-hr-extra.mf
+++ b/usr/src/pkg/manifests/locale-hr-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-hr.mf b/usr/src/pkg/manifests/locale-hr.p5m
index 1688eb5475..1688eb5475 100644
--- a/usr/src/pkg/manifests/locale-hr.mf
+++ b/usr/src/pkg/manifests/locale-hr.p5m
diff --git a/usr/src/pkg/manifests/locale-hu-extra.mf b/usr/src/pkg/manifests/locale-hu-extra.p5m
index 2ba588e8d5..2ba588e8d5 100644
--- a/usr/src/pkg/manifests/locale-hu-extra.mf
+++ b/usr/src/pkg/manifests/locale-hu-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-hu.mf b/usr/src/pkg/manifests/locale-hu.p5m
index 38cbfbb64a..38cbfbb64a 100644
--- a/usr/src/pkg/manifests/locale-hu.mf
+++ b/usr/src/pkg/manifests/locale-hu.p5m
diff --git a/usr/src/pkg/manifests/locale-hy.mf b/usr/src/pkg/manifests/locale-hy.p5m
index d642044faa..d642044faa 100644
--- a/usr/src/pkg/manifests/locale-hy.mf
+++ b/usr/src/pkg/manifests/locale-hy.p5m
diff --git a/usr/src/pkg/manifests/locale-id.mf b/usr/src/pkg/manifests/locale-id.p5m
index 58fd3a77ad..58fd3a77ad 100644
--- a/usr/src/pkg/manifests/locale-id.mf
+++ b/usr/src/pkg/manifests/locale-id.p5m
diff --git a/usr/src/pkg/manifests/locale-ii.mf b/usr/src/pkg/manifests/locale-ii.p5m
index b6b2d4e61e..b6b2d4e61e 100644
--- a/usr/src/pkg/manifests/locale-ii.mf
+++ b/usr/src/pkg/manifests/locale-ii.p5m
diff --git a/usr/src/pkg/manifests/locale-is-extra.mf b/usr/src/pkg/manifests/locale-is-extra.p5m
index 1c1123d0a8..1c1123d0a8 100644
--- a/usr/src/pkg/manifests/locale-is-extra.mf
+++ b/usr/src/pkg/manifests/locale-is-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-is.mf b/usr/src/pkg/manifests/locale-is.p5m
index e2eaaca555..e2eaaca555 100644
--- a/usr/src/pkg/manifests/locale-is.mf
+++ b/usr/src/pkg/manifests/locale-is.p5m
diff --git a/usr/src/pkg/manifests/locale-it-extra.mf b/usr/src/pkg/manifests/locale-it-extra.p5m
index 34f75f16ef..34f75f16ef 100644
--- a/usr/src/pkg/manifests/locale-it-extra.mf
+++ b/usr/src/pkg/manifests/locale-it-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-it.mf b/usr/src/pkg/manifests/locale-it.p5m
index ef0d54b8d2..ef0d54b8d2 100644
--- a/usr/src/pkg/manifests/locale-it.mf
+++ b/usr/src/pkg/manifests/locale-it.p5m
diff --git a/usr/src/pkg/manifests/locale-ja.mf b/usr/src/pkg/manifests/locale-ja.p5m
index e458f68fcf..e458f68fcf 100644
--- a/usr/src/pkg/manifests/locale-ja.mf
+++ b/usr/src/pkg/manifests/locale-ja.p5m
diff --git a/usr/src/pkg/manifests/locale-ka.mf b/usr/src/pkg/manifests/locale-ka.p5m
index eee9cf7e27..eee9cf7e27 100644
--- a/usr/src/pkg/manifests/locale-ka.mf
+++ b/usr/src/pkg/manifests/locale-ka.p5m
diff --git a/usr/src/pkg/manifests/locale-kk.mf b/usr/src/pkg/manifests/locale-kk.p5m
index e080645320..e080645320 100644
--- a/usr/src/pkg/manifests/locale-kk.mf
+++ b/usr/src/pkg/manifests/locale-kk.p5m
diff --git a/usr/src/pkg/manifests/locale-km.mf b/usr/src/pkg/manifests/locale-km.p5m
index f619c8dc14..f619c8dc14 100644
--- a/usr/src/pkg/manifests/locale-km.mf
+++ b/usr/src/pkg/manifests/locale-km.p5m
diff --git a/usr/src/pkg/manifests/locale-kn.mf b/usr/src/pkg/manifests/locale-kn.p5m
index 080ebec67e..080ebec67e 100644
--- a/usr/src/pkg/manifests/locale-kn.mf
+++ b/usr/src/pkg/manifests/locale-kn.p5m
diff --git a/usr/src/pkg/manifests/locale-ko.mf b/usr/src/pkg/manifests/locale-ko.p5m
index 07fdfb472b..07fdfb472b 100644
--- a/usr/src/pkg/manifests/locale-ko.mf
+++ b/usr/src/pkg/manifests/locale-ko.p5m
diff --git a/usr/src/pkg/manifests/locale-kok.mf b/usr/src/pkg/manifests/locale-kok.p5m
index 6065e493e7..6065e493e7 100644
--- a/usr/src/pkg/manifests/locale-kok.mf
+++ b/usr/src/pkg/manifests/locale-kok.p5m
diff --git a/usr/src/pkg/manifests/locale-lt-extra.mf b/usr/src/pkg/manifests/locale-lt-extra.p5m
index 6de7b4157d..6de7b4157d 100644
--- a/usr/src/pkg/manifests/locale-lt-extra.mf
+++ b/usr/src/pkg/manifests/locale-lt-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-lt.mf b/usr/src/pkg/manifests/locale-lt.p5m
index 209dc67561..209dc67561 100644
--- a/usr/src/pkg/manifests/locale-lt.mf
+++ b/usr/src/pkg/manifests/locale-lt.p5m
diff --git a/usr/src/pkg/manifests/locale-lv-extra.mf b/usr/src/pkg/manifests/locale-lv-extra.p5m
index 5459f5b4c3..5459f5b4c3 100644
--- a/usr/src/pkg/manifests/locale-lv-extra.mf
+++ b/usr/src/pkg/manifests/locale-lv-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-lv.mf b/usr/src/pkg/manifests/locale-lv.p5m
index 010511268f..010511268f 100644
--- a/usr/src/pkg/manifests/locale-lv.mf
+++ b/usr/src/pkg/manifests/locale-lv.p5m
diff --git a/usr/src/pkg/manifests/locale-mk-extra.mf b/usr/src/pkg/manifests/locale-mk-extra.p5m
index 82c5723a1b..82c5723a1b 100644
--- a/usr/src/pkg/manifests/locale-mk-extra.mf
+++ b/usr/src/pkg/manifests/locale-mk-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-mk.mf b/usr/src/pkg/manifests/locale-mk.p5m
index 6e279b6165..6e279b6165 100644
--- a/usr/src/pkg/manifests/locale-mk.mf
+++ b/usr/src/pkg/manifests/locale-mk.p5m
diff --git a/usr/src/pkg/manifests/locale-ml.mf b/usr/src/pkg/manifests/locale-ml.p5m
index 315916899f..315916899f 100644
--- a/usr/src/pkg/manifests/locale-ml.mf
+++ b/usr/src/pkg/manifests/locale-ml.p5m
diff --git a/usr/src/pkg/manifests/locale-mn.mf b/usr/src/pkg/manifests/locale-mn.p5m
index d576d7d0f8..d576d7d0f8 100644
--- a/usr/src/pkg/manifests/locale-mn.mf
+++ b/usr/src/pkg/manifests/locale-mn.p5m
diff --git a/usr/src/pkg/manifests/locale-mr.mf b/usr/src/pkg/manifests/locale-mr.p5m
index 23b9347f7d..23b9347f7d 100644
--- a/usr/src/pkg/manifests/locale-mr.mf
+++ b/usr/src/pkg/manifests/locale-mr.p5m
diff --git a/usr/src/pkg/manifests/locale-ms.mf b/usr/src/pkg/manifests/locale-ms.p5m
index b0763e3564..b0763e3564 100644
--- a/usr/src/pkg/manifests/locale-ms.mf
+++ b/usr/src/pkg/manifests/locale-ms.p5m
diff --git a/usr/src/pkg/manifests/locale-mt.mf b/usr/src/pkg/manifests/locale-mt.p5m
index bd8902201c..bd8902201c 100644
--- a/usr/src/pkg/manifests/locale-mt.mf
+++ b/usr/src/pkg/manifests/locale-mt.p5m
diff --git a/usr/src/pkg/manifests/locale-nb.mf b/usr/src/pkg/manifests/locale-nb.p5m
index 22449b6839..22449b6839 100644
--- a/usr/src/pkg/manifests/locale-nb.mf
+++ b/usr/src/pkg/manifests/locale-nb.p5m
diff --git a/usr/src/pkg/manifests/locale-ne.mf b/usr/src/pkg/manifests/locale-ne.p5m
index ef92b368cf..ef92b368cf 100644
--- a/usr/src/pkg/manifests/locale-ne.mf
+++ b/usr/src/pkg/manifests/locale-ne.p5m
diff --git a/usr/src/pkg/manifests/locale-nl-extra.mf b/usr/src/pkg/manifests/locale-nl-extra.p5m
index 03974a88a7..03974a88a7 100644
--- a/usr/src/pkg/manifests/locale-nl-extra.mf
+++ b/usr/src/pkg/manifests/locale-nl-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-nl.mf b/usr/src/pkg/manifests/locale-nl.p5m
index de577cf64e..de577cf64e 100644
--- a/usr/src/pkg/manifests/locale-nl.mf
+++ b/usr/src/pkg/manifests/locale-nl.p5m
diff --git a/usr/src/pkg/manifests/locale-nn.mf b/usr/src/pkg/manifests/locale-nn.p5m
index ce82f6e658..ce82f6e658 100644
--- a/usr/src/pkg/manifests/locale-nn.mf
+++ b/usr/src/pkg/manifests/locale-nn.p5m
diff --git a/usr/src/pkg/manifests/locale-or.mf b/usr/src/pkg/manifests/locale-or.p5m
index 6ea69c3093..6ea69c3093 100644
--- a/usr/src/pkg/manifests/locale-or.mf
+++ b/usr/src/pkg/manifests/locale-or.p5m
diff --git a/usr/src/pkg/manifests/locale-pa.mf b/usr/src/pkg/manifests/locale-pa.p5m
index f020090524..f020090524 100644
--- a/usr/src/pkg/manifests/locale-pa.mf
+++ b/usr/src/pkg/manifests/locale-pa.p5m
diff --git a/usr/src/pkg/manifests/locale-pl-extra.mf b/usr/src/pkg/manifests/locale-pl-extra.p5m
index 3bd6fa9146..3bd6fa9146 100644
--- a/usr/src/pkg/manifests/locale-pl-extra.mf
+++ b/usr/src/pkg/manifests/locale-pl-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-pl.mf b/usr/src/pkg/manifests/locale-pl.p5m
index 8a9dfd298b..8a9dfd298b 100644
--- a/usr/src/pkg/manifests/locale-pl.mf
+++ b/usr/src/pkg/manifests/locale-pl.p5m
diff --git a/usr/src/pkg/manifests/locale-pt-extra.mf b/usr/src/pkg/manifests/locale-pt-extra.p5m
index fd5954716c..fd5954716c 100644
--- a/usr/src/pkg/manifests/locale-pt-extra.mf
+++ b/usr/src/pkg/manifests/locale-pt-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-pt.mf b/usr/src/pkg/manifests/locale-pt.p5m
index 4974230e4d..4974230e4d 100644
--- a/usr/src/pkg/manifests/locale-pt.mf
+++ b/usr/src/pkg/manifests/locale-pt.p5m
diff --git a/usr/src/pkg/manifests/locale-ro.mf b/usr/src/pkg/manifests/locale-ro.p5m
index c665f7e3ff..c665f7e3ff 100644
--- a/usr/src/pkg/manifests/locale-ro.mf
+++ b/usr/src/pkg/manifests/locale-ro.p5m
diff --git a/usr/src/pkg/manifests/locale-ru-extra.mf b/usr/src/pkg/manifests/locale-ru-extra.p5m
index 003a741084..003a741084 100644
--- a/usr/src/pkg/manifests/locale-ru-extra.mf
+++ b/usr/src/pkg/manifests/locale-ru-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-ru.mf b/usr/src/pkg/manifests/locale-ru.p5m
index 42b6eebc47..42b6eebc47 100644
--- a/usr/src/pkg/manifests/locale-ru.mf
+++ b/usr/src/pkg/manifests/locale-ru.p5m
diff --git a/usr/src/pkg/manifests/locale-sa.mf b/usr/src/pkg/manifests/locale-sa.p5m
index d1f4346406..d1f4346406 100644
--- a/usr/src/pkg/manifests/locale-sa.mf
+++ b/usr/src/pkg/manifests/locale-sa.p5m
diff --git a/usr/src/pkg/manifests/locale-si.mf b/usr/src/pkg/manifests/locale-si.p5m
index bea444ba74..bea444ba74 100644
--- a/usr/src/pkg/manifests/locale-si.mf
+++ b/usr/src/pkg/manifests/locale-si.p5m
diff --git a/usr/src/pkg/manifests/locale-sk.mf b/usr/src/pkg/manifests/locale-sk.p5m
index fe50d6978c..fe50d6978c 100644
--- a/usr/src/pkg/manifests/locale-sk.mf
+++ b/usr/src/pkg/manifests/locale-sk.p5m
diff --git a/usr/src/pkg/manifests/locale-sl.mf b/usr/src/pkg/manifests/locale-sl.p5m
index 5ebdfa5703..5ebdfa5703 100644
--- a/usr/src/pkg/manifests/locale-sl.mf
+++ b/usr/src/pkg/manifests/locale-sl.p5m
diff --git a/usr/src/pkg/manifests/locale-sq-extra.mf b/usr/src/pkg/manifests/locale-sq-extra.p5m
index 98c5cf76b0..98c5cf76b0 100644
--- a/usr/src/pkg/manifests/locale-sq-extra.mf
+++ b/usr/src/pkg/manifests/locale-sq-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-sq.mf b/usr/src/pkg/manifests/locale-sq.p5m
index 8c4c122704..8c4c122704 100644
--- a/usr/src/pkg/manifests/locale-sq.mf
+++ b/usr/src/pkg/manifests/locale-sq.p5m
diff --git a/usr/src/pkg/manifests/locale-sr.mf b/usr/src/pkg/manifests/locale-sr.p5m
index 4b5849fcab..4b5849fcab 100644
--- a/usr/src/pkg/manifests/locale-sr.mf
+++ b/usr/src/pkg/manifests/locale-sr.p5m
diff --git a/usr/src/pkg/manifests/locale-sv-extra.mf b/usr/src/pkg/manifests/locale-sv-extra.p5m
index cec5cb2812..cec5cb2812 100644
--- a/usr/src/pkg/manifests/locale-sv-extra.mf
+++ b/usr/src/pkg/manifests/locale-sv-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-sv.mf b/usr/src/pkg/manifests/locale-sv.p5m
index 7a56089885..7a56089885 100644
--- a/usr/src/pkg/manifests/locale-sv.mf
+++ b/usr/src/pkg/manifests/locale-sv.p5m
diff --git a/usr/src/pkg/manifests/locale-ta.mf b/usr/src/pkg/manifests/locale-ta.p5m
index c839f4ab45..c839f4ab45 100644
--- a/usr/src/pkg/manifests/locale-ta.mf
+++ b/usr/src/pkg/manifests/locale-ta.p5m
diff --git a/usr/src/pkg/manifests/locale-te.mf b/usr/src/pkg/manifests/locale-te.p5m
index 4e857a861a..4e857a861a 100644
--- a/usr/src/pkg/manifests/locale-te.mf
+++ b/usr/src/pkg/manifests/locale-te.p5m
diff --git a/usr/src/pkg/manifests/locale-th-extra.mf b/usr/src/pkg/manifests/locale-th-extra.p5m
index 71339a31c7..71339a31c7 100644
--- a/usr/src/pkg/manifests/locale-th-extra.mf
+++ b/usr/src/pkg/manifests/locale-th-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-th.mf b/usr/src/pkg/manifests/locale-th.p5m
index d06af8b9c5..d06af8b9c5 100644
--- a/usr/src/pkg/manifests/locale-th.mf
+++ b/usr/src/pkg/manifests/locale-th.p5m
diff --git a/usr/src/pkg/manifests/locale-tr-extra.mf b/usr/src/pkg/manifests/locale-tr-extra.p5m
index 0b965c8587..0b965c8587 100644
--- a/usr/src/pkg/manifests/locale-tr-extra.mf
+++ b/usr/src/pkg/manifests/locale-tr-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-tr.mf b/usr/src/pkg/manifests/locale-tr.p5m
index 661c8154a1..661c8154a1 100644
--- a/usr/src/pkg/manifests/locale-tr.mf
+++ b/usr/src/pkg/manifests/locale-tr.p5m
diff --git a/usr/src/pkg/manifests/locale-ug.mf b/usr/src/pkg/manifests/locale-ug.p5m
index e68a60fd0c..e68a60fd0c 100644
--- a/usr/src/pkg/manifests/locale-ug.mf
+++ b/usr/src/pkg/manifests/locale-ug.p5m
diff --git a/usr/src/pkg/manifests/locale-uk.mf b/usr/src/pkg/manifests/locale-uk.p5m
index 96a4c4c34c..96a4c4c34c 100644
--- a/usr/src/pkg/manifests/locale-uk.mf
+++ b/usr/src/pkg/manifests/locale-uk.p5m
diff --git a/usr/src/pkg/manifests/locale-ur.mf b/usr/src/pkg/manifests/locale-ur.p5m
index 5e75da893f..5e75da893f 100644
--- a/usr/src/pkg/manifests/locale-ur.mf
+++ b/usr/src/pkg/manifests/locale-ur.p5m
diff --git a/usr/src/pkg/manifests/locale-vi.mf b/usr/src/pkg/manifests/locale-vi.p5m
index fec65bec81..fec65bec81 100644
--- a/usr/src/pkg/manifests/locale-vi.mf
+++ b/usr/src/pkg/manifests/locale-vi.p5m
diff --git a/usr/src/pkg/manifests/locale-zh-cn-extra.mf b/usr/src/pkg/manifests/locale-zh-cn-extra.p5m
index 62b2964aa4..62b2964aa4 100644
--- a/usr/src/pkg/manifests/locale-zh-cn-extra.mf
+++ b/usr/src/pkg/manifests/locale-zh-cn-extra.p5m
diff --git a/usr/src/pkg/manifests/locale-zh-cn.mf b/usr/src/pkg/manifests/locale-zh-cn.p5m
index c45f9a55f9..c45f9a55f9 100644
--- a/usr/src/pkg/manifests/locale-zh-cn.mf
+++ b/usr/src/pkg/manifests/locale-zh-cn.p5m
diff --git a/usr/src/pkg/manifests/locale-zh-hk.mf b/usr/src/pkg/manifests/locale-zh-hk.p5m
index c30182543c..c30182543c 100644
--- a/usr/src/pkg/manifests/locale-zh-hk.mf
+++ b/usr/src/pkg/manifests/locale-zh-hk.p5m
diff --git a/usr/src/pkg/manifests/locale-zh-mo.mf b/usr/src/pkg/manifests/locale-zh-mo.p5m
index 6ec2625f26..6ec2625f26 100644
--- a/usr/src/pkg/manifests/locale-zh-mo.mf
+++ b/usr/src/pkg/manifests/locale-zh-mo.p5m
diff --git a/usr/src/pkg/manifests/locale-zh-sg.mf b/usr/src/pkg/manifests/locale-zh-sg.p5m
index 24c674b0ec..24c674b0ec 100644
--- a/usr/src/pkg/manifests/locale-zh-sg.mf
+++ b/usr/src/pkg/manifests/locale-zh-sg.p5m
diff --git a/usr/src/pkg/manifests/locale-zh-tw.mf b/usr/src/pkg/manifests/locale-zh-tw.p5m
index 259a3773a1..259a3773a1 100644
--- a/usr/src/pkg/manifests/locale-zh-tw.mf
+++ b/usr/src/pkg/manifests/locale-zh-tw.p5m
diff --git a/usr/src/pkg/manifests/media-cdrw.mf b/usr/src/pkg/manifests/media-cdrw.p5m
index a36b2ddb29..a36b2ddb29 100644
--- a/usr/src/pkg/manifests/media-cdrw.mf
+++ b/usr/src/pkg/manifests/media-cdrw.p5m
diff --git a/usr/src/pkg/manifests/naming-ldap.mf b/usr/src/pkg/manifests/naming-ldap.p5m
index 9434a34137..9434a34137 100644
--- a/usr/src/pkg/manifests/naming-ldap.mf
+++ b/usr/src/pkg/manifests/naming-ldap.p5m
diff --git a/usr/src/pkg/manifests/network-bridging.mf b/usr/src/pkg/manifests/network-bridging.p5m
index 2265920442..2265920442 100644
--- a/usr/src/pkg/manifests/network-bridging.mf
+++ b/usr/src/pkg/manifests/network-bridging.p5m
diff --git a/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf b/usr/src/pkg/manifests/network-dhcp-dhcpmgr.p5m
index d691399421..d691399421 100644
--- a/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf
+++ b/usr/src/pkg/manifests/network-dhcp-dhcpmgr.p5m
diff --git a/usr/src/pkg/manifests/network-ftp.mf b/usr/src/pkg/manifests/network-ftp.p5m
index bc2d4e2d2f..bc2d4e2d2f 100644
--- a/usr/src/pkg/manifests/network-ftp.mf
+++ b/usr/src/pkg/manifests/network-ftp.p5m
diff --git a/usr/src/pkg/manifests/network-ipd.mf b/usr/src/pkg/manifests/network-ipd.p5m
index 7b7c24d9be..7b7c24d9be 100644
--- a/usr/src/pkg/manifests/network-ipd.mf
+++ b/usr/src/pkg/manifests/network-ipd.p5m
diff --git a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.p5m
index ccbfcbad92..ccbfcbad92 100644
--- a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf
+++ b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.p5m
diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.p5m
index bd63749dfe..bd63749dfe 100644
--- a/usr/src/pkg/manifests/network-ipfilter.mf
+++ b/usr/src/pkg/manifests/network-ipfilter.p5m
diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.mf b/usr/src/pkg/manifests/network-iscsi-initiator.p5m
index c8578a8da6..c8578a8da6 100644
--- a/usr/src/pkg/manifests/network-iscsi-initiator.mf
+++ b/usr/src/pkg/manifests/network-iscsi-initiator.p5m
diff --git a/usr/src/pkg/manifests/network-iscsi-iser.mf b/usr/src/pkg/manifests/network-iscsi-iser.p5m
index 2ba4146555..2ba4146555 100644
--- a/usr/src/pkg/manifests/network-iscsi-iser.mf
+++ b/usr/src/pkg/manifests/network-iscsi-iser.p5m
diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.p5m
index 68f1415c87..68f1415c87 100644
--- a/usr/src/pkg/manifests/network-iscsi-target.mf
+++ b/usr/src/pkg/manifests/network-iscsi-target.p5m
diff --git a/usr/src/pkg/manifests/network-netcat.mf b/usr/src/pkg/manifests/network-netcat.p5m
index d9474fbbec..d9474fbbec 100644
--- a/usr/src/pkg/manifests/network-netcat.mf
+++ b/usr/src/pkg/manifests/network-netcat.p5m
diff --git a/usr/src/pkg/manifests/network-ssh-ssh-key.mf b/usr/src/pkg/manifests/network-ssh-ssh-key.p5m
index 1a1b01c6d4..1a1b01c6d4 100644
--- a/usr/src/pkg/manifests/network-ssh-ssh-key.mf
+++ b/usr/src/pkg/manifests/network-ssh-ssh-key.p5m
diff --git a/usr/src/pkg/manifests/network-ssh.mf b/usr/src/pkg/manifests/network-ssh.p5m
index 28862063ba..28862063ba 100644
--- a/usr/src/pkg/manifests/network-ssh.mf
+++ b/usr/src/pkg/manifests/network-ssh.p5m
diff --git a/usr/src/pkg/manifests/network-telnet.mf b/usr/src/pkg/manifests/network-telnet.p5m
index e0c4097799..e0c4097799 100644
--- a/usr/src/pkg/manifests/network-telnet.mf
+++ b/usr/src/pkg/manifests/network-telnet.p5m
diff --git a/usr/src/pkg/manifests/package-svr4.mf b/usr/src/pkg/manifests/package-svr4.p5m
index 7b5e348ad0..7b5e348ad0 100644
--- a/usr/src/pkg/manifests/package-svr4.mf
+++ b/usr/src/pkg/manifests/package-svr4.p5m
diff --git a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.p5m
index bc6eb32aad..bc6eb32aad 100644
--- a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf
+++ b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.p5m
diff --git a/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.mf b/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.p5m
index d9a3a58189..d9a3a58189 100644
--- a/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.mf
+++ b/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.p5m
diff --git a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.p5m
index 4d2a54178f..4d2a54178f 100644
--- a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf
+++ b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.p5m
diff --git a/usr/src/pkg/manifests/print-lp-ipp-libipp.mf b/usr/src/pkg/manifests/print-lp-ipp-libipp.p5m
index 9ba6656543..9ba6656543 100644
--- a/usr/src/pkg/manifests/print-lp-ipp-libipp.mf
+++ b/usr/src/pkg/manifests/print-lp-ipp-libipp.p5m
diff --git a/usr/src/pkg/manifests/print-lp-print-client-commands.mf b/usr/src/pkg/manifests/print-lp-print-client-commands.p5m
index b070436d24..b070436d24 100644
--- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf
+++ b/usr/src/pkg/manifests/print-lp-print-client-commands.p5m
diff --git a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf b/usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m
index 45514b7e9a..45514b7e9a 100644
--- a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf
+++ b/usr/src/pkg/manifests/print-lp-print-manager-legacy.p5m
diff --git a/usr/src/pkg/manifests/print-lp.mf b/usr/src/pkg/manifests/print-lp.p5m
index 61fbccc07d..61fbccc07d 100644
--- a/usr/src/pkg/manifests/print-lp.mf
+++ b/usr/src/pkg/manifests/print-lp.p5m
diff --git a/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf b/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.p5m
index 4748a56257..4748a56257 100644
--- a/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf
+++ b/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.p5m
diff --git a/usr/src/pkg/manifests/security-bart.mf b/usr/src/pkg/manifests/security-bart.p5m
index a69e4fc0a4..a69e4fc0a4 100644
--- a/usr/src/pkg/manifests/security-bart.mf
+++ b/usr/src/pkg/manifests/security-bart.p5m
diff --git a/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf b/usr/src/pkg/manifests/service-fault-management-smtp-notify.p5m
index bea0809a56..bea0809a56 100644
--- a/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf
+++ b/usr/src/pkg/manifests/service-fault-management-smtp-notify.p5m
diff --git a/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf b/usr/src/pkg/manifests/service-fault-management-snmp-notify.p5m
index bedcaeaad4..bedcaeaad4 100644
--- a/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf
+++ b/usr/src/pkg/manifests/service-fault-management-snmp-notify.p5m
diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.p5m
index 8dd84986a5..8dd84986a5 100644
--- a/usr/src/pkg/manifests/service-fault-management.mf
+++ b/usr/src/pkg/manifests/service-fault-management.p5m
diff --git a/usr/src/pkg/manifests/service-file-system-nfs.mf b/usr/src/pkg/manifests/service-file-system-nfs.p5m
index fdd63c3330..fdd63c3330 100644
--- a/usr/src/pkg/manifests/service-file-system-nfs.mf
+++ b/usr/src/pkg/manifests/service-file-system-nfs.p5m
diff --git a/usr/src/pkg/manifests/service-file-system-smb.mf b/usr/src/pkg/manifests/service-file-system-smb.p5m
index b767a030fe..b767a030fe 100644
--- a/usr/src/pkg/manifests/service-file-system-smb.mf
+++ b/usr/src/pkg/manifests/service-file-system-smb.p5m
diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.p5m
index 0153e15d13..0153e15d13 100644
--- a/usr/src/pkg/manifests/service-hal.mf
+++ b/usr/src/pkg/manifests/service-hal.p5m
diff --git a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.p5m
index 92681985ec..92681985ec 100644
--- a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf
+++ b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.p5m
diff --git a/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf b/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.p5m
index fdfd6876ff..fdfd6876ff 100644
--- a/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf
+++ b/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.p5m
diff --git a/usr/src/pkg/manifests/service-network-dhcp.mf b/usr/src/pkg/manifests/service-network-dhcp.p5m
index 32b39894ee..32b39894ee 100644
--- a/usr/src/pkg/manifests/service-network-dhcp.mf
+++ b/usr/src/pkg/manifests/service-network-dhcp.p5m
diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.p5m
index 701554dd97..701554dd97 100644
--- a/usr/src/pkg/manifests/service-network-dns-mdns.mf
+++ b/usr/src/pkg/manifests/service-network-dns-mdns.p5m
diff --git a/usr/src/pkg/manifests/service-network-ftp.mf b/usr/src/pkg/manifests/service-network-ftp.p5m
index 97f373e71f..97f373e71f 100644
--- a/usr/src/pkg/manifests/service-network-ftp.mf
+++ b/usr/src/pkg/manifests/service-network-ftp.p5m
diff --git a/usr/src/pkg/manifests/service-network-legacy.mf b/usr/src/pkg/manifests/service-network-legacy.p5m
index 5484ea0600..5484ea0600 100644
--- a/usr/src/pkg/manifests/service-network-legacy.mf
+++ b/usr/src/pkg/manifests/service-network-legacy.p5m
diff --git a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf b/usr/src/pkg/manifests/service-network-load-balancer-ilb.p5m
index 9ad4ae9b37..9ad4ae9b37 100644
--- a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf
+++ b/usr/src/pkg/manifests/service-network-load-balancer-ilb.p5m
diff --git a/usr/src/pkg/manifests/service-network-network-clients.mf b/usr/src/pkg/manifests/service-network-network-clients.p5m
index fb4b7b186a..fb4b7b186a 100644
--- a/usr/src/pkg/manifests/service-network-network-clients.mf
+++ b/usr/src/pkg/manifests/service-network-network-clients.p5m
diff --git a/usr/src/pkg/manifests/service-network-network-servers.mf b/usr/src/pkg/manifests/service-network-network-servers.p5m
index 6b9f82a09e..6b9f82a09e 100644
--- a/usr/src/pkg/manifests/service-network-network-servers.mf
+++ b/usr/src/pkg/manifests/service-network-network-servers.p5m
diff --git a/usr/src/pkg/manifests/service-network-nis.mf b/usr/src/pkg/manifests/service-network-nis.p5m
index 3f79fee832..3f79fee832 100644
--- a/usr/src/pkg/manifests/service-network-nis.mf
+++ b/usr/src/pkg/manifests/service-network-nis.p5m
diff --git a/usr/src/pkg/manifests/service-network-slp.mf b/usr/src/pkg/manifests/service-network-slp.p5m
index 4d6aefacaf..4d6aefacaf 100644
--- a/usr/src/pkg/manifests/service-network-slp.mf
+++ b/usr/src/pkg/manifests/service-network-slp.p5m
diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.p5m
index 1e5f0bc521..1e5f0bc521 100644
--- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf
+++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.p5m
diff --git a/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf b/usr/src/pkg/manifests/service-network-snmp-mibiisa.p5m
index aad5299cad..aad5299cad 100644
--- a/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf
+++ b/usr/src/pkg/manifests/service-network-snmp-mibiisa.p5m
diff --git a/usr/src/pkg/manifests/service-network-ssh-common.mf b/usr/src/pkg/manifests/service-network-ssh-common.p5m
index 0f02aeb217..0f02aeb217 100644
--- a/usr/src/pkg/manifests/service-network-ssh-common.mf
+++ b/usr/src/pkg/manifests/service-network-ssh-common.p5m
diff --git a/usr/src/pkg/manifests/service-network-ssh.mf b/usr/src/pkg/manifests/service-network-ssh.p5m
index 9826662cf3..9826662cf3 100644
--- a/usr/src/pkg/manifests/service-network-ssh.mf
+++ b/usr/src/pkg/manifests/service-network-ssh.p5m
diff --git a/usr/src/pkg/manifests/service-network-telnet.mf b/usr/src/pkg/manifests/service-network-telnet.p5m
index 631f23a68a..631f23a68a 100644
--- a/usr/src/pkg/manifests/service-network-telnet.mf
+++ b/usr/src/pkg/manifests/service-network-telnet.p5m
diff --git a/usr/src/pkg/manifests/service-network-tftp.mf b/usr/src/pkg/manifests/service-network-tftp.p5m
index 261c278d5b..261c278d5b 100644
--- a/usr/src/pkg/manifests/service-network-tftp.mf
+++ b/usr/src/pkg/manifests/service-network-tftp.p5m
diff --git a/usr/src/pkg/manifests/service-network-uucp.mf b/usr/src/pkg/manifests/service-network-uucp.p5m
index b65e1830d9..b65e1830d9 100644
--- a/usr/src/pkg/manifests/service-network-uucp.mf
+++ b/usr/src/pkg/manifests/service-network-uucp.p5m
diff --git a/usr/src/pkg/manifests/service-network-wpa.mf b/usr/src/pkg/manifests/service-network-wpa.p5m
index d82ebe060a..d82ebe060a 100644
--- a/usr/src/pkg/manifests/service-network-wpa.mf
+++ b/usr/src/pkg/manifests/service-network-wpa.p5m
diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.p5m
index a51f349062..a51f349062 100644
--- a/usr/src/pkg/manifests/service-picl.mf
+++ b/usr/src/pkg/manifests/service-picl.p5m
diff --git a/usr/src/pkg/manifests/service-resource-cap.mf b/usr/src/pkg/manifests/service-resource-cap.p5m
index fa249da074..fa249da074 100644
--- a/usr/src/pkg/manifests/service-resource-cap.mf
+++ b/usr/src/pkg/manifests/service-resource-cap.p5m
diff --git a/usr/src/pkg/manifests/service-resource-pools-poold.mf b/usr/src/pkg/manifests/service-resource-pools-poold.p5m
index 82d4704704..82d4704704 100644
--- a/usr/src/pkg/manifests/service-resource-pools-poold.mf
+++ b/usr/src/pkg/manifests/service-resource-pools-poold.p5m
diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.p5m
index 6275964012..6275964012 100644
--- a/usr/src/pkg/manifests/service-resource-pools.mf
+++ b/usr/src/pkg/manifests/service-resource-pools.p5m
diff --git a/usr/src/pkg/manifests/service-security-gss.mf b/usr/src/pkg/manifests/service-security-gss.p5m
index 8b895a7db2..8b895a7db2 100644
--- a/usr/src/pkg/manifests/service-security-gss.mf
+++ b/usr/src/pkg/manifests/service-security-gss.p5m
diff --git a/usr/src/pkg/manifests/service-security-kerberos-5.mf b/usr/src/pkg/manifests/service-security-kerberos-5.p5m
index 8d03edefac..8d03edefac 100644
--- a/usr/src/pkg/manifests/service-security-kerberos-5.mf
+++ b/usr/src/pkg/manifests/service-security-kerberos-5.p5m
diff --git a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf b/usr/src/pkg/manifests/service-storage-avs-cache-management.p5m
index 6800ba2fca..6800ba2fca 100644
--- a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf
+++ b/usr/src/pkg/manifests/service-storage-avs-cache-management.p5m
diff --git a/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf b/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.p5m
index 1942dfbb52..1942dfbb52 100644
--- a/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf
+++ b/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.p5m
diff --git a/usr/src/pkg/manifests/service-storage-isns.mf b/usr/src/pkg/manifests/service-storage-isns.p5m
index 0c26b77aec..0c26b77aec 100644
--- a/usr/src/pkg/manifests/service-storage-isns.mf
+++ b/usr/src/pkg/manifests/service-storage-isns.p5m
diff --git a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf b/usr/src/pkg/manifests/service-storage-media-volume-manager.p5m
index 2295c03b63..2295c03b63 100644
--- a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf
+++ b/usr/src/pkg/manifests/service-storage-media-volume-manager.p5m
diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.p5m
index 35fa0aac79..35fa0aac79 100644
--- a/usr/src/pkg/manifests/service-storage-ndmp.mf
+++ b/usr/src/pkg/manifests/service-storage-ndmp.p5m
diff --git a/usr/src/pkg/manifests/service-storage-removable-media.mf b/usr/src/pkg/manifests/service-storage-removable-media.p5m
index 228e77bd06..228e77bd06 100644
--- a/usr/src/pkg/manifests/service-storage-removable-media.mf
+++ b/usr/src/pkg/manifests/service-storage-removable-media.p5m
diff --git a/usr/src/pkg/manifests/service-storage-virus-scan.mf b/usr/src/pkg/manifests/service-storage-virus-scan.p5m
index 1bee3e7914..1bee3e7914 100644
--- a/usr/src/pkg/manifests/service-storage-virus-scan.mf
+++ b/usr/src/pkg/manifests/service-storage-virus-scan.p5m
diff --git a/usr/src/pkg/manifests/shell-ksh93.mf b/usr/src/pkg/manifests/shell-ksh93.p5m
index 897d5a56c5..897d5a56c5 100644
--- a/usr/src/pkg/manifests/shell-ksh93.mf
+++ b/usr/src/pkg/manifests/shell-ksh93.p5m
diff --git a/usr/src/pkg/manifests/source-demo-mdb-examples.mf b/usr/src/pkg/manifests/source-demo-mdb-examples.p5m
index e7600e56a9..e7600e56a9 100644
--- a/usr/src/pkg/manifests/source-demo-mdb-examples.mf
+++ b/usr/src/pkg/manifests/source-demo-mdb-examples.p5m
diff --git a/usr/src/pkg/manifests/source-demo-system.mf b/usr/src/pkg/manifests/source-demo-system.p5m
index e3ba7bd6f9..e3ba7bd6f9 100644
--- a/usr/src/pkg/manifests/source-demo-system.mf
+++ b/usr/src/pkg/manifests/source-demo-system.p5m
diff --git a/usr/src/pkg/manifests/source-network-pppdump.mf b/usr/src/pkg/manifests/source-network-pppdump.p5m
index 79255e4f1e..79255e4f1e 100644
--- a/usr/src/pkg/manifests/source-network-pppdump.mf
+++ b/usr/src/pkg/manifests/source-network-pppdump.p5m
diff --git a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf b/usr/src/pkg/manifests/source-security-tcp-wrapper.p5m
index 9fa05189a1..9fa05189a1 100644
--- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
+++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.p5m
diff --git a/usr/src/pkg/manifests/source-system-grub.mf b/usr/src/pkg/manifests/source-system-grub.p5m
index 473a130b47..473a130b47 100644
--- a/usr/src/pkg/manifests/source-system-grub.mf
+++ b/usr/src/pkg/manifests/source-system-grub.p5m
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.p5m
index 20ba7c235a..20ba7c235a 100644
--- a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
+++ b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.p5m
diff --git a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf b/usr/src/pkg/manifests/storage-avs-remote-mirror.p5m
index c710709388..c710709388 100644
--- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
+++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.p5m
diff --git a/usr/src/pkg/manifests/storage-avs.mf b/usr/src/pkg/manifests/storage-avs.p5m
index ecc9686a93..ecc9686a93 100644
--- a/usr/src/pkg/manifests/storage-avs.mf
+++ b/usr/src/pkg/manifests/storage-avs.p5m
diff --git a/usr/src/pkg/manifests/storage-library-network-array.mf b/usr/src/pkg/manifests/storage-library-network-array.p5m
index efa085a824..efa085a824 100644
--- a/usr/src/pkg/manifests/storage-library-network-array.mf
+++ b/usr/src/pkg/manifests/storage-library-network-array.p5m
diff --git a/usr/src/pkg/manifests/storage-metassist.mf b/usr/src/pkg/manifests/storage-metassist.p5m
index 6590066a70..6590066a70 100644
--- a/usr/src/pkg/manifests/storage-metassist.mf
+++ b/usr/src/pkg/manifests/storage-metassist.p5m
diff --git a/usr/src/pkg/manifests/storage-mpathadm.mf b/usr/src/pkg/manifests/storage-mpathadm.p5m
index 26a63efea2..26a63efea2 100644
--- a/usr/src/pkg/manifests/storage-mpathadm.mf
+++ b/usr/src/pkg/manifests/storage-mpathadm.p5m
diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.p5m
index 89afa3f8c4..89afa3f8c4 100644
--- a/usr/src/pkg/manifests/storage-stmf.mf
+++ b/usr/src/pkg/manifests/storage-stmf.p5m
diff --git a/usr/src/pkg/manifests/storage-storage-nas.mf b/usr/src/pkg/manifests/storage-storage-nas.p5m
index 588c92ba80..588c92ba80 100644
--- a/usr/src/pkg/manifests/storage-storage-nas.mf
+++ b/usr/src/pkg/manifests/storage-storage-nas.p5m
diff --git a/usr/src/pkg/manifests/storage-storage-server.mf b/usr/src/pkg/manifests/storage-storage-server.p5m
index 3381ae7751..3381ae7751 100644
--- a/usr/src/pkg/manifests/storage-storage-server.mf
+++ b/usr/src/pkg/manifests/storage-storage-server.p5m
diff --git a/usr/src/pkg/manifests/storage-svm.mf b/usr/src/pkg/manifests/storage-svm.p5m
index aec36dfd86..aec36dfd86 100644
--- a/usr/src/pkg/manifests/storage-svm.mf
+++ b/usr/src/pkg/manifests/storage-svm.p5m
diff --git a/usr/src/pkg/manifests/system-accounting-legacy.mf b/usr/src/pkg/manifests/system-accounting-legacy.p5m
index 163d525287..163d525287 100644
--- a/usr/src/pkg/manifests/system-accounting-legacy.mf
+++ b/usr/src/pkg/manifests/system-accounting-legacy.p5m
diff --git a/usr/src/pkg/manifests/system-bhyve-tests.mf b/usr/src/pkg/manifests/system-bhyve-tests.p5m
index d582b61df1..d582b61df1 100644
--- a/usr/src/pkg/manifests/system-bhyve-tests.mf
+++ b/usr/src/pkg/manifests/system-bhyve-tests.p5m
diff --git a/usr/src/pkg/manifests/system-bhyve.mf b/usr/src/pkg/manifests/system-bhyve.p5m
index 469f846704..469f846704 100644
--- a/usr/src/pkg/manifests/system-bhyve.mf
+++ b/usr/src/pkg/manifests/system-bhyve.p5m
diff --git a/usr/src/pkg/manifests/system-boot-grub.mf b/usr/src/pkg/manifests/system-boot-grub.p5m
index 22201868ee..22201868ee 100644
--- a/usr/src/pkg/manifests/system-boot-grub.mf
+++ b/usr/src/pkg/manifests/system-boot-grub.p5m
diff --git a/usr/src/pkg/manifests/system-boot-loader.mf b/usr/src/pkg/manifests/system-boot-loader.p5m
index 6ecd5280a1..6ecd5280a1 100644
--- a/usr/src/pkg/manifests/system-boot-loader.mf
+++ b/usr/src/pkg/manifests/system-boot-loader.p5m
diff --git a/usr/src/pkg/manifests/system-boot-network.mf b/usr/src/pkg/manifests/system-boot-network.p5m
index 492b84c971..492b84c971 100644
--- a/usr/src/pkg/manifests/system-boot-network.mf
+++ b/usr/src/pkg/manifests/system-boot-network.p5m
diff --git a/usr/src/pkg/manifests/system-boot-real-mode.mf b/usr/src/pkg/manifests/system-boot-real-mode.p5m
index f6258f950f..f6258f950f 100644
--- a/usr/src/pkg/manifests/system-boot-real-mode.mf
+++ b/usr/src/pkg/manifests/system-boot-real-mode.p5m
diff --git a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf b/usr/src/pkg/manifests/system-boot-wanboot-internal.p5m
index 13f30082f8..13f30082f8 100644
--- a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf
+++ b/usr/src/pkg/manifests/system-boot-wanboot-internal.p5m
diff --git a/usr/src/pkg/manifests/system-boot-wanboot.mf b/usr/src/pkg/manifests/system-boot-wanboot.p5m
index 9ab99df261..9ab99df261 100644
--- a/usr/src/pkg/manifests/system-boot-wanboot.mf
+++ b/usr/src/pkg/manifests/system-boot-wanboot.p5m
diff --git a/usr/src/pkg/manifests/system-compatibility-sunos4.mf b/usr/src/pkg/manifests/system-compatibility-sunos4.p5m
index c82825c68e..c82825c68e 100644
--- a/usr/src/pkg/manifests/system-compatibility-sunos4.mf
+++ b/usr/src/pkg/manifests/system-compatibility-sunos4.p5m
diff --git a/usr/src/pkg/manifests/system-data-console-fonts.mf b/usr/src/pkg/manifests/system-data-console-fonts.p5m
index d7d486480d..d7d486480d 100644
--- a/usr/src/pkg/manifests/system-data-console-fonts.mf
+++ b/usr/src/pkg/manifests/system-data-console-fonts.p5m
diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.mf b/usr/src/pkg/manifests/system-data-hardware-registry.p5m
index 4e569039d4..4e569039d4 100644
--- a/usr/src/pkg/manifests/system-data-hardware-registry.mf
+++ b/usr/src/pkg/manifests/system-data-hardware-registry.p5m
diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf b/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
index 32bc023c96..32bc023c96 100644
--- a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf
+++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
diff --git a/usr/src/pkg/manifests/system-data-terminfo.mf b/usr/src/pkg/manifests/system-data-terminfo.p5m
index 114864462b..114864462b 100644
--- a/usr/src/pkg/manifests/system-data-terminfo.mf
+++ b/usr/src/pkg/manifests/system-data-terminfo.p5m
diff --git a/usr/src/pkg/manifests/system-data-zoneinfo.mf b/usr/src/pkg/manifests/system-data-zoneinfo.p5m
index f7fb817ad9..f7fb817ad9 100644
--- a/usr/src/pkg/manifests/system-data-zoneinfo.mf
+++ b/usr/src/pkg/manifests/system-data-zoneinfo.p5m
diff --git a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
index 7b997b3cd1..7b997b3cd1 100644
--- a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf
+++ b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
diff --git a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
index 92317831cd..92317831cd 100644
--- a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf
+++ b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
diff --git a/usr/src/pkg/manifests/system-dtrace-tests.mf b/usr/src/pkg/manifests/system-dtrace-tests.p5m
index 65ad9980de..65ad9980de 100644
--- a/usr/src/pkg/manifests/system-dtrace-tests.mf
+++ b/usr/src/pkg/manifests/system-dtrace-tests.p5m
diff --git a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
index aac44008df..aac44008df 100644
--- a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf
+++ b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.p5m
index 5fa4728b9f..5fa4728b9f 100644
--- a/usr/src/pkg/manifests/system-extended-system-utilities.mf
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.p5m
diff --git a/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf b/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.p5m
index 11ac89296b..11ac89296b 100644
--- a/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf
+++ b/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.p5m
diff --git a/usr/src/pkg/manifests/system-ficl.mf b/usr/src/pkg/manifests/system-ficl.p5m
index 90be4563a2..90be4563a2 100644
--- a/usr/src/pkg/manifests/system-ficl.mf
+++ b/usr/src/pkg/manifests/system-ficl.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-autofs.mf b/usr/src/pkg/manifests/system-file-system-autofs.p5m
index 63a635f32f..63a635f32f 100644
--- a/usr/src/pkg/manifests/system-file-system-autofs.mf
+++ b/usr/src/pkg/manifests/system-file-system-autofs.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.p5m
index 4da15bab09..4da15bab09 100644
--- a/usr/src/pkg/manifests/system-file-system-nfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-nfs.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf b/usr/src/pkg/manifests/system-file-system-ntfsprogs.p5m
index 97f3de55de..97f3de55de 100644
--- a/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
+++ b/usr/src/pkg/manifests/system-file-system-ntfsprogs.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-smb.mf b/usr/src/pkg/manifests/system-file-system-smb.p5m
index f62246159f..f62246159f 100644
--- a/usr/src/pkg/manifests/system-file-system-smb.mf
+++ b/usr/src/pkg/manifests/system-file-system-smb.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-udfs.mf b/usr/src/pkg/manifests/system-file-system-udfs.p5m
index 9cfcb5d12d..9cfcb5d12d 100644
--- a/usr/src/pkg/manifests/system-file-system-udfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-udfs.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf b/usr/src/pkg/manifests/system-file-system-zfs-tests.p5m
index 707af7c1bc..707af7c1bc 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.p5m
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.p5m
index 65de299b35..65de299b35 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs.p5m
diff --git a/usr/src/pkg/manifests/system-flash-fwflash.mf b/usr/src/pkg/manifests/system-flash-fwflash.p5m
index af21df6047..af21df6047 100644
--- a/usr/src/pkg/manifests/system-flash-fwflash.mf
+++ b/usr/src/pkg/manifests/system-flash-fwflash.p5m
diff --git a/usr/src/pkg/manifests/system-floating-point-scrubber.mf b/usr/src/pkg/manifests/system-floating-point-scrubber.p5m
index 030563479c..030563479c 100644
--- a/usr/src/pkg/manifests/system-floating-point-scrubber.mf
+++ b/usr/src/pkg/manifests/system-floating-point-scrubber.p5m
diff --git a/usr/src/pkg/manifests/system-fru-id-platform.mf b/usr/src/pkg/manifests/system-fru-id-platform.p5m
index 1e173de45f..1e173de45f 100644
--- a/usr/src/pkg/manifests/system-fru-id-platform.mf
+++ b/usr/src/pkg/manifests/system-fru-id-platform.p5m
diff --git a/usr/src/pkg/manifests/system-fru-id.mf b/usr/src/pkg/manifests/system-fru-id.p5m
index a4759644d4..a4759644d4 100644
--- a/usr/src/pkg/manifests/system-fru-id.mf
+++ b/usr/src/pkg/manifests/system-fru-id.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-audio.mf b/usr/src/pkg/manifests/system-header-header-audio.p5m
index d68f8d29ba..d68f8d29ba 100644
--- a/usr/src/pkg/manifests/system-header-header-audio.mf
+++ b/usr/src/pkg/manifests/system-header-header-audio.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-firewire.mf b/usr/src/pkg/manifests/system-header-header-firewire.p5m
index 461e4abbd9..461e4abbd9 100644
--- a/usr/src/pkg/manifests/system-header-header-firewire.mf
+++ b/usr/src/pkg/manifests/system-header-header-firewire.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-picl.mf b/usr/src/pkg/manifests/system-header-header-picl.p5m
index 5ed2d877d0..5ed2d877d0 100644
--- a/usr/src/pkg/manifests/system-header-header-picl.mf
+++ b/usr/src/pkg/manifests/system-header-header-picl.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-platform.mf b/usr/src/pkg/manifests/system-header-header-platform.p5m
index 6bbb98c9e8..6bbb98c9e8 100644
--- a/usr/src/pkg/manifests/system-header-header-platform.mf
+++ b/usr/src/pkg/manifests/system-header-header-platform.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-storage.mf b/usr/src/pkg/manifests/system-header-header-storage.p5m
index 52e61044c4..52e61044c4 100644
--- a/usr/src/pkg/manifests/system-header-header-storage.mf
+++ b/usr/src/pkg/manifests/system-header-header-storage.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-ugen.mf b/usr/src/pkg/manifests/system-header-header-ugen.p5m
index 1eadd87d2d..1eadd87d2d 100644
--- a/usr/src/pkg/manifests/system-header-header-ugen.mf
+++ b/usr/src/pkg/manifests/system-header-header-ugen.p5m
diff --git a/usr/src/pkg/manifests/system-header-header-usb.mf b/usr/src/pkg/manifests/system-header-header-usb.p5m
index 8ba90a07d6..8ba90a07d6 100644
--- a/usr/src/pkg/manifests/system-header-header-usb.mf
+++ b/usr/src/pkg/manifests/system-header-header-usb.p5m
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.p5m
index b9fdadbd86..b9fdadbd86 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.p5m
diff --git a/usr/src/pkg/manifests/system-io-tests.mf b/usr/src/pkg/manifests/system-io-tests.p5m
index 177030f622..177030f622 100644
--- a/usr/src/pkg/manifests/system-io-tests.mf
+++ b/usr/src/pkg/manifests/system-io-tests.p5m
diff --git a/usr/src/pkg/manifests/system-ipc.mf b/usr/src/pkg/manifests/system-ipc.p5m
index 374c6bbb56..374c6bbb56 100644
--- a/usr/src/pkg/manifests/system-ipc.mf
+++ b/usr/src/pkg/manifests/system-ipc.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf b/usr/src/pkg/manifests/system-kernel-cpu-counters.p5m
index a365f67f05..a365f67f05 100644
--- a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf
+++ b/usr/src/pkg/manifests/system-kernel-cpu-counters.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.p5m
index 2b9dd26474..2b9dd26474 100644
--- a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf
+++ b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.p5m
index 8a85fadf0f..8a85fadf0f 100644
--- a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf
+++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m
index 702733b28c..702733b28c 100644
--- a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf
+++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.p5m
index 6b2ae12dd8..6b2ae12dd8 100644
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf
+++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.p5m
index 3cd4fda628..3cd4fda628 100644
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.mf
+++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
index 41d057b8ab..41d057b8ab 100644
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf
+++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.p5m
index 0477a8a1fa..0477a8a1fa 100644
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.mf
+++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.mf b/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.p5m
index 40b1ad61fb..40b1ad61fb 100644
--- a/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.mf
+++ b/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf b/usr/src/pkg/manifests/system-kernel-io-performance-counters.p5m
index b40cce755f..b40cce755f 100644
--- a/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf
+++ b/usr/src/pkg/manifests/system-kernel-io-performance-counters.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-platform-netra.mf b/usr/src/pkg/manifests/system-kernel-platform-netra.p5m
index 5e548e8f0f..5e548e8f0f 100644
--- a/usr/src/pkg/manifests/system-kernel-platform-netra.mf
+++ b/usr/src/pkg/manifests/system-kernel-platform-netra.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.p5m
index 115c250117..115c250117 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.mf
+++ b/usr/src/pkg/manifests/system-kernel-platform.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-power.mf b/usr/src/pkg/manifests/system-kernel-power.p5m
index 34fe2e82d3..34fe2e82d3 100644
--- a/usr/src/pkg/manifests/system-kernel-power.mf
+++ b/usr/src/pkg/manifests/system-kernel-power.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-rsmops.mf b/usr/src/pkg/manifests/system-kernel-rsmops.p5m
index 4175c88127..4175c88127 100644
--- a/usr/src/pkg/manifests/system-kernel-rsmops.mf
+++ b/usr/src/pkg/manifests/system-kernel-rsmops.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf b/usr/src/pkg/manifests/system-kernel-secure-rpc.p5m
index a502281015..a502281015 100644
--- a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf
+++ b/usr/src/pkg/manifests/system-kernel-secure-rpc.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-security-gss.mf b/usr/src/pkg/manifests/system-kernel-security-gss.p5m
index 0bb3473221..0bb3473221 100644
--- a/usr/src/pkg/manifests/system-kernel-security-gss.mf
+++ b/usr/src/pkg/manifests/system-kernel-security-gss.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf b/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
index 28e0fae6f7..28e0fae6f7 100644
--- a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf
+++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
diff --git a/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf b/usr/src/pkg/manifests/system-kernel-ultra-wideband.p5m
index 76c1b7cb8f..76c1b7cb8f 100644
--- a/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf
+++ b/usr/src/pkg/manifests/system-kernel-ultra-wideband.p5m
diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.p5m
index 375e5ecc76..375e5ecc76 100644
--- a/usr/src/pkg/manifests/system-kernel.mf
+++ b/usr/src/pkg/manifests/system-kernel.p5m
diff --git a/usr/src/pkg/manifests/system-ksensor.mf b/usr/src/pkg/manifests/system-ksensor.p5m
index 659ba3574c..659ba3574c 100644
--- a/usr/src/pkg/manifests/system-ksensor.mf
+++ b/usr/src/pkg/manifests/system-ksensor.p5m
diff --git a/usr/src/pkg/manifests/system-ldoms.mf b/usr/src/pkg/manifests/system-ldoms.p5m
index 5b5fc0e2c0..5b5fc0e2c0 100644
--- a/usr/src/pkg/manifests/system-ldoms.mf
+++ b/usr/src/pkg/manifests/system-ldoms.p5m
diff --git a/usr/src/pkg/manifests/system-library-bhyve.mf b/usr/src/pkg/manifests/system-library-bhyve.p5m
index 254d3da975..254d3da975 100644
--- a/usr/src/pkg/manifests/system-library-bhyve.mf
+++ b/usr/src/pkg/manifests/system-library-bhyve.p5m
diff --git a/usr/src/pkg/manifests/system-library-c-runtime.mf b/usr/src/pkg/manifests/system-library-c-runtime.p5m
index 56f1eb3a22..56f1eb3a22 100644
--- a/usr/src/pkg/manifests/system-library-c-runtime.mf
+++ b/usr/src/pkg/manifests/system-library-c-runtime.p5m
diff --git a/usr/src/pkg/manifests/system-library-demangle.mf b/usr/src/pkg/manifests/system-library-demangle.p5m
index 8a061afbbd..8a061afbbd 100644
--- a/usr/src/pkg/manifests/system-library-demangle.mf
+++ b/usr/src/pkg/manifests/system-library-demangle.p5m
diff --git a/usr/src/pkg/manifests/system-library-iconv-extra.mf b/usr/src/pkg/manifests/system-library-iconv-extra.p5m
index d64d66f1c4..d64d66f1c4 100644
--- a/usr/src/pkg/manifests/system-library-iconv-extra.mf
+++ b/usr/src/pkg/manifests/system-library-iconv-extra.p5m
diff --git a/usr/src/pkg/manifests/system-library-iconv-unicode.mf b/usr/src/pkg/manifests/system-library-iconv-unicode.p5m
index 95f8aac2a1..95f8aac2a1 100644
--- a/usr/src/pkg/manifests/system-library-iconv-unicode.mf
+++ b/usr/src/pkg/manifests/system-library-iconv-unicode.p5m
diff --git a/usr/src/pkg/manifests/system-library-iconv-utf-8.mf b/usr/src/pkg/manifests/system-library-iconv-utf-8.p5m
index 2e7fe4457a..2e7fe4457a 100644
--- a/usr/src/pkg/manifests/system-library-iconv-utf-8.mf
+++ b/usr/src/pkg/manifests/system-library-iconv-utf-8.p5m
diff --git a/usr/src/pkg/manifests/system-library-iconv-xsh4-latin.mf b/usr/src/pkg/manifests/system-library-iconv-xsh4-latin.p5m
index ae6aedb55b..ae6aedb55b 100644
--- a/usr/src/pkg/manifests/system-library-iconv-xsh4-latin.mf
+++ b/usr/src/pkg/manifests/system-library-iconv-xsh4-latin.p5m
diff --git a/usr/src/pkg/manifests/system-library-install-libinstzones.mf b/usr/src/pkg/manifests/system-library-install-libinstzones.p5m
index f8c91e1112..f8c91e1112 100644
--- a/usr/src/pkg/manifests/system-library-install-libinstzones.mf
+++ b/usr/src/pkg/manifests/system-library-install-libinstzones.p5m
diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf b/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.p5m
index 76624bf145..76624bf145 100644
--- a/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf
+++ b/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.p5m
diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt.mf b/usr/src/pkg/manifests/system-library-libdiskmgt.p5m
index 5477ee2595..5477ee2595 100644
--- a/usr/src/pkg/manifests/system-library-libdiskmgt.mf
+++ b/usr/src/pkg/manifests/system-library-libdiskmgt.p5m
diff --git a/usr/src/pkg/manifests/system-library-libfcoe.mf b/usr/src/pkg/manifests/system-library-libfcoe.p5m
index c98bd8eb48..c98bd8eb48 100644
--- a/usr/src/pkg/manifests/system-library-libfcoe.mf
+++ b/usr/src/pkg/manifests/system-library-libfcoe.p5m
diff --git a/usr/src/pkg/manifests/system-library-libpcsc.mf b/usr/src/pkg/manifests/system-library-libpcsc.p5m
index 8660b07607..8660b07607 100644
--- a/usr/src/pkg/manifests/system-library-libpcsc.mf
+++ b/usr/src/pkg/manifests/system-library-libpcsc.p5m
diff --git a/usr/src/pkg/manifests/system-library-libutempter.mf b/usr/src/pkg/manifests/system-library-libutempter.p5m
index 2176769f36..2176769f36 100644
--- a/usr/src/pkg/manifests/system-library-libutempter.mf
+++ b/usr/src/pkg/manifests/system-library-libutempter.p5m
diff --git a/usr/src/pkg/manifests/system-library-math-header-math.mf b/usr/src/pkg/manifests/system-library-math-header-math.p5m
index 0556a30696..0556a30696 100644
--- a/usr/src/pkg/manifests/system-library-math-header-math.mf
+++ b/usr/src/pkg/manifests/system-library-math-header-math.p5m
diff --git a/usr/src/pkg/manifests/system-library-math.mf b/usr/src/pkg/manifests/system-library-math.p5m
index 255cf89a61..255cf89a61 100644
--- a/usr/src/pkg/manifests/system-library-math.mf
+++ b/usr/src/pkg/manifests/system-library-math.p5m
diff --git a/usr/src/pkg/manifests/system-library-platform.mf b/usr/src/pkg/manifests/system-library-platform.p5m
index 09c449c977..09c449c977 100644
--- a/usr/src/pkg/manifests/system-library-platform.mf
+++ b/usr/src/pkg/manifests/system-library-platform.p5m
diff --git a/usr/src/pkg/manifests/system-library-policykit.mf b/usr/src/pkg/manifests/system-library-policykit.p5m
index 7f8f3fc062..7f8f3fc062 100644
--- a/usr/src/pkg/manifests/system-library-policykit.mf
+++ b/usr/src/pkg/manifests/system-library-policykit.p5m
diff --git a/usr/src/pkg/manifests/system-library-processor.mf b/usr/src/pkg/manifests/system-library-processor.p5m
index 291df2b28e..291df2b28e 100644
--- a/usr/src/pkg/manifests/system-library-processor.mf
+++ b/usr/src/pkg/manifests/system-library-processor.p5m
diff --git a/usr/src/pkg/manifests/system-library-python-libbe-2.mf b/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
index 5080566e9f..5080566e9f 100644
--- a/usr/src/pkg/manifests/system-library-python-libbe-2.mf
+++ b/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
diff --git a/usr/src/pkg/manifests/system-library-python-libbe-3.mf b/usr/src/pkg/manifests/system-library-python-libbe-3.p5m
index d1382543f7..d1382543f7 100644
--- a/usr/src/pkg/manifests/system-library-python-libbe-3.mf
+++ b/usr/src/pkg/manifests/system-library-python-libbe-3.p5m
diff --git a/usr/src/pkg/manifests/system-library-python-solaris-2.mf b/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
index 6a0c991af3..6a0c991af3 100644
--- a/usr/src/pkg/manifests/system-library-python-solaris-2.mf
+++ b/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
diff --git a/usr/src/pkg/manifests/system-library-python-solaris-3.mf b/usr/src/pkg/manifests/system-library-python-solaris-3.p5m
index c1681c81b7..c1681c81b7 100644
--- a/usr/src/pkg/manifests/system-library-python-solaris-3.mf
+++ b/usr/src/pkg/manifests/system-library-python-solaris-3.p5m
diff --git a/usr/src/pkg/manifests/system-library-python-zfs-2.mf b/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
index 70da834b9b..70da834b9b 100644
--- a/usr/src/pkg/manifests/system-library-python-zfs-2.mf
+++ b/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
diff --git a/usr/src/pkg/manifests/system-library-python-zfs-3.mf b/usr/src/pkg/manifests/system-library-python-zfs-3.p5m
index 23f37b01f5..23f37b01f5 100644
--- a/usr/src/pkg/manifests/system-library-python-zfs-3.mf
+++ b/usr/src/pkg/manifests/system-library-python-zfs-3.p5m
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.p5m
index 432ee9b0e4..432ee9b0e4 100644
--- a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf
+++ b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.p5m
diff --git a/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.mf b/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.p5m
index d068c037ed..d068c037ed 100644
--- a/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.mf
+++ b/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.p5m
diff --git a/usr/src/pkg/manifests/system-library-security-gss-spnego.mf b/usr/src/pkg/manifests/system-library-security-gss-spnego.p5m
index 549102adc5..549102adc5 100644
--- a/usr/src/pkg/manifests/system-library-security-gss-spnego.mf
+++ b/usr/src/pkg/manifests/system-library-security-gss-spnego.p5m
diff --git a/usr/src/pkg/manifests/system-library-security-gss.mf b/usr/src/pkg/manifests/system-library-security-gss.p5m
index 6d21f3ec7b..6d21f3ec7b 100644
--- a/usr/src/pkg/manifests/system-library-security-gss.mf
+++ b/usr/src/pkg/manifests/system-library-security-gss.p5m
diff --git a/usr/src/pkg/manifests/system-library-security-libsasl.mf b/usr/src/pkg/manifests/system-library-security-libsasl.p5m
index e27beaec54..e27beaec54 100644
--- a/usr/src/pkg/manifests/system-library-security-libsasl.mf
+++ b/usr/src/pkg/manifests/system-library-security-libsasl.p5m
diff --git a/usr/src/pkg/manifests/system-library-security-rpcsec.mf b/usr/src/pkg/manifests/system-library-security-rpcsec.p5m
index 28e6de2506..28e6de2506 100644
--- a/usr/src/pkg/manifests/system-library-security-rpcsec.mf
+++ b/usr/src/pkg/manifests/system-library-security-rpcsec.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m
index 905c4bce61..905c4bce61 100644
--- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf
+++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf b/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.p5m
index 3db9e716e1..3db9e716e1 100644
--- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf
+++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.p5m
index fc830e9a18..fc830e9a18 100644
--- a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf
+++ b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima.p5m
index 6b95d664df..6b95d664df 100644
--- a/usr/src/pkg/manifests/system-library-storage-ima.mf
+++ b/usr/src/pkg/manifests/system-library-storage-ima.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf b/usr/src/pkg/manifests/system-library-storage-libmpapi.p5m
index f20dc0e2d6..f20dc0e2d6 100644
--- a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf
+++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.p5m
index 4230d400a2..4230d400a2 100644
--- a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf
+++ b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf b/usr/src/pkg/manifests/system-library-storage-scsi-plugin.p5m
index 1ffc6127b3..1ffc6127b3 100644
--- a/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf
+++ b/usr/src/pkg/manifests/system-library-storage-scsi-plugin.p5m
diff --git a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.p5m
index 7f6f30dc68..7f6f30dc68 100644
--- a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf
+++ b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.p5m
diff --git a/usr/src/pkg/manifests/system-library-svm-rcm.mf b/usr/src/pkg/manifests/system-library-svm-rcm.p5m
index cbd1169f87..cbd1169f87 100644
--- a/usr/src/pkg/manifests/system-library-svm-rcm.mf
+++ b/usr/src/pkg/manifests/system-library-svm-rcm.p5m
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.p5m
index c133104787..c133104787 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.p5m
diff --git a/usr/src/pkg/manifests/system-man.mf b/usr/src/pkg/manifests/system-man.p5m
index 83f8dba15a..83f8dba15a 100644
--- a/usr/src/pkg/manifests/system-man.mf
+++ b/usr/src/pkg/manifests/system-man.p5m
diff --git a/usr/src/pkg/manifests/system-management-intel-amt.mf b/usr/src/pkg/manifests/system-management-intel-amt.p5m
index c5a47d5b30..c5a47d5b30 100644
--- a/usr/src/pkg/manifests/system-management-intel-amt.mf
+++ b/usr/src/pkg/manifests/system-management-intel-amt.p5m
diff --git a/usr/src/pkg/manifests/system-management-pcitool.mf b/usr/src/pkg/manifests/system-management-pcitool.p5m
index 94987d567b..94987d567b 100644
--- a/usr/src/pkg/manifests/system-management-pcitool.mf
+++ b/usr/src/pkg/manifests/system-management-pcitool.p5m
diff --git a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.p5m
index 13814ec9b3..13814ec9b3 100644
--- a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf
+++ b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.p5m
diff --git a/usr/src/pkg/manifests/system-management-snmp-sea.mf b/usr/src/pkg/manifests/system-management-snmp-sea.p5m
index 5d5acf402a..5d5acf402a 100644
--- a/usr/src/pkg/manifests/system-management-snmp-sea.mf
+++ b/usr/src/pkg/manifests/system-management-snmp-sea.p5m
diff --git a/usr/src/pkg/manifests/system-management-wbem-data-management.mf b/usr/src/pkg/manifests/system-management-wbem-data-management.p5m
index 435eb26103..435eb26103 100644
--- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf
+++ b/usr/src/pkg/manifests/system-management-wbem-data-management.p5m
diff --git a/usr/src/pkg/manifests/system-management-wbem-resource-management.mf b/usr/src/pkg/manifests/system-management-wbem-resource-management.p5m
index 690409c2fa..690409c2fa 100644
--- a/usr/src/pkg/manifests/system-management-wbem-resource-management.mf
+++ b/usr/src/pkg/manifests/system-management-wbem-resource-management.p5m
diff --git a/usr/src/pkg/manifests/system-manual.mf b/usr/src/pkg/manifests/system-manual.p5m
index 79c43e269f..79c43e269f 100644
--- a/usr/src/pkg/manifests/system-manual.mf
+++ b/usr/src/pkg/manifests/system-manual.p5m
diff --git a/usr/src/pkg/manifests/system-microcode-amd.mf b/usr/src/pkg/manifests/system-microcode-amd.p5m
index 5df04b9d48..5df04b9d48 100644
--- a/usr/src/pkg/manifests/system-microcode-amd.mf
+++ b/usr/src/pkg/manifests/system-microcode-amd.p5m
diff --git a/usr/src/pkg/manifests/system-microcode-intel.mf b/usr/src/pkg/manifests/system-microcode-intel.p5m
index 9590f18276..9590f18276 100644
--- a/usr/src/pkg/manifests/system-microcode-intel.mf
+++ b/usr/src/pkg/manifests/system-microcode-intel.p5m
diff --git a/usr/src/pkg/manifests/system-monitoring-arcstat.mf b/usr/src/pkg/manifests/system-monitoring-arcstat.p5m
index 44b0ef87b0..44b0ef87b0 100644
--- a/usr/src/pkg/manifests/system-monitoring-arcstat.mf
+++ b/usr/src/pkg/manifests/system-monitoring-arcstat.p5m
diff --git a/usr/src/pkg/manifests/system-network-console.mf b/usr/src/pkg/manifests/system-network-console.p5m
index 87f4ec95cb..87f4ec95cb 100644
--- a/usr/src/pkg/manifests/system-network-console.mf
+++ b/usr/src/pkg/manifests/system-network-console.p5m
diff --git a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf b/usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m
index e2b1c6e355..e2b1c6e355 100644
--- a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf
+++ b/usr/src/pkg/manifests/system-network-http-cache-accelerator.p5m
diff --git a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m
index e34f200ffc..e34f200ffc 100644
--- a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf
+++ b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.p5m
diff --git a/usr/src/pkg/manifests/system-network-ipqos.mf b/usr/src/pkg/manifests/system-network-ipqos.p5m
index 78bdfb6bae..78bdfb6bae 100644
--- a/usr/src/pkg/manifests/system-network-ipqos.mf
+++ b/usr/src/pkg/manifests/system-network-ipqos.p5m
diff --git a/usr/src/pkg/manifests/system-network-mailwrapper.mf b/usr/src/pkg/manifests/system-network-mailwrapper.p5m
index d7501c918e..d7501c918e 100644
--- a/usr/src/pkg/manifests/system-network-mailwrapper.mf
+++ b/usr/src/pkg/manifests/system-network-mailwrapper.p5m
diff --git a/usr/src/pkg/manifests/system-network-nis.mf b/usr/src/pkg/manifests/system-network-nis.p5m
index 0a85825c4b..0a85825c4b 100644
--- a/usr/src/pkg/manifests/system-network-nis.mf
+++ b/usr/src/pkg/manifests/system-network-nis.p5m
diff --git a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf b/usr/src/pkg/manifests/system-network-ppp-pppdump.p5m
index a0af439544..a0af439544 100644
--- a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf
+++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.p5m
diff --git a/usr/src/pkg/manifests/system-network-ppp-tunnel.mf b/usr/src/pkg/manifests/system-network-ppp-tunnel.p5m
index 67d943843e..67d943843e 100644
--- a/usr/src/pkg/manifests/system-network-ppp-tunnel.mf
+++ b/usr/src/pkg/manifests/system-network-ppp-tunnel.p5m
diff --git a/usr/src/pkg/manifests/system-network-ppp.mf b/usr/src/pkg/manifests/system-network-ppp.p5m
index bd17ed1bf9..bd17ed1bf9 100644
--- a/usr/src/pkg/manifests/system-network-ppp.mf
+++ b/usr/src/pkg/manifests/system-network-ppp.p5m
diff --git a/usr/src/pkg/manifests/system-network-routing-vrrp.mf b/usr/src/pkg/manifests/system-network-routing-vrrp.p5m
index f694cd4fcb..f694cd4fcb 100644
--- a/usr/src/pkg/manifests/system-network-routing-vrrp.mf
+++ b/usr/src/pkg/manifests/system-network-routing-vrrp.p5m
diff --git a/usr/src/pkg/manifests/system-network-routing.mf b/usr/src/pkg/manifests/system-network-routing.p5m
index 1c14680a53..1c14680a53 100644
--- a/usr/src/pkg/manifests/system-network-routing.mf
+++ b/usr/src/pkg/manifests/system-network-routing.p5m
diff --git a/usr/src/pkg/manifests/system-network-spdadm.mf b/usr/src/pkg/manifests/system-network-spdadm.p5m
index 202aa5d7fc..202aa5d7fc 100644
--- a/usr/src/pkg/manifests/system-network-spdadm.mf
+++ b/usr/src/pkg/manifests/system-network-spdadm.p5m
diff --git a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.p5m
index 125383fc10..125383fc10 100644
--- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
+++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.p5m
diff --git a/usr/src/pkg/manifests/system-network-udapl.mf b/usr/src/pkg/manifests/system-network-udapl.p5m
index 98945e844b..98945e844b 100644
--- a/usr/src/pkg/manifests/system-network-udapl.mf
+++ b/usr/src/pkg/manifests/system-network-udapl.p5m
diff --git a/usr/src/pkg/manifests/system-network-wificonfig.mf b/usr/src/pkg/manifests/system-network-wificonfig.p5m
index d9d85020bc..d9d85020bc 100644
--- a/usr/src/pkg/manifests/system-network-wificonfig.mf
+++ b/usr/src/pkg/manifests/system-network-wificonfig.p5m
diff --git a/usr/src/pkg/manifests/system-network.mf b/usr/src/pkg/manifests/system-network.p5m
index 69bfc0f363..69bfc0f363 100644
--- a/usr/src/pkg/manifests/system-network.mf
+++ b/usr/src/pkg/manifests/system-network.p5m
diff --git a/usr/src/pkg/manifests/system-remote-shared-memory.mf b/usr/src/pkg/manifests/system-remote-shared-memory.p5m
index a00cde5ca2..a00cde5ca2 100644
--- a/usr/src/pkg/manifests/system-remote-shared-memory.mf
+++ b/usr/src/pkg/manifests/system-remote-shared-memory.p5m
diff --git a/usr/src/pkg/manifests/system-scheduler-fss.mf b/usr/src/pkg/manifests/system-scheduler-fss.p5m
index 39d4d72e75..39d4d72e75 100644
--- a/usr/src/pkg/manifests/system-scheduler-fss.mf
+++ b/usr/src/pkg/manifests/system-scheduler-fss.p5m
diff --git a/usr/src/pkg/manifests/system-security-kerberos-5.mf b/usr/src/pkg/manifests/system-security-kerberos-5.p5m
index 8ee7a52924..8ee7a52924 100644
--- a/usr/src/pkg/manifests/system-security-kerberos-5.mf
+++ b/usr/src/pkg/manifests/system-security-kerberos-5.p5m
diff --git a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m
index 061d3175a9..061d3175a9 100644
--- a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf
+++ b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.p5m
diff --git a/usr/src/pkg/manifests/system-storage-luxadm.mf b/usr/src/pkg/manifests/system-storage-luxadm.p5m
index 6f53351126..6f53351126 100644
--- a/usr/src/pkg/manifests/system-storage-luxadm.mf
+++ b/usr/src/pkg/manifests/system-storage-luxadm.p5m
diff --git a/usr/src/pkg/manifests/system-storage-parted.mf b/usr/src/pkg/manifests/system-storage-parted.p5m
index 938e887d83..938e887d83 100644
--- a/usr/src/pkg/manifests/system-storage-parted.mf
+++ b/usr/src/pkg/manifests/system-storage-parted.p5m
diff --git a/usr/src/pkg/manifests/system-storage-sasinfo.mf b/usr/src/pkg/manifests/system-storage-sasinfo.p5m
index 7285e8220a..7285e8220a 100644
--- a/usr/src/pkg/manifests/system-storage-sasinfo.mf
+++ b/usr/src/pkg/manifests/system-storage-sasinfo.p5m
diff --git a/usr/src/pkg/manifests/system-test-cryptotest.mf b/usr/src/pkg/manifests/system-test-cryptotest.p5m
index 8362bcca37..8362bcca37 100644
--- a/usr/src/pkg/manifests/system-test-cryptotest.mf
+++ b/usr/src/pkg/manifests/system-test-cryptotest.p5m
diff --git a/usr/src/pkg/manifests/system-test-elftest.mf b/usr/src/pkg/manifests/system-test-elftest.p5m
index f0acc920a7..f0acc920a7 100644
--- a/usr/src/pkg/manifests/system-test-elftest.mf
+++ b/usr/src/pkg/manifests/system-test-elftest.p5m
diff --git a/usr/src/pkg/manifests/system-test-ksh93.mf b/usr/src/pkg/manifests/system-test-ksh93.p5m
index d6aac3d679..d6aac3d679 100644
--- a/usr/src/pkg/manifests/system-test-ksh93.mf
+++ b/usr/src/pkg/manifests/system-test-ksh93.p5m
diff --git a/usr/src/pkg/manifests/system-test-libctest.mf b/usr/src/pkg/manifests/system-test-libctest.p5m
index 07f82a6e63..07f82a6e63 100644
--- a/usr/src/pkg/manifests/system-test-libctest.mf
+++ b/usr/src/pkg/manifests/system-test-libctest.p5m
diff --git a/usr/src/pkg/manifests/system-test-libmlrpctest.mf b/usr/src/pkg/manifests/system-test-libmlrpctest.p5m
index cea566bb2c..cea566bb2c 100644
--- a/usr/src/pkg/manifests/system-test-libmlrpctest.mf
+++ b/usr/src/pkg/manifests/system-test-libmlrpctest.p5m
diff --git a/usr/src/pkg/manifests/system-test-nettest.mf b/usr/src/pkg/manifests/system-test-nettest.p5m
index 1e2579073e..1e2579073e 100644
--- a/usr/src/pkg/manifests/system-test-nettest.mf
+++ b/usr/src/pkg/manifests/system-test-nettest.p5m
diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.p5m
index 967e8f1384..967e8f1384 100644
--- a/usr/src/pkg/manifests/system-test-ostest.mf
+++ b/usr/src/pkg/manifests/system-test-ostest.p5m
diff --git a/usr/src/pkg/manifests/system-test-smbclient.mf b/usr/src/pkg/manifests/system-test-smbclient.p5m
index a6bd4d509b..a6bd4d509b 100644
--- a/usr/src/pkg/manifests/system-test-smbclient.mf
+++ b/usr/src/pkg/manifests/system-test-smbclient.p5m
diff --git a/usr/src/pkg/manifests/system-test-testrunner.mf b/usr/src/pkg/manifests/system-test-testrunner.p5m
index 28c9b2c5aa..28c9b2c5aa 100644
--- a/usr/src/pkg/manifests/system-test-testrunner.mf
+++ b/usr/src/pkg/manifests/system-test-testrunner.p5m
diff --git a/usr/src/pkg/manifests/system-test-utiltest.mf b/usr/src/pkg/manifests/system-test-utiltest.p5m
index e1156d322f..e1156d322f 100644
--- a/usr/src/pkg/manifests/system-test-utiltest.mf
+++ b/usr/src/pkg/manifests/system-test-utiltest.p5m
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.p5m
index fa831d7628..fa831d7628 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.p5m
diff --git a/usr/src/pkg/manifests/system-tnf.mf b/usr/src/pkg/manifests/system-tnf.p5m
index 6dc1d2f0da..6dc1d2f0da 100644
--- a/usr/src/pkg/manifests/system-tnf.mf
+++ b/usr/src/pkg/manifests/system-tnf.p5m
diff --git a/usr/src/pkg/manifests/system-trusted-global-zone.mf b/usr/src/pkg/manifests/system-trusted-global-zone.p5m
index 9a313c1ec5..9a313c1ec5 100644
--- a/usr/src/pkg/manifests/system-trusted-global-zone.mf
+++ b/usr/src/pkg/manifests/system-trusted-global-zone.p5m
diff --git a/usr/src/pkg/manifests/system-trusted.mf b/usr/src/pkg/manifests/system-trusted.p5m
index 45443f2d75..45443f2d75 100644
--- a/usr/src/pkg/manifests/system-trusted.mf
+++ b/usr/src/pkg/manifests/system-trusted.p5m
diff --git a/usr/src/pkg/manifests/system-xopen-xcu4.mf b/usr/src/pkg/manifests/system-xopen-xcu4.p5m
index d57d723a0b..d57d723a0b 100644
--- a/usr/src/pkg/manifests/system-xopen-xcu4.mf
+++ b/usr/src/pkg/manifests/system-xopen-xcu4.p5m
diff --git a/usr/src/pkg/manifests/system-xopen-xcu6.mf b/usr/src/pkg/manifests/system-xopen-xcu6.p5m
index 6fb0d65269..6fb0d65269 100644
--- a/usr/src/pkg/manifests/system-xopen-xcu6.mf
+++ b/usr/src/pkg/manifests/system-xopen-xcu6.p5m
diff --git a/usr/src/pkg/manifests/system-xvm-ipagent.mf b/usr/src/pkg/manifests/system-xvm-ipagent.p5m
index 29aeb69ec0..29aeb69ec0 100644
--- a/usr/src/pkg/manifests/system-xvm-ipagent.mf
+++ b/usr/src/pkg/manifests/system-xvm-ipagent.p5m
diff --git a/usr/src/pkg/manifests/system-zones-brand-lx.mf b/usr/src/pkg/manifests/system-zones-brand-lx.p5m
index ca3a8cc541..ca3a8cc541 100644
--- a/usr/src/pkg/manifests/system-zones-brand-lx.mf
+++ b/usr/src/pkg/manifests/system-zones-brand-lx.p5m
diff --git a/usr/src/pkg/manifests/system-zones-brand-s10.mf b/usr/src/pkg/manifests/system-zones-brand-s10.p5m
index be159cbb8e..be159cbb8e 100644
--- a/usr/src/pkg/manifests/system-zones-brand-s10.mf
+++ b/usr/src/pkg/manifests/system-zones-brand-s10.p5m
diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.mf b/usr/src/pkg/manifests/system-zones-brand-sn1.p5m
index 5be5d6c0e7..5be5d6c0e7 100644
--- a/usr/src/pkg/manifests/system-zones-brand-sn1.mf
+++ b/usr/src/pkg/manifests/system-zones-brand-sn1.p5m
diff --git a/usr/src/pkg/manifests/system-zones-internal.mf b/usr/src/pkg/manifests/system-zones-internal.p5m
index ce30a7c785..ce30a7c785 100644
--- a/usr/src/pkg/manifests/system-zones-internal.mf
+++ b/usr/src/pkg/manifests/system-zones-internal.p5m
diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.p5m
index f122d03231..f122d03231 100644
--- a/usr/src/pkg/manifests/system-zones.mf
+++ b/usr/src/pkg/manifests/system-zones.p5m
diff --git a/usr/src/pkg/manifests/text-doctools.mf b/usr/src/pkg/manifests/text-doctools.p5m
index 3a8ff07452..3a8ff07452 100644
--- a/usr/src/pkg/manifests/text-doctools.mf
+++ b/usr/src/pkg/manifests/text-doctools.p5m
diff --git a/usr/src/pkg/manifests/text-locale.mf b/usr/src/pkg/manifests/text-locale.p5m
index e1f80b474b..e1f80b474b 100644
--- a/usr/src/pkg/manifests/text-locale.mf
+++ b/usr/src/pkg/manifests/text-locale.p5m
diff --git a/usr/src/pkg/osnet-incorporation.mf b/usr/src/pkg/osnet-incorporation.p5m
index 8a6699a3df..8a6699a3df 100644
--- a/usr/src/pkg/osnet-incorporation.mf
+++ b/usr/src/pkg/osnet-incorporation.p5m
diff --git a/usr/src/pkg/osnet-redist.mf b/usr/src/pkg/osnet-redist.p5m
index c396a6e84e..c396a6e84e 100644
--- a/usr/src/pkg/osnet-redist.mf
+++ b/usr/src/pkg/osnet-redist.p5m