--- a/usr/src/pkg/Makefile	Thu May 17 14:56:25 2012 -0400
+++ b/usr/src/pkg/Makefile	Fri May 18 01:37:59 2012 -0400
@@ -126,8 +126,6 @@
 SCRATCH_wos = build_wos
 SCRATCH = $(SCRATCH_$(TYPE))
 
-INCORP = consolidation-vpanels-vpanels-incorporation
-
 DYNAMIC_MANIFEST_normal = system-management-visual-panels-doc.p5m
 DYNAMIC_MANIFEST = $(DYNAMIC_MANIFEST_$(TYPE))
 
@@ -145,7 +143,7 @@
 MOGS = $(MANIFESTS:%.p5m=$(SCRATCH)/%.mog)
 DEPS = $(MANIFESTS:%.p5m=$(SCRATCH)/%.dep)
 RESS = $(MANIFESTS:%.p5m=$(SCRATCH)/%.dep.res)
-FINALS = $(SCRATCH)/$(INCORP).final $(MANIFESTS:%.p5m=$(SCRATCH)/%.final)
+FINALS = $(MANIFESTS:%.p5m=$(SCRATCH)/%.final)
 
 TRANSFORMS = \
 	common_actions \
@@ -218,17 +216,6 @@
 $(SCRATCH)/%.final: $(SCRATCH)/%.dep.res
 	$(PKGMOGRIFY) -I transforms strip_versions $(<) > $(@)
 
-#
-# Step 5b
-# Rule for generating incorporation for final publishing
-#
-
-$(SCRATCH)/$(INCORP).final: $(SCRATCH) $(INCORP).p5m transforms/incorp transforms/incorp2 $(RMANIFESTS)
-	$(PKGMOGRIFY) -I transforms incorp2 $(INCORP).p5m | \
-	$(PKGMOGRIFY) $(PKGMOG_DEFINES:%=-D %) -D DEPTYPE=incorporate \
-	-I transforms $(MDIRS:%=-I %) -O $(@) /dev/stdin incorp $(MANIFESTS)
-
-
 $(SCRATCH):
 	mkdir -p $(SCRATCH)
 

--- a/usr/src/pkg/consolidation-vpanels-vpanels-incorporation.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/consolidation/vpanels/vpanels-incorporation@$(PKGVERS)
-set name=pkg.summary value="Visual Panels consolidation incorporation"
-set name=pkg.description value="This incorporation constrains packages from the Visual Panels consolidation."
-set name=pkg.depend.install-hold value=core-os.vpanels
-set name=variant.arch value=$(ARCH)

--- a/usr/src/pkg/manifests/developer-opensolaris-vpanels.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/developer/opensolaris/vpanels@$(PKGVERS)
-set name=pkg.summary value="Dependencies required to build the Visual Panels Consolidation"
-set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=variant.arch value=$(ARCH)
-
-depend fmri=pkg:/runtime/java/jre-6 type=require
-depend fmri=pkg:/developer/java/jdk-6 type=require

--- a/usr/src/pkg/manifests/library-python-2-python-kstat.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/library/python-2/python-kstat@$(PKGVERS)
-set name=pkg.summary value="python kstat bindings"
-set name=pkg.description value="python kstat bindings"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/kstat
-file path=usr/lib/python2.6/vendor-packages/kstat/__init__.py
-file path=usr/lib/python2.6/vendor-packages/kstat/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/kstat/rad.py
-file path=usr/lib/python2.6/vendor-packages/kstat/rad.pyc
-depend fmri=pkg:/runtime/python-26 type=require
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
-depend fmri=pkg:/system/management/rad/module/rad-kstat@$(PKGVERS) type=require
-depend fmri=pkg:/system/management/rad/client/rad-python@$(PKGVERS) type=require

--- a/usr/src/pkg/manifests/library-python-2-python-smf.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/library/python-2/python-smf@$(PKGVERS)
-set name=pkg.summary value="python smf bindings"
-set name=pkg.description value="python smf bindings"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/smf
-file path=usr/lib/python2.6/vendor-packages/smf/__init__.py
-file path=usr/lib/python2.6/vendor-packages/smf/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/smf/rad.py
-file path=usr/lib/python2.6/vendor-packages/smf/rad.pyc
-file path=usr/lib/python2.6/vendor-packages/smf/fmri.py
-file path=usr/lib/python2.6/vendor-packages/smf/fmri.pyc
-depend fmri=pkg:/runtime/python-26 type=require
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
-depend fmri=pkg:/system/management/rad/module/rad-smf@$(PKGVERS) type=require
-depend fmri=pkg:/system/management/rad/client/rad-python@$(PKGVERS) type=require

--- a/usr/src/pkg/manifests/system-management-rad-client-rad-java.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/client/rad-java@$(PKGVERS)
-set name=pkg.summary value="rad JMX client"
-set name=pkg.description value="rad JMX client"
-set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-file path=usr/lib/libUnixDomainSocket_jni.so.1
-link path=usr/lib/libjniutil.so target=libjniutil.so.1 facet.devel=true
-file path=usr/lib/libjniutil.so.1
-dir path=usr/lib/rad
-dir path=usr/lib/rad/java
-file path=usr/lib/rad/java/rad.jar
-file path=usr/lib/rad/java/afunix.jar
-
-# Needed for adr.jar
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
-depend fmri=pkg:/runtime/java/jre-6 type=require

--- a/usr/src/pkg/manifests/system-management-rad-client-rad-python.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/client/rad-python@$(PKGVERS)
-set name=pkg.summary value="rad python client"
-set name=pkg.description value="rad python client"
-set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/rad
-file path=usr/lib/python2.6/vendor-packages/rad/__init__.py
-file path=usr/lib/python2.6/vendor-packages/rad/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/rad/client.py
-file path=usr/lib/python2.6/vendor-packages/rad/client.pyc
-file path=usr/lib/python2.6/vendor-packages/rad/recordmarking.py
-file path=usr/lib/python2.6/vendor-packages/rad/recordmarking.pyc
-file path=usr/lib/python2.6/vendor-packages/rad/util.py
-file path=usr/lib/python2.6/vendor-packages/rad/util.pyc
-depend fmri=pkg:/runtime/python-26 type=require

--- a/usr/src/pkg/manifests/system-management-rad-module-rad-kstat.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/module/rad-kstat@$(PKGVERS)
-set name=pkg.summary value="rad kstat module"
-set name=pkg.description value="rad kstat module"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-dir path=usr/lib/rad
-dir path=usr/lib/rad/module
-file path=usr/lib/rad/module/mod_kstat.so
-dir path=usr/share group=sys facet.devel=true
-dir path=usr/share/man facet.devel=true
-dir path=usr/share/man/man3rad facet.devel=true
-file path=usr/share/man/man3rad/kstat.3rad facet.devel=true
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require

--- a/usr/src/pkg/manifests/system-management-rad-module-rad-smf.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/module/rad-smf@$(PKGVERS)
-set name=pkg.summary value="rad SMF module"
-set name=pkg.description value="rad SMF module"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-dir path=usr/lib/rad
-dir path=usr/lib/rad/java
-file path=usr/lib/rad/java/smf.jar
-dir path=usr/lib/rad/module
-file path=usr/lib/rad/module/mod_smf.so
-dir path=usr/share group=sys facet.devel=true
-dir path=usr/share/man facet.devel=true
-dir path=usr/share/man/man3rad facet.devel=true
-file path=usr/share/man/man3rad/smf.3rad facet.devel=true
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require

--- a/usr/src/pkg/manifests/system-management-rad-module-rad-usermgr.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/module/rad-usermgr@$(PKGVERS)
-set name=pkg.summary value="rad UserMgr module"
-set name=pkg.description value="rad UserMgr module"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/lib
-dir path=usr/lib/rad
-dir path=usr/lib/rad/java
-dir path=usr/lib/rad/module
-file path=usr/lib/rad/module/mod_usermgr.so
-dir path=usr/share group=sys
-#file path=usr/lib/rad/apis/usermgr.xml
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require

--- a/usr/src/pkg/manifests/system-management-rad.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad@$(PKGVERS)
-set name=pkg.summary value="RAD - Remote Administration Daemon"
-set name=pkg.description value="RAD - Remote Administration Daemon"
-set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=variant.arch value=$(ARCH)
-dir path=etc group=sys
-dir path=etc/rad
-dir path=etc/security group=sys
-dir path=etc/security/auth_attr.d group=sys
-file path=etc/security/auth_attr.d/system-management-rad group=sys
-dir path=etc/security/prof_attr.d group=sys
-file path=etc/security/prof_attr.d/system-management-rad group=sys
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/system group=sys
-file path=lib/svc/manifest/system/rad.xml group=sys
-dir path=usr group=sys
-dir path=usr/bin facet.devel=true
-file path=usr/bin/radadrgen mode=0555 facet.devel=true
-dir path=usr/include facet.devel=true
-dir path=usr/include/rad facet.devel=true
-file path=usr/include/rad/adr.h facet.devel=true
-file path=usr/include/rad/adr_name.h facet.devel=true
-file path=usr/include/rad/adr_object.h facet.devel=true
-file path=usr/include/rad/adr_stream.h facet.devel=true
-file path=usr/include/rad/rad_modapi.h facet.devel=true
-file path=usr/include/rad/radclient.h facet.devel=true
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-link path=usr/lib/$(ARCH64)/libadr.so target=libadr.so.1 facet.devel=true
-file path=usr/lib/$(ARCH64)/libadr.so.1
-link path=usr/lib/$(ARCH64)/libradproto.so target=libradproto.so.1 facet.devel=true
-file path=usr/lib/$(ARCH64)/libradproto.so.1
-file path=usr/lib/$(ARCH64)/llib-ladr.ln facet.devel=true
-file path=usr/lib/$(ARCH64)/llib-lradproto.ln facet.devel=true
-dir path=usr/lib/help
-dir path=usr/lib/help/auths
-dir path=usr/lib/help/auths/locale
-dir path=usr/lib/help/auths/locale/C
-file path=usr/lib/help/auths/locale/C/RadManage.html
-file path=usr/lib/help/auths/locale/C/RadValue.html
-dir path=usr/lib/help/profiles
-dir path=usr/lib/help/profiles/locale
-dir path=usr/lib/help/profiles/locale/C
-file path=usr/lib/help/profiles/locale/C/RtRadConfiguration.html
-file path=usr/lib/help/profiles/locale/C/RtRadManagement.html
-link path=usr/lib/libadr.so target=libadr.so.1 facet.devel=true
-file path=usr/lib/libadr.so.1
-link path=usr/lib/libradproto.so target=libradproto.so.1 facet.devel=true
-file path=usr/lib/libradproto.so.1
-file path=usr/lib/llib-ladr facet.devel=true
-file path=usr/lib/llib-ladr.ln facet.devel=true
-file path=usr/lib/llib-lradproto facet.devel=true
-file path=usr/lib/llib-lradproto.ln facet.devel=true
-dir path=usr/lib/mdb group=sys
-dir path=usr/lib/mdb/proc group=sys
-file path=usr/lib/mdb/proc/$(ARCH64)/libadr.so
-file path=usr/lib/mdb/proc/libadr.so
-file path=usr/lib/mdb/proc/rad.so
-dir path=usr/lib/rad
-dir path=usr/lib/rad/java
-file path=usr/lib/rad/java/adr.jar
-dir path=usr/lib/rad/module
-file path=usr/lib/rad/module/mod_zonesbridge.so
-dir path=usr/lib/rad/protocol
-file path=usr/lib/rad/protocol/mod_proto_rad.so
-file path=usr/lib/rad/rad mode=0555
-file path=usr/lib/rad/radconsole mode=0555 facet.devel=true
-file path=usr/lib/rad/radpipe mode=0555
-dir path=usr/lib/rad/site-modules
-dir path=usr/lib/rad/transport
-file path=usr/lib/rad/transport/mod_xport_pipe.so
-file path=usr/lib/rad/transport/mod_xport_tcp.so
-file path=usr/lib/rad/transport/mod_xport_tls.so
-file path=usr/lib/rad/transport/mod_xport_unix.so
-dir path=usr/share group=sys
-dir path=usr/share/lib group=sys facet.devel=true
-dir path=usr/share/lib/xml group=sys facet.devel=true
-dir path=usr/share/lib/xml/rng group=sys facet.devel=true
-file path=usr/share/lib/xml/rng/radadr-doc.rng.1 facet.devel=true
-file path=usr/share/lib/xml/rng/radadr.rng.1 facet.devel=true
-dir path=usr/share/lib/xml/style group=sys facet.devel=true
-dir path=usr/share/lib/xml/style/locale group=sys facet.devel=true
-file path=usr/share/lib/xml/style/locale.xsl facet.devel=true
-file path=usr/share/lib/xml/style/locale/radadr-strings.xml facet.devel=true
-file path=usr/share/lib/xml/style/radadr-docbook-common.xsl facet.devel=true
-file path=usr/share/lib/xml/style/radadr-docbook-man.xsl facet.devel=true
-file path=usr/share/lib/xml/style/radadr-docbook.xsl facet.devel=true
-file path=usr/share/lib/xml/style/radadr-rmdoc.xsl facet.devel=true
-dir path=usr/share/man
-dir path=usr/share/man/man1 facet.devel=true
-file path=usr/share/man/man1/radadrgen.1 facet.devel=true
-dir path=usr/share/man/man1m facet.doc.man=true
-file path=usr/share/man/man1m/rad.1m facet.doc.man=true
-dir path=usr/share/man/man3rad facet.devel=true
-file path=usr/share/man/man3rad/zonesbridge.3rad facet.devel=true
-depend fmri=pkg:/runtime/java/jre-6 type=require facet.devel=true
-depend fmri=pkg:/library/libxml2 type=require
-depend fmri=pkg:/data/docbook/docbook-style-xsl type=require facet.devel=true
-depend fmri=pkg:/data/docbook/docbook-dtds type=require facet.devel=true

--- a/usr/src/pkg/manifests/system-management-visual-panels-core.p5m	Thu May 17 14:56:25 2012 -0400
+++ b/usr/src/pkg/manifests/system-management-visual-panels-core.p5m	Fri May 18 01:37:59 2012 -0400
@@ -61,9 +61,9 @@
 file path=usr/share/vpanels/vpanels-client.jar
 file path=usr/share/vpanels/vpanels-panel.jar
 file path=usr/share/vpanels/vpanels-util.jar
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
-depend fmri=pkg:/system/management/rad/module/rad-smf@$(PKGVERS) type=require
-depend fmri=pkg:/system/management/rad/client/rad-java@$(PKGVERS) type=require
+depend fmri=pkg:/system/management/rad type=require
+depend fmri=pkg:/system/management/rad/module/rad-smf type=require
+depend fmri=pkg:/system/management/rad/client/rad-java type=require
 depend fmri=pkg:/library/java/javahelp type=require
 depend fmri=pkg:/runtime/java type=require
 depend fmri=pkg:/file/gnu-findutils type=require

--- a/usr/src/pkg/manifests_dev/system-management-rad-module-rad-pkg.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/module/rad-pkg@$(PKGVERS)
-set name=pkg.summary value="rad pkg(5) configuration module"
-set name=pkg.description value="rad pkg(5) configuration module"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
-set name=variant.arch value=$(ARCH)
-dir path=usr/lib
-dir path=usr/lib/rad
-dir path=usr/lib/rad/module
-file path=usr/lib/rad/module/mod_pkg.so
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/pkg_rad
-file path=usr/lib/python2.6/vendor-packages/pkg_rad/__init__.py
-file path=usr/lib/python2.6/vendor-packages/pkg_rad/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/pkg_rad/radpkg_glue.py
-file path=usr/lib/python2.6/vendor-packages/pkg_rad/radpkg_glue.pyc
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require

--- a/usr/src/pkg/manifests_dev/system-management-rad-module-rad-zones.p5m	Thu May 17 14:56:25 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-license cr_Oracle license=cr_Oracle
-set name=pkg.fmri value=pkg:/system/management/rad/module/rad-zones@$(PKGVERS)
-set name=pkg.summary value="zones configuration module"
-set name=pkg.description value="zones configuration module"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/bin
-#file path=usr/bin/zmgr mode=0555
-dir path=usr/lib
-dir path=usr/lib/rad
-dir path=usr/lib/rad/module
-#file path=usr/lib/rad/module/mod_zones.so
-depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require