--- a/usr/src/pkg/manifests/SUNWcs.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/SUNWcs.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -2541,21 +2541,14 @@
 hardlink path=usr/share/lib/zoneinfo/Zulu \
     target=../../../../usr/share/lib/zoneinfo/Etc/UTC
 hardlink path=usr/xpg4/bin/pfsh target=../../bin/pfexec
-legacy pkg=SUNWcsr arch=$(ARCH) category=system \
-    desc="core software for a specific instruction-set architecture" \
-    hotline="Please contact your local service provider" \
-    name="Core Solaris, (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWcsu arch=$(ARCH) category=system \
+legacy pkg=SUNWcsr \
     desc="core software for a specific instruction-set architecture" \
-    hotline="Please contact your local service provider" \
-    name="Core Solaris, (Usr)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWftpr arch=$(ARCH) category=system \
-    desc="FTP Server Configuration Files" \
-    hotline="Please contact your local service provider" \
-    name="FTP Server, (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Core Solaris, (Root)"
+legacy pkg=SUNWcsu \
+    desc="core software for a specific instruction-set architecture" \
+    name="Core Solaris, (Usr)"
+legacy pkg=SUNWftpr desc="FTP Server Configuration Files" \
+    name="FTP Server, (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/SUNWcsd.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/SUNWcsd.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -74,11 +74,9 @@
 file path=etc/security/extra_privs group=sys preserve=true
 file path=lib/svc/manifest/system/sysevent.xml group=sys mode=0444
 file path=lib/svc/method/svc-syseventd mode=0555
-legacy pkg=SUNWcsd arch=$(ARCH) category=system \
+legacy pkg=SUNWcsd \
     desc="core entries for /dev and /devices needed for the initial boot of Solaris" \
-    hotline="Please contact your local service provider" \
-    name="Core Solaris Devices" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Core Solaris Devices"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=dev/stderr target=./fd/2

--- a/usr/src/pkg/manifests/audio-audio-utilities.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/audio-audio-utilities.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -35,10 +35,6 @@
 file path=usr/bin/audioplay mode=0555
 file path=usr/bin/audiorecord mode=0555
 file path=usr/bin/audiotest mode=0555
-legacy pkg=SUNWauda arch=$(ARCH) category=system \
-    desc="SunOS audio applications" \
-    hotline="Please contact your local service provider" \
-    name="Audio Applications" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWauda desc="SunOS audio applications" name="Audio Applications"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/benchmark-filebench.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/benchmark-filebench.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -108,9 +108,8 @@
 file path=usr/benchmarks/filebench/workloads/webserver.f mode=0444
 hardlink path=usr/benchmarks/filebench/bin/go_filebench \
     target=../../../../usr/lib/isaexec
-legacy pkg=SUNWfilebench arch=$(ARCH) category=system \
+legacy pkg=SUNWfilebench \
     desc="FileBench Commands, Workloads, Scripts, and Config Files" \
-    hotline="Please contact your local service provider" name=FileBench \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name=FileBench
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/compatibility-ucb.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/compatibility-ucb.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -87,16 +87,12 @@
 $(i386_ONLY)hardlink path=usr/ucb/$(ARCH32)/ps target=../../bin/$(ARCH32)/ps
 hardlink path=usr/ucb/$(ARCH64)/ps target=../../bin/$(ARCH64)/ps
 hardlink path=usr/ucb/ps target=../../usr/lib/isaexec
-legacy pkg=SUNWscpr arch=$(ARCH) category=system \
+legacy pkg=SUNWscpr \
     desc="utilities for user interface and source build compatibility with SunOS 4.x" \
-    hotline="Please contact your local service provider" \
-    name="Source Compatibility, (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWscpu arch=$(ARCH) category=system \
+    name="Source Compatibility, (Root)"
+legacy pkg=SUNWscpu \
     desc="utilities for user interface and source build compatibility with SunOS 4.x" \
-    hotline="Please contact your local service provider" \
-    name="Source Compatibility, (Usr)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Source Compatibility, (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/ucbcmd/basename/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -448,10 +448,8 @@
 file path=usr/share/lib/locale/com/sun/dhcpmgr/ui/ResourceBundle.properties
 file path=usr/share/lib/locale/com/sun/slp/ClientLib_en.properties group=sys
 file path=usr/share/lib/locale/com/sun/slp/Server_en.properties group=sys
-legacy pkg=SUNW0on arch=all category=system \
+legacy pkg=SUNW0on arch=all \
     desc="localizable message files for the OS-Networking consolidation" \
-    hotline="Please contact your local service provider" \
-    name="Localizable ON message files" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.10
+    name="Localizable ON message files" version=11.11,REV=2009.11.10
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-appcert.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-appcert.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,11 +46,9 @@
 file path=usr/lib/abi/appcert/symcheck mode=0555
 file path=usr/lib/abi/appcert/symprof mode=0555
 file path=usr/lib/abi/appcert/symreport mode=0555
-legacy pkg=SUNWapct arch=$(ARCH) category=system \
+legacy pkg=SUNWapct \
     desc="Appcert utility for application ABI stability checking" \
-    hotline="Please contact your local service provider" \
-    name="ABI Application Certification Tools" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="ABI Application Certification Tools"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 depend fmri=runtime/perl-584 type=require

--- a/usr/src/pkg/manifests/developer-apptrace-platform.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-apptrace-platform.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -91,10 +91,8 @@
 dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib
 dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract group=sys
 dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib
-legacy pkg=SUNWpstl.u arch=$(ARCH).sun4u category=system \
+legacy pkg=SUNWpstl.u arch=$(ARCH).sun4u \
     desc="Apptrace processor specific shared objects" \
-    hotline="Please contact your local service provider" \
-    name="Platform specific apptrace support" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Platform specific apptrace support"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-apptrace-ucblib.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -32,9 +32,7 @@
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/ucblib
-legacy pkg=SUNWucbt arch=$(ARCH) category=system \
+legacy pkg=SUNWucbt \
     desc="Apptrace shared objects for UCB compatibility libraries" \
-    hotline="Please contact your local service provider" \
-    name="Apptrace support objects for ucblib" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Apptrace support objects for ucblib"
 license cr_Sun license=cr_Sun

--- a/usr/src/pkg/manifests/developer-apptrace.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-apptrace.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -38,10 +38,8 @@
 file path=usr/bin/apptrace mode=0555
 file path=usr/lib/abi/$(ARCH64)/apptrace.so.1
 file path=usr/lib/abi/apptrace.so.1
-legacy pkg=SUNWcstl arch=$(ARCH) category=system \
+legacy pkg=SUNWcstl \
     desc="Apptrace utility for application tracing, including shared objects" \
-    hotline="Please contact your local service provider" \
-    name="Apptrace Utility" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Apptrace Utility"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-astdev.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-astdev.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,11 +43,8 @@
 file path=usr/include/ast/pp.h
 file path=usr/include/ast/ppkey.h
 file path=usr/lib/libpp.so.1
-legacy pkg=SUNWastdev arch=$(ARCH) category=system \
-    desc="AT&T AST development utilities" \
-    hotline="Please contact your local service provider" \
-    name="AT&T AST development utilities" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWastdev desc="AT&T AST development utilities" \
+    name="AT&T AST development utilities"
 license cr_Sun license=cr_Sun
 license usr/src/cmd/ast/THIRDPARTYLICENSE \
     license=usr/src/cmd/ast/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/developer-build-onbld.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -272,11 +272,8 @@
 file path=opt/onbld/man/sman1/get_depend_info.1
 file path=opt/onbld/man/sman1/make_pkg_db.1
 hardlink path=opt/onbld/bin/$(ARCH)/install.bin target=./install
-legacy pkg=SUNWonbld arch=$(ARCH) category=system \
-    desc="tools used to build the OS-Net consolidation" \
-    hotline="Please contact your local service provider" \
-    name="OS-Net Build Tools" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.10.22
+legacy pkg=SUNWonbld desc="tools used to build the OS-Net consolidation" \
+    name="OS-Net Build Tools" version=11.11,REV=2009.10.22
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,10 +41,7 @@
 $(i386_ONLY)file path=usr/lib/mdb/kvm/fcip.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/fcp.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/fctl.so group=sys mode=0555
-legacy pkg=SUNWfcmdb arch=$(ARCH) category=system \
-    desc="Fibre Channel adb macros and mdb modules" \
-    hotline="Please contact your local service provider" \
-    name="Fibre Channel adb macros and mdb modules" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWfcmdb desc="Fibre Channel adb macros and mdb modules" \
+    name="Fibre Channel adb macros and mdb modules"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -37,10 +37,8 @@
 dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
 file path=usr/lib/mdb/kvm/$(ARCH64)/qlc.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/qlc.so group=sys mode=0555
-legacy pkg=SUNWqlcu arch=$(ARCH) category=system \
+legacy pkg=SUNWqlcu \
     desc="Utilties associated with the Qlogic Fibre Channel Adapter" \
-    hotline="Please contact your local service provider" \
-    name="Qlogic Fibre Channel Adapter Utilities (usr)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Qlogic Fibre Channel Adapter Utilities (usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-debug-mdb.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-debug-mdb.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -362,15 +362,9 @@
 hardlink path=usr/bin/$(ARCH64)/adb target=../../../usr/bin/$(ARCH64)/mdb
 hardlink path=usr/bin/adb target=../../usr/lib/isaexec
 hardlink path=usr/bin/mdb target=../../usr/lib/isaexec
-legacy pkg=SUNWmdb arch=$(ARCH) category=system desc="Modular Debugger (MDB)" \
-    hotline="Please contact your local service provider" \
-    name="Modular Debugger" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWmdbr arch=$(ARCH) category=system \
-    desc="Modular Debugger (MDB) (Root)" \
-    hotline="Please contact your local service provider" \
-    name="Modular Debugger (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWmdb desc="Modular Debugger (MDB)" name="Modular Debugger"
+legacy pkg=SUNWmdbr desc="Modular Debugger (MDB) (Root)" \
+    name="Modular Debugger (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE

--- a/usr/src/pkg/manifests/developer-driver-ftsafe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-driver-ftsafe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,15 +42,9 @@
 file path=usr/lib/th_script mode=0555
 file path=usr/sbin/th_define mode=0555
 file path=usr/sbin/th_manage mode=0555
-legacy pkg=SUNWftdur arch=$(ARCH) category=system \
-    desc="Driver Hardening Test Harness" \
-    hotline="Please contact your local service provider" \
-    name="ftSafe developer utilities package (Root)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-legacy pkg=SUNWftduu arch=$(ARCH) category=system \
-    desc="Driver Hardening Test Harness (usr)" \
-    hotline="Please contact your local service provider" \
-    name="ftSafe developer utilities package (Usr)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWftdur desc="Driver Hardening Test Harness" \
+    name="ftSafe developer utilities package (Root)"
+legacy pkg=SUNWftduu desc="Driver Hardening Test Harness (usr)" \
+    name="ftSafe developer utilities package (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-dtrace.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-dtrace.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -631,11 +631,8 @@
 hardlink path=usr/sbin/intrstat target=../../usr/lib/isaexec
 hardlink path=usr/sbin/lockstat target=../../usr/lib/isaexec
 hardlink path=usr/sbin/plockstat target=../../usr/lib/isaexec
-legacy pkg=SUNWdtrc arch=$(ARCH) category=system \
-    desc="Dynamic Tracing (DTrace) Clients" \
-    hotline="Please contact your local service provider" \
-    name="DTrace Clients" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWdtrc desc="Dynamic Tracing (DTrace) Clients" \
+    name="DTrace Clients"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1

--- a/usr/src/pkg/manifests/developer-library-lint.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-library-lint.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -353,16 +353,11 @@
 file path=usr/xpg4/lib/$(ARCH64)/llib-lcurses.ln
 file path=usr/xpg4/lib/llib-lcurses
 file path=usr/xpg4/lib/llib-lcurses.ln
-legacy pkg=SUNWarc arch=$(ARCH) category=system \
+legacy pkg=SUNWarc \
     desc="lint libraries and startup objects for software development" \
-    hotline="Please contact your local service provider" \
-    name="Lint Libraries (usr)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWarcr arch=$(ARCH) category=system \
-    desc="lint libraries for software development" \
-    hotline="Please contact your local service provider" \
-    name="Lint Libraries (root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Lint Libraries (usr)"
+legacy pkg=SUNWarcr desc="lint libraries for software development" \
+    name="Lint Libraries (root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=lib/$(ARCH64)/llib-lposix4.ln target=./llib-lrt.ln

--- a/usr/src/pkg/manifests/developer-library-profiled-libc.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-library-profiled-libc.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -34,11 +34,9 @@
 dir path=usr/lib
 dir path=usr/lib/libp
 dir path=usr/lib/libp/$(ARCH64)
-legacy pkg=SUNWdpl arch=$(ARCH) category=system \
+legacy pkg=SUNWdpl \
     desc="system libraries compiled with profiling for software development performance measurement" \
-    hotline="Please contact your local service provider" \
-    name="Developer Profiled Libraries" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Developer Profiled Libraries"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=usr/lib/libp/$(ARCH64)/libc.so.1 \

--- a/usr/src/pkg/manifests/developer-linker.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-linker.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -94,11 +94,9 @@
 hardlink path=usr/bin/plimit target=../../usr/lib/isaexec
 hardlink path=usr/bin/strings target=../../usr/lib/isaexec
 hardlink path=usr/bin/truss target=../../usr/lib/isaexec
-legacy pkg=SUNWtoo arch=$(ARCH) category=system \
+legacy pkg=SUNWtoo \
     desc="utilities for software development, including ld, ldd, od, and truss" \
-    hotline="Please contact your local service provider" \
-    name="Programming Tools" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Programming Tools"
 license cr_ATT license=cr_ATT
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/developer-object-file.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-object-file.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -100,11 +100,9 @@
 file path=usr/share/lib/ccs/yaccpar
 hardlink path=usr/bin/$(ARCH64)/strip target=../../bin/$(ARCH64)/mcs
 hardlink path=usr/bin/strip target=../bin/mcs
-legacy pkg=SUNWbtool arch=$(ARCH) category=system \
+legacy pkg=SUNWbtool \
     desc="software development utilities, including ar, dis, dump, elfdump, elfedit, lex, lorder, mcs, nm, prof, ranlib, rpcgen, size, strip, tsort, and yacc" \
-    hotline="Please contact your local service provider" \
-    name="CCS tools bundled with SunOS" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="CCS tools bundled with SunOS"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/cmd/backup/dump/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/developer-tnf.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/developer-tnf.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,11 +41,9 @@
 file path=usr/include/tnf/tnf.h
 file path=usr/include/tnf/writer.h
 file path=usr/lib/libtnf.so.1
-legacy pkg=SUNWtnfd arch=$(ARCH) category=system \
+legacy pkg=SUNWtnfd \
     desc="utilities needed by developers using Trace Normal Format (TNF) facilities" \
-    hotline="Please contact your local service provider" \
-    name="TNF Developer Components" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="TNF Developer Components"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=usr/lib/libtnf.so target=./libtnf.so.1

--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -78,11 +78,8 @@
     target=pcbe.GenuineIntel.6
 $(i386_ONLY)hardlink path=usr/kernel/pcbe/pcbe.GenuineIntel.5 \
     target=pcbe.GenuineIntel.6
-legacy pkg=SUNWcpcu arch=$(ARCH) category=system \
-    desc="CPU Performance Counter libraries and utilities" \
-    hotline="Please contact your local service provider" \
-    name="CPU Performance Counter libraries and utilities" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWcpcu desc="CPU Performance Counter libraries and utilities" \
+    name="CPU Performance Counter libraries and utilities"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 $(i386_ONLY)license usr/src/uts/intel/pcbe/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/diagnostic-latencytop.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/diagnostic-latencytop.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -36,9 +36,6 @@
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/latencytop mode=0555
 file path=usr/bin/$(ARCH64)/latencytop mode=0555
 hardlink path=usr/bin/latencytop target=../../usr/lib/isaexec
-legacy pkg=SUNWlatencytop arch=$(ARCH) category=system desc="LatencyTOP tool" \
-    hotline="Please contact your local service provider" \
-    name="LatencyTOP tool" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWlatencytop desc="LatencyTOP tool" name="LatencyTOP tool"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/diagnostic-powertop.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/diagnostic-powertop.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -36,8 +36,6 @@
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/powertop mode=0555
 file path=usr/bin/$(ARCH64)/powertop mode=0555
 hardlink path=usr/bin/powertop target=../../usr/lib/isaexec
-legacy pkg=SUNWpowertop arch=$(ARCH) category=system desc="PowerTOP tool" \
-    hotline="Please contact your local service provider" name="PowerTOP tool" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWpowertop desc="PowerTOP tool" name="PowerTOP tool"
 license usr/src/cmd/powertop/common/COPYING \
     license=usr/src/cmd/powertop/common/COPYING

--- a/usr/src/pkg/manifests/driver-audio-audio810.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audio810.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -66,10 +66,8 @@
 file path=kernel/drv/audio810 group=sys
 file path=kernel/drv/audio810.conf group=sys \
     original_name=SUNWad810:kernel/drv/audio810.conf preserve=true
-legacy pkg=SUNWad810 arch=$(ARCH) category=system \
+legacy pkg=SUNWad810 \
     desc="SunOS audio device driver for W1100z & W2100z workstations" \
-    hotline="Please contact your local service provider" \
-    name="SUNW W1100z & W2100z Audio Drivers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="SUNW W1100z & W2100z Audio Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audiocmi.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiocmi.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,7 @@
     alias=pci13f6,111
 file path=kernel/drv/$(ARCH64)/audiocmi group=sys
 file path=kernel/drv/audiocmi group=sys
-legacy pkg=SUNWaudiocmi arch=$(ARCH) category=system \
-    desc="SunOS audio device driver for C-Media 8738" \
-    hotline="Please contact your local service provider" \
-    name="C-Media 8738 Family Audio Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWaudiocmi desc="SunOS audio device driver for C-Media 8738" \
+    name="C-Media 8738 Family Audio Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,8 @@
     alias=pci1102,8
 file path=kernel/drv/$(ARCH64)/audioemu10k group=sys
 file path=kernel/drv/audioemu10k group=sys
-legacy pkg=SUNWaudioemu10k arch=$(ARCH) category=system \
+legacy pkg=SUNWaudioemu10k \
     desc="SunOS audio device driver for Creative EMU10K" \
-    hotline="Please contact your local service provider" \
-    name="Creative EMU10K Audio Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Creative EMU10K Audio Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audiohd.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiohd.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,10 +46,7 @@
 file path=kernel/drv/$(ARCH64)/audiohd group=sys
 file path=kernel/drv/audiohd group=sys
 file path=kernel/drv/audiohd.conf group=sys
-legacy pkg=SUNWaudiohd arch=$(ARCH) category=system \
-    desc="SunOS audio device driver for Munich workstation" \
-    hotline="Please contact your local service provider" \
-    name="SUNW High Definition Audio Drivers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWaudiohd desc="SunOS audio device driver for Munich workstation" \
+    name="SUNW High Definition Audio Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audioixp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audioixp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,8 @@
     alias=pci1002,4370
 file path=kernel/drv/$(ARCH64)/audioixp group=sys
 file path=kernel/drv/audioixp group=sys
-legacy pkg=SUNWadixp arch=$(ARCH) category=system \
+legacy pkg=SUNWadixp \
     desc="SunOS audio device driver for ATI IXP integrated audio hardware" \
-    hotline="Please contact your local service provider" \
-    name="SUNW Audio Driver for ATI IXP" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="SUNW Audio Driver for ATI IXP"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audiols.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiols.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,10 +41,7 @@
 driver name=audiols alias=pci1102,7
 file path=kernel/drv/$(ARCH64)/audiols group=sys
 $(i386_ONLY)file path=kernel/drv/audiols group=sys
-legacy pkg=SUNWaudiols arch=$(ARCH) category=system \
-    desc="SunOS audio device driver for Creative Audigy LS" \
-    hotline="Please contact your local service provider" \
-    name="Creative Audigy LS Audio Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWaudiols desc="SunOS audio device driver for Creative Audigy LS" \
+    name="Creative Audigy LS Audio Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audiop16x.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiop16x.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,10 +41,8 @@
 driver name=audiop16x alias=pci1102,6
 file path=kernel/drv/$(ARCH64)/audiop16x group=sys
 $(i386_ONLY)file path=kernel/drv/audiop16x group=sys
-legacy pkg=SUNWaudiop16x arch=$(ARCH) category=system \
+legacy pkg=SUNWaudiop16x \
     desc="SunOS audio device driver for Creative P16X (EMU10K1X)" \
-    hotline="Please contact your local service provider" \
-    name="Creative P16X Audio Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Creative P16X Audio Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audiosolo.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiosolo.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -40,11 +40,8 @@
 driver name=audiosolo alias=pci125d,1969
 file path=kernel/drv/$(ARCH64)/audiosolo group=sys
 file path=kernel/drv/audiosolo group=sys
-legacy pkg=SUNWaudiosolo arch=$(ARCH) category=system \
-    desc="SunOS audio device driver for ESS Solo-1" \
-    hotline="Please contact your local service provider" \
-    name="ESS Solo-1 Audio Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWaudiosolo desc="SunOS audio device driver for ESS Solo-1" \
+    name="ESS Solo-1 Audio Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,10 +41,8 @@
 driver name=audiovia823x alias=pci1106,3059
 file path=kernel/drv/$(ARCH64)/audiovia823x group=sys
 file path=kernel/drv/audiovia823x group=sys
-legacy pkg=SUNWvia823x arch=$(ARCH) category=system \
+legacy pkg=SUNWvia823x \
     desc="SunOS audio device driver for VIA VT823x south bridges" \
-    hotline="Please contact your local service provider" \
-    name="SUNW Audio Driver for VIA VT823x" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="SUNW Audio Driver for VIA VT823x"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio-audiovia97.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio-audiovia97.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -38,10 +38,7 @@
 dir path=kernel/drv group=sys
 driver name=audiovia97 alias=pci1106,3058
 file path=kernel/drv/audiovia97 group=sys
-legacy pkg=SUNWaudiovia97 arch=$(ARCH) category=system \
-    desc="SunOS audio device driver for Via 82C686" \
-    hotline="Please contact your local service provider" \
-    name="Via 82C686 Audio Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWaudiovia97 desc="SunOS audio device driver for Via 82C686" \
+    name="Via 82C686 Audio Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-audio.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-audio.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -61,9 +61,6 @@
 $(i386_ONLY)file path=kernel/drv/audiots group=sys
 file path=kernel/misc/$(ARCH64)/ac97 group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/ac97 group=sys mode=0755
-legacy pkg=SUNWaudd arch=$(ARCH) category=system \
-    desc="SunOS audio device drivers" \
-    hotline="Please contact your local service provider" name="Audio Drivers" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWaudd desc="SunOS audio device drivers" name="Audio Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-cpu-us.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-cpu-us.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,11 +46,8 @@
     alias=SUNW,UltraSPARC-IIIi+ \
     alias=SUNW,UltraSPARC-IIe
 file path=platform/sun4u/kernel/drv/$(ARCH64)/us group=sys
-legacy pkg=SUNWus.u arch=$(ARCH).sun4u category=system \
-    desc="UltraSPARC CPU Device Driver" \
-    hotline="Please contact your local service provider" \
-    name="UltraSPARC CPU Device Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWus.u arch=$(ARCH).sun4u desc="UltraSPARC CPU Device Driver" \
+    name="UltraSPARC CPU Device Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license license_in_headers license=license_in_headers

--- a/usr/src/pkg/manifests/driver-crypto-dca.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-crypto-dca.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -59,16 +59,10 @@
 file path=usr/lib/fm/eft/sca500.eft mode=0444
 file path=usr/lib/locale/C/LC_MESSAGES/SCA1000.mo mode=0444
 file path=usr/lib/locale/C/LC_MESSAGES/SCA500.mo mode=0444
-legacy pkg=SUNWdcaf arch=$(ARCH) category=system \
-    desc="DCA Crypto Accelerator Supplemental Files (usr)" \
-    hotline="Please contact your local service provider" \
-    name="DCA Crypto Accelerator (usr)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWdcar arch=$(ARCH) category=system \
-    desc="DCA Crypto Accelerator driver" \
-    hotline="Please contact your local service provider" \
-    name="DCA Crypto Accelerator (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWdcaf desc="DCA Crypto Accelerator Supplemental Files (usr)" \
+    name="DCA Crypto Accelerator (usr)"
+legacy pkg=SUNWdcar desc="DCA Crypto Accelerator driver" \
+    name="DCA Crypto Accelerator (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 $(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require

--- a/usr/src/pkg/manifests/driver-crypto-dprov.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-crypto-dprov.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -48,11 +48,8 @@
 file path=kernel/drv/$(ARCH64)/dprov group=sys
 $(i386_ONLY)file path=kernel/drv/dprov group=sys
 file path=kernel/drv/dprov.conf group=sys
-legacy pkg=SUNWcryptoint arch=$(ARCH) category=system \
-    desc="Kernel Crypto Framework Test Driver" \
-    hotline="Please contact your local service provider" \
-    name="Kernel Crypto Framework Test Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWcryptoint desc="Kernel Crypto Framework Test Driver" \
+    name="Kernel Crypto Framework Test Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=kernel/crypto/$(ARCH64)/dprov \

--- a/usr/src/pkg/manifests/driver-crypto-n2cp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-crypto-n2cp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,10 +46,7 @@
     alias=SUNW,vf-cwq
 file path=platform/sun4v/kernel/drv/$(ARCH64)/n2cp group=sys
 file path=platform/sun4v/kernel/drv/n2cp.conf group=sys
-legacy pkg=SUNWn2cp.v arch=$(ARCH).sun4v category=system \
-    desc="UltraSPARC-T2 Crypto Provider" \
-    hotline="Please contact your local service provider" \
-    name="UltraSPARC-T2 Crypto Provider" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWn2cp.v arch=$(ARCH).sun4v desc="UltraSPARC-T2 Crypto Provider" \
+    name="UltraSPARC-T2 Crypto Provider"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-crypto-tpm.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-crypto-tpm.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -50,10 +50,7 @@
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/tpm group=sys
 $(i386_ONLY)file path=kernel/drv/tpm group=sys
 $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/tpm group=sys
-legacy pkg=SUNWtpm arch=$(ARCH) category=system \
-    desc="Trusted Platform Module driver" \
-    hotline="Please contact your local service provider" \
-    name="Trusted Platform Module driver" vendor="Sun Microsystems, Inc." \
-    version=11.11.0,REV=2009.11.11
+legacy pkg=SUNWtpm desc="Trusted Platform Module driver" \
+    name="Trusted Platform Module driver" version=11.11.0,REV=2009.11.11
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-firewire.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-firewire.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,10 +46,7 @@
 file path=kernel/drv/hci1394.conf group=sys
 file path=kernel/misc/$(ARCH64)/s1394 group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/s1394 group=sys mode=0755
-legacy pkg=SUNW1394 arch=$(ARCH) category=system \
-    desc="IEEE1394 Framework and OpenHCI Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun IEEE1394 Framework" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNW1394 desc="IEEE1394 Framework and OpenHCI Driver" \
+    name="Sun IEEE1394 Framework"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -81,11 +81,8 @@
 file path=kernel/drv/agpgart group=sys
 file path=kernel/drv/agpgart.conf group=sys
 file path=kernel/drv/agptarget group=sys
-legacy pkg=SUNWagp arch=$(ARCH) category=system \
-    desc="AGP GART driver for x86 workstations" \
-    hotline="Please contact your local service provider" \
-    name="AGP GART Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWagp desc="AGP GART driver for x86 workstations" \
+    name="AGP GART Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart \

--- a/usr/src/pkg/manifests/driver-graphics-atiatom.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-atiatom.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,11 +41,8 @@
 driver name=atiatom alias=pci1002,4752 perms="* 0644 root sys"
 file path=kernel/drv/$(ARCH64)/atiatom group=sys
 file path=kernel/drv/atiatom group=sys
-legacy pkg=SUNWatigfx arch=$(ARCH) category=system \
-    desc="Drivers for ATI framebuffer hardware" \
-    hotline="Please contact your local service provider" \
-    name="ATI Framebuffer Drivers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWatigfx desc="Drivers for ATI framebuffer hardware" \
+    name="ATI Framebuffer Drivers"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-graphics-av1394.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-av1394.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,9 +42,6 @@
     alias=firewire00a02d,010001
 file path=kernel/drv/$(ARCH64)/av1394 group=sys
 $(i386_ONLY)file path=kernel/drv/av1394 group=sys
-legacy pkg=SUNWav1394 arch=$(ARCH) category=system desc="IEEE1394 AV Driver" \
-    hotline="Please contact your local service provider" \
-    name="IEEE1394 AV Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWav1394 desc="IEEE1394 AV Driver" name="IEEE1394 AV Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
 dir path=usr/lib/devfsadm/linkmod group=sys
 file path=usr/include/sys/dcam/dcam1394_io.h
 file path=usr/lib/devfsadm/linkmod/SUNW_dcam1394_link.so group=sys
-legacy pkg=SUNWfwdcu arch=$(ARCH) category=system \
-    desc="Sun IEEE1394 Video Conferencing support" \
-    hotline="Please contact your local service provider" \
-    name="Sun IEEE1394 Video Conferencing Support (Usr)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWfwdcu desc="Sun IEEE1394 Video Conferencing support" \
+    name="Sun IEEE1394 Video Conferencing Support (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,10 +42,7 @@
     alias=firewire00a02d,000100
 file path=kernel/drv/$(ARCH64)/dcam1394 group=sys
 $(i386_ONLY)file path=kernel/drv/dcam1394 group=sys
-legacy pkg=SUNWfwdc arch=$(ARCH) category=system \
-    desc="IEEE1394 Video Conferencing Class Driver" \
-    hotline="Please contact your local service provider" \
-    name="IEEE1394 Video Conferencing Class Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWfwdc desc="IEEE1394 Video Conferencing Class Driver" \
+    name="IEEE1394 Video Conferencing Class Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-graphics-drm.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-drm.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -72,11 +72,8 @@
 file path=kernel/drv/radeon group=sys
 file path=kernel/misc/$(ARCH64)/drm group=sys mode=0755
 file path=kernel/misc/drm group=sys mode=0755
-legacy pkg=SUNWdrmr arch=$(ARCH) category=system \
-    desc="Direct Rendering Manager kernel drivers and modules" \
-    hotline="Please contact your local service provider" \
-    name="DRM Kernel Drivers, (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWdrmr desc="Direct Rendering Manager kernel drivers and modules" \
+    name="DRM Kernel Drivers, (Root)"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/drm/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/drm/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-graphics-usbvc.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-graphics-usbvc.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,7 @@
     alias=usbia46d,8c5.config1.0
 file path=kernel/drv/$(ARCH64)/usbvc group=sys
 $(i386_ONLY)file path=kernel/drv/usbvc group=sys
-legacy pkg=SUNWusbvc arch=$(ARCH) category=system \
-    desc="usbvc (USB Video Class Driver)" \
-    hotline="Please contact your local service provider" \
-    name="USB Video Class Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWusbvc desc="usbvc (USB Video Class Driver)" \
+    name="USB Video Class Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-i86pc-fipe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-i86pc-fipe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,10 +47,7 @@
 file path=platform/i86pc/kernel/drv/$(ARCH64)/fipe group=sys
 file path=platform/i86pc/kernel/drv/fipe group=sys
 file path=platform/i86pc/kernel/drv/fipe.conf group=sys
-legacy pkg=SUNWfipe arch=$(ARCH) category=system \
-    desc="Intel 5000/7300 memory power management driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel 5000/7300 memory power management driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWfipe desc="Intel 5000/7300 memory power management driver" \
+    name="Intel 5000/7300 memory power management driver"
 license usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE \
     license=usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-i86pc-ioat.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-i86pc-ioat.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -59,9 +59,6 @@
 file path=platform/i86xpv/kernel/drv/$(ARCH64)/ioat group=sys
 file path=platform/i86xpv/kernel/drv/ioat group=sys
 file path=platform/i86xpv/kernel/drv/ioat.conf group=sys
-legacy pkg=SUNWdcopy arch=$(ARCH) category=system desc="Sun dcopy DMA drivers" \
-    hotline="Please contact your local service provider" \
-    name="Sun dcopy DMA drivers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWdcopy desc="Sun dcopy DMA drivers" name="Sun dcopy DMA drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-i86pc-platform.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-i86pc-platform.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -80,10 +80,8 @@
 file path=kernel/strmod/vuidm3p group=sys mode=0755
 file path=kernel/strmod/vuidm4p group=sys mode=0755
 file path=kernel/strmod/vuidm5p group=sys mode=0755
-legacy pkg=SUNWpsdcr arch=$(ARCH) category=system \
+legacy pkg=SUNWpsdcr \
     desc="Platform Support, Bus-independent Device Drivers, (Root)" \
-    hotline="Please contact your local service provider" \
-    name="Platform Support, Bus-independent Device Drivers (Root)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Platform Support, Bus-independent Device Drivers (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-afe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-afe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -53,11 +53,8 @@
     alias=pci1737,ab08
 file path=kernel/drv/$(ARCH64)/afe group=sys
 $(i386_ONLY)file path=kernel/drv/afe group=sys
-legacy pkg=SUNWafe arch=$(ARCH) category=system \
-    desc="ADMtek/Infineon Fast Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="ADMtek Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWafe desc="ADMtek/Infineon Fast Ethernet Network Adapter Driver" \
+    name="ADMtek Ethernet Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/afe/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/afe/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-amd8111s.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-amd8111s.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,11 +41,8 @@
 driver name=amd8111s alias=pci1022,7462
 file path=kernel/drv/$(ARCH64)/amd8111s group=sys
 file path=kernel/drv/amd8111s group=sys
-legacy pkg=SUNWamd8111s arch=$(ARCH) category=system \
-    desc="AMD8111 FAST Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="AMD8111 Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWamd8111s desc="AMD8111 FAST Ethernet Network Adapter Driver" \
+    name="AMD8111 Fast Ethernet Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s \
     license=usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s

--- a/usr/src/pkg/manifests/driver-network-arbel.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-arbel.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -38,8 +38,5 @@
 dir path=kernel group=sys
 dir path=kernel/drv group=sys
 dir path=kernel/drv/$(ARCH64) group=sys
-legacy pkg=SUNWarbel arch=$(ARCH) category=system desc="Arbel HCA Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun IB Arbel HCA driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWarbel desc="Arbel HCA Driver" name="Sun IB Arbel HCA driver"
 license cr_Sun license=cr_Sun

--- a/usr/src/pkg/manifests/driver-network-arn.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-arn.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,11 +43,8 @@
     alias=pciex168c,2b
 file path=kernel/drv/$(ARCH64)/arn group=sys
 file path=kernel/drv/arn group=sys
-legacy pkg=SUNWarn arch=$(ARCH) category=system \
-    desc="Atheros AR9xxx 802.11 Wireless NIC Driver" \
-    hotline="Please contact your local service provider" \
-    name="Atheros IEEE 802.11 Wireless NIC Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWarn desc="Atheros AR9xxx 802.11 Wireless NIC Driver" \
+    name="Atheros IEEE 802.11 Wireless NIC Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/arn/LICENSE \
     license=usr/src/uts/common/io/arn/LICENSE

--- a/usr/src/pkg/manifests/driver-network-atge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-atge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
     alias=pciex1969,1048
 file path=kernel/drv/$(ARCH64)/atge group=sys
 file path=kernel/drv/atge group=sys
-legacy pkg=SUNWatge arch=$(ARCH) category=system \
-    desc="Atheros/Attansic L1E Gigabit Ethernet" \
-    hotline="Please contact your local service provider" \
-    name="Atheros/Attansic L1E Gigabit Ethernet 10/100/1000 Base (AR8121/AR8113)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWatge desc="Atheros/Attansic L1E Gigabit Ethernet" \
+    name="Atheros/Attansic L1E Gigabit Ethernet 10/100/1000 Base (AR8121/AR8113)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-ath.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ath.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -49,11 +49,8 @@
     alias=pciex168c,24
 file path=kernel/drv/$(ARCH64)/ath group=sys
 file path=kernel/drv/ath group=sys
-legacy pkg=SUNWatheros arch=$(ARCH) category=system \
-    desc="Atheros AR52xx 802.11b/g Wireless NIC Driver" \
-    hotline="Please contact your local service provider" \
-    name="Atheros 802.11b/g Wireless NIC Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWatheros desc="Atheros AR52xx 802.11b/g Wireless NIC Driver" \
+    name="Atheros 802.11b/g Wireless NIC Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/ath/LICENSE \
     license=usr/src/uts/common/io/ath/LICENSE

--- a/usr/src/pkg/manifests/driver-network-atu.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-atu.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,11 +44,9 @@
     perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/atu group=sys
 file path=kernel/drv/atu group=sys
-legacy pkg=SUNWatu arch=$(ARCH) category=system \
+legacy pkg=SUNWatu \
     desc="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" \
-    hotline="Please contact your local service provider" \
-    name="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/atu/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/atu/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-bfe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bfe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
     alias=pci14e4,4402
 file path=kernel/drv/$(ARCH64)/bfe group=sys
 file path=kernel/drv/bfe group=sys
-legacy pkg=SUNWbfe arch=$(ARCH) category=system \
-    desc="Broadcom BCM4401 Fast Ethernet Driver" \
-    hotline="Please contact your local service provider" \
-    name="Broadcom BCM4401 Fast Ethernet Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWbfe desc="Broadcom BCM4401 Fast Ethernet Driver" \
+    name="Broadcom BCM4401 Fast Ethernet Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-bge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -123,11 +123,9 @@
 file path=kernel/drv/$(ARCH64)/bge group=sys
 $(i386_ONLY)file path=kernel/drv/bge group=sys
 file path=kernel/drv/bge.conf group=sys
-legacy pkg=SUNWbge arch=$(ARCH) category=system \
+legacy pkg=SUNWbge \
     desc="Broadcom 57xx Gigabit Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Broadcom 57xx GE NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Broadcom 57xx GE NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/bge/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/driver-network-bnx.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bnx.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -53,11 +53,10 @@
 file path=kernel/drv/bnx group=sys
 file path=kernel/drv/bnx.conf group=sys \
     original_name=BRCMbnx:kernel/drv/bnx.conf preserve=renamenew
-legacy pkg=BRCMbnx arch=$(ARCH) category=system \
+legacy pkg=BRCMbnx \
     desc="Broadcom NetXtreme II Gigabit Ethernet PCI-X/PCIE Adapter Driver" \
-    hotline="Please contact your local service provider" \
     name="Broadcom NetXtreme II Gigabit Ethernet Adapter Driver" \
-    vendor="Broadcom Corporation, Inc." version=11.11,REV=2009.11.11
+    vendor="Broadcom Corporation, Inc."
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-network-bnxe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bnxe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -50,11 +50,10 @@
 file path=kernel/drv/bnxe group=sys
 file path=kernel/drv/bnxe.conf group=sys \
     original_name=BRCMbnxe:kernel/drv/bnxe.conf preserve=renameold
-legacy pkg=BRCMbnxe arch=$(ARCH) category=system \
+legacy pkg=BRCMbnxe \
     desc="Broadcom NetXtreme II 10 Gigabit Ethernet PCI-X/PCIE Adapter Driver" \
-    hotline="Please contact your local service provider" \
     name="Broadcom NetXtreme II 10GbE NIC Driver" \
-    vendor="Broadcom Corporation, Inc." version=11.11,REV=2009.11.11
+    vendor="Broadcom Corporation, Inc."
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-network-bpf.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-bpf.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -51,16 +51,10 @@
 file path=usr/kernel/drv/bpf.conf group=sys
 file path=usr/kernel/socketmod/$(ARCH64)/sockpfp group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/socketmod/sockpfp group=sys mode=0755
-legacy pkg=SUNWpacketh arch=$(ARCH) category=system \
-    desc="C header files for BPF/PF_PACKET" \
-    hotline="Please contact your local service provider" \
-    name="Solaris Packet header files" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-legacy pkg=SUNWpacketu arch=$(ARCH) category=system \
-    desc="BPF/PF_PACKET kernel packet modules" \
-    hotline="Please contact your local service provider" \
-    name="Solaris Kernel Packet (Usr)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWpacketh desc="C header files for BPF/PF_PACKET" \
+    name="Solaris Packet header files"
+legacy pkg=SUNWpacketu desc="BPF/PF_PACKET kernel packet modules" \
+    name="Solaris Kernel Packet (Usr)"
 license cr_Sun license=cr_Sun
 license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \
     license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE

--- a/usr/src/pkg/manifests/driver-network-chxge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-chxge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,11 +44,9 @@
     alias=pci1425,a
 file path=kernel/drv/$(ARCH64)/chxge group=sys
 $(i386_ONLY)file path=kernel/drv/chxge group=sys
-legacy pkg=SUNWchxge arch=$(ARCH) category=system \
+legacy pkg=SUNWchxge \
     desc="Chelsio N110 10 Gigabit Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Chelsio N110 10GE NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Chelsio N110 10GE NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/chxge/com/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/driver-network-dmfe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-dmfe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,7 @@
     alias=pci128h,9102
 file path=kernel/drv/$(ARCH64)/dmfe group=sys
 $(i386_ONLY)file path=kernel/drv/dmfe group=sys
-legacy pkg=SUNWdmfe arch=$(ARCH) category=system \
-    desc="Davicom 9102 Fast Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Davicom 9102 Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWdmfe desc="Davicom 9102 Fast Ethernet Network Adapter Driver" \
+    name="Davicom 9102 Fast Ethernet Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-e1000g.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-e1000g.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -187,10 +187,7 @@
 $(i386_ONLY)file path=kernel/drv/e1000g group=sys
 file path=kernel/drv/e1000g.conf group=sys \
     original_name=SUNWintgige:kernel/drv/e1000g.conf preserve=renamenew
-legacy pkg=SUNWintgige arch=$(ARCH) category=system \
-    desc="Intel(R) PRO/1000 Server Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel(R) PRO/1000 Server Adapter Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWintgige desc="Intel(R) PRO/1000 Server Adapter Driver" \
+    name="Intel(R) PRO/1000 Server Adapter Driver"
 license usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-elxl.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-elxl.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -56,10 +56,7 @@
     alias=pci10b7,9805
 file path=kernel/drv/$(ARCH64)/elxl group=sys
 file path=kernel/drv/elxl group=sys
-legacy pkg=SUNWelxl arch=$(ARCH) category=system \
-    desc="3Com Etherlink XL Ethernet Driver" \
-    hotline="Please contact your local service provider" \
-    name="3Com Etherlink XL Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWelxl desc="3Com Etherlink XL Ethernet Driver" \
+    name="3Com Etherlink XL Ethernet Driver"
 license usr/src/uts/common/io/elxl/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/elxl/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-emlxs.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-emlxs.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -81,16 +81,14 @@
 $(i386_ONLY)file path=kernel/misc/emlxs/emlxs_fw group=sys mode=0755
 file path=usr/lib/mdb/kvm/$(ARCH64)/emlxs.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/emlxs.so group=sys mode=0555
-legacy pkg=SUNWemlxs arch=$(ARCH) category=system \
+legacy pkg=SUNWemlxs \
     desc="Device driver kit for Emulex-Sun FC, FCoE, and NIC adapters" \
-    hotline="Please contact your local service provider" \
     name="Emulex-Sun driver kit for Fibre Channel and Converged Network Adapters (root)" \
-    vendor="Emulex Corporation" version=11.11,REV=2009.11.11
-legacy pkg=SUNWemlxu arch=$(ARCH) category=system \
+    vendor="Emulex Corporation"
+legacy pkg=SUNWemlxu \
     desc="Support software for Emulex-Sun LightPulse Fibre Channel adapters" \
-    hotline="Please contact your local service provider" \
     name="Emulex-Sun LightPulse Fibre Channel Adapter Utilties (usr)" \
-    vendor="Emulex Corporation" version=11.11,REV=2009.11.11
+    vendor="Emulex Corporation"
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE \
     license=usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE

--- a/usr/src/pkg/manifests/driver-network-eri.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-eri.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -40,10 +40,7 @@
 dir path=kernel/drv/$(ARCH64) group=sys
 driver name=eri alias=pci108e,1101 clone_perms="eri 0666 root sys"
 file path=kernel/drv/$(ARCH64)/eri group=sys
-legacy pkg=SUNWerid arch=$(ARCH) category=system \
-    desc="Sun RIO 10/100 Mb Ethernet Drivers" \
-    hotline="Please contact your local service provider" \
-    name="Sun RIO 10/100 Mb Ethernet Drivers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWerid desc="Sun RIO 10/100 Mb Ethernet Drivers" \
+    name="Sun RIO 10/100 Mb Ethernet Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fcip.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fcip.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,10 +42,7 @@
 file path=kernel/drv/$(ARCH64)/fcip group=sys
 $(i386_ONLY)file path=kernel/drv/fcip group=sys
 file path=kernel/drv/fcip.conf group=sys
-legacy pkg=SUNWfcip arch=$(ARCH) category=system \
-    desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun FCIP IP/ARP over FibreChannel Device Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWfcip desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \
+    name="Sun FCIP IP/ARP over FibreChannel Device Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fcoe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fcoe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,8 @@
 file path=kernel/drv/$(ARCH64)/fcoe group=sys
 $(i386_ONLY)file path=kernel/drv/fcoe group=sys
 file path=kernel/drv/fcoe.conf group=sys
-legacy pkg=SUNWfcoe arch=$(ARCH) category=system \
+legacy pkg=SUNWfcoe \
     desc="Sun FCoE (Fibre Channel over Ethernet) Transport Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun FCoE Transport Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Sun FCoE Transport Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fcoei.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fcoei.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,8 @@
 file path=kernel/drv/$(ARCH64)/fcoei group=sys
 $(i386_ONLY)file path=kernel/drv/fcoei group=sys
 file path=kernel/drv/fcoei.conf group=sys
-legacy pkg=SUNWfcoei arch=$(ARCH) category=system \
+legacy pkg=SUNWfcoei \
     desc="Sun FCoE (Fibre Channel over Ethernet) Initiator Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun FCoE Initiator Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Sun FCoE Initiator Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fcoet.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fcoet.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,10 +42,8 @@
 driver name=fcoet perms="* 0600 root sys"
 file path=kernel/drv/$(ARCH64)/fcoet group=sys
 $(i386_ONLY)file path=kernel/drv/fcoet group=sys
-legacy pkg=SUNWfcoet arch=$(ARCH) category=system \
+legacy pkg=SUNWfcoet \
     desc="Sun FCoE (Fibre Channel over Ethernet) COMSTAR Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun FCoE COMSTAR Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Sun FCoE COMSTAR Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fcp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fcp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,10 +42,7 @@
 file path=kernel/drv/$(ARCH64)/fcp group=sys
 $(i386_ONLY)file path=kernel/drv/fcp group=sys
 file path=kernel/drv/fcp.conf group=sys
-legacy pkg=SUNWfcp arch=$(ARCH) category=system \
-    desc="Sun FCP SCSI Fibre Channel Device Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun FCP SCSI Device Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWfcp desc="Sun FCP SCSI Fibre Channel Device Driver" \
+    name="Sun FCP SCSI Device Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fcsm.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fcsm.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,9 +42,6 @@
 file path=kernel/drv/$(ARCH64)/fcsm group=sys
 $(i386_ONLY)file path=kernel/drv/fcsm group=sys
 file path=kernel/drv/fcsm.conf group=sys
-legacy pkg=SUNWfcsm arch=$(ARCH) category=system \
-    desc="Provides the FCSM driver" \
-    hotline="Please contact your local service provider" name="FCSM driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWfcsm desc="Provides the FCSM driver" name="FCSM driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-fp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-fp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,10 +47,7 @@
     original_name=SUNWfctl:kernel/drv/fp.conf preserve=true
 file path=kernel/misc/$(ARCH64)/fctl group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/fctl group=sys mode=0755
-legacy pkg=SUNWfctl arch=$(ARCH) category=system \
-    desc="fctl module and fp device driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun Fibre Channel Transport layer" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWfctl desc="fctl module and fp device driver" \
+    name="Sun Fibre Channel Transport layer"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-hermon.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-hermon.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,9 +47,6 @@
 file path=kernel/drv/$(ARCH64)/hermon group=sys
 $(i386_ONLY)file path=kernel/drv/hermon group=sys
 file path=kernel/drv/hermon.conf group=sys
-legacy pkg=SUNWhermon arch=$(ARCH) category=system desc="Hermon HCA driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun IB Hermon HCA driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWhermon desc="Hermon HCA driver" name="Sun IB Hermon HCA driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-hme.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-hme.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,7 @@
 $(sparc_ONLY)file path=kernel/drv/$(ARCH64)/fas group=sys
 file path=kernel/drv/$(ARCH64)/hme group=sys
 $(i386_ONLY)file path=kernel/drv/hme group=sys
-legacy pkg=SUNWhmd arch=$(ARCH) category=system \
-    desc="SunSwift Adapter Drivers" \
-    hotline="Please contact your local service provider" \
-    name="SunSwift Adapter Drivers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWhmd desc="SunSwift Adapter Drivers" \
+    name="SunSwift Adapter Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-hxge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-hxge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
 $(i386_ONLY)file path=kernel/drv/hxge group=sys
 file path=kernel/drv/hxge.conf group=sys \
     original_name=SUNWhxge:kernel/drv/hxge.conf preserve=renamenew
-legacy pkg=SUNWhxge arch=$(ARCH) category=system \
-    desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="SUN 10Gb hxge NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWhxge desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \
+    name="SUN 10Gb hxge NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-ib.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ib.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -53,10 +53,8 @@
 $(i386_ONLY)file path=kernel/misc/ibdm group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/ibmf group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/ibtl group=sys mode=0755
-legacy pkg=SUNWib arch=$(ARCH) category=system desc="Sun InfiniBand Framework" \
-    hotline="Please contact your local service provider" \
-    name="Sun InfiniBand Framework" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWib desc="Sun InfiniBand Framework" \
+    name="Sun InfiniBand Framework"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-network-ibdma.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ibdma.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -40,10 +40,7 @@
 dir path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/ibdma group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/ibdma group=sys mode=0755
-legacy pkg=SUNWibdmar arch=$(ARCH) category=system \
-    desc="Sun InfiniBand Device Management Agent (Root)" \
-    hotline="Please contact your local service provider" \
-    name="Sun InfiniBand Device Management Agent (Root)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWibdmar desc="Sun InfiniBand Device Management Agent (Root)" \
+    name="Sun InfiniBand Device Management Agent (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-ibp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ibp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -54,10 +54,7 @@
 file path=lib/svc/method/ibd-post-upgrade mode=0555
 file path=sbin/ibd_delete_link mode=0555
 file path=sbin/ibd_upgrade mode=0555
-legacy pkg=SUNWipoib arch=$(ARCH) category=system \
-    desc="Sun IP over InfiniBand" \
-    hotline="Please contact your local service provider" \
-    name="Sun IP over InfiniBand" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWipoib desc="Sun IP over InfiniBand" \
+    name="Sun IP over InfiniBand"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-igb.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-igb.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -58,10 +58,7 @@
 $(i386_ONLY)file path=kernel/drv/igb group=sys
 file path=kernel/drv/igb.conf group=sys \
     original_name=SUNWigb:kernel/drv/igb.conf preserve=renamenew
-legacy pkg=SUNWigb arch=$(ARCH) category=system \
-    desc="Intel 82575 1Gb PCI Express NIC Driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel 82575 1Gb PCI Express NIC Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWigb desc="Intel 82575 1Gb PCI Express NIC Driver" \
+    name="Intel 82575 1Gb PCI Express NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-ipw.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ipw.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,11 +42,8 @@
     perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/ipw group=sys
 file path=kernel/drv/ipw group=sys
-legacy pkg=SUNWipw arch=$(ARCH) category=system \
-    desc="Intel Pro. Wirless 802.11b IPW2100B Driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel Pro. Wireless 802.11b IPW2100B Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWipw desc="Intel Pro. Wirless 802.11b IPW2100B Driver" \
+    name="Intel Pro. Wireless 802.11b IPW2100B Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/ipw/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/ipw/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-iwh.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwh.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -50,11 +50,8 @@
     alias=pciex8086,423d
 file path=kernel/drv/$(ARCH64)/iwh group=sys
 file path=kernel/drv/iwh group=sys
-legacy pkg=SUNWiwh arch=$(ARCH) category=system \
-    desc="Intel(R) WiFi Link 5100/5300 driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel(R) WiFi Link 5100/5300 driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWiwh desc="Intel(R) WiFi Link 5100/5300 driver" \
+    name="Intel(R) WiFi Link 5100/5300 driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/iwh/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/iwh/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-iwi.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwi.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -50,11 +50,9 @@
     alias=pci8086,4224.8086.1011
 file path=kernel/drv/$(ARCH64)/iwi group=sys
 file path=kernel/drv/iwi group=sys
-legacy pkg=SUNWiwi arch=$(ARCH) category=system \
+legacy pkg=SUNWiwi \
     desc="Intel Pro. Wirless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel Pro. Wireless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Intel Pro. Wireless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/iwi/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/iwi/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-iwk.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwk.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,11 +43,8 @@
     alias=pciex8086,4230
 file path=kernel/drv/$(ARCH64)/iwk group=sys
 file path=kernel/drv/iwk group=sys
-legacy pkg=SUNWiwk arch=$(ARCH) category=system \
-    desc="Intel(R) PRO/Wireless 4965AGN driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel(R) PRO/Wireless 4965AGN driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWiwk desc="Intel(R) PRO/Wireless 4965AGN driver" \
+    name="Intel(R) PRO/Wireless 4965AGN driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/iwk/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/iwk/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-iwp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-iwp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,11 +47,8 @@
     alias=pciex8086,4239
 file path=kernel/drv/$(ARCH64)/iwp group=sys
 file path=kernel/drv/iwp group=sys
-legacy pkg=SUNWiwp arch=$(ARCH) category=system \
-    desc="Intel(R) WiFi Link 6000 series driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel(R) WiFi Link 6000 series driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWiwp desc="Intel(R) WiFi Link 6000 series driver" \
+    name="Intel(R) WiFi Link 6000 series driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/iwp/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/iwp/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-ixgb.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ixgb.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,11 +45,8 @@
     alias=pci8086,a11f
 file path=kernel/drv/$(ARCH64)/ixgb group=sys
 $(i386_ONLY)file path=kernel/drv/ixgb group=sys
-legacy pkg=SUNWixgb arch=$(ARCH) category=system \
-    desc="Intel(R) PRO/10G Server Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel(R) PRO/10G Server Adapter Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWixgb desc="Intel(R) PRO/10G Server Adapter Driver" \
+    name="Intel(R) PRO/10G Server Adapter Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-network-ixgbe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ixgbe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -64,11 +64,8 @@
 $(i386_ONLY)file path=kernel/drv/ixgbe group=sys
 file path=kernel/drv/ixgbe.conf group=sys \
     original_name=SUNWixgbe:kernel/drv/ixgbe.conf preserve=renamenew
-legacy pkg=SUNWixgbe arch=$(ARCH) category=system \
-    desc="Intel 10GbE PCIE NIC Driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel 10GbE PCIE NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWixgbe desc="Intel 10GbE PCIE NIC Driver" \
+    name="Intel 10GbE PCIE NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/driver-network-llc2.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-llc2.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -71,16 +71,11 @@
 hardlink path=etc/rc1.d/K52llc2 target=../../etc/init.d/llc2
 hardlink path=etc/rc2.d/S40llc2 target=../../etc/init.d/llc2
 hardlink path=etc/rcS.d/K52llc2 target=../../etc/init.d/llc2
-legacy pkg=SUNWllc arch=$(ARCH) category=system \
+legacy pkg=SUNWllc \
     desc="LLC2 driver implementing IEEE 802.2 Logical Link Control 2 service" \
-    hotline="Please contact your local service provider" \
-    name="LLC2 driver and its initialization programs" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-legacy pkg=SUNWllcr arch=$(ARCH) category=system \
-    desc="The configuration and startup files for llc2 driver" \
-    hotline="Please contact your local service provider" \
-    name="LLC2 driver configuration and startup files" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="LLC2 driver and its initialization programs"
+legacy pkg=SUNWllcr desc="The configuration and startup files for llc2 driver" \
+    name="LLC2 driver configuration and startup files"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-network-mwl.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-mwl.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -49,11 +49,9 @@
 file path=kernel/drv/mwl group=sys
 file path=kernel/misc/$(ARCH64)/mwlfw group=sys mode=0755
 file path=kernel/misc/mwlfw group=sys mode=0755
-legacy pkg=SUNWmwl arch=$(ARCH) category=system \
+legacy pkg=SUNWmwl \
     desc="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \
-    hotline="Please contact your local service provider" \
-    name="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver"
 license usr/src/uts/common/io/mwl/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/mwl/THIRDPARTYLICENSE
 license usr/src/uts/common/io/mwl/mwl_fw/LICENSE \

--- a/usr/src/pkg/manifests/driver-network-mxfe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-mxfe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,11 +45,8 @@
     alias=pci11fc,9881
 file path=kernel/drv/$(ARCH64)/mxfe group=sys
 $(i386_ONLY)file path=kernel/drv/mxfe group=sys
-legacy pkg=SUNWmxfe arch=$(ARCH) category=system \
-    desc="Macronix Fast Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Macronix Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWmxfe desc="Macronix Fast Ethernet Network Adapter Driver" \
+    name="Macronix Fast Ethernet Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-myri10ge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-myri10ge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,11 +46,8 @@
     alias=pciex14c1,9
 file path=kernel/drv/$(ARCH64)/myri10ge group=sys
 $(i386_ONLY)file path=kernel/drv/myri10ge group=sys
-legacy pkg=SUNWmyri10ge arch=$(ARCH) category=system \
-    desc="Myricom 10 Gigabit Ethernet Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Myricom 10Gb NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWmyri10ge desc="Myricom 10 Gigabit Ethernet Adapter Driver" \
+    name="Myricom 10Gb NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/myri10ge/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/driver-network-nge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-nge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -56,9 +56,7 @@
 file path=kernel/drv/$(ARCH64)/nge group=sys
 file path=kernel/drv/nge group=sys
 file path=kernel/drv/nge.conf group=sys
-legacy pkg=SUNWnge arch=$(ARCH) category=system desc="Nvidia CK8-04 GE driver" \
-    hotline="Please contact your local service provider" \
-    name="Nvidia CK8-04 GE driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWnge desc="Nvidia CK8-04 GE driver" \
+    name="Nvidia CK8-04 GE driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-niumx.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-niumx.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,10 +41,8 @@
 dir path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
 driver name=niumx alias=SUNW,niumx perms="* 0666 root sys"
 file path=platform/sun4v/kernel/drv/$(ARCH64)/niumx group=sys
-legacy pkg=SUNWniumx.v arch=$(ARCH).sun4v category=system \
+legacy pkg=SUNWniumx.v arch=$(ARCH).sun4v \
     desc="UltraSPARC-T2 NIU nexus driver" \
-    hotline="Please contact your local service provider" \
-    name="UltraSPARC-T2 NIU nexus driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="UltraSPARC-T2 NIU nexus driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-ntxn.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ntxn.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -50,11 +50,8 @@
 file path=kernel/drv/$(ARCH64)/ntxn group=sys
 file path=kernel/drv/ntxn group=sys
 file path=kernel/drv/ntxn.conf group=sys
-legacy pkg=SUNWntxn arch=$(ARCH) category=system \
-    desc="NetXen 1Gb/10Gb Ethernet Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="NetXen 1Gb/10Gb NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWntxn desc="NetXen 1Gb/10Gb Ethernet Adapter Driver" \
+    name="NetXen 1Gb/10Gb NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/ntxn/THIRDPARTYLICENSE \

--- a/usr/src/pkg/manifests/driver-network-nxge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-nxge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -68,20 +68,11 @@
 $(sparc_ONLY)file path=platform/sun4v/kernel/drv/nxge.conf group=sys \
     original_name=SUNWnxge:platform/sun4v/kernel/drv/nxge.conf \
     preserve=renamenew
-$(i386_ONLY)legacy pkg=SUNWnxge arch=$(ARCH) category=system \
-    desc="Sun NIU 10Gb/1Gb leaf driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun NIU leaf driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-$(sparc_ONLY)legacy pkg=SUNWnxge.u arch=$(ARCH).sun4u category=system \
-    desc="Sun NIU 10Gb/1Gb driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun NIU leaf driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
-$(sparc_ONLY)legacy pkg=SUNWnxge.v arch=$(ARCH).sun4v category=system \
-    desc="Sun NIU leaf driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun NIU leaf driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+$(i386_ONLY)legacy pkg=SUNWnxge desc="Sun NIU 10Gb/1Gb leaf driver" \
+    name="Sun NIU leaf driver"
+$(sparc_ONLY)legacy pkg=SUNWnxge.u arch=$(ARCH).sun4u \
+    desc="Sun NIU 10Gb/1Gb driver" name="Sun NIU leaf driver"
+$(sparc_ONLY)legacy pkg=SUNWnxge.v arch=$(ARCH).sun4v \
+    desc="Sun NIU leaf driver" name="Sun NIU leaf driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-pcan.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-pcan.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,7 @@
     alias=pci14b9,a504
 file path=kernel/drv/$(ARCH64)/pcan group=sys
 $(i386_ONLY)file path=kernel/drv/pcan group=sys
-legacy pkg=SUNWpcan arch=$(ARCH) category=system \
-    desc="Cisco-Aironet 802.11b driver" \
-    hotline="Please contact your local service provider" \
-    name="Cisco-Aironet 802.11b driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWpcan desc="Cisco-Aironet 802.11b driver" \
+    name="Cisco-Aironet 802.11b driver"
 license usr/src/uts/common/io/pcan/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/pcan/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-pcwl.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-pcwl.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,10 +47,7 @@
     alias=pci1385,4105
 file path=kernel/drv/$(ARCH64)/pcwl group=sys
 $(i386_ONLY)file path=kernel/drv/pcwl group=sys
-legacy pkg=SUNWpcwl arch=$(ARCH) category=system \
-    desc="Lucent/PRISM-II 802.11b driver" \
-    hotline="Please contact your local service provider" \
-    name="Lucent/PRISM-II 802.11b driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWpcwl desc="Lucent/PRISM-II 802.11b driver" \
+    name="Lucent/PRISM-II 802.11b driver"
 license usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-platform.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-platform.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -181,11 +181,8 @@
 file path=kernel/drv/sd group=sys
 file path=kernel/drv/sd.conf group=sys \
     original_name=SUNWos86r:kernel/drv/sd.conf preserve=true
-legacy pkg=SUNWos86r arch=$(ARCH) category=system \
-    desc="Platform Support, OS Functionality (Root)" \
-    hotline="Please contact your local service provider" \
-    name="Platform Support, OS Functionality (Root)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWos86r desc="Platform Support, OS Functionality (Root)" \
+    name="Platform Support, OS Functionality (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-network-qfe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-qfe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -40,10 +40,7 @@
 dir path=kernel/drv/$(ARCH64) group=sys
 driver name=qfe alias=SUNW,qfe
 file path=kernel/drv/$(ARCH64)/qfe group=sys
-legacy pkg=SUNWqfed arch=$(ARCH) category=system \
-    desc="Sun Quad FastEtherent PCI/SBus Adapter" \
-    hotline="Please contact your local service provider" \
-    name="Sun Quad FastEthernet Adapter Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWqfed desc="Sun Quad FastEtherent PCI/SBus Adapter" \
+    name="Sun Quad FastEthernet Adapter Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-qlc.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-qlc.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -83,11 +83,9 @@
 $(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2500 group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_6322 group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_8100 group=sys mode=0755
-legacy pkg=SUNWqlc arch=$(ARCH) category=system \
+legacy pkg=SUNWqlc \
     desc="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" \
-    hotline="Please contact your local service provider" \
-    name="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE \

--- a/usr/src/pkg/manifests/driver-network-ral.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ral.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,10 +42,7 @@
     perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/ral group=sys
 file path=kernel/drv/ral group=sys
-legacy pkg=SUNWralink arch=$(ARCH) category=system \
-    desc="Ralink RT2500 802.11b/g Wireless Driver" \
-    hotline="Please contact your local service provider" \
-    name="Ralink RT2500 802.11b/g Wireless Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWralink desc="Ralink RT2500 802.11b/g Wireless Driver" \
+    name="Ralink RT2500 802.11b/g Wireless Driver"
 license usr/src/uts/common/io/ral/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/ral/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-rds.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rds.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -49,10 +49,7 @@
 file path=kernel/drv/rds.conf group=sys
 $(i386_ONLY)file path=kernel/drv/rdsib group=sys
 file path=kernel/drv/rdsib.conf group=sys
-legacy pkg=SUNWrds arch=$(ARCH) category=system \
-    desc="Sun Reliable Datagram Sockets" \
-    hotline="Please contact your local service provider" \
-    name="Sun Reliable Datagram Sockets" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWrds desc="Sun Reliable Datagram Sockets" \
+    name="Sun Reliable Datagram Sockets"
 license usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-rge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -48,10 +48,7 @@
     alias=pciex10ec,8136
 file path=kernel/drv/$(ARCH64)/rge group=sys
 $(i386_ONLY)file path=kernel/drv/rge group=sys
-legacy pkg=SUNWrge arch=$(ARCH) category=system \
-    desc="Realtek Gigabit Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Realtek Gigabit Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWrge desc="Realtek Gigabit Ethernet Network Adapter Driver" \
+    name="Realtek Gigabit Ethernet Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-rpcib.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rpcib.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
 $(i386_ONLY)file path=kernel/drv/rpcib group=sys
 file path=kernel/drv/rpcib.conf group=sys \
     original_name=SUNWrpcib:kernel/drv/rpcib.conf preserve=true
-legacy pkg=SUNWrpcib arch=$(ARCH) category=system \
-    desc="InfiniBand plugin implementation of RPC over RDMA" \
-    hotline="Please contact your local service provider" \
-    name="InfiniBand plugin to RPC over RDMA" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWrpcib desc="InfiniBand plugin implementation of RPC over RDMA" \
+    name="InfiniBand plugin to RPC over RDMA"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-rtls.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rtls.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,9 +45,6 @@
     alias=pci1186,1301
 file path=kernel/drv/$(ARCH64)/rtls group=sys
 $(i386_ONLY)file path=kernel/drv/rtls group=sys
-legacy pkg=SUNWrtls arch=$(ARCH) category=system desc="RTL Fast NIC" \
-    hotline="Please contact your local service provider" \
-    name="REALTEK Fast NIC" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWrtls desc="RTL Fast NIC" name="REALTEK Fast NIC"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-rtw.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rtw.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,10 +42,7 @@
     perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/rtw group=sys
 file path=kernel/drv/rtw group=sys
-legacy pkg=SUNWrtw arch=$(ARCH) category=system \
-    desc="realtek 8180L 802.11b driver" \
-    hotline="Please contact your local service provider" \
-    name="realtek 8180L 802.11b driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWrtw desc="realtek 8180L 802.11b driver" \
+    name="realtek 8180L 802.11b driver"
 license usr/src/uts/common/io/rtw/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/rtw/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-rum.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rum.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -50,11 +50,9 @@
     alias=usbb05,1723
 file path=kernel/drv/$(ARCH64)/rum group=sys
 file path=kernel/drv/rum group=sys
-legacy pkg=SUNWrum arch=$(ARCH) category=system \
+legacy pkg=SUNWrum \
     desc="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" \
-    hotline="Please contact your local service provider" \
-    name="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/rum/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/rum/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-rwd.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rwd.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,8 @@
     perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/rwd group=sys
 file path=kernel/drv/rwd group=sys
-legacy pkg=SUNWrwd arch=$(ARCH) category=system \
+legacy pkg=SUNWrwd \
     desc="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" \
-    hotline="Please contact your local service provider" \
-    name="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device"
 license usr/src/uts/common/io/rwd/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/rwd/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-rwn.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rwn.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,11 +44,9 @@
     perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/rwn group=sys
 file path=kernel/drv/rwn group=sys
-legacy pkg=SUNWrwn arch=$(ARCH) category=system \
+legacy pkg=SUNWrwn \
     desc="Ralink RT2700/RT2800 IEEE802.11 a/b/g/n Wireless Network Device" \
-    hotline="Please contact your local service provider" \
-    name="Ralink RT2700/2800 IEEE802.11 a/b/g/n Wireless Network Device" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Ralink RT2700/2800 IEEE802.11 a/b/g/n Wireless Network Device"
 license usr/src/uts/common/io/rwn/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/rwn/THIRDPARTYLICENSE
 license usr/src/uts/common/io/rwn/fw-rt2860/LICENSE \

--- a/usr/src/pkg/manifests/driver-network-sdp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-sdp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -52,11 +52,8 @@
 file path=kernel/drv/sdp.conf group=sys
 file path=kernel/socketmod/$(ARCH64)/socksdp group=sys mode=0755
 $(i386_ONLY)file path=kernel/socketmod/socksdp group=sys mode=0755
-legacy pkg=SUNWibsdp arch=$(ARCH) category=system \
-    desc="Sun InfiniBand layered Sockets Direct Protocol" \
-    hotline="Please contact your local service provider" \
-    name="Sun InfiniBand layered Sockets Direct Protocol" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWibsdp desc="Sun InfiniBand layered Sockets Direct Protocol" \
+    name="Sun InfiniBand layered Sockets Direct Protocol"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-network-sdpib.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-sdpib.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,11 +47,8 @@
 hardlink path=kernel/strmod/$(ARCH64)/sdpib \
     target=../../../kernel/drv/$(ARCH64)/sdpib
 $(i386_ONLY)hardlink path=kernel/strmod/sdpib target=../../kernel/drv/sdpib
-legacy pkg=SUNWibsdpib arch=$(ARCH) category=system \
-    desc="Sun InfiniBand Sockets Direct Protocol" \
-    hotline="Please contact your local service provider" \
-    name="Sun InfiniBand Sockets Direct Protocol" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWibsdpib desc="Sun InfiniBand Sockets Direct Protocol" \
+    name="Sun InfiniBand Sockets Direct Protocol"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-network-sfe.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-sfe.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,7 @@
     alias=pci1039,900
 file path=kernel/drv/$(ARCH64)/sfe group=sys
 $(i386_ONLY)file path=kernel/drv/sfe group=sys
-legacy pkg=SUNWsfe arch=$(ARCH) category=system \
-    desc="SiS900 series Fast Ethernet Network Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="SiS900 Ethernet Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWsfe desc="SiS900 series Fast Ethernet Network Adapter Driver" \
+    name="SiS900 Ethernet Driver"
 license usr/src/uts/common/io/sfe/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/sfe/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-socal.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-socal.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -41,10 +41,7 @@
 dir path=kernel/drv/$(ARCH64) group=sys
 driver name=socal alias=SUNW,socal
 file path=kernel/drv/$(ARCH64)/socal group=sys
-legacy pkg=SUNWluxl arch=$(ARCH) category=system \
-    desc="Sun Enterprise Network Array socal Device Driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun Enterprise Network Array socal Device Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWluxl desc="Sun Enterprise Network Array socal Device Driver" \
+    name="Sun Enterprise Network Array socal Device Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-srpt.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-srpt.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -67,16 +67,10 @@
 file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/srpt.so group=sys mode=0555
 file path=usr/sbin/srptadm mode=0555
-legacy pkg=SUNWsrptr arch=$(ARCH) category=system \
-    desc="Sun SRP COMSTAR Port Provider (Root)" \
-    hotline="Please contact your local service provider" \
-    name="Sun SRP COMSTAR Port Provider (Root)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-legacy pkg=SUNWsrptu arch=$(ARCH) category=system \
-    desc="Sun SRP COMSTAR Port Provider utilities (Usr)" \
-    hotline="Please contact your local service provider" \
-    name="Sun SRP COMSTAR Port Provider utilities (Usr)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWsrptr desc="Sun SRP COMSTAR Port Provider (Root)" \
+    name="Sun SRP COMSTAR Port Provider (Root)"
+legacy pkg=SUNWsrptu desc="Sun SRP COMSTAR Port Provider utilities (Usr)" \
+    name="Sun SRP COMSTAR Port Provider utilities (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=usr/lib/$(ARCH64)/libsrpt.so target=libsrpt.so.1

--- a/usr/src/pkg/manifests/driver-network-tavor.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-tavor.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -48,10 +48,7 @@
 file path=kernel/drv/$(ARCH64)/tavor group=sys
 $(i386_ONLY)file path=kernel/drv/tavor group=sys
 file path=kernel/drv/tavor.conf group=sys
-legacy pkg=SUNWtavor arch=$(ARCH) category=system desc="Tavor HCA driver" \
-    hotline="Please contact your local service provider" \
-    name="Sun Tavor HCA driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWtavor desc="Tavor HCA driver" name="Sun Tavor HCA driver"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-network-uath.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-uath.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -51,11 +51,9 @@
 file path=kernel/drv/uath group=sys
 file path=kernel/misc/$(ARCH64)/uathfw group=sys mode=0755
 file path=kernel/misc/uathfw group=sys mode=0755
-legacy pkg=SUNWuath arch=$(ARCH) category=system \
+legacy pkg=SUNWuath \
     desc="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \
-    hotline="Please contact your local service provider" \
-    name="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver"
 license usr/src/uts/common/io/uath/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/uath/THIRDPARTYLICENSE
 license usr/src/uts/common/io/uath/uath_fw/LICENSE \

--- a/usr/src/pkg/manifests/driver-network-ural.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ural.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,11 +45,8 @@
     alias=usb411,67
 file path=kernel/drv/$(ARCH64)/ural group=sys
 file path=kernel/drv/ural group=sys
-legacy pkg=SUNWural arch=$(ARCH) category=system \
-    desc="Ralink RT2500USB 802.11b/g Wireless Driver" \
-    hotline="Please contact your local service provider" \
-    name="Ralink RT2500USB 802.11b/g Wireless Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWural desc="Ralink RT2500USB 802.11b/g Wireless Driver" \
+    name="Ralink RT2500USB 802.11b/g Wireless Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/ural/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/ural/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-urtw.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-urtw.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -54,11 +54,8 @@
     alias=usbdf6,28
 file path=kernel/drv/$(ARCH64)/urtw group=sys
 file path=kernel/drv/urtw group=sys
-legacy pkg=SUNWurtw arch=$(ARCH) category=system \
-    desc="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \
-    hotline="Please contact your local service provider" \
-    name="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWurtw desc="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \
+    name="RealTek RTL8187L/B USB 802.11b/g Wireless Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/urtw/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/urtw/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-vr.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-vr.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,7 @@
     alias=pci1106,3106
 file path=kernel/drv/$(ARCH64)/vr group=sys
 $(i386_ONLY)file path=kernel/drv/vr group=sys
-legacy pkg=SUNWvr arch=$(ARCH) category=system \
-    desc="VIA Rhine Fast Ethernet driver" \
-    hotline="Please contact your local service provider" \
-    name="VIA Rhine Fast Ethernet driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWvr desc="VIA Rhine Fast Ethernet driver" \
+    name="VIA Rhine Fast Ethernet driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-wpi.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-wpi.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -55,11 +55,8 @@
     alias=pciex8086,4227.8086.1014
 file path=kernel/drv/$(ARCH64)/wpi group=sys
 file path=kernel/drv/wpi group=sys
-legacy pkg=SUNWwpi arch=$(ARCH) category=system \
-    desc="Intel(R) PRO/Wireless 3945ABG driver" \
-    hotline="Please contact your local service provider" \
-    name="Intel(R) PRO/Wireless 3945ABG driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWwpi desc="Intel(R) PRO/Wireless 3945ABG driver" \
+    name="Intel(R) PRO/Wireless 3945ABG driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/wpi/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/wpi/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-xge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-xge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,10 +45,8 @@
     alias=pci17d5,5832
 file path=kernel/drv/$(ARCH64)/xge group=sys
 $(i386_ONLY)file path=kernel/drv/xge group=sys
-legacy pkg=SUNWxge arch=$(ARCH) category=system \
+legacy pkg=SUNWxge \
     desc="Neterion Xframe (I/II) 10 Gigabit Ethernet Adapter Driver" \
-    hotline="Please contact your local service provider" \
-    name="Xframe 10GE NIC Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="Xframe 10GE NIC Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-network-yge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-yge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -49,11 +49,8 @@
     alias=pciex11ab,436a
 file path=kernel/drv/$(ARCH64)/yge group=sys
 $(i386_ONLY)file path=kernel/drv/yge group=sys
-legacy pkg=SUNWyge arch=$(ARCH) category=system \
-    desc="Marvell Yukon 2 Gigabit Ethernet Controller Driver" \
-    hotline="Please contact your local service provider" \
-    name="Marvell Yukon 2 Gigabit Ethernet Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWyge desc="Marvell Yukon 2 Gigabit Ethernet Controller Driver" \
+    name="Marvell Yukon 2 Gigabit Ethernet Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/yge/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/yge/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-network-zyd.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-zyd.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,11 +43,8 @@
     alias=usbace,1211
 file path=kernel/drv/$(ARCH64)/zyd group=sys
 file path=kernel/drv/zyd group=sys
-legacy pkg=SUNWzyd arch=$(ARCH) category=system \
-    desc="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \
-    hotline="Please contact your local service provider" \
-    name="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWzyd desc="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \
+    name="ZyDAS ZD1211 USB 802.11b/g Wireless Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/zyd/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/zyd/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-pcmcia.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-pcmcia.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -48,10 +48,8 @@
 $(i386_ONLY)file path=kernel/drv/pcic group=sys
 file path=kernel/drv/pcic.conf group=sys
 $(i386_ONLY)file path=kernel/drv/pcs group=sys
-legacy pkg=SUNWpcmci arch=$(ARCH) category=system \
+legacy pkg=SUNWpcmci \
     desc="kernel modules and start-up files for PCMCIA card services" \
-    hotline="Please contact your local service provider" \
-    name="PCMCIA Card Services, (Root)" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+    name="PCMCIA Card Services, (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-serial-pcser.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-pcser.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -45,11 +45,8 @@
     alias=pccard102,5
 file path=kernel/drv/$(ARCH64)/pcser group=sys
 $(i386_ONLY)file path=kernel/drv/pcser group=sys
-legacy pkg=SUNWpcser arch=$(ARCH) category=system \
-    desc="PCMCIA serial card driver" \
-    hotline="Please contact your local service provider" \
-    name="PCMCIA serial card driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWpcser desc="PCMCIA serial card driver" \
+    name="PCMCIA serial card driver"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-serial-usbftdi.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbftdi.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -66,10 +66,7 @@
 $(i386_ONLY)file path=kernel/drv/usbftdi group=sys
 file path=kernel/drv/usbftdi.conf group=sys \
     original_name=SUNWuftdi:kernel/drv/usbftdi.conf preserve=true
-legacy pkg=SUNWuftdi arch=$(ARCH) category=system \
-    desc="FTDI FT232R USB serial driver" \
-    hotline="Please contact your local service provider" \
-    name="FT232R USB UART" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWuftdi desc="FTDI FT232R USB serial driver" \
+    name="FT232R USB UART"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-serial-usbsacm.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbsacm.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
     alias=usbif,class2.2
 file path=kernel/drv/$(ARCH64)/usbsacm group=sys
 $(i386_ONLY)file path=kernel/drv/usbsacm group=sys
-legacy pkg=SUNWuacm arch=$(ARCH) category=system \
-    desc="CDC ACM USB-to-serial driver" \
-    hotline="Please contact your local service provider" \
-    name="CDC ACM USB-to-serial driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWuacm desc="CDC ACM USB-to-serial driver" \
+    name="CDC ACM USB-to-serial driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-serial-usbser.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbser.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -40,10 +40,7 @@
 dir path=kernel/misc/$(ARCH64) group=sys
 file path=kernel/misc/$(ARCH64)/usbser group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/usbser group=sys mode=0755
-legacy pkg=SUNWusbs arch=$(ARCH) category=system \
-    desc="USB generic serial module" \
-    hotline="Please contact your local service provider" \
-    name="USB generic serial module" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWusbs desc="USB generic serial module" \
+    name="USB generic serial module"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -73,11 +73,8 @@
 $(i386_ONLY)file path=kernel/drv/usbser_edge group=sys
 file path=kernel/drv/usbser_edge.conf group=sys \
     original_name=SUNWuedg:kernel/drv/usbser_edge.conf preserve=true
-legacy pkg=SUNWuedg arch=$(ARCH) category=system \
-    desc="USB Digi Edgeport serial driver" \
-    hotline="Please contact your local service provider" \
-    name="USB Digi Edgeport serial driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWuedg desc="USB Digi Edgeport serial driver" \
+    name="USB Digi Edgeport serial driver"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,7 @@
     original_name=SUNWukspfw:kernel/misc/$(ARCH64)/usbs49_fw preserve=true
 $(i386_ONLY)file path=kernel/misc/usbs49_fw group=sys mode=0755 \
     original_name=SUNWukspfw:kernel/misc/usbs49_fw preserve=true
-legacy pkg=SUNWukspfw arch=$(ARCH) category=system \
-    desc="USA49WLC firmware for USB Keyspan serial driver" \
-    hotline="Please contact your local service provider" \
-    name="USA49WLC firmware for USB Keyspan serial driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWukspfw desc="USA49WLC firmware for USB Keyspan serial driver" \
+    name="USA49WLC firmware for USB Keyspan serial driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-serial-usbsksp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -44,10 +44,7 @@
     alias=usb6cd,131
 file path=kernel/drv/$(ARCH64)/usbsksp group=sys
 $(i386_ONLY)file path=kernel/drv/usbsksp group=sys
-legacy pkg=SUNWuksp arch=$(ARCH) category=system \
-    desc="USB Keyspan serial driver" \
-    hotline="Please contact your local service provider" \
-    name="USB Keyspan serial driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWuksp desc="USB Keyspan serial driver" \
+    name="USB Keyspan serial driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-serial-usbsprl.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-serial-usbsprl.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -46,10 +46,7 @@
     alias=usb67b,aaa2
 file path=kernel/drv/$(ARCH64)/usbsprl group=sys
 $(i386_ONLY)file path=kernel/drv/usbsprl group=sys
-legacy pkg=SUNWuprl arch=$(ARCH) category=system \
-    desc="Prolific PL2303 USB-to-serial driver" \
-    hotline="Please contact your local service provider" \
-    name="Prolific PL2303 USB-to-serial driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWuprl desc="Prolific PL2303 USB-to-serial driver" \
+    name="Prolific PL2303 USB-to-serial driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-sparc-platform.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-sparc-platform.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -67,9 +67,7 @@
 file path=kernel/drv/$(ARCH64)/se group=sys
 file path=kernel/drv/ecpp.conf group=sys
 file path=kernel/drv/mpt.conf group=sys preserve=true
-legacy pkg=SUNWpd arch=$(ARCH) category=system desc="Drivers for the PCI bus" \
-    hotline="Please contact your local service provider" name="PCI Drivers" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWpd desc="Drivers for the PCI bus" name="PCI Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-storage-aac.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-aac.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -49,11 +49,8 @@
 $(i386_ONLY)file path=kernel/drv/aac group=sys
 file path=kernel/drv/aac.conf group=sys \
     original_name=SUNWaac:kernel/drv/aac.conf preserve=true
-legacy pkg=SUNWaac arch=$(ARCH) category=system \
-    desc="Adaptec AdvanceRaid Controller SCSI HBA Driver" \
-    hotline="Please contact your local service provider" \
-    name="Adaptec AdvanceRaid Controller SCSI HBA Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWaac desc="Adaptec AdvanceRaid Controller SCSI HBA Driver" \
+    name="Adaptec AdvanceRaid Controller SCSI HBA Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/common/io/aac/THIRDPARTYLICENSE \
     license=usr/src/uts/common/io/aac/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-storage-adpu320.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-adpu320.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -54,11 +54,8 @@
 file path=kernel/drv/$(ARCH64)/adpu320 group=sys
 file path=kernel/drv/adpu320 group=sys
 file path=kernel/drv/adpu320.conf group=sys
-legacy pkg=SUNWadpu320 arch=$(ARCH) category=system \
-    desc="Adaptec 7902 SCSI Driver" \
-    hotline="Please contact your local service provider" \
-    name="Adaptec Ultra320 Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWadpu320 desc="Adaptec 7902 SCSI Driver" \
+    name="Adaptec Ultra320 Driver"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-storage-ahci.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-ahci.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,8 @@
     perms="* 0644 root sys"
 file path=kernel/drv/$(ARCH64)/ahci group=sys
 file path=kernel/drv/ahci group=sys
-legacy pkg=SUNWahci arch=$(ARCH) category=system \
+legacy pkg=SUNWahci \
     desc="Advanced Host Controller Interface (AHCI) SATA HBA Driver" \
-    hotline="Please contact your local service provider" \
-    name="Advanced Host Controller Interface (AHCI) SATA HBA Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Advanced Host Controller Interface (AHCI) SATA HBA Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-storage-amr.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-amr.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -47,11 +47,8 @@
 file path=kernel/drv/$(ARCH64)/amr group=sys
 file path=kernel/drv/amr group=sys
 file path=kernel/drv/amr.conf group=sys
-legacy pkg=SUNWamr arch=$(ARCH) category=system \
-    desc="LSI MegaRAID SCSI HBA Driver" \
-    hotline="Please contact your local service provider" \
-    name="LSI MegaRAID SCSI HBA Driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWamr desc="LSI MegaRAID SCSI HBA Driver" \
+    name="LSI MegaRAID SCSI HBA Driver"
 license cr_Sun license=cr_Sun
 license usr/src/uts/intel/io/amr/THIRDPARTYLICENSE \
     license=usr/src/uts/intel/io/amr/THIRDPARTYLICENSE

--- a/usr/src/pkg/manifests/driver-storage-arcmsr.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-arcmsr.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -58,9 +58,7 @@
 file path=kernel/drv/$(ARCH64)/arcmsr group=sys
 file path=kernel/drv/arcmsr group=sys
 file path=kernel/drv/arcmsr.conf group=sys
-legacy pkg=SUNWarcmsr arch=$(ARCH) category=system desc="SAS/SATA RAID driver" \
-    hotline="Please contact your local service provider" \
-    name="Areca SAS/SATA RAID driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWarcmsr desc="SAS/SATA RAID driver" \
+    name="Areca SAS/SATA RAID driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-storage-ata.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-ata.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -59,10 +59,7 @@
 file path=platform/i86xpv/kernel/drv/$(ARCH64)/pci-ide group=sys
 file path=platform/i86xpv/kernel/drv/pci-ide group=sys
 file path=platform/i86xpv/kernel/drv/pci-ide.conf group=sys
-legacy pkg=SUNWpsdir arch=$(ARCH) category=system \
-    desc="Platform Support, ISA Bus Device Drivers, (Root)" \
-    hotline="Please contact your local service provider" \
-    name="Platform Support, ISA Bus Device Drivers, (Root)" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWpsdir desc="Platform Support, ISA Bus Device Drivers, (Root)" \
+    name="Platform Support, ISA Bus Device Drivers, (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,11 +42,8 @@
     perms="* 0644 root sys"
 file path=kernel/drv/$(ARCH64)/bcm_sata group=sys
 file path=kernel/drv/bcm_sata group=sys
-legacy pkg=SUNWbcmsata arch=$(ARCH) category=system \
-    desc="BroadCom ht1000 sata driver" \
-    hotline="Please contact your local service provider" \
-    name="BroadCom ht1000 sata driver" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWbcmsata desc="BroadCom ht1000 sata driver" \
+    name="BroadCom ht1000 sata driver"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble

--- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-cpqary3.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -67,10 +67,7 @@
 file path=kernel/drv/$(ARCH64)/cpqary3 group=sys
 file path=kernel/drv/cpqary3 group=sys
 file path=kernel/drv/cpqary3.conf group=sys
-legacy pkg=CPQary3 arch=$(ARCH) category=system \
-    desc="HP Smart Array HBA Driver 2.2.0.1" \
-    hotline="Please contact your local service provider" \
-    name="HP Smart Array HBA Driver 2.2.0.1" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=CPQary3 desc="HP Smart Array HBA Driver 2.2.0.1" \
+    name="HP Smart Array HBA Driver 2.2.0.1"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -38,10 +38,7 @@
 file path=usr/include/sys/scsi/adapters/fasdma.h
 file path=usr/include/sys/scsi/adapters/fasreg.h
 file path=usr/include/sys/scsi/adapters/fasvar.h
-legacy pkg=SUNWhmdu arch=$(ARCH) category=system \
-    desc="SunSwift Adapter Headers" \
-    hotline="Please contact your local service provider" \
-    name="SunSwift Adapter Headers" vendor="Sun Microsystems, Inc." \
-    version=11.11,REV=2009.11.11
+legacy pkg=SUNWhmdu desc="SunSwift Adapter Headers" \
+    name="SunSwift Adapter Headers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL

--- a/usr/src/pkg/manifests/driver-storage-glm.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-glm.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -42,9 +42,7 @@
 file path=kernel/drv/$(ARCH64)/glm group=sys
 file path=kernel/drv/glm group=sys
 file path=kernel/drv/glm.conf group=sys
-legacy pkg=SUNWpd arch=$(ARCH) category=system desc="Drivers for the PCI bus" \
-    hotline="Please contact your local service provider" name="PCI Drivers" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+legacy pkg=SUNWpd desc="Drivers for the PCI bus" name="PCI Drivers"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license lic_OSBL license=lic_OSBL

--- a/usr/src/pkg/manifests/driver-storage-ifp.mf	Tue Aug 10 10:17:01 2010 -0600
+++ b/usr/src/pkg/manifests/driver-storage-ifp.mf	Tue Aug 10 17:50:55 2010 +0100
@@ -43,10 +43,8 @@
 driver name=ifp alias=pci1077,2100 perms="* 0600 root sys"
 file path=kernel/drv/$(ARCH64)/ifp group=sys
 file path=kernel/drv/ifp.conf group=sys
-legacy pkg=SUNWifp arch=$(ARCH) category=system \
+legacy pkg=SUNWifp \
     desc="Sun FC-AL Device Driver For QLogic Fibre Channel Family" \
-    hotline="Please contact your local service provider" \
-    name="Sun Fibre Channel Arbitrated Loop Device Driver" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
+    name="Sun Fibre Channel Arbitrated Loop Device Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL