Mercurial Mercurial > upstream > oracle > pkg-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
15551 add solaris/network/netcat to 'slim_install' and 'server_install' clusters in174
authordavid.comay@oracle.com
Mon, 19 Sep 2011 02:03:09 -0700
changeset 2559 244beb5c12be
parent 2558 5903fa459c85
child 2560 ab360da5d89e
15551 add solaris/network/netcat to 'slim_install' and 'server_install' clusters 18709 obsolete/renamed packages no longer included in ips-incorporation 18804 solaris-desktop no longers needs input method package iiim 18907 system/locale not installed to non-global zone by default 18923 importer.py should create "entire" with facet.version-lock attributes 18925 SUNWcedu and SUNWproduct-registry-root are not properly obsoleted 18926 Time for "redistributable" to no longer be distributed 18929 resync repository to snv_174
src/pkg/manifests/amp.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/auto_install.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/babel_install.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/developer:gnu.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/gcc-dev.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:feature:amp.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:feature:developer-gnu.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:feature:multi-user-desktop.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:feature:trusted-desktop.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:system:solaris-auto-install.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:system:solaris-desktop.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:system:solaris-large-server.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/group:system:solaris-small-server.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/package:pkg.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/server_install.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/slim_install.p5m file | annotate | diff | comparison | revisions
src/pkg/manifests/web:amp.p5m file | annotate | diff | comparison | revisions
src/pkg/transforms/incorp file | annotate | diff | comparison | revisions
src/util/distro-import/174.0.0.0.0.0/common/Redistributable file | annotate | diff | comparison | revisions
src/util/distro-import/174.0.0.0.0.0/common/driver:network:ce file | annotate | diff | comparison | revisions
src/util/distro-import/174.0.0.0.0.0/common/system:management:product-registry file | annotate | diff | comparison | revisions
src/util/distro-import/174.0.0.0.0.0/redist_cluster file | annotate | diff | comparison | revisions
src/util/distro-import/Makefile file | annotate | diff | comparison | revisions
src/util/distro-import/importer.py file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/amp.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=nopublish.after value=133
+depend type=require fmri=web/[email protected]
--- a/src/pkg/manifests/auto_install.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/auto_install.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -24,6 +24,12 @@
 #
 
 set name=pkg.fmri value=pkg:/[email protected],5.11-0.166
+#
+# These old-style "renamed" group packages purposely lack
+# info.classification and pkg.summary set actions.
+#
+set name=pkg.linted.opensolaris.manifest001.1 value=true
+set name=pkg.linted.opensolaris.manifest001.2 value=true
 set name=nopublish.after value=166
 set name=variant.arch value=$(ARCH)
 depend type=require fmri=group/system/solaris-auto-install
--- a/src/pkg/manifests/babel_install.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/babel_install.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -24,6 +24,12 @@
 #
 
 set name=pkg.fmri value=pkg:/[email protected],5.11-0.166
+#
+# These old-style "renamed" group packages purposely lack
+# info.classification and pkg.summary set actions.
+#
+set name=pkg.linted.opensolaris.manifest001.1 value=true
+set name=pkg.linted.opensolaris.manifest001.2 value=true
 set name=nopublish.after value=166
 set name=variant.arch value=$(ARCH)
 depend type=require fmri=slim_install
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/developer:gnu.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+set name=pkg.fmri value=pkg:/developer/[email protected],5.11-0.174.0.0.0.0.0
+set name=pkg.renamed value=true
+set name=nopublish.after value=174
+depend type=require fmri=group/feature/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/gcc-dev.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=nopublish.after value=133
+depend type=require fmri=developer/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/group:feature:amp.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,42 @@
+#
+# 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.
+#
+
+set name=pkg.fmri value=pkg:/group/feature/amp@$(PKGVERS)
+set name=pkg.summary \
+    value="AMP (Apache, MySQL, PHP) Deployment Kit for Oracle Solaris"
+set name=pkg.description \
+    value="Provides a set of components for deployment of an AMP (Apache, MySQL, PHP) stack on Oracle Solaris"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Meta Packages/Group Packages" \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=variant.arch value=$(ARCH)
+depend type=group fmri=database/mysql-51
+depend type=group fmri=web/php-52
+depend type=group fmri=web/php-52/extension/php-apc
+depend type=group fmri=web/php-52/extension/php-mysql
+depend type=group fmri=web/server/apache-22
+depend type=group fmri=web/server/apache-22/module/apache-dtrace
+depend type=group fmri=web/server/apache-22/module/apache-fcgid
+depend type=group fmri=web/server/apache-22/module/apache-php5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/group:feature:developer-gnu.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,56 @@
+#
+# 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.
+#
+
+set name=pkg.fmri value=pkg:/group/feature/developer-gnu@$(PKGVERS)
+set name=pkg.summary value="GNU Development Tools for Oracle Solaris"
+set name=pkg.description \
+    value="Provides a set of GNU tools for developing C, C++, Fortran and Objective C programs on Oracle Solaris"
+set name=info.classification value=org.opensolaris.category.2008:Development/C \
+    value=org.opensolaris.category.2008:Development/C++ \
+    value=org.opensolaris.category.2008:Development/Fortran \
+    value=org.opensolaris.category.2008:Development/GNU \
+    value="org.opensolaris.category.2008:Development/Objective C" \
+    value=org.opensolaris.category.2008:Development/Suites \
+    value="org.opensolaris.category.2008:Meta Packages/Group Packages"
+set name=variant.arch value=$(ARCH)
+depend type=group fmri=developer/build/autoconf
+depend type=group fmri=developer/build/automake-110
+depend type=group fmri=developer/build/automake-19
+depend type=group fmri=developer/build/gnu-make
+depend type=group fmri=developer/build/libtool
+depend type=group fmri=developer/build/make
+depend type=group fmri=developer/debug/gdb
+depend type=group fmri=developer/gcc-45
+depend type=group fmri=developer/gnu-binutils
+depend type=group fmri=developer/lexer/flex
+depend type=group fmri=developer/macro/gnu-m4
+depend type=group fmri=developer/parser/bison
+depend type=group fmri=developer/versioning/cvs
+depend type=group fmri=developer/versioning/git
+depend type=group fmri=developer/versioning/mercurial
+depend type=group fmri=developer/versioning/sccs
+depend type=group fmri=developer/versioning/subversion
+depend type=group fmri=system/header
+depend type=group fmri=system/library/gcc-45-runtime
--- a/src/pkg/manifests/group:feature:multi-user-desktop.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/group:feature:multi-user-desktop.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -31,18 +31,15 @@
     value="org.opensolaris.category.2008:Meta Packages/Group Packages"
 set name=variant.arch value=$(ARCH)
 depend type=group fmri=audio/audio-utilities
-depend type=group fmri=benchmark/x11perf
+depend type=group fmri=cde/cde-runtime
 depend type=group fmri=codec/flac
 depend type=group fmri=codec/libtheora
 depend type=group fmri=codec/ogg-vorbis
 depend type=group fmri=codec/speex
 depend type=group fmri=communication/im/pidgin
-depend type=group fmri=crypto/gnupg
-depend type=group fmri=data/sgml-common
 depend type=group fmri=desktop/administration/nwam-manager
 depend type=group fmri=desktop/archive-manager/file-roller
 depend type=group fmri=desktop/calculator/gcalctool
-depend type=group fmri=desktop/cd-burning/brasero
 depend type=group fmri=desktop/character-map/gucharmap
 depend type=group fmri=desktop/gksu
 depend type=group fmri=desktop/pdf-viewer/evince
@@ -50,20 +47,13 @@
 depend type=group fmri=desktop/remote-desktop/tigervnc
 depend type=group fmri=desktop/system-monitor/gnome-system-monitor
 depend type=group fmri=desktop/time-slider
-depend type=group fmri=desktop/time-tracking/hamster
 depend type=group fmri=desktop/window-manager/twm
 depend type=group fmri=desktop/xdg/menu-editor/alacarte
 depend type=group fmri=desktop/xdg/xdg-user-dirs-gtk
 depend type=group fmri=desktop/xdg/xdg-utils
 depend type=group fmri=desktop/xscreensaver
-depend type=group fmri=developer/documentation-tool/openjade
-depend type=group fmri=developer/documentation-tool/opensp
-depend type=group fmri=developer/gnome/gettext
 depend type=group fmri=developer/gnome/gnome-doc-utils
-depend type=group fmri=developer/java/jdk-6
-depend type=group fmri=developer/ui-designer/glade
 depend type=group fmri=diagnostic/ddu
-depend type=group fmri=diagnostic/ddu/locale
 depend type=group fmri=diagnostic/xload
 depend type=group fmri=documentation/gnome/gnome-user-docs
 depend type=group fmri=driver/audio/audio-usb
@@ -80,10 +70,12 @@
 depend type=group fmri=driver/ieee-1394/av1394
 depend type=group fmri=driver/ieee-1394/dcam1394
 depend type=group fmri=driver/x11/winlock
+$(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 depend type=group fmri=editor/diagram/dia
 depend type=group fmri=editor/gedit
+depend type=group fmri=editor/gedit/gedit-plugins
+depend type=group fmri=editor/gvim
 depend type=group fmri=editor/vim
-depend type=group fmri=gnome/accessibility/gnome-a11y-libs
 depend type=group fmri=gnome/accessibility/orca
 depend type=group fmri=gnome/applet/gnome-applets
 depend type=group fmri=gnome/applet/gnome-fun-applets
@@ -91,13 +83,11 @@
 depend type=group fmri=gnome/applet/gnome-intranet-applets
 depend type=group fmri=gnome/applet/gnome-mm-applets
 depend type=group fmri=gnome/applet/gnome-utility-applets
-depend type=group fmri=gnome/config/gconf
 depend type=group fmri=gnome/config/gconf/multi-user-desktop
 depend type=group fmri=gnome/disk-analyzer/baobab
 depend type=group fmri=gnome/file-manager/nautilus
 depend type=group fmri=gnome/ggv
 depend type=group fmri=gnome/gnome-audio
-depend type=group fmri=gnome/gnome-camera
 depend type=group fmri=gnome/gnome-dictionary
 depend type=group fmri=gnome/gnome-keyring
 depend type=group fmri=gnome/gnome-log-viewer
@@ -108,30 +98,19 @@
 depend type=group fmri=gnome/gnome-search-tool
 depend type=group fmri=gnome/gnome-session
 depend type=group fmri=gnome/help-viewer/yelp
-depend type=group fmri=gnome/locale/de
-depend type=group fmri=gnome/locale/es
-depend type=group fmri=gnome/locale/fr
-depend type=group fmri=gnome/locale/hi
-depend type=group fmri=gnome/locale/it
-depend type=group fmri=gnome/locale/ja
-depend type=group fmri=gnome/locale/ko
-depend type=group fmri=gnome/locale/pl
-depend type=group fmri=gnome/locale/pt_br
-depend type=group fmri=gnome/locale/rtl
-depend type=group fmri=gnome/locale/ru
-depend type=group fmri=gnome/locale/zh_cn
-depend type=group fmri=gnome/locale/zh_tw
 depend type=group fmri=gnome/media/gnome-media
 depend type=group fmri=gnome/media/gnome-media-player
 depend type=group fmri=gnome/preferences/control-center
 depend type=group fmri=gnome/speech/gnome-speech
 depend type=group fmri=gnome/speech/gnome-speech/driver/gnome-speech-espeak
 depend type=group fmri=gnome/theme/background/os-backgrounds
+depend type=group fmri=gnome/theme/background/os-backgrounds-extra
 depend type=group fmri=gnome/theme/gnome-icon-theme
 depend type=group fmri=gnome/theme/gnome-themes
 depend type=group fmri=gnome/theme/gtk2-engines
 depend type=group fmri=gnome/theme/hicolor-icon-theme
 depend type=group fmri=gnome/theme/nimbus
+depend type=group fmri=gnome/theme/nimbus-hires
 depend type=group fmri=gnome/theme/sound/xdg-sound-theme
 depend type=group fmri=gnome/theme/tango-icon-theme
 depend type=group fmri=gnome/window-manager/metacity
@@ -139,136 +118,44 @@
 depend type=group fmri=image/dcraw
 depend type=group fmri=image/editor/gimp
 depend type=group fmri=image/editor/gimp/gimp-help
-depend type=group fmri=image/library/babl
-depend type=group fmri=image/library/gegl
-depend type=group fmri=image/library/libart
-depend type=group fmri=image/library/libexif
-depend type=group fmri=image/library/librsvg
-depend type=group fmri=image/scanner/xsane/sane-backends
+depend type=group fmri=image/imagemagick
 depend type=group fmri=image/viewer/eog
-depend type=group fmri=library/aalib
 depend type=group fmri=library/accessibility/brltty
-depend type=group fmri=library/audio/gstreamer
-depend type=group fmri=library/c++/glibmm
-depend type=group fmri=library/c++/sigcpp
 depend type=group fmri=library/demo/audio-samples
-depend type=group fmri=library/desktop/c++/cairomm
-depend type=group fmri=library/desktop/c++/gtkmm
-depend type=group fmri=library/desktop/c++/pangomm
-depend type=group fmri=library/desktop/evolution-data-server
-depend type=group fmri=library/desktop/gobject/gobject-introspection
 depend type=group fmri=library/desktop/gtk2/gtk-backend-cups
-depend type=group fmri=library/desktop/gtkhtml
-depend type=group fmri=library/desktop/gtksourceview
-depend type=group fmri=library/desktop/gtkspell
-depend type=group fmri=library/desktop/libgdata
-depend type=group fmri=library/desktop/libglade
-depend type=group fmri=library/desktop/libgnomecanvas
-depend type=group fmri=library/desktop/libgsf
-depend type=group fmri=library/desktop/libgweather
-depend type=group fmri=library/desktop/libsexy
-depend type=group fmri=library/desktop/libvisual
-depend type=group fmri=library/desktop/libxklavier
-depend type=group fmri=library/desktop/xdg/libcanberra
-depend type=group fmri=library/file-monitor/gamin
-depend type=group fmri=library/gc
-depend type=group fmri=library/gmime
-depend type=group fmri=library/gnome/gnome-component
-depend type=group fmri=library/gnome/gnome-keyring
-depend type=group fmri=library/gnome/gnome-libs
-depend type=group fmri=library/gnome/gnome-vfs
 depend type=group fmri=library/gnome/gvfs
-depend type=group fmri=library/gnome/libgnomekbd
-depend type=group fmri=library/gnome/print/gnome-print
-depend type=group fmri=library/gnutls
-depend type=group fmri=library/idnkit
-depend type=group fmri=library/java/javahelp
-depend type=group fmri=library/java/jss
-depend type=group fmri=library/lcms
-depend type=group fmri=library/libcroco
-depend type=group fmri=library/libdaemon
-depend type=group fmri=library/libgtop
-depend type=group fmri=library/libical
-depend type=group fmri=library/libnotify
-depend type=group fmri=library/liboil
-depend type=group fmri=library/libproxy
 depend type=group fmri=library/libproxy/libproxy-gnome
-depend type=group fmri=library/libsoup
-depend type=group fmri=library/libtasn1
-depend type=group fmri=library/libtool/libltdl
-depend type=group fmri=library/libunique
-depend type=group fmri=library/media-player/totem-pl-parser
-depend type=group fmri=library/musicbrainz/libdiscid
-depend type=group fmri=library/musicbrainz/libmusicbrainz
+depend type=group fmri=library/myspell/dictionary/de
 depend type=group fmri=library/myspell/dictionary/en
-depend type=group fmri=library/neon
-depend type=group fmri=library/perl-5/authen-pam
-depend type=group fmri=library/perl-5/xml-parser-512
-depend type=group fmri=library/popt
-depend type=group fmri=library/pth
+depend type=group fmri=library/myspell/dictionary/es
+depend type=group fmri=library/myspell/dictionary/fr
+depend type=group fmri=library/myspell/dictionary/it
+depend type=group fmri=library/myspell/dictionary/pt_br
+#
+# Several desktop components require Coherence but fail to express a
+# dependency.
+#
 depend type=group fmri=library/python-2/coherence-26
-depend type=group fmri=library/python-2/libxml2-26
-depend type=group fmri=library/python-2/libxsl-26
-depend type=group fmri=library/python-2/locale-services
-depend type=group fmri=library/python-2/pyatspi-26
-depend type=group fmri=library/python-2/pycairo-26
-depend type=group fmri=library/python-2/pycups
-depend type=group fmri=library/python-2/pygobject-26
-depend type=group fmri=library/python-2/pygtk2-26
-depend type=group fmri=library/python-2/pygtksourceview2-26
-depend type=group fmri=library/python-2/pyorbit-26
-depend type=group fmri=library/python-2/python-dbus-26
-depend type=group fmri=library/python-2/python-gnome-26
-depend type=group fmri=library/python-2/python-gnome-desktop-26
-depend type=group fmri=library/python-2/python-gnome-extras-26
-depend type=group fmri=library/python-2/python-gst-26
-depend type=group fmri=library/python-2/python-notify-26
-depend type=group fmri=library/python-2/python-twisted-26
-depend type=group fmri=library/python-2/python-xdg-26
-depend type=group fmri=library/python-2/python-zope-interface-26
-depend type=group fmri=library/python-2/pyyaml-26
-depend type=group fmri=library/python-2/tkinter-26
-depend type=group fmri=library/raptor
-depend type=group fmri=library/samba/libsmbclient
-depend type=group fmri=library/sdl
-depend type=group fmri=library/security/libassuan
-depend type=group fmri=library/security/libksba
-depend type=group fmri=library/slang
-depend type=group fmri=library/speech/espeak
-depend type=group fmri=library/spell-checking/enchant
-depend type=group fmri=library/xdg/consolekit
-depend type=group fmri=library/xdg/xdg-user-dirs
 depend type=group fmri=mail/thunderbird
-depend type=group fmri=mail/thunderbird/locale/de
-depend type=group fmri=mail/thunderbird/locale/es
-depend type=group fmri=mail/thunderbird/locale/fr
-depend type=group fmri=mail/thunderbird/locale/it
-depend type=group fmri=mail/thunderbird/locale/ja
-depend type=group fmri=mail/thunderbird/locale/ko
-depend type=group fmri=mail/thunderbird/locale/pl
-depend type=group fmri=mail/thunderbird/locale/pt_br
-depend type=group fmri=mail/thunderbird/locale/ru
-depend type=group fmri=mail/thunderbird/locale/zh_cn
-depend type=group fmri=mail/thunderbird/locale/zh_tw
 depend type=group fmri=mail/thunderbird/plugin/thunderbird-lightning
-depend type=group fmri=network/ftp/ncftp
+depend type=group fmri=network/dhcp/dhcpmgr
+depend type=group fmri=network/dhcp/dhcpmgr/locale
 depend type=group fmri=package/pkg/package-manager
 depend type=group fmri=package/pkg/update-manager
-depend type=group fmri=print/cups/hal-cups-utils
 depend type=group fmri=print/cups/system-config-printer
 depend type=group fmri=print/filter/ghostscript
 depend type=group fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-other
 depend type=group fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-std
 depend type=group fmri=print/filter/gutenprint
-depend type=group fmri=print/filter/hplip
+depend type=group fmri=print/mp
 depend type=group fmri=release/os-welcome
-depend type=group fmri=runtime/lua
-depend type=group fmri=runtime/tk-8
-depend type=group fmri=service/network/wpa
+depend type=group fmri=service/gnome/desktop-cache
+depend type=group fmri=service/network/dhcp/datastore/binfiles
 depend type=group fmri=service/postrun
 depend type=group fmri=system/display-manager/desktop-startup
 depend type=group fmri=system/display-manager/gdm
 $(i386_ONLY)depend type=group fmri=system/file-system/ntfsprogs
+depend type=group fmri=system/file-system/smb
 depend type=group fmri=system/font/truetype/arphic-uming
 depend type=group fmri=system/font/truetype/dejavu
 depend type=group fmri=system/font/truetype/hanyang-ko-core
@@ -288,62 +175,23 @@
 depend type=group fmri=system/input-method/ibus/sayura
 depend type=group fmri=system/input-method/ibus/sunpinyin
 depend type=group fmri=system/input-method/ibus/xkbc
-depend type=group fmri=system/input-method/iiim
 depend type=group fmri=system/input-method/imf-startup
-depend type=group fmri=system/input-method/library/libanthy
-depend type=group fmri=system/input-method/library/libchewing
-depend type=group fmri=system/input-method/library/libdatrie
-depend type=group fmri=system/input-method/library/libhangul
-depend type=group fmri=system/input-method/library/libthai
-depend type=group fmri=system/input-method/library/m17n
-depend type=group fmri=system/input-method/library/m17n/contrib
 depend type=group fmri=system/io/audio
-depend type=group fmri=system/library/dbus/dbus-x11
-depend type=group fmri=system/library/iconv/unicode
-depend type=group fmri=system/library/libpcap
-depend type=group fmri=system/library/usb/libusb
-depend type=group fmri=system/library/usb/libusbugen
+depend type=group fmri=system/keyboard/kbd_mode
 depend type=group fmri=system/locale/support
-depend type=group fmri=system/management/rad
-depend type=group fmri=system/management/rad/client/rad-java
-depend type=group fmri=system/management/rad/client/rad-python
-depend type=group fmri=system/management/rad/module/rad-smf
-depend type=group fmri=system/management/visual-panels-core
-depend type=group fmri=system/management/visual-panels-core/locale
-depend type=group fmri=system/management/visual-panels/panel-coreadm
-depend type=group fmri=system/management/visual-panels/panel-coreadm/locale
-depend type=group fmri=system/management/visual-panels/panel-firewall
-depend type=group fmri=system/management/visual-panels/panel-firewall/locale
-depend type=group fmri=system/management/visual-panels/panel-smf
-depend type=group fmri=system/management/visual-panels/panel-smf/locale
-depend type=group fmri=system/management/visual-panels/panel-sysmon
-depend type=group fmri=system/management/visual-panels/panel-sysmon/locale
-depend type=group fmri=system/management/visual-panels/panel-time
-depend type=group fmri=system/management/visual-panels/panel-time/locale
+depend type=group fmri=system/management/visual-panels
 depend type=group fmri=system/network/avahi
 $(i386_ONLY)depend type=group fmri=system/storage/parted
+depend type=group fmri=terminal/fbconsole
 depend type=group fmri=terminal/gnome-terminal
 depend type=group fmri=terminal/xterm
 depend type=group fmri=web/browser/firefox
-depend type=group fmri=web/browser/firefox/locale/de_de
-depend type=group fmri=web/browser/firefox/locale/es_es
-depend type=group fmri=web/browser/firefox/locale/fr_fr
-depend type=group fmri=web/browser/firefox/locale/hi_in
-depend type=group fmri=web/browser/firefox/locale/it_it
-depend type=group fmri=web/browser/firefox/locale/ja_jp
-depend type=group fmri=web/browser/firefox/locale/ko_kr
-depend type=group fmri=web/browser/firefox/locale/pl_pl
-depend type=group fmri=web/browser/firefox/locale/pt_br
-depend type=group fmri=web/browser/firefox/locale/ru_ru
-depend type=group fmri=web/browser/firefox/locale/zh_cn
-depend type=group fmri=web/browser/firefox/locale/zh_tw
 depend type=group fmri=web/browser/firefox/multi-user-desktop
 depend type=group fmri=web/browser/firefox/plugin/firefox-flashplayer
 depend type=group fmri=web/browser/firefox/plugin/firefox-java
 depend type=group fmri=web/browser/w3m
 depend type=group fmri=web/data/firefox-bookmarks
 depend type=group fmri=x11/colormap-utilities
-depend type=group fmri=x11/compatibility/links-svid
 depend type=group fmri=x11/data/workspace-patterns
 depend type=group fmri=x11/data/xbitmaps
 depend type=group fmri=x11/data/xcursor-themes
@@ -357,58 +205,22 @@
 depend type=group fmri=x11/keyboard/data-xkb
 depend type=group fmri=x11/keyboard/xkb-utilities
 depend type=group fmri=x11/keyboard/xkbcomp
-depend type=group fmri=x11/library/dps
-depend type=group fmri=x11/library/libdmx
-depend type=group fmri=x11/library/libdrm
-depend type=group fmri=x11/library/libfs
-depend type=group fmri=x11/library/libowconfig
-depend type=group fmri=x11/library/libxcomposite
-depend type=group fmri=x11/library/libxcursor
-depend type=group fmri=x11/library/libxdamage
-depend type=group fmri=x11/library/libxevie
-depend type=group fmri=x11/library/libxfixes
-depend type=group fmri=x11/library/libxfont
-depend type=group fmri=x11/library/libxkbfile
-depend type=group fmri=x11/library/libxp
-depend type=group fmri=x11/library/libxrandr
-depend type=group fmri=x11/library/libxres
-depend type=group fmri=x11/library/libxscrnsaver
-depend type=group fmri=x11/library/libxv
-depend type=group fmri=x11/library/libxvmc
-depend type=group fmri=x11/library/libxxf86misc
-depend type=group fmri=x11/library/mesa
-depend type=group fmri=x11/library/toolkit/libxaw4
-depend type=group fmri=x11/library/toolkit/libxaw5
-depend type=group fmri=x11/library/xcb-util
-depend type=group fmri=x11/library/xtrans
 depend type=group fmri=x11/server/xephyr
 depend type=group fmri=x11/server/xorg
-$(sparc_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-efb
+$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-acecad
 $(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-hotkey
 depend type=group fmri=x11/server/xorg/driver/xorg-input-keyboard
 depend type=group fmri=x11/server/xorg/driver/xorg-input-mouse
 $(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-synaptics
 $(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-vmmouse
-depend type=group fmri=x11/server/xorg/driver/xorg-video-ast
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-ati
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-cirrus
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-intel
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-mach64
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-mga
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-nv
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-openchrome
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-r128
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-trident
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-vesa
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-vmware
-depend type=group fmri=x11/server/xserver-common
+depend type=group fmri=x11/server/xorg/driver/xorg-input-void
+depend type=group fmri=x11/server/xorg/driver/xorg-video
 depend type=group fmri=x11/server/xvnc
 depend type=group fmri=x11/session/sessreg
 depend type=group fmri=x11/session/smproxy
 depend type=group fmri=x11/session/winsysck
 depend type=group fmri=x11/session/xauth
 depend type=group fmri=x11/session/xinit
-depend type=group fmri=x11/trusted/libxtsol
 depend type=group fmri=x11/x11-server-utilities
 depend type=group fmri=x11/x11-window-dump
 depend type=group fmri=x11/xcalc
--- a/src/pkg/manifests/group:feature:trusted-desktop.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/group:feature:trusted-desktop.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -75,7 +75,6 @@
 depend type=group fmri=pkg:/image/viewer/eog
 depend type=group fmri=pkg:/image/viewer/gthumb
 depend type=group fmri=pkg:/library/gnome/gnome-component
-depend type=group fmri=pkg:/library/gnome/print/gnome-print
 depend type=group fmri=pkg:/library/spell-checking/enchant
 depend type=group fmri=pkg:/mail/thunderbird
 depend type=group fmri=pkg:/mail/thunderbird/plugin/thunderbird-lightning
--- a/src/pkg/manifests/group:system:solaris-auto-install.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/group:system:solaris-auto-install.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -35,16 +35,12 @@
 depend type=group fmri=compress/p7zip
 depend type=group fmri=compress/unzip
 depend type=group fmri=compress/zip
-depend type=group fmri=crypto/ca-certificates
-depend type=group fmri=data/iso-codes
-depend type=group fmri=database/sqlite-3
-depend type=group fmri=developer/base-developer-utilities
 depend type=group fmri=developer/debug/mdb
-depend type=group fmri=developer/macro/cpp
 $(i386_ONLY)depend type=group fmri=diagnostic/acpidump
 depend type=group fmri=diagnostic/cpu-counters
-depend type=group fmri=diagnostic/ddu/data
 depend type=group fmri=diagnostic/ddu/library
+depend type=group fmri=diagnostic/latencytop
+depend type=group fmri=diagnostic/powertop
 depend type=group fmri=diagnostic/scanpci
 depend type=group fmri=diagnostic/snoop
 depend type=group fmri=diagnostic/spray
@@ -119,6 +115,7 @@
 $(i386_ONLY)depend type=group fmri=driver/network/wlan/urtw
 $(i386_ONLY)depend type=group fmri=driver/network/wlan/wpi
 $(i386_ONLY)depend type=group fmri=driver/network/wlan/zyd
+depend type=group fmri=driver/parallel/ecpp
 depend type=group fmri=driver/pcmcia
 $(i386_ONLY)depend type=group fmri=driver/serial/asy
 depend type=group fmri=driver/serial/pcser
@@ -160,42 +157,13 @@
 $(i386_ONLY)depend type=group fmri=driver/storage/si3124
 depend type=group fmri=driver/storage/smp
 $(sparc_ONLY)depend type=group fmri=driver/storage/ssd
-$(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 $(i386_ONLY)depend type=group fmri=driver/xvm/pv
 depend type=group fmri=editor/vim/vim-core
-depend type=group fmri=library/apr-13
-depend type=group fmri=library/apr-util-13
-depend type=group fmri=library/database/gdbm
-depend type=group fmri=library/expat
-depend type=group fmri=library/glib2
-depend type=group fmri=library/libffi
-depend type=group fmri=library/libidn
-depend type=group fmri=library/libmilter
-depend type=group fmri=library/libtecla
-depend type=group fmri=library/libxml2
-depend type=group fmri=library/libxslt
-depend type=group fmri=library/ncurses
-depend type=group fmri=library/nspr
-depend type=group fmri=library/perl-5/sun-solaris-512
-depend type=group fmri=library/python-2/cherrypy-26
-depend type=group fmri=library/python-2/lxml-26
-depend type=group fmri=library/python-2/m2crypto-26
-depend type=group fmri=library/python-2/mako-26
-depend type=group fmri=library/python-2/ply-26
-depend type=group fmri=library/python-2/pybonjour-26
-depend type=group fmri=library/python-2/pycurl-26
-depend type=group fmri=library/python-2/pyopenssl-26
-depend type=group fmri=library/python-2/python-extra-26
-depend type=group fmri=library/python-2/simplejson-26
-depend type=group fmri=library/readline
-depend type=group fmri=library/security/nss
-depend type=group fmri=library/security/openssl
-depend type=group fmri=library/security/trousers
-depend type=group fmri=library/zlib
 depend type=group fmri=media/cdrtools
-depend type=group fmri=network/bridging
+depend type=group fmri=media/xorriso
+depend type=group fmri=naming/ldap
+depend type=group fmri=network/dns/bind
 depend type=group fmri=network/ftp
-depend type=group fmri=network/ipfilter
 depend type=group fmri=network/legacy-remote-utilities
 depend type=group fmri=network/ping
 depend type=group fmri=network/rsync
@@ -203,21 +171,13 @@
 depend type=group fmri=network/ssh/ssh-key
 depend type=group fmri=network/telnet
 depend type=group fmri=package/pkg
-depend type=group fmri=package/pkg/system-repository
-depend type=group fmri=package/pkg/zones-proxy
 depend type=group fmri=package/svr4
 depend type=group fmri=release/name
 depend type=group fmri=release/notices
-depend type=group fmri=runtime/perl-512
-depend type=group fmri=runtime/perl-584
-depend type=group fmri=runtime/perl-584/extra
-depend type=group fmri=runtime/python-26
+depend type=group fmri=security/bart
+depend type=group fmri=security/nss-utilities
 depend type=group fmri=security/sudo
-depend type=group fmri=service/file-system/smb
-$(sparc_ONLY)depend type=group fmri=service/key-management/sun-fire-15000
-depend type=group fmri=service/network/dns/mdns
 depend type=group fmri=service/network/ntp
-depend type=group fmri=service/network/smtp/sendmail
 depend type=group fmri=service/network/ssh
 depend type=group fmri=service/network/tftp
 depend type=group fmri=service/network/wpa
@@ -226,44 +186,28 @@
 depend type=group fmri=shell/bash
 depend type=group fmri=shell/ksh
 $(sparc_ONLY)depend type=group fmri=storage/library/network-array
-depend type=group fmri=storage/svm
-depend type=group fmri=system/accounting/legacy-accounting
 depend type=group fmri=system/boot-environment-utilities
 depend type=group fmri=system/boot/grub
 depend type=group fmri=system/boot/wanboot
 depend type=group fmri=system/core-os
-depend type=group fmri=system/data/hardware-registry
-depend type=group fmri=system/data/keyboard/keytables
 depend type=group fmri=system/data/terminfo
 depend type=group fmri=system/data/terminfo/terminfo-core
 depend type=group fmri=system/data/timezone
 depend type=group fmri=system/device-administration
-$(sparc_ONLY)depend type=group fmri=system/domain-configuration/sparc-enterprise
-$(sparc_ONLY)depend type=group \
-    fmri=system/domain-service-processor-protocol/sparc-enterprise
 depend type=group fmri=system/dtrace
 depend type=group fmri=system/dtrace/dtrace-toolkit
-depend type=group fmri=system/dynamic-reconfiguration
-$(sparc_ONLY)depend type=group fmri=system/embedded-fcode-interpreter
 depend type=group fmri=system/fault-management
-depend type=group fmri=system/fault-management/asr-notify
-depend type=group fmri=system/fault-management/fm-snmp-mib
-depend type=group fmri=system/fault-management/smtp-notify
-depend type=group fmri=system/fault-management/snmp-notify
 depend type=group fmri=system/file-system/autofs
 depend type=group fmri=system/file-system/hsfs
 depend type=group fmri=system/file-system/nfs
 depend type=group fmri=system/file-system/pcfs
-depend type=group fmri=system/file-system/smb
 depend type=group fmri=system/file-system/udfs
 depend type=group fmri=system/file-system/ufs
 depend type=group fmri=system/file-system/zfs
 depend type=group fmri=system/firmware-utilities
-depend type=group fmri=system/fru-id
+$(sparc_ONLY)depend type=group fmri=system/floating-point-scrubber
 depend type=group fmri=system/hal
-depend type=group fmri=system/install
 depend type=group fmri=system/install/auto-install
-depend type=group fmri=system/install/auto-install/auto-install-common
 depend type=group fmri=system/install/tests
 depend type=group fmri=system/io/fc/fc-fabric
 depend type=group fmri=system/io/fc/fc-port
@@ -292,52 +236,22 @@
 depend type=group fmri=system/kernel/platform
 $(sparc_ONLY)depend type=group fmri=system/kernel/platform/netra
 depend type=group fmri=system/kernel/power
-depend type=group fmri=system/kernel/secure-rpc
-depend type=group fmri=system/kernel/security/gss
 depend type=group fmri=system/kernel/suspend-resume
 depend type=group fmri=system/keyboard/keyboard-utilities
 $(sparc_ONLY)depend type=group fmri=system/ldoms
-depend type=group fmri=system/library
-depend type=group fmri=system/library/c++-runtime
-depend type=group fmri=system/library/dbus
-depend type=group fmri=system/library/gcc-3-runtime
 depend type=group fmri=system/library/iconv/utf-8
-depend type=group fmri=system/library/install
-depend type=group fmri=system/library/libdbus
-depend type=group fmri=system/library/libdbus-glib
-depend type=group fmri=system/library/libpcap
-depend type=group fmri=system/library/math
-depend type=group fmri=system/library/openmp
 depend type=group fmri=system/library/platform
-depend type=group fmri=system/library/policykit
 depend type=group fmri=system/library/processor
-depend type=group fmri=system/library/security/gss
-depend type=group fmri=system/library/security/gss/diffie-hellman
-depend type=group fmri=system/library/security/gss/spnego
-depend type=group fmri=system/library/security/libsasl
-depend type=group fmri=system/library/security/rpcsec
-depend type=group fmri=system/library/storage/libdiskmgt
-depend type=group fmri=system/library/storage/libfcoe
-depend type=group fmri=system/library/storage/scsi-plugins
-depend type=group fmri=system/library/storage/snia-hbaapi
-depend type=group fmri=system/library/storage/snia-ima
-depend type=group fmri=system/library/storage/snia-mpapi
-depend type=group fmri=system/library/storage/t11-sm-hba
 depend type=group fmri=system/linker
+depend type=group fmri=system/management/ilomconfig
 $(i386_ONLY)depend type=group fmri=system/management/intel-amt
-depend type=group fmri=system/management/snmp/net-snmp
+depend type=group fmri=system/management/ipmitool
 depend type=group fmri=system/network
-$(sparc_ONLY)depend type=group fmri=system/network-console
 depend type=group fmri=system/network/bpf
 depend type=group fmri=system/network/nis
-depend type=group fmri=system/network/ppp
-depend type=group fmri=system/network/ppp/pppdump
-depend type=group fmri=system/network/ppp/tunnel
 depend type=group fmri=system/network/routing
 depend type=group fmri=system/picl
 depend type=group fmri=system/prerequisite/gnu
-depend type=group fmri=system/resource-mgmt/resource-pools
-depend type=group fmri=system/scheduler/fss
 depend type=group fmri=system/storage/fc-utilities
 depend type=group fmri=system/storage/fcoe
 depend type=group fmri=system/storage/fcoe/fcoe-initiator
@@ -348,16 +262,10 @@
 depend type=group fmri=system/storage/raid-utilities
 depend type=group fmri=system/storage/removable-media
 depend type=group fmri=system/storage/sas-utilities
-depend type=group fmri=system/storage/scsi-target-mode-framework
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
-depend type=group fmri=system/xopen/xcu4
 depend type=group fmri=system/zones
 depend type=group fmri=system/zones/brand/brand-solaris
 depend type=group fmri=terminal/resize
 depend type=group fmri=text/less
-depend type=group fmri=text/locale
-depend type=group fmri=text/spelling-utilities
-depend type=group fmri=web/curl
-depend type=group fmri=web/server/apache-22
 depend type=group fmri=web/wget
--- a/src/pkg/manifests/group:system:solaris-desktop.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/group:system:solaris-desktop.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -31,24 +31,18 @@
 set name=variant.arch value=$(ARCH)
 depend type=group fmri=archiver/gnu-tar
 depend type=group fmri=audio/audio-utilities
-depend type=group fmri=benchmark/x11perf
 depend type=group fmri=codec/flac
 depend type=group fmri=codec/libtheora
 depend type=group fmri=codec/ogg-vorbis
 depend type=group fmri=codec/speex
 depend type=group fmri=communication/im/pidgin
-depend type=group fmri=communication/pda/gnome-pilot
-depend type=group fmri=communication/pda/pilot-link
 depend type=group fmri=compress/bzip2
 depend type=group fmri=compress/gzip
 depend type=group fmri=compress/p7zip
 depend type=group fmri=compress/unzip
 depend type=group fmri=compress/zip
-depend type=group fmri=crypto/ca-certificates
 depend type=group fmri=crypto/gnupg
-depend type=group fmri=data/iso-codes
-depend type=group fmri=data/sgml-common
-depend type=group fmri=database/sqlite-3
+depend type=group fmri=crypto/pwgen
 $(i386_ONLY)depend type=group fmri=desktop/administration/gparted
 depend type=group fmri=desktop/administration/nwam-manager
 depend type=group fmri=desktop/archive-manager/file-roller
@@ -59,7 +53,6 @@
 depend type=group fmri=desktop/compiz
 $(i386_ONLY)depend type=group fmri=desktop/compiz/ccsm
 $(i386_ONLY)depend type=group fmri=desktop/compiz/library/compizconfig-gconf
-$(i386_ONLY)depend type=group fmri=desktop/compiz/library/libcompizconfig
 $(i386_ONLY)depend type=group fmri=desktop/compiz/plugin/compiz-fusion-extra
 $(i386_ONLY)depend type=group fmri=desktop/compiz/plugin/compiz-fusion-main
 depend type=group fmri=desktop/gksu
@@ -72,27 +65,14 @@
 depend type=group fmri=desktop/xdg/xdg-user-dirs-gtk
 depend type=group fmri=desktop/xdg/xdg-utils
 depend type=group fmri=desktop/xscreensaver
-depend type=group fmri=developer/assembler
-depend type=group fmri=developer/base-developer-utilities
 depend type=group fmri=developer/build/gnu-make
 depend type=group fmri=developer/build/make
 depend type=group fmri=developer/debug/mdb
-depend type=group fmri=developer/documentation-tool/openjade
-depend type=group fmri=developer/documentation-tool/opensp
-depend type=group fmri=developer/gnome/gettext
 depend type=group fmri=developer/gnome/gnome-doc-utils
-depend type=group fmri=developer/java/jdk-6
-depend type=group fmri=developer/library/xprofile
-depend type=group fmri=developer/macro/cpp
-depend type=group fmri=developer/ui-designer/glade
-depend type=group fmri=developer/versioning/sccs
 $(i386_ONLY)depend type=group fmri=diagnostic/acpidump
-depend type=group fmri=diagnostic/constype
 depend type=group fmri=diagnostic/cpu-counters
 depend type=group fmri=diagnostic/ddu
-depend type=group fmri=diagnostic/ddu/data
-depend type=group fmri=diagnostic/ddu/library
-depend type=group fmri=diagnostic/ddu/locale
+depend type=group fmri=diagnostic/ddu/text
 depend type=group fmri=diagnostic/latencytop
 depend type=group fmri=diagnostic/powertop
 depend type=group fmri=diagnostic/scanpci
@@ -233,14 +213,14 @@
 $(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 $(i386_ONLY)depend type=group fmri=driver/xvm/pv
 depend type=group fmri=editor/gedit
+depend type=group fmri=editor/gedit/gedit-plugins
+depend type=group fmri=editor/gvim
 depend type=group fmri=editor/nano
 depend type=group fmri=editor/vim
-depend type=group fmri=editor/vim/vim-core
 depend type=group fmri=file/filesync
 depend type=group fmri=file/gnu-coreutils
 depend type=group fmri=file/gnu-findutils
 depend type=group fmri=file/slocate
-depend type=group fmri=gnome/accessibility/gnome-a11y-libs
 depend type=group fmri=gnome/accessibility/orca
 depend type=group fmri=gnome/applet/gnome-applets
 depend type=group fmri=gnome/applet/gnome-fun-applets
@@ -248,7 +228,6 @@
 depend type=group fmri=gnome/applet/gnome-intranet-applets
 depend type=group fmri=gnome/applet/gnome-mm-applets
 depend type=group fmri=gnome/applet/gnome-utility-applets
-depend type=group fmri=gnome/config/gconf
 depend type=group fmri=gnome/disk-analyzer/baobab
 depend type=group fmri=gnome/file-manager/nautilus
 depend type=group fmri=gnome/ggv
@@ -264,201 +243,57 @@
 depend type=group fmri=gnome/gnome-search-tool
 depend type=group fmri=gnome/gnome-session
 depend type=group fmri=gnome/help-viewer/yelp
-depend type=group fmri=gnome/locale/de
-depend type=group fmri=gnome/locale/es
-depend type=group fmri=gnome/locale/fr
-depend type=group fmri=gnome/locale/hi
-depend type=group fmri=gnome/locale/it
-depend type=group fmri=gnome/locale/ja
-depend type=group fmri=gnome/locale/ko
-depend type=group fmri=gnome/locale/pl
-depend type=group fmri=gnome/locale/pt_br
-depend type=group fmri=gnome/locale/rtl
-depend type=group fmri=gnome/locale/ru
-depend type=group fmri=gnome/locale/zh_cn
-depend type=group fmri=gnome/locale/zh_tw
 depend type=group fmri=gnome/media/gnome-media
 depend type=group fmri=gnome/media/gnome-media-player
 depend type=group fmri=gnome/preferences/control-center
 depend type=group fmri=gnome/speech/gnome-speech
 depend type=group fmri=gnome/speech/gnome-speech/driver/gnome-speech-espeak
 depend type=group fmri=gnome/theme/background/os-backgrounds
+depend type=group fmri=gnome/theme/background/os-backgrounds-extra
 depend type=group fmri=gnome/theme/gnome-icon-theme
 depend type=group fmri=gnome/theme/gnome-themes
 depend type=group fmri=gnome/theme/gtk2-engines
 depend type=group fmri=gnome/theme/hicolor-icon-theme
 depend type=group fmri=gnome/theme/nimbus
+depend type=group fmri=gnome/theme/nimbus-hires
 depend type=group fmri=gnome/theme/sound/xdg-sound-theme
 depend type=group fmri=gnome/theme/tango-icon-theme
 depend type=group fmri=gnome/window-manager/metacity
 depend type=group fmri=gnome/zenity
 depend type=group fmri=image/dcraw
-depend type=group fmri=image/library/libart
-depend type=group fmri=image/library/libexif
-depend type=group fmri=image/library/libjpeg
-depend type=group fmri=image/library/libpng
-depend type=group fmri=image/library/librsvg
-depend type=group fmri=image/library/libtiff
-depend type=group fmri=image/scanner/xsane/sane-backends
+depend type=group fmri=image/imagemagick
 depend type=group fmri=image/viewer/eog
-depend type=group fmri=library/aalib
 depend type=group fmri=library/accessibility/brltty
-depend type=group fmri=library/apr-13
-depend type=group fmri=library/apr-util-13
-depend type=group fmri=library/audio/gstreamer
-depend type=group fmri=library/c++/glibmm
-depend type=group fmri=library/c++/sigcpp
-depend type=group fmri=library/database/gdbm
 depend type=group fmri=library/demo/audio-samples
-depend type=group fmri=library/desktop/atk
-depend type=group fmri=library/desktop/c++/cairomm
-depend type=group fmri=library/desktop/c++/gtkmm
-depend type=group fmri=library/desktop/c++/pangomm
-depend type=group fmri=library/desktop/cairo
-depend type=group fmri=library/desktop/evolution-data-server
-depend type=group fmri=library/desktop/gobject/gobject-introspection
-depend type=group fmri=library/desktop/gtk2
 depend type=group fmri=library/desktop/gtk2/gtk-backend-cups
-depend type=group fmri=library/desktop/gtkhtml
-depend type=group fmri=library/desktop/gtksourceview
-depend type=group fmri=library/desktop/gtkspell
-depend type=group fmri=library/desktop/libgdata
-depend type=group fmri=library/desktop/libglade
-depend type=group fmri=library/desktop/libgnomecanvas
-depend type=group fmri=library/desktop/libgsf
-depend type=group fmri=library/desktop/libgweather
-depend type=group fmri=library/desktop/libsexy
-depend type=group fmri=library/desktop/libvisual
-depend type=group fmri=library/desktop/libxklavier
-depend type=group fmri=library/desktop/pango
 depend type=group fmri=library/desktop/search/tracker
-depend type=group fmri=library/desktop/xdg/libcanberra
-depend type=group fmri=library/expat
-depend type=group fmri=library/file-monitor/gamin
-depend type=group fmri=library/gc
-depend type=group fmri=library/glib2
-depend type=group fmri=library/gmime
-depend type=group fmri=library/gmp
-depend type=group fmri=library/gnome/gnome-component
-depend type=group fmri=library/gnome/gnome-keyring
-depend type=group fmri=library/gnome/gnome-libs
-depend type=group fmri=library/gnome/gnome-vfs
 depend type=group fmri=library/gnome/gvfs
-depend type=group fmri=library/gnome/libgnomekbd
-depend type=group fmri=library/gnome/print/gnome-print
-depend type=group fmri=library/gnutls
-depend type=group fmri=library/graphics/pixman
-depend type=group fmri=library/idnkit
-depend type=group fmri=library/java/javahelp
-depend type=group fmri=library/java/jss
-depend type=group fmri=library/lcms
-depend type=group fmri=library/libcroco
-depend type=group fmri=library/libdaemon
-depend type=group fmri=library/libffi
-depend type=group fmri=library/libgtop
-depend type=group fmri=library/libical
-depend type=group fmri=library/libidn
-depend type=group fmri=library/libmilter
-depend type=group fmri=library/libnotify
-depend type=group fmri=library/liboil
-depend type=group fmri=library/libproxy
 depend type=group fmri=library/libproxy/libproxy-gnome
-depend type=group fmri=library/libsoup
-depend type=group fmri=library/libtasn1
-depend type=group fmri=library/libtecla
-depend type=group fmri=library/libtool/libltdl
-depend type=group fmri=library/libunique
-depend type=group fmri=library/libxml2
-depend type=group fmri=library/libxslt
-depend type=group fmri=library/media-player/totem-pl-parser
-depend type=group fmri=library/musicbrainz/libdiscid
-depend type=group fmri=library/musicbrainz/libmusicbrainz
+depend type=group fmri=library/myspell/dictionary/de
 depend type=group fmri=library/myspell/dictionary/en
-depend type=group fmri=library/ncurses
-depend type=group fmri=library/neon
-depend type=group fmri=library/nspr
-depend type=group fmri=library/pcre
-depend type=group fmri=library/perl-5/authen-pam
-depend type=group fmri=library/perl-5/sun-solaris-512
-depend type=group fmri=library/perl-5/xml-parser-512
-depend type=group fmri=library/perl-5/xml-parser-584
-depend type=group fmri=library/popt
-depend type=group fmri=library/print/cups-libs
-depend type=group fmri=library/print/open-printing
-depend type=group fmri=library/pth
-depend type=group fmri=library/python-2/cherrypy-26
+depend type=group fmri=library/myspell/dictionary/es
+depend type=group fmri=library/myspell/dictionary/fr
+depend type=group fmri=library/myspell/dictionary/it
+depend type=group fmri=library/myspell/dictionary/pt_br
+#
+# Several desktop components require Coherence but fail to express a
+# dependency.
+#
 depend type=group fmri=library/python-2/coherence-26
-depend type=group fmri=library/python-2/libxml2-26
-depend type=group fmri=library/python-2/libxsl-26
-depend type=group fmri=library/python-2/locale-services
-depend type=group fmri=library/python-2/lxml-26
-depend type=group fmri=library/python-2/m2crypto-26
-depend type=group fmri=library/python-2/mako-26
-depend type=group fmri=library/python-2/ply-26
-depend type=group fmri=library/python-2/pyatspi-26
-depend type=group fmri=library/python-2/pybonjour-26
-depend type=group fmri=library/python-2/pycairo-26
-depend type=group fmri=library/python-2/pycups
-depend type=group fmri=library/python-2/pycurl-26
-depend type=group fmri=library/python-2/pygobject-26
-depend type=group fmri=library/python-2/pygtk2-26
-depend type=group fmri=library/python-2/pygtksourceview2-26
-depend type=group fmri=library/python-2/pyopenssl-26
-depend type=group fmri=library/python-2/pyorbit-26
-$(i386_ONLY)depend type=group fmri=library/python-2/python-compizconfig-26
-depend type=group fmri=library/python-2/python-dbus-26
-depend type=group fmri=library/python-2/python-extra-26
-depend type=group fmri=library/python-2/python-gnome-26
-depend type=group fmri=library/python-2/python-gnome-desktop-26
-depend type=group fmri=library/python-2/python-gnome-extras-26
-depend type=group fmri=library/python-2/python-gst-26
-depend type=group fmri=library/python-2/python-notify-26
-depend type=group fmri=library/python-2/python-twisted-26
-depend type=group fmri=library/python-2/python-xdg-26
-depend type=group fmri=library/python-2/python-zope-interface-26
-depend type=group fmri=library/python-2/pyyaml-26
-depend type=group fmri=library/python-2/simplejson-26
-depend type=group fmri=library/python-2/tkinter-26
-depend type=group fmri=library/raptor
-depend type=group fmri=library/readline
-depend type=group fmri=library/samba/libsmbclient
-depend type=group fmri=library/sdl
-depend type=group fmri=library/security/gpgme
-depend type=group fmri=library/security/libassuan
-depend type=group fmri=library/security/libgpg-error
-depend type=group fmri=library/security/libksba
-depend type=group fmri=library/security/nss
-depend type=group fmri=library/security/openssl
-depend type=group fmri=library/security/trousers
-depend type=group fmri=library/slang
-depend type=group fmri=library/speech/espeak
-depend type=group fmri=library/spell-checking/enchant
-depend type=group fmri=library/unixodbc
-depend type=group fmri=library/xdg/consolekit
-depend type=group fmri=library/xdg/xdg-user-dirs
-depend type=group fmri=library/zlib
 depend type=group fmri=mail/thunderbird
-depend type=group fmri=mail/thunderbird/locale/de
-depend type=group fmri=mail/thunderbird/locale/es
-depend type=group fmri=mail/thunderbird/locale/fr
-depend type=group fmri=mail/thunderbird/locale/it
-depend type=group fmri=mail/thunderbird/locale/ja
-depend type=group fmri=mail/thunderbird/locale/ko
-depend type=group fmri=mail/thunderbird/locale/pl
-depend type=group fmri=mail/thunderbird/locale/pt_br
-depend type=group fmri=mail/thunderbird/locale/ru
-depend type=group fmri=mail/thunderbird/locale/zh_cn
-depend type=group fmri=mail/thunderbird/locale/zh_tw
 depend type=group fmri=mail/thunderbird/plugin/thunderbird-lightning
 depend type=group fmri=media/cdrtools
+depend type=group fmri=media/cdrw
+depend type=group fmri=media/dvd+rw-tools
+depend type=group fmri=media/xorriso
 depend type=group fmri=naming/ldap
-depend type=group fmri=network/bridging
 depend type=group fmri=network/dns/bind
 depend type=group fmri=network/finger
 depend type=group fmri=network/ftp
 depend type=group fmri=network/ftp/ncftp
 depend type=group fmri=network/ipfilter
 depend type=group fmri=network/legacy-remote-utilities
+depend type=group fmri=network/netcat
 depend type=group fmri=network/ping
 depend type=group fmri=network/rsync
 depend type=group fmri=network/ssh
@@ -468,53 +303,42 @@
 depend type=group fmri=network/whois
 depend type=group fmri=package/pkg
 depend type=group fmri=package/pkg/package-manager
-depend type=group fmri=package/pkg/system-repository
 depend type=group fmri=package/pkg/update-manager
-depend type=group fmri=package/pkg/zones-proxy
 depend type=group fmri=package/rpm
 depend type=group fmri=package/svr4
 depend type=group fmri=print/cups
+depend type=group fmri=print/cups/filter/foomatic-db
+depend type=group fmri=print/cups/filter/foomatic-db-engine
 depend type=group fmri=print/cups/hal-cups-utils
 depend type=group fmri=print/cups/system-config-printer
+depend type=group fmri=print/filter/a2ps
 depend type=group fmri=print/filter/ghostscript
 depend type=group fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-other
 depend type=group fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-std
 depend type=group fmri=print/filter/gutenprint
 depend type=group fmri=print/filter/hplip
+depend type=group fmri=print/lp/filter/foomatic-rip
+depend type=group fmri=print/mp
+depend type=group fmri=print/psutils
 depend type=group fmri=release/name
 depend type=group fmri=release/notices
 depend type=group fmri=release/os-welcome
 depend type=group fmri=release/registration
-depend type=group fmri=runtime/java/jre-6
-depend type=group fmri=runtime/perl-512
-depend type=group fmri=runtime/perl-584
-depend type=group fmri=runtime/perl-584/extra
-depend type=group fmri=runtime/python-26
-depend type=group fmri=runtime/tcl-8
-depend type=group fmri=runtime/tk-8
 depend type=group fmri=security/bart
-depend type=group fmri=security/pinentry
+depend type=group fmri=security/nss-utilities
 depend type=group fmri=security/sudo
 depend type=group fmri=security/tcp-wrapper
 depend type=group fmri=service/diagnostic/spray
 depend type=group fmri=service/file-system/nfs
-depend type=group fmri=service/file-system/smb
 depend type=group fmri=service/gnome/desktop-cache
-$(sparc_ONLY)depend type=group fmri=service/key-management/sun-fire-15000
 depend type=group fmri=service/network/comsat
 depend type=group fmri=service/network/dns/mdns
-depend type=group fmri=service/network/finger
-depend type=group fmri=service/network/ftp
-depend type=group fmri=service/network/legacy-remote-utilities
+depend type=group fmri=service/network/load-balancer/ilb
 depend type=group fmri=service/network/ntp
 depend type=group fmri=service/network/slp
 depend type=group fmri=service/network/smtp/sendmail
 depend type=group fmri=service/network/ssh
-depend type=group fmri=service/network/talk
-depend type=group fmri=service/network/telnet
-depend type=group fmri=service/network/tftp
 depend type=group fmri=service/network/wpa
-depend type=group fmri=service/opengl/ogl-select
 depend type=group fmri=service/postrun
 depend type=group fmri=service/security/gss
 depend type=group fmri=service/security/kerberos-5
@@ -527,31 +351,20 @@
 depend type=group fmri=shell/which
 depend type=group fmri=shell/zsh
 $(sparc_ONLY)depend type=group fmri=storage/library/network-array
-depend type=group fmri=storage/svm
 depend type=group fmri=system/accounting/legacy-accounting
 depend type=group fmri=system/boot-environment-utilities
 depend type=group fmri=system/boot/grub
-depend type=group fmri=system/boot/wanboot
 depend type=group fmri=system/core-os
-depend type=group fmri=system/data/hardware-registry
-depend type=group fmri=system/data/keyboard/keytables
 depend type=group fmri=system/data/terminfo
 depend type=group fmri=system/data/terminfo/terminfo-core
 depend type=group fmri=system/data/timezone
 depend type=group fmri=system/device-administration
-depend type=group fmri=system/device-allocation
 depend type=group fmri=system/display-manager/desktop-startup
 depend type=group fmri=system/display-manager/gdm
-$(sparc_ONLY)depend type=group fmri=system/domain-configuration/sparc-enterprise
-$(sparc_ONLY)depend type=group \
-    fmri=system/domain-service-processor-protocol/sparc-enterprise
 depend type=group fmri=system/dtrace
 depend type=group fmri=system/dtrace/dtrace-toolkit
-depend type=group fmri=system/dynamic-reconfiguration
-$(sparc_ONLY)depend type=group fmri=system/embedded-fcode-interpreter
 depend type=group fmri=system/fault-management
 depend type=group fmri=system/fault-management/asr-notify
-depend type=group fmri=system/fault-management/fm-snmp-mib
 depend type=group fmri=system/fault-management/smtp-notify
 depend type=group fmri=system/fault-management/snmp-notify
 depend type=group fmri=system/file-system/autofs
@@ -586,17 +399,7 @@
 depend type=group fmri=system/input-method/ibus/sayura
 depend type=group fmri=system/input-method/ibus/sunpinyin
 depend type=group fmri=system/input-method/ibus/xkbc
-depend type=group fmri=system/input-method/iiim
 depend type=group fmri=system/input-method/imf-startup
-depend type=group fmri=system/input-method/library/libanthy
-depend type=group fmri=system/input-method/library/libchewing
-depend type=group fmri=system/input-method/library/libdatrie
-depend type=group fmri=system/input-method/library/libhangul
-depend type=group fmri=system/input-method/library/libthai
-depend type=group fmri=system/input-method/library/m17n
-depend type=group fmri=system/input-method/library/m17n/contrib
-depend type=group fmri=system/install
-depend type=group fmri=system/install/auto-install/auto-install-common
 depend type=group fmri=system/install/configuration
 depend type=group fmri=system/install/locale
 depend type=group fmri=system/install/tests
@@ -619,47 +422,13 @@
 depend type=group fmri=system/kernel/platform
 $(sparc_ONLY)depend type=group fmri=system/kernel/platform/netra
 depend type=group fmri=system/kernel/power
-depend type=group fmri=system/kernel/secure-rpc
-depend type=group fmri=system/kernel/security/gss
 depend type=group fmri=system/kernel/suspend-resume
 depend type=group fmri=system/keyboard/kbd_mode
 depend type=group fmri=system/keyboard/keyboard-utilities
 $(sparc_ONLY)depend type=group fmri=system/ldoms
-depend type=group fmri=system/library
-depend type=group fmri=system/library/c++-runtime
-depend type=group fmri=system/library/dbus
-depend type=group fmri=system/library/dbus/dbus-x11
-depend type=group fmri=system/library/flex-runtime
-depend type=group fmri=system/library/fontconfig
-depend type=group fmri=system/library/freetype-2
-depend type=group fmri=system/library/gcc-3-runtime
-depend type=group fmri=system/library/gcc-45-runtime
-depend type=group fmri=system/library/iconv/unicode
 depend type=group fmri=system/library/iconv/utf-8
-depend type=group fmri=system/library/install
-depend type=group fmri=system/library/libdbus
-depend type=group fmri=system/library/libdbus-glib
-depend type=group fmri=system/library/libpcap
-depend type=group fmri=system/library/math
-depend type=group fmri=system/library/openmp
 depend type=group fmri=system/library/platform
-depend type=group fmri=system/library/policykit
 depend type=group fmri=system/library/processor
-depend type=group fmri=system/library/security/gss
-depend type=group fmri=system/library/security/gss/diffie-hellman
-depend type=group fmri=system/library/security/gss/spnego
-depend type=group fmri=system/library/security/libgcrypt
-depend type=group fmri=system/library/security/libsasl
-depend type=group fmri=system/library/security/rpcsec
-depend type=group fmri=system/library/storage/libdiskmgt
-depend type=group fmri=system/library/storage/libfcoe
-depend type=group fmri=system/library/storage/scsi-plugins
-depend type=group fmri=system/library/storage/snia-hbaapi
-depend type=group fmri=system/library/storage/snia-ima
-depend type=group fmri=system/library/storage/snia-mpapi
-depend type=group fmri=system/library/storage/t11-sm-hba
-depend type=group fmri=system/library/usb/libusb
-depend type=group fmri=system/library/usb/libusbugen
 depend type=group fmri=system/linker
 depend type=group fmri=system/locale
 depend type=group fmri=system/locale/support
@@ -671,25 +440,13 @@
 depend type=group fmri=system/management/rad/client/rad-java
 depend type=group fmri=system/management/rad/client/rad-python
 depend type=group fmri=system/management/rad/module/rad-smf
-depend type=group fmri=system/management/service-tag
 depend type=group fmri=system/management/snmp/net-snmp
+depend type=group fmri=system/management/snmp/net-snmp/addons
 depend type=group fmri=system/management/snmp/net-snmp/documentation
-depend type=group fmri=system/management/visual-panels-core
-depend type=group fmri=system/management/visual-panels-core/locale
-depend type=group fmri=system/management/visual-panels/panel-coreadm
-depend type=group fmri=system/management/visual-panels/panel-coreadm/locale
-depend type=group fmri=system/management/visual-panels/panel-firewall
-depend type=group fmri=system/management/visual-panels/panel-firewall/locale
-depend type=group fmri=system/management/visual-panels/panel-smf
-depend type=group fmri=system/management/visual-panels/panel-smf/locale
-depend type=group fmri=system/management/visual-panels/panel-sysmon
-depend type=group fmri=system/management/visual-panels/panel-sysmon/locale
-depend type=group fmri=system/management/visual-panels/panel-time
-depend type=group fmri=system/management/visual-panels/panel-time/locale
+depend type=group fmri=system/management/visual-panels
 depend type=group fmri=system/manual
 depend type=group fmri=system/manual/locale
 depend type=group fmri=system/network
-$(sparc_ONLY)depend type=group fmri=system/network-console
 depend type=group fmri=system/network/avahi
 depend type=group fmri=system/network/bpf
 depend type=group fmri=system/network/nis
@@ -699,6 +456,8 @@
 depend type=group fmri=system/network/routing
 depend type=group fmri=system/picl
 depend type=group fmri=system/prerequisite/gnu
+depend type=group fmri=system/resource-mgmt/dynamic-resource-pools
+depend type=group fmri=system/resource-mgmt/resource-caps
 depend type=group fmri=system/resource-mgmt/resource-pools
 depend type=group fmri=system/scheduler/fss
 depend type=group fmri=system/storage/fc-utilities
@@ -712,10 +471,8 @@
 depend type=group fmri=system/storage/raid-utilities
 depend type=group fmri=system/storage/removable-media
 depend type=group fmri=system/storage/sas-utilities
-depend type=group fmri=system/storage/scsi-target-mode-framework
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
-depend type=group fmri=system/xopen/xcu4
 depend type=group fmri=system/zones
 depend type=group fmri=system/zones/brand/brand-solaris
 depend type=group fmri=system/zones/brand/brand-solaris10
@@ -733,34 +490,16 @@
 depend type=group fmri=text/gnu-patch
 depend type=group fmri=text/gnu-sed
 depend type=group fmri=text/groff
-depend type=group fmri=text/groff/groff-core
 depend type=group fmri=text/less
-depend type=group fmri=text/locale
 depend type=group fmri=text/spelling-utilities
 depend type=group fmri=text/texinfo
 depend type=group fmri=web/browser/firefox
-depend type=group fmri=web/browser/firefox/locale/de_de
-depend type=group fmri=web/browser/firefox/locale/es_es
-depend type=group fmri=web/browser/firefox/locale/fr_fr
-depend type=group fmri=web/browser/firefox/locale/hi_in
-depend type=group fmri=web/browser/firefox/locale/it_it
-depend type=group fmri=web/browser/firefox/locale/ja_jp
-depend type=group fmri=web/browser/firefox/locale/ko_kr
-depend type=group fmri=web/browser/firefox/locale/pl_pl
-depend type=group fmri=web/browser/firefox/locale/pt_br
-depend type=group fmri=web/browser/firefox/locale/ru_ru
-depend type=group fmri=web/browser/firefox/locale/zh_cn
-depend type=group fmri=web/browser/firefox/locale/zh_tw
 depend type=group fmri=web/browser/firefox/plugin/firefox-flashplayer
 depend type=group fmri=web/browser/firefox/plugin/firefox-java
 depend type=group fmri=web/browser/w3m
-depend type=group fmri=web/curl
 depend type=group fmri=web/data/firefox-bookmarks
-depend type=group fmri=web/server/apache-22
 depend type=group fmri=web/wget
 depend type=group fmri=x11/colormap-utilities
-depend type=group fmri=x11/compatibility/links-svid
-depend type=group fmri=x11/compatibility/links-xorg
 depend type=group fmri=x11/data/workspace-patterns
 depend type=group fmri=x11/data/xbitmaps
 depend type=group fmri=x11/data/xcursor-themes
@@ -771,83 +510,25 @@
 depend type=group fmri=x11/diagnostic/xscope
 depend type=group fmri=x11/documentation/xorg-docs
 depend type=group fmri=x11/font-utilities
-depend type=group fmri=x11/header/x11-protocols
 depend type=group fmri=x11/keyboard/data-xkb
 depend type=group fmri=x11/keyboard/xkb-utilities
 depend type=group fmri=x11/keyboard/xkbcomp
-depend type=group fmri=x11/library/dps
-depend type=group fmri=x11/library/libdga
-depend type=group fmri=x11/library/libdmx
-depend type=group fmri=x11/library/libdrm
-depend type=group fmri=x11/library/libfontenc
-depend type=group fmri=x11/library/libfs
-depend type=group fmri=x11/library/libice
-depend type=group fmri=x11/library/libowconfig
-depend type=group fmri=x11/library/libpthread-stubs
-depend type=group fmri=x11/library/libsm
-depend type=group fmri=x11/library/libx11
-depend type=group fmri=x11/library/libxau
-depend type=group fmri=x11/library/libxcb
-depend type=group fmri=x11/library/libxcomposite
-depend type=group fmri=x11/library/libxcursor
-depend type=group fmri=x11/library/libxdamage
-depend type=group fmri=x11/library/libxdmcp
-depend type=group fmri=x11/library/libxevie
-depend type=group fmri=x11/library/libxext
-depend type=group fmri=x11/library/libxfixes
-depend type=group fmri=x11/library/libxfont
-depend type=group fmri=x11/library/libxft
-depend type=group fmri=x11/library/libxi
-depend type=group fmri=x11/library/libxinerama
-depend type=group fmri=x11/library/libxkbfile
-depend type=group fmri=x11/library/libxmu
-depend type=group fmri=x11/library/libxmuu
-depend type=group fmri=x11/library/libxp
-depend type=group fmri=x11/library/libxpm
-depend type=group fmri=x11/library/libxrandr
-depend type=group fmri=x11/library/libxrender
-depend type=group fmri=x11/library/libxres
-depend type=group fmri=x11/library/libxscrnsaver
-depend type=group fmri=x11/library/libxtst
-depend type=group fmri=x11/library/libxv
-depend type=group fmri=x11/library/libxvmc
-depend type=group fmri=x11/library/libxxf86misc
-depend type=group fmri=x11/library/libxxf86vm
-depend type=group fmri=x11/library/mesa
-depend type=group fmri=x11/library/toolkit/libxaw4
-depend type=group fmri=x11/library/toolkit/libxaw5
-depend type=group fmri=x11/library/toolkit/libxaw7
-depend type=group fmri=x11/library/toolkit/libxt
-depend type=group fmri=x11/library/xcb-util
-depend type=group fmri=x11/library/xtrans
 depend type=group fmri=x11/server/xephyr
 depend type=group fmri=x11/server/xorg
-$(sparc_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-efb
+$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-acecad
 $(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-hotkey
 depend type=group fmri=x11/server/xorg/driver/xorg-input-keyboard
 depend type=group fmri=x11/server/xorg/driver/xorg-input-mouse
 $(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-synaptics
 $(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-input-vmmouse
-depend type=group fmri=x11/server/xorg/driver/xorg-video-ast
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-ati
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-cirrus
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-intel
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-mach64
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-mga
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-nv
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-openchrome
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-r128
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-trident
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-vesa
-$(i386_ONLY)depend type=group fmri=x11/server/xorg/driver/xorg-video-vmware
-depend type=group fmri=x11/server/xserver-common
+depend type=group fmri=x11/server/xorg/driver/xorg-input-void
+depend type=group fmri=x11/server/xorg/driver/xorg-video
 depend type=group fmri=x11/server/xvnc
 depend type=group fmri=x11/session/sessreg
 depend type=group fmri=x11/session/smproxy
 depend type=group fmri=x11/session/winsysck
 depend type=group fmri=x11/session/xauth
 depend type=group fmri=x11/session/xinit
-depend type=group fmri=x11/trusted/libxtsol
 depend type=group fmri=x11/x11-server-utilities
 depend type=group fmri=x11/x11-window-dump
 depend type=group fmri=x11/xcalc
--- a/src/pkg/manifests/group:system:solaris-large-server.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/group:system:solaris-large-server.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -36,23 +36,13 @@
 depend type=group fmri=compress/p7zip
 depend type=group fmri=compress/unzip
 depend type=group fmri=compress/zip
-depend type=group fmri=crypto/ca-certificates
-depend type=group fmri=data/iso-codes
-depend type=group fmri=database/sqlite-3
-depend type=group fmri=developer/assembler
-depend type=group fmri=developer/base-developer-utilities
+depend type=group fmri=crypto/gnupg
+depend type=group fmri=crypto/pwgen
 depend type=group fmri=developer/build/gnu-make
 depend type=group fmri=developer/build/make
 depend type=group fmri=developer/debug/mdb
-depend type=group fmri=developer/library/xprofile
-depend type=group fmri=developer/macro/cpp
-depend type=group fmri=developer/versioning/sccs
 $(i386_ONLY)depend type=group fmri=diagnostic/acpidump
-depend type=group fmri=diagnostic/constype
 depend type=group fmri=diagnostic/cpu-counters
-depend type=group fmri=diagnostic/ddu/data
-depend type=group fmri=diagnostic/ddu/library
-depend type=group fmri=diagnostic/ddu/locale
 depend type=group fmri=diagnostic/ddu/text
 depend type=group fmri=diagnostic/latencytop
 depend type=group fmri=diagnostic/powertop
@@ -68,12 +58,8 @@
 depend type=group fmri=driver/fc/emlxs
 depend type=group fmri=driver/fc/qlc
 $(sparc_ONLY)depend type=group fmri=driver/fc/socal
-$(i386_ONLY)depend type=group fmri=driver/graphics/agpgart
 $(sparc_ONLY)depend type=group fmri=driver/graphics/ast
-$(i386_ONLY)depend type=group fmri=driver/graphics/atiatom
-$(i386_ONLY)depend type=group fmri=driver/graphics/drm
 $(sparc_ONLY)depend type=group fmri=driver/graphics/efb
-$(i386_ONLY)depend type=group fmri=driver/graphics/nvidia
 depend type=group fmri=driver/infiniband/connectx
 depend type=group fmri=driver/infiniband/tavor
 $(i386_ONLY)depend type=group fmri=driver/management/bmc
@@ -177,7 +163,6 @@
 $(i386_ONLY)depend type=group fmri=driver/storage/si3124
 depend type=group fmri=driver/storage/smp
 $(sparc_ONLY)depend type=group fmri=driver/storage/ssd
-$(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 $(i386_ONLY)depend type=group fmri=driver/xvm/pv
 depend type=group fmri=editor/nano
 depend type=group fmri=editor/vim/vim-core
@@ -185,60 +170,20 @@
 depend type=group fmri=file/gnu-coreutils
 depend type=group fmri=file/gnu-findutils
 depend type=group fmri=file/slocate
-depend type=group fmri=image/library/libjpeg
-depend type=group fmri=image/library/libpng
-depend type=group fmri=image/library/libtiff
 depend type=group fmri=install/installadm
-depend type=group fmri=library/apr-13
-depend type=group fmri=library/apr-util-13
-depend type=group fmri=library/database/gdbm
-depend type=group fmri=library/desktop/atk
-depend type=group fmri=library/desktop/cairo
-depend type=group fmri=library/desktop/gtk2
-depend type=group fmri=library/desktop/pango
-depend type=group fmri=library/expat
-depend type=group fmri=library/glib2
-depend type=group fmri=library/gmp
-depend type=group fmri=library/graphics/pixman
-depend type=group fmri=library/libffi
-depend type=group fmri=library/libidn
-depend type=group fmri=library/libmilter
-depend type=group fmri=library/libtecla
-depend type=group fmri=library/libxml2
-depend type=group fmri=library/libxslt
-depend type=group fmri=library/ncurses
-depend type=group fmri=library/nspr
-depend type=group fmri=library/pcre
-depend type=group fmri=library/perl-5/sun-solaris-512
-depend type=group fmri=library/perl-5/xml-parser-512
-depend type=group fmri=library/perl-5/xml-parser-584
-depend type=group fmri=library/print/cups-libs
-depend type=group fmri=library/print/open-printing
-depend type=group fmri=library/python-2/cherrypy-26
-depend type=group fmri=library/python-2/lxml-26
-depend type=group fmri=library/python-2/m2crypto-26
-depend type=group fmri=library/python-2/mako-26
-depend type=group fmri=library/python-2/ply-26
-depend type=group fmri=library/python-2/pybonjour-26
-depend type=group fmri=library/python-2/pycurl-26
-depend type=group fmri=library/python-2/pyopenssl-26
-depend type=group fmri=library/python-2/python-extra-26
-depend type=group fmri=library/python-2/simplejson-26
-depend type=group fmri=library/readline
-depend type=group fmri=library/security/libgpg-error
-depend type=group fmri=library/security/nss
-depend type=group fmri=library/security/openssl
-depend type=group fmri=library/security/trousers
-depend type=group fmri=library/unixodbc
-depend type=group fmri=library/zlib
+depend type=group fmri=install/js2ai
 depend type=group fmri=media/cdrtools
+depend type=group fmri=media/cdrw
+depend type=group fmri=media/dvd+rw-tools
+depend type=group fmri=media/xorriso
 depend type=group fmri=naming/ldap
-depend type=group fmri=network/bridging
 depend type=group fmri=network/dns/bind
 depend type=group fmri=network/finger
 depend type=group fmri=network/ftp
+depend type=group fmri=network/ftp/ncftp
 depend type=group fmri=network/ipfilter
 depend type=group fmri=network/legacy-remote-utilities
+depend type=group fmri=network/netcat
 depend type=group fmri=network/open-fabrics
 depend type=group fmri=network/ping
 depend type=group fmri=network/rsync
@@ -248,30 +193,25 @@
 depend type=group fmri=network/telnet
 depend type=group fmri=network/whois
 depend type=group fmri=package/pkg
-depend type=group fmri=package/pkg/system-repository
-depend type=group fmri=package/pkg/zones-proxy
 depend type=group fmri=package/rpm
 depend type=group fmri=package/svr4
 depend type=group fmri=print/cups
+depend type=group fmri=print/cups/filter/foomatic-db
+depend type=group fmri=print/cups/filter/foomatic-db-engine
+depend type=group fmri=print/cups/hal-cups-utils
 depend type=group fmri=print/filter/a2ps
-depend type=group fmri=print/lp/filter/foomatic-ppds
+depend type=group fmri=print/filter/hplip
 depend type=group fmri=print/lp/filter/foomatic-rip
+depend type=group fmri=print/psutils
 depend type=group fmri=release/name
 depend type=group fmri=release/notices
 depend type=group fmri=release/registration
-depend type=group fmri=runtime/java/jre-6
-depend type=group fmri=runtime/perl-512
-depend type=group fmri=runtime/perl-584
-depend type=group fmri=runtime/perl-584/extra
-depend type=group fmri=runtime/python-26
-depend type=group fmri=runtime/tcl-8
 depend type=group fmri=security/bart
+depend type=group fmri=security/nss-utilities
 depend type=group fmri=security/sudo
 depend type=group fmri=security/tcp-wrapper
 depend type=group fmri=service/diagnostic/spray
 depend type=group fmri=service/file-system/nfs
-depend type=group fmri=service/file-system/smb
-depend type=group fmri=service/gnome/desktop-cache
 $(sparc_ONLY)depend type=group fmri=service/key-management/sun-fire-15000
 depend type=group fmri=service/network/comsat
 depend type=group fmri=service/network/dhcp/isc-dhcp
@@ -279,7 +219,9 @@
 depend type=group fmri=service/network/dns/mdns
 depend type=group fmri=service/network/finger
 depend type=group fmri=service/network/ftp
+depend type=group fmri=service/network/legacy-network-services
 depend type=group fmri=service/network/legacy-remote-utilities
+depend type=group fmri=service/network/load-balancer/ilb
 depend type=group fmri=service/network/ntp
 depend type=group fmri=service/network/slp
 depend type=group fmri=service/network/smtp/sendmail
@@ -287,7 +229,7 @@
 depend type=group fmri=service/network/talk
 depend type=group fmri=service/network/telnet
 depend type=group fmri=service/network/tftp
-depend type=group fmri=service/opengl/ogl-select
+depend type=group fmri=service/network/wpa
 depend type=group fmri=service/security/gss
 depend type=group fmri=service/security/kerberos-5
 depend type=group fmri=service/storage/rmt
@@ -299,19 +241,15 @@
 depend type=group fmri=shell/which
 depend type=group fmri=shell/zsh
 $(sparc_ONLY)depend type=group fmri=storage/library/network-array
-depend type=group fmri=storage/svm
 depend type=group fmri=system/accounting/legacy-accounting
 depend type=group fmri=system/boot-environment-utilities
 depend type=group fmri=system/boot/grub
 depend type=group fmri=system/boot/wanboot
 depend type=group fmri=system/core-os
-depend type=group fmri=system/data/hardware-registry
-depend type=group fmri=system/data/keyboard/keytables
 depend type=group fmri=system/data/terminfo
 depend type=group fmri=system/data/terminfo/terminfo-core
 depend type=group fmri=system/data/timezone
 depend type=group fmri=system/device-administration
-depend type=group fmri=system/device-allocation
 $(sparc_ONLY)depend type=group fmri=system/domain-configuration/sparc-enterprise
 $(sparc_ONLY)depend type=group \
     fmri=system/domain-service-processor-protocol/sparc-enterprise
@@ -321,14 +259,12 @@
 $(sparc_ONLY)depend type=group fmri=system/embedded-fcode-interpreter
 depend type=group fmri=system/fault-management
 depend type=group fmri=system/fault-management/asr-notify
-depend type=group fmri=system/fault-management/fm-snmp-mib
 depend type=group fmri=system/fault-management/smtp-notify
 depend type=group fmri=system/fault-management/snmp-notify
 depend type=group fmri=system/file-system/autofs
 depend type=group fmri=system/file-system/hsfs
 depend type=group fmri=system/file-system/nfs
 depend type=group fmri=system/file-system/pcfs
-depend type=group fmri=system/file-system/smb
 depend type=group fmri=system/file-system/udfs
 depend type=group fmri=system/file-system/ufs
 depend type=group fmri=system/file-system/zfs
@@ -336,9 +272,6 @@
 $(sparc_ONLY)depend type=group fmri=system/floating-point-scrubber
 depend type=group fmri=system/fru-id
 depend type=group fmri=system/hal
-depend type=group fmri=system/install
-depend type=group fmri=system/install/auto-install
-depend type=group fmri=system/install/auto-install/auto-install-common
 depend type=group fmri=system/install/configuration
 depend type=group fmri=system/install/locale
 depend type=group fmri=system/install/tests
@@ -378,52 +311,25 @@
 depend type=group fmri=system/kernel/platform
 $(sparc_ONLY)depend type=group fmri=system/kernel/platform/netra
 depend type=group fmri=system/kernel/power
-depend type=group fmri=system/kernel/secure-rpc
-depend type=group fmri=system/kernel/security/gss
 depend type=group fmri=system/kernel/suspend-resume
-depend type=group fmri=system/keyboard/kbd_mode
 depend type=group fmri=system/keyboard/keyboard-utilities
 $(sparc_ONLY)depend type=group fmri=system/ldoms
 $(sparc_ONLY)depend type=group fmri=system/ldoms/ldomsmanager
-depend type=group fmri=system/library
-depend type=group fmri=system/library/c++-runtime
-depend type=group fmri=system/library/dbus
-depend type=group fmri=system/library/flex-runtime
-depend type=group fmri=system/library/fontconfig
-depend type=group fmri=system/library/freetype-2
-depend type=group fmri=system/library/gcc-3-runtime
-depend type=group fmri=system/library/gcc-45-runtime
 depend type=group fmri=system/library/iconv/utf-8
-depend type=group fmri=system/library/install
-depend type=group fmri=system/library/libdbus
-depend type=group fmri=system/library/libdbus-glib
-depend type=group fmri=system/library/libpcap
-depend type=group fmri=system/library/math
-depend type=group fmri=system/library/openmp
 depend type=group fmri=system/library/platform
-depend type=group fmri=system/library/policykit
 depend type=group fmri=system/library/processor
-depend type=group fmri=system/library/security/gss
-depend type=group fmri=system/library/security/gss/diffie-hellman
-depend type=group fmri=system/library/security/gss/spnego
-depend type=group fmri=system/library/security/libgcrypt
-depend type=group fmri=system/library/security/libsasl
-depend type=group fmri=system/library/security/rpcsec
-depend type=group fmri=system/library/storage/libdiskmgt
-depend type=group fmri=system/library/storage/libfcoe
-depend type=group fmri=system/library/storage/scsi-plugins
-depend type=group fmri=system/library/storage/snia-hbaapi
-depend type=group fmri=system/library/storage/snia-ima
-depend type=group fmri=system/library/storage/snia-mpapi
-depend type=group fmri=system/library/storage/t11-sm-hba
 depend type=group fmri=system/linker
 depend type=group fmri=system/locale
 depend type=group fmri=system/management/ilomconfig
 $(i386_ONLY)depend type=group fmri=system/management/intel-amt
 depend type=group fmri=system/management/ipmitool
 depend type=group fmri=system/management/ocm
-depend type=group fmri=system/management/service-tag
+depend type=group fmri=system/management/rad
+depend type=group fmri=system/management/rad/client/rad-java
+depend type=group fmri=system/management/rad/client/rad-python
+depend type=group fmri=system/management/rad/module/rad-smf
 depend type=group fmri=system/management/snmp/net-snmp
+depend type=group fmri=system/management/snmp/net-snmp/addons
 depend type=group fmri=system/management/snmp/net-snmp/documentation
 depend type=group fmri=system/manual
 depend type=group fmri=system/manual/locale
@@ -451,14 +357,11 @@
 depend type=group fmri=system/storage/raid-utilities
 depend type=group fmri=system/storage/removable-media
 depend type=group fmri=system/storage/sas-utilities
-depend type=group fmri=system/storage/scsi-target-mode-framework
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
-depend type=group fmri=system/xopen/xcu4
 depend type=group fmri=system/zones
 depend type=group fmri=system/zones/brand/brand-solaris
 depend type=group fmri=system/zones/brand/brand-solaris10
-depend type=group fmri=terminal/fbconsole
 depend type=group fmri=terminal/luit
 depend type=group fmri=terminal/resize
 depend type=group fmri=terminal/screen
@@ -470,39 +373,7 @@
 depend type=group fmri=text/gnu-patch
 depend type=group fmri=text/gnu-sed
 depend type=group fmri=text/groff
-depend type=group fmri=text/groff/groff-core
 depend type=group fmri=text/less
-depend type=group fmri=text/locale
 depend type=group fmri=text/spelling-utilities
 depend type=group fmri=text/texinfo
-depend type=group fmri=web/curl
-depend type=group fmri=web/server/apache-22
 depend type=group fmri=web/wget
-depend type=group fmri=x11/compatibility/links-xorg
-depend type=group fmri=x11/header/x11-protocols
-depend type=group fmri=x11/library/libdga
-depend type=group fmri=x11/library/libfontenc
-depend type=group fmri=x11/library/libice
-depend type=group fmri=x11/library/libpthread-stubs
-depend type=group fmri=x11/library/libsm
-depend type=group fmri=x11/library/libx11
-depend type=group fmri=x11/library/libxau
-depend type=group fmri=x11/library/libxcb
-depend type=group fmri=x11/library/libxcomposite
-depend type=group fmri=x11/library/libxcursor
-depend type=group fmri=x11/library/libxdamage
-depend type=group fmri=x11/library/libxdmcp
-depend type=group fmri=x11/library/libxext
-depend type=group fmri=x11/library/libxfixes
-depend type=group fmri=x11/library/libxft
-depend type=group fmri=x11/library/libxi
-depend type=group fmri=x11/library/libxinerama
-depend type=group fmri=x11/library/libxmu
-depend type=group fmri=x11/library/libxmuu
-depend type=group fmri=x11/library/libxpm
-depend type=group fmri=x11/library/libxrandr
-depend type=group fmri=x11/library/libxrender
-depend type=group fmri=x11/library/libxtst
-depend type=group fmri=x11/library/libxxf86vm
-depend type=group fmri=x11/library/toolkit/libxaw7
-depend type=group fmri=x11/library/toolkit/libxt
--- a/src/pkg/manifests/group:system:solaris-small-server.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/group:system:solaris-small-server.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -23,6 +23,23 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+#
+# The following packages (among others) currently have "parent"
+# dependencies with an FMRI of "self" to ensure the package is kept
+# consistent between the global and non-global zones. These packages for
+# now are tagged for the global zone only so that installation of this
+# group package in a non-global zone doesn't produce an error if the
+# package isn't installed in the global zone.
+#
+<transform depend fmri=developer/driver($|/) -> \
+    default variant.opensolaris.zone global>
+<transform depend fmri=driver($|/) -> default variant.opensolaris.zone global>
+<transform depend fmri=system/io($|/) -> \
+    default variant.opensolaris.zone global>
+<transform depend fmri=system/kernel($|/) -> \
+    default variant.opensolaris.zone global>
+<transform depend fmri=system/storage($|/) -> \
+    default variant.opensolaris.zone global>
 set name=pkg.fmri value=pkg:/group/system/solaris-small-server@$(PKGVERS)
 set name=pkg.summary value="Oracle Solaris Small Server"
 set name=pkg.description \
@@ -32,41 +49,263 @@
 set name=variant.arch value=$(ARCH)
 depend type=group fmri=compress/bzip2
 depend type=group fmri=compress/gzip
+depend type=group fmri=compress/p7zip
 depend type=group fmri=compress/unzip
 depend type=group fmri=compress/zip
+depend type=group fmri=developer/debug/mdb
+$(i386_ONLY)depend type=group fmri=diagnostic/acpidump \
+    variant.opensolaris.zone=global
+depend type=group fmri=diagnostic/cpu-counters
+depend type=group fmri=diagnostic/latencytop variant.opensolaris.zone=global
+depend type=group fmri=diagnostic/powertop variant.opensolaris.zone=global
+depend type=group fmri=diagnostic/scanpci variant.opensolaris.zone=global
 depend type=group fmri=diagnostic/snoop
-depend type=group fmri=diagnostic/spray
+depend type=group fmri=diagnostic/tcpdump
+$(sparc_ONLY)depend type=group fmri=driver/cpu/us
+depend type=group fmri=driver/crypto/dca
+$(sparc_ONLY)depend type=group fmri=driver/crypto/n2cp
+depend type=group fmri=driver/crypto/tpm
+depend type=group fmri=driver/fc/emlxs
+depend type=group fmri=driver/fc/qlc
+$(sparc_ONLY)depend type=group fmri=driver/fc/socal
+$(sparc_ONLY)depend type=group fmri=driver/graphics/ast
+$(sparc_ONLY)depend type=group fmri=driver/graphics/efb
+depend type=group fmri=driver/infiniband/connectx
+depend type=group fmri=driver/infiniband/tavor
+$(i386_ONLY)depend type=group fmri=driver/management/bmc
+depend type=group fmri=driver/network/ethernet/afe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/amd8111s
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/atge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bfe
+depend type=group fmri=driver/network/ethernet/bge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnx
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnxe
+depend type=group fmri=driver/network/ethernet/chxge
+depend type=group fmri=driver/network/ethernet/cxge
+depend type=group fmri=driver/network/ethernet/dmfe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/dnet
+depend type=group fmri=driver/network/ethernet/e1000g
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/elxl
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/eri
+depend type=group fmri=driver/network/ethernet/hme
+depend type=group fmri=driver/network/ethernet/hxge
+depend type=group fmri=driver/network/ethernet/igb
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/iprb
+depend type=group fmri=driver/network/ethernet/ixgb
+depend type=group fmri=driver/network/ethernet/ixgbe
+depend type=group fmri=driver/network/ethernet/mxfe
+depend type=group fmri=driver/network/ethernet/myri10ge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/nge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/ntxn
+depend type=group fmri=driver/network/ethernet/nxge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/pcn
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/qfe
+depend type=group fmri=driver/network/ethernet/qlcnic
+depend type=group fmri=driver/network/ethernet/rge
+depend type=group fmri=driver/network/ethernet/rtls
+depend type=group fmri=driver/network/ethernet/sfe
+depend type=group fmri=driver/network/ethernet/sxge
+depend type=group fmri=driver/network/ethernet/usbecm
+depend type=group fmri=driver/network/ethernet/vr
+depend type=group fmri=driver/network/ethernet/vxge
+depend type=group fmri=driver/network/ethernet/xge
+depend type=group fmri=driver/network/ethernet/yge
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/arn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/atu
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ipw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwh
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwk
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwp
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/mwl
+depend type=group fmri=driver/network/wlan/pcan
+depend type=group fmri=driver/network/wlan/pcwl
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ral
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rum
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwd
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/uath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ural
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/urtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/wpi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/zyd
+depend type=group fmri=driver/parallel/ecpp
+depend type=group fmri=driver/pcmcia
+$(i386_ONLY)depend type=group fmri=driver/serial/asy
+depend type=group fmri=driver/serial/pcser
+$(sparc_ONLY)depend type=group fmri=driver/serial/se
+depend type=group fmri=driver/serial/usbftdi
+depend type=group fmri=driver/serial/usbsacm
+depend type=group fmri=driver/serial/usbser
+depend type=group fmri=driver/serial/usbser_edge
+depend type=group fmri=driver/serial/usbsksp
+depend type=group fmri=driver/serial/usbsksp/usbs49_fw
+depend type=group fmri=driver/serial/usbsprl
+depend type=group fmri=driver/storage/aac
+$(i386_ONLY)depend type=group fmri=driver/storage/adpu320
+$(i386_ONLY)depend type=group fmri=driver/storage/ahci
+$(i386_ONLY)depend type=group fmri=driver/storage/arcmsr
+$(i386_ONLY)depend type=group fmri=driver/storage/ata
+$(i386_ONLY)depend type=group fmri=driver/storage/bcm_sata
+depend type=group fmri=driver/storage/blkdev
+$(i386_ONLY)depend type=group fmri=driver/storage/cmdk
+$(i386_ONLY)depend type=group fmri=driver/storage/cpqary3
+depend type=group fmri=driver/storage/glm
+$(sparc_ONLY)depend type=group fmri=driver/storage/ifp
+$(i386_ONLY)depend type=group fmri=driver/storage/imraid_sas
+$(sparc_ONLY)depend type=group fmri=driver/storage/isp
+$(i386_ONLY)depend type=group fmri=driver/storage/marvell88sx
+$(i386_ONLY)depend type=group fmri=driver/storage/mega_sas
+depend type=group fmri=driver/storage/mpt
+depend type=group fmri=driver/storage/mpt_sas
+depend type=group fmri=driver/storage/mr_sas
+$(i386_ONLY)depend type=group fmri=driver/storage/nv_sata
+depend type=group fmri=driver/storage/pcata
+depend type=group fmri=driver/storage/pmcs
+depend type=group fmri=driver/storage/sbp2
+depend type=group fmri=driver/storage/scsa1394
+$(i386_ONLY)depend type=group fmri=driver/storage/scu
+$(i386_ONLY)depend type=group fmri=driver/storage/sdcard
+depend type=group fmri=driver/storage/ses
+$(sparc_ONLY)depend type=group fmri=driver/storage/sf
+$(i386_ONLY)depend type=group fmri=driver/storage/si3124
+depend type=group fmri=driver/storage/smp
+$(sparc_ONLY)depend type=group fmri=driver/storage/ssd
+$(i386_ONLY)depend type=group fmri=driver/xvm/pv
 depend type=group fmri=editor/vim/vim-core
-depend type=group fmri=file/filesync
+depend type=group fmri=media/cdrtools
+depend type=group fmri=media/xorriso
 depend type=group fmri=naming/ldap
 depend type=group fmri=network/dns/bind
-depend type=group fmri=network/finger
-depend type=group fmri=network/legacy-remote-utilities
+depend type=group fmri=network/ipfilter
+depend type=group fmri=network/open-fabrics
 depend type=group fmri=network/ping
+depend type=group fmri=network/rsync
 depend type=group fmri=network/ssh
 depend type=group fmri=network/ssh/ssh-key
-depend type=group fmri=network/talk
-depend type=group fmri=network/whois
 depend type=group fmri=package/pkg
+depend type=group fmri=release/name
+depend type=group fmri=release/notices
+depend type=group fmri=release/registration variant.opensolaris.zone=global
+depend type=group fmri=security/nss-utilities
 depend type=group fmri=security/sudo
+depend type=group fmri=security/tcp-wrapper
+depend type=group fmri=service/network/smtp/sendmail
 depend type=group fmri=service/network/ssh
+depend type=group fmri=service/network/wpa variant.opensolaris.zone=global
+depend type=group fmri=service/security/gss
+depend type=group fmri=service/security/kerberos-5
 depend type=group fmri=shell/bash
 depend type=group fmri=shell/ksh
+$(sparc_ONLY)depend type=group fmri=storage/library/network-array \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/boot-environment-utilities
+depend type=group fmri=system/boot/grub variant.opensolaris.zone=global
 depend type=group fmri=system/core-os
+depend type=group fmri=system/data/terminfo/terminfo-core
 depend type=group fmri=system/data/timezone
+depend type=group fmri=system/device-administration \
+    variant.opensolaris.zone=global
 depend type=group fmri=system/dtrace
+depend type=group fmri=system/dtrace/dtrace-toolkit
+depend type=group fmri=system/fault-management
+depend type=group fmri=system/fault-management/asr-notify \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/fault-management/smtp-notify
 depend type=group fmri=system/file-system/autofs
+depend type=group fmri=system/file-system/hsfs
 depend type=group fmri=system/file-system/nfs
-depend type=group fmri=system/install
+depend type=group fmri=system/file-system/pcfs
+depend type=group fmri=system/file-system/udfs
+depend type=group fmri=system/file-system/ufs
+depend type=group fmri=system/file-system/zfs
+depend type=group fmri=system/firmware-utilities variant.opensolaris.zone=global
+$(sparc_ONLY)depend type=group fmri=system/floating-point-scrubber \
+    variant.opensolaris.zone=global
 depend type=group fmri=system/install/configuration
+depend type=group fmri=system/install/locale
+depend type=group fmri=system/io/fc/fc-fabric
+depend type=group fmri=system/io/fc/fc-port
+depend type=group fmri=system/io/fc/fc-san-management
+depend type=group fmri=system/io/fc/fc-scsi
+depend type=group fmri=system/io/fc/ip-over-fc
+depend type=group fmri=system/io/ieee-1394
+depend type=group fmri=system/io/infiniband
+depend type=group fmri=system/io/infiniband/ethernet-over-ib
+depend type=group fmri=system/io/infiniband/ib-device-mgt-agent
+depend type=group fmri=system/io/infiniband/ib-sockets-direct
+depend type=group fmri=system/io/infiniband/ip-over-ib
+depend type=group fmri=system/io/infiniband/open-fabrics
+depend type=group fmri=system/io/infiniband/reliable-datagram-sockets
+depend type=group fmri=system/io/infiniband/reliable-datagram-sockets-v3
+depend type=group fmri=system/io/infiniband/rpc-over-rdma
+depend type=group fmri=system/io/infiniband/udapl
+depend type=group fmri=system/io/ultra-wideband
+depend type=group fmri=system/io/usb
 depend type=group fmri=system/kernel
-depend type=group fmri=system/library/install
+depend type=group fmri=system/kernel/cpu-counters
+$(sparc_ONLY)depend type=group fmri=system/kernel/cpu/sun4v
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/fipe
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/ioat
+$(sparc_ONLY)depend type=group fmri=system/kernel/io-performance-counters
+depend type=group fmri=system/kernel/platform
+$(sparc_ONLY)depend type=group fmri=system/kernel/platform/netra
+depend type=group fmri=system/kernel/power
+depend type=group fmri=system/kernel/suspend-resume
+depend type=group fmri=system/keyboard/keyboard-utilities \
+    variant.opensolaris.zone=global
+$(sparc_ONLY)depend type=group fmri=system/ldoms variant.opensolaris.zone=global
+depend type=group fmri=system/library/iconv/utf-8
+depend type=group fmri=system/library/platform variant.opensolaris.zone=global
+depend type=group fmri=system/library/processor variant.opensolaris.zone=global
 depend type=group fmri=system/linker
-depend type=group fmri=system/management/ocm
+depend type=group fmri=system/locale
+depend type=group fmri=system/management/ilomconfig \
+    variant.opensolaris.zone=global
+$(i386_ONLY)depend type=group fmri=system/management/intel-amt \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/management/ipmitool \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/management/ocm variant.opensolaris.zone=global
+depend type=group fmri=system/management/rad variant.opensolaris.zone=global
+depend type=group fmri=system/management/rad/client/rad-java \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/management/rad/client/rad-python \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/management/rad/module/rad-smf \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/manual
+depend type=group fmri=system/manual/locale
 depend type=group fmri=system/network
+depend type=group fmri=system/network/bpf variant.opensolaris.zone=global
 depend type=group fmri=system/network/nis
 depend type=group fmri=system/network/routing
+depend type=group fmri=system/picl variant.opensolaris.zone=global
+depend type=group fmri=system/prerequisite/gnu
+depend type=group fmri=system/resource-mgmt/dynamic-resource-pools \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/resource-mgmt/resource-caps
+depend type=group fmri=system/resource-mgmt/resource-pools \
+    variant.opensolaris.zone=global
+depend type=group fmri=system/scheduler/fss variant.opensolaris.zone=global
+depend type=group fmri=system/storage/fc-utilities
+depend type=group fmri=system/storage/fcoe
+depend type=group fmri=system/storage/fcoe/fcoe-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-iser
+depend type=group fmri=system/storage/multipath-utilities
+depend type=group fmri=system/storage/raid-utilities
+depend type=group fmri=system/storage/sas-utilities
+depend type=group fmri=system/system-events variant.opensolaris.zone=global
+depend type=group fmri=system/virtual-console variant.opensolaris.zone=global
+depend type=group fmri=system/zones
+depend type=group fmri=system/zones/brand/brand-solaris
+depend type=group fmri=terminal/luit
 depend type=group fmri=terminal/resize
 depend type=group fmri=text/doctools
-depend type=group fmri=text/locale
+depend type=group fmri=text/doctools/ja
+depend type=group fmri=text/less
 depend type=group fmri=text/spelling-utilities
+depend type=group fmri=web/wget
--- a/src/pkg/manifests/package:pkg.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/package:pkg.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -345,6 +345,10 @@
 license cr_Oracle license=cr_Oracle
 license lic_gustaebel license=lic_gustaebel
 license lic_minisat license=lic_minisat
+depend type=exclude fmri=system/platform/exadata/firstrun \
+    facet.exclude.system/platform/exadata/firstrun=true
+depend type=exclude fmri=system/platform/exalogic/firstrun \
+    facet.exclude.system/platform/exalogic/firstrun=true
 depend type=group fmri=package/pkg/zones-proxy \
     variant.opensolaris.zone=nonglobal
 # cross zone dependency on linked image metadata
--- a/src/pkg/manifests/server_install.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/server_install.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -24,6 +24,12 @@
 #
 
 set name=pkg.fmri value=pkg:/[email protected],5.11-0.166
+#
+# These old-style "renamed" group packages purposely lack
+# info.classification and pkg.summary set actions.
+#
+set name=pkg.linted.opensolaris.manifest001.1 value=true
+set name=pkg.linted.opensolaris.manifest001.2 value=true
 set name=nopublish.after value=166
 set name=variant.arch value=$(ARCH)
 depend type=require fmri=group/system/solaris-large-server
--- a/src/pkg/manifests/slim_install.p5m	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/manifests/slim_install.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -24,6 +24,12 @@
 #
 
 set name=pkg.fmri value=pkg:/[email protected],5.11-0.166
+#
+# These old-style "renamed" group packages purposely lack
+# info.classification and pkg.summary set actions.
+#
+set name=pkg.linted.opensolaris.manifest001.1 value=true
+set name=pkg.linted.opensolaris.manifest001.2 value=true
 set name=nopublish.after value=166
 set name=variant.arch value=$(ARCH)
 depend type=require fmri=group/system/solaris-desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/web:amp.p5m	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+set name=pkg.fmri value=pkg:/web/[email protected],5.11-0.174.0.0.0.0.0
+set name=pkg.renamed value=true
+set name=nopublish.after value=174
+depend type=require fmri=group/feature/[email protected]
--- a/src/pkg/transforms/incorp	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/pkg/transforms/incorp	Mon Sep 19 02:03:09 2011 -0700
@@ -51,12 +51,4 @@
 # Don't need to incorporate the incorporation!
 <transform depend fmri=.*/ips-incorporation@.* -> drop>
 
-#
-# Temporarily drop system/zones/brand/ipkg and its ancestors from the
-# incorporation while they are moved to ON.
-#
-<transform depend fmri=(pkg:/)?SUNWipkg-brand@.* type=incorporate -> drop>
-<transform depend fmri=(pkg:/)?system/zones/brand/ipkg@.* type=incorporate \
-    -> drop>
-
 # vim: ft=pkg5manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/174.0.0.0.0.0/common/Redistributable	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,4 @@
+package redistributable
+obsoleted 174.0.0.0.0.0
+version 0.1
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/174.0.0.0.0.0/common/driver:network:ce	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,24 @@
+package driver/network/ce
+consolidation "nspg"
+obsoleted 172
+end package
+
+package SUNWced
+consolidation "nspg"
+obsoleted 172
+end package
+
+package developer/debug/mdb/module/module-ce
+consolidation "nspg"
+obsoleted 172
+end package
+
+package SUNWcea
+consolidation "nspg"
+obsoleted 172
+end package
+
+package SUNWcedu
+consolidation "nspg"
+obsoleted 174.0.0.0.0.0
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/174.0.0.0.0.0/common/system:management:product-registry	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,14 @@
+package system/management/product-registry
+consolidation "admin"
+obsoleted 171
+end package
+
+package SUNWwsr2
+consolidation "admin"
+obsoleted 171
+end package
+
+package SUNWproduct-registry-root
+consolidation "admin"
+obsoleted 174.0.0.0.0.0
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/174.0.0.0.0.0/redist_cluster	Mon Sep 19 02:03:09 2011 -0700
@@ -0,0 +1,365 @@
+include common/developer:java:jdk-6
+include common/library:java:java-demo-6
+include common/library:java:javadb
+include common/library:java:javahelp
+include common/runtime:java:jre-6
+# Include statements for obsoleted packages.
+$(i386_ONLY)include common/FSWfontconfig-devel-docs
+$(i386_ONLY)include common/FSWxorg-devel-docs
+$(i386_ONLY)include common/FSWxwpft
+$(i386_ONLY)include common/Hypervisor
+include common/Redistributable
+$(i386_ONLY)include common/SUNWadmc
+$(i386_ONLY)include common/SUNWaspell
+$(i386_ONLY)include common/SUNWaspell-en
+$(i386_ONLY)include common/SUNWbrg
+$(i386_ONLY)include common/SUNWccccfg
+$(i386_ONLY)include common/SUNWccccr
+$(i386_ONLY)include common/SUNWccfw
+$(i386_ONLY)include common/SUNWccfwctrl
+$(i386_ONLY)include common/SUNWccinv
+$(i386_ONLY)include common/SUNWccsign
+$(i386_ONLY)include common/SUNWcctpx
+$(i386_ONLY)include common/SUNWciu8
+$(i386_ONLY)include common/SUNWcsmauth
+$(i386_ONLY)include common/SUNWeuxwe
+$(i386_ONLY)include common/SUNWgnome-media-mp3
+$(i386_ONLY)include common/SUNWgnu-libiconv
+$(i386_ONLY)include common/SUNWhiu8
+$(i386_ONLY)include common/SUNWiniu8
+$(i386_ONLY)include common/SUNWkiu8
+$(i386_ONLY)include common/SUNWladm
+$(i386_ONLY)include common/SUNWlccom
+$(i386_ONLY)include common/SUNWlcl
+include common/SUNWpostgr
+include common/SUNWpostgr-contrib
+include common/SUNWpostgr-docs
+include common/SUNWpostgr-libs
+include common/SUNWpostgr-pl
+include common/SUNWpostgr-server
+$(i386_ONLY)include common/SUNWpostgr-server-data
+$(i386_ONLY)include common/SUNWppro
+$(i386_ONLY)include common/SUNWppro-plugin-sunos-base
+$(i386_ONLY)include common/SUNWsam
+$(i386_ONLY)include common/SUNWscn-base
+$(i386_ONLY)include common/SUNWscnprm
+$(i386_ONLY)include common/SUNWscnsom
+$(i386_ONLY)include common/SUNWsensor
+include common/SUNWsfdoc
+include common/SUNWsfinf
+include common/SUNWsfman
+include common/SUNWsfwhea
+$(i386_ONLY)include common/SUNWtiu8
+$(i386_ONLY)include common/SUNWulcf
+$(i386_ONLY)include common/SUNWupdatemgr
+include common/SUNWusbccid
+$(i386_ONLY)include common/SUNWuxlcf
+$(i386_ONLY)include common/SUNWxi18n
+$(i386_ONLY)include common/SUNWxsun-keytables
+$(i386_ONLY)include common/SUNWxwhl
+include common/benchmark:bonnieplus
+include common/benchmark:iozone
+include common/benchmark:sysbench
+include common/database:mysql-4
+include common/database:mysql-4:tests
+include common/database:mysql-50
+include common/database:mysql-50:connector:jdbc
+include common/database:mysql-50:tests
+include common/database:postgres-82
+include common/database:postgres-82:connector:jdbc
+include common/database:postgres-82:contrib
+include common/database:postgres-82:developer
+include common/database:postgres-82:documentation
+include common/database:postgres-82:language-bindings
+include common/database:postgres-82:library
+include common/database:postgres-82:pgtcl
+include common/database:postgres-83
+include common/database:postgres-83:connector:jdbc
+include common/database:postgres-83:contrib
+include common/database:postgres-83:developer
+include common/database:postgres-83:documentation
+include common/database:postgres-83:language-bindings
+include common/database:postgres-83:library
+include common/database:postgres-83:pgbouncer
+include common/database:postgres-83:pgtcl
+include common/database:postgres-84
+include common/database:postgres-84:contrib
+include common/database:postgres-84:developer
+include common/database:postgres-84:documentation
+include common/database:postgres-84:language-bindings
+include common/database:postgres-84:library
+include common/database:postgres-84:tests
+include common/database:postgres-common
+include common/database:postgres:library:c++:libpqxx
+include common/database:postgres:pg_upgrade
+include common/database:postgres:pgadmin
+include common/database:postgres:pgtcl
+include common/database:yaz
+include common/desktop:remote-desktop:turbovnc
+include common/developer:documentation-tool:epydoc
+include common/developer:imperius
+include common/developer:konkretcmpi
+include common/developer:parser:antlr-3
+include common/diagnostic:bwm-ng
+include common/driver:network:ce
+include common/editor:bvi
+include common/editor:jedit
+include common/image:virtualgl
+include common/library:apr-util-13:dbd-pgsql
+include common/library:desktop:gtk1
+include common/library:fftw-2
+include common/library:glib1
+include common/library:java:activation
+include common/library:java:asm
+include common/library:java:cglib
+include common/library:java:dom4j
+include common/library:java:drools
+include common/library:java:janino
+include common/library:java:jarjar
+include common/library:java:javamail
+include common/library:java:jaxb
+include common/library:java:jaxen-core
+include common/library:java:jdt-core
+include common/library:java:jettison
+include common/library:java:jexcelapi
+include common/library:java:joda-time
+include common/library:java:jrexx
+include common/library:java:log4j
+include common/library:java:mvel
+include common/library:java:pullparser
+include common/library:java:relaxngdatatype
+include common/library:java:saaj
+include common/library:java:stringtemplate
+include common/library:java:trove
+include common/library:java:wiseman
+include common/library:java:xom
+include common/library:java:xpp3-min
+include common/library:java:xsdlib
+include common/library:java:xstream
+include common/library:libosip2
+include common/library:perl-5:postgres-dbi
+include common/library:python-2:libxml2-24
+include common/library:python-2:libxsl-24
+include common/library:python-2:lxml-24
+include common/library:python-2:pyopenssl-24
+$(i386_ONLY)include common/loc/SUNWauaos
+$(i386_ONLY)include common/loc/SUNWauaow
+$(i386_ONLY)include common/loc/SUNWcadis
+$(i386_ONLY)include common/loc/SUNWcadma
+$(i386_ONLY)include common/loc/SUNWcamos
+$(i386_ONLY)include common/loc/SUNWcamow
+$(i386_ONLY)include common/loc/SUNWcbrg
+$(i386_ONLY)include common/loc/SUNWceuos
+$(i386_ONLY)include common/loc/SUNWceuow
+$(i386_ONLY)include common/loc/SUNWcladm
+$(i386_ONLY)include common/loc/SUNWcleue
+$(i386_ONLY)include common/loc/SUNWcpprou
+$(i386_ONLY)include common/loc/SUNWcupdatemgru
+$(i386_ONLY)include common/loc/SUNWcwsr2
+$(i386_ONLY)include common/loc/SUNWdbrg
+$(i386_ONLY)include common/loc/SUNWdedis
+$(i386_ONLY)include common/loc/SUNWdedma
+$(i386_ONLY)include common/loc/SUNWdeiso1
+$(i386_ONLY)include common/loc/SUNWdews2
+$(i386_ONLY)include common/loc/SUNWdladm
+$(i386_ONLY)include common/loc/SUNWdpprou
+$(i386_ONLY)include common/loc/SUNWdupdatemgru
+$(i386_ONLY)include common/loc/SUNWdxplt
+$(i386_ONLY)include common/loc/SUNWebrg
+$(i386_ONLY)include common/loc/SUNWeeuos
+$(i386_ONLY)include common/loc/SUNWeeuow
+$(i386_ONLY)include common/loc/SUNWeladm
+$(i386_ONLY)include common/loc/SUNWepprou
+$(i386_ONLY)include common/loc/SUNWesdis
+$(i386_ONLY)include common/loc/SUNWesdma
+$(i386_ONLY)include common/loc/SUNWesiso1
+$(i386_ONLY)include common/loc/SUNWesws2
+$(i386_ONLY)include common/loc/SUNWeu8os
+$(i386_ONLY)include common/loc/SUNWeuluf
+$(i386_ONLY)include common/loc/SUNWeupdatemgru
+$(i386_ONLY)include common/loc/SUNWexplt
+$(i386_ONLY)include common/loc/SUNWfbrg
+$(i386_ONLY)include common/loc/SUNWfladm
+$(i386_ONLY)include common/loc/SUNWfpprou
+$(i386_ONLY)include common/loc/SUNWfrdis
+$(i386_ONLY)include common/loc/SUNWfrdma
+$(i386_ONLY)include common/loc/SUNWfriso1
+$(i386_ONLY)include common/loc/SUNWfrws2
+$(i386_ONLY)include common/loc/SUNWfupdatemgru
+$(i386_ONLY)include common/loc/SUNWfxplt
+$(i386_ONLY)include common/loc/SUNWhadis
+$(i386_ONLY)include common/loc/SUNWhadma
+$(i386_ONLY)include common/loc/SUNWhbrg
+$(i386_ONLY)include common/loc/SUNWhkeue
+$(i386_ONLY)include common/loc/SUNWhladm
+$(i386_ONLY)include common/loc/SUNWhleue
+$(i386_ONLY)include common/loc/SUNWhpprou
+$(i386_ONLY)include common/loc/SUNWhupdatemgru
+$(i386_ONLY)include common/loc/SUNWhwsr2
+$(i386_ONLY)include common/loc/SUNWi13cs
+$(i386_ONLY)include common/loc/SUNWi15cs
+$(i386_ONLY)include common/loc/SUNWi1cs
+$(i386_ONLY)include common/loc/SUNWi2cs
+$(i386_ONLY)include common/loc/SUNWi5cs
+$(i386_ONLY)include common/loc/SUNWi7cs
+$(i386_ONLY)include common/loc/SUNWi9cs
+$(i386_ONLY)include common/loc/SUNWibrg
+$(i386_ONLY)include common/loc/SUNWiiimf-in-indicle
+$(i386_ONLY)include common/loc/SUNWiiimf-ko-kole
+$(i386_ONLY)include common/loc/SUNWiladm
+$(i386_ONLY)include common/loc/SUNWindt
+$(i386_ONLY)include common/loc/SUNWinleu
+$(i386_ONLY)include common/loc/SUNWinplt
+$(i386_ONLY)include common/loc/SUNWipprou
+$(i386_ONLY)include common/loc/SUNWitdis
+$(i386_ONLY)include common/loc/SUNWitdma
+$(i386_ONLY)include common/loc/SUNWitiso1
+$(i386_ONLY)include common/loc/SUNWitws2
+$(i386_ONLY)include common/loc/SUNWiupdatemgru
+$(i386_ONLY)include common/loc/SUNWixplt
+$(i386_ONLY)include common/loc/SUNWjadis
+$(i386_ONLY)include common/loc/SUNWjadma
+$(i386_ONLY)include common/loc/SUNWjbrg
+$(i386_ONLY)include common/loc/SUNWjladm
+$(i386_ONLY)include common/loc/SUNWjpprou
+$(i386_ONLY)include common/loc/SUNWjtsu
+$(i386_ONLY)include common/loc/SUNWjupdatemgru
+$(i386_ONLY)include common/loc/SUNWjws2
+$(i386_ONLY)include common/loc/SUNWjxplt
+$(i386_ONLY)include common/loc/SUNWkadis
+$(i386_ONLY)include common/loc/SUNWkadma
+$(i386_ONLY)include common/loc/SUNWkbrg
+$(i386_ONLY)include common/loc/SUNWkladm
+$(i386_ONLY)include common/loc/SUNWkleue
+$(i386_ONLY)include common/loc/SUNWkpprou
+$(i386_ONLY)include common/loc/SUNWktsu
+$(i386_ONLY)include common/loc/SUNWkupdatemgru
+$(i386_ONLY)include common/loc/SUNWkwsr2
+$(i386_ONLY)include common/loc/SUNWlocaledefsrc
+$(i386_ONLY)include common/loc/SUNWmeaos
+$(i386_ONLY)include common/loc/SUNWmeaow
+$(i386_ONLY)include common/loc/SUNWnafos
+$(i386_ONLY)include common/loc/SUNWnafow
+$(i386_ONLY)include common/loc/SUNWnamos
+$(i386_ONLY)include common/loc/SUNWnamow
+$(i386_ONLY)include common/loc/SUNWneuos
+$(i386_ONLY)include common/loc/SUNWneuow
+$(i386_ONLY)include common/loc/SUNWsamos
+$(i386_ONLY)include common/loc/SUNWsamow
+$(i386_ONLY)include common/loc/SUNWsbrg
+$(i386_ONLY)include common/loc/SUNWseuos
+$(i386_ONLY)include common/loc/SUNWseuow
+$(i386_ONLY)include common/loc/SUNWsladm
+$(i386_ONLY)include common/loc/SUNWspprou
+$(i386_ONLY)include common/loc/SUNWsupdatemgru
+$(i386_ONLY)include common/loc/SUNWsvdis
+$(i386_ONLY)include common/loc/SUNWsvdma
+$(i386_ONLY)include common/loc/SUNWsviso1
+$(i386_ONLY)include common/loc/SUNWsxplt
+$(i386_ONLY)include common/loc/SUNWweuos
+$(i386_ONLY)include common/loc/SUNWweuow
+include common/network:tor
+include common/runtime:dosbox
+include common/runtime:java:jruby
+include common/runtime:perl-510
+include common/runtime:perl-510:extra
+include common/runtime:tcl-8:snack
+include common/service:database:postgres-82
+include common/service:database:postgres-83
+include common/service:database:postgres-84
+include common/service:management:sysidtool
+include common/service:network:load-balancer:pen
+include common/service:network:sip:ser
+include common/service:network:sip:ser:administration
+include common/shell:pdsh
+include common/shell:shmux
+$(i386_ONLY)include common/slim_cd
+include common/system:library:sysidtool
+include common/system:management:powerman
+include common/system:management:product-registry
+include common/system:management:sysidtool
+include common/system:management:wbem:cimple
+include common/system:management:webmin
+include common/terminal:mrxvt
+include common/text:dwdiff
+include common/text:idzebra
+include common/web:aget
+include common/web:analytics:awstats
+include common/web:php-52:extension:php-pgsql
+include common/web:server:apache-13
+include common/web:server:apache-13:documentation
+$(i386_ONLY)include i386/SUNWxvmhvm
+$(i386_ONLY)include i386/system:library:libvirt
+$(i386_ONLY)include i386/system:storage:vdiskadm
+$(i386_ONLY)include i386/system:virtinst
+$(i386_ONLY)include i386/system:xvm:header-xvm
+$(i386_ONLY)include i386/system:xvm:xvmstore
+$(i386_ONLY)include i386/web:urlgrabber
+$(sparc_ONLY)include sparc/SUNWafb
+$(sparc_ONLY)include sparc/SUNWafbcf
+$(sparc_ONLY)include sparc/SUNWafbw
+$(sparc_ONLY)include sparc/SUNWffb
+$(sparc_ONLY)include sparc/SUNWffbcf
+$(sparc_ONLY)include sparc/SUNWffbw
+$(sparc_ONLY)include sparc/SUNWgfb
+$(sparc_ONLY)include sparc/SUNWgfbcf
+$(sparc_ONLY)include sparc/SUNWgfbw
+$(sparc_ONLY)include sparc/SUNWifb
+$(sparc_ONLY)include sparc/SUNWifbcf
+$(sparc_ONLY)include sparc/SUNWifbw
+$(sparc_ONLY)include sparc/SUNWjfb
+$(sparc_ONLY)include sparc/SUNWjfbcf
+$(sparc_ONLY)include sparc/SUNWjfbw
+$(sparc_ONLY)include sparc/SUNWm64
+$(sparc_ONLY)include sparc/SUNWm64cf
+$(sparc_ONLY)include sparc/SUNWm64w
+$(sparc_ONLY)include sparc/SUNWnfbcf
+$(sparc_ONLY)include sparc/SUNWpfbcf
+$(sparc_ONLY)include sparc/SUNWzulu
+$(sparc_ONLY)include sparc/SUNWzuluc
+$(sparc_ONLY)include sparc/SUNWzuluw
+$(sparc_ONLY)include sparc/TSIpgx
+$(sparc_ONLY)include sparc/TSIpgxw
+$(sparc_ONLY)include sparc/driver:graphics:kfb
+$(sparc_ONLY)include sparc/driver:network:ge
+$(sparc_ONLY)include sparc/system:graphics:fbconfig:fbconfig-kfb
+$(sparc_ONLY)include sparc/x11:server:xorg:driver:xorg-kfb
+# Include statements for renamed packages.
+$(i386_ONLY)include common/FSWxorg-client-docs
+$(i386_ONLY)include common/FSWxorg-client-programs
+$(i386_ONLY)include common/FSWxorg-clientlibs
+$(i386_ONLY)include common/FSWxorg-data
+$(i386_ONLY)include common/FSWxorg-headers
+$(i386_ONLY)include common/FSWxwrtl
+$(i386_ONLY)include common/SUNWapch2
+$(i386_ONLY)include common/SUNWapch22m-php5
+$(i386_ONLY)include common/SUNWapch2d
+$(i386_ONLY)include common/SUNWdistro-license
+include common/SUNWgimpprint
+$(i386_ONLY)include common/SUNWgnome-a11y-poke-root
+$(i386_ONLY)include common/SUNWgnome-xml-root
+$(i386_ONLY)include common/SUNWgnome-xml-share
+$(i386_ONLY)include common/SUNWgscr
+$(i386_ONLY)include common/SUNWiiim
+$(i386_ONLY)include common/SUNWjavadb-client
+$(i386_ONLY)include common/SUNWjavadb-common
+$(i386_ONLY)include common/SUNWjavadb-core
+$(i386_ONLY)include common/SUNWjavadb-demo
+$(i386_ONLY)include common/SUNWjavadb-docs
+$(i386_ONLY)include common/SUNWjavadb-javadoc
+include common/SUNWnet-snmp-utils
+$(i386_ONLY)include common/SUNWphp524
+$(i386_ONLY)include common/SUNWphp524-mysql
+$(i386_ONLY)include common/SUNWphp524core
+$(i386_ONLY)include common/SUNWphp524doc
+$(i386_ONLY)include common/SUNWphp524man
+$(i386_ONLY)include common/SUNWphp524usr
+include common/SUNWsfwdemo
+include common/SUNWsmagt
+include common/SUNWsmcmd
+include common/SUNWsmdoc
+include common/SUNWsmmgr
+$(sparc_ONLY)include sparc/SUNWnfb
+$(sparc_ONLY)include sparc/SUNWnfbw
+$(sparc_ONLY)include sparc/SUNWpfb
+$(sparc_ONLY)include sparc/SUNWpfbw
--- a/src/util/distro-import/Makefile	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/util/distro-import/Makefile	Mon Sep 19 02:03:09 2011 -0700
@@ -28,11 +28,18 @@
 NATIVE_ARCH:sh = uname -p
 PROTO_AREA=../../../proto/root_$(NATIVE_ARCH)
 
+TRUNKID=174
+UPDATENUM=0
+SRUNUM=0
+PLATNUM=0
+BUILDID=0
+BRANCHID=$(TRUNKID).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).0
+
 #
 # Needs to point to filesystem on Solaris install dvd
 # replace as needed with a local solaris install image
 #
-WOS_PKGS_BASE=/net/pkgdock.us.oracle.com/export/integrate_dock/nv/nv_solnext_$(BUILDID)
+WOS_PKGS_BASE=/net/pkgdock.us.oracle.com/export/integrate_dock/nv/nv_solnext_$(TRUNKID)
 WOS_PKGS=$(WOS_PKGS_BASE)/$(ARCH)
 WOS_EXTRA_PKGS=$(WOS_PKGS_BASE)/all
 NONWOS_DOCK=
@@ -42,93 +49,91 @@
 REPO=http://localhost:10000
 
 ON_REPO=http://localhost:20000
-ON_BUILDID=$(BUILDID)
-ON_INCORPORATION=consolidation/osnet/[email protected].$(ON_BUILDID)
+ON_BRANCHID=$(BRANCHID)
+ON_INCORPORATION=consolidation/osnet/[email protected].$(ON_BRANCHID)
 
 INSTALL_REPO=http://localhost:20001
-INSTALL_BUILDID=$(BUILDID)
-INSTALL_INCORPORATION=consolidation/install/[email protected].$(INSTALL_BUILDID)
+INSTALL_BRANCHID=$(BRANCHID)
+INSTALL_INCORPORATION=consolidation/install/[email protected].$(INSTALL_BRANCHID)
 
 X_REPO=http://localhost:20002
-X_BUILDID=$(BUILDID)
-X_INCORPORATION=consolidation/X/[email protected].$(X_BUILDID)
+X_BRANCHID=$(BRANCHID)
+X_INCORPORATION=consolidation/X/[email protected].$(X_BRANCHID)
 
 IPS_REPO=http://localhost:20003
-IPS_BUILDID=$(BUILDID)
-IPS_INCORPORATION=consolidation/ips/[email protected].$(IPS_BUILDID)
+IPS_BRANCHID=$(BRANCHID)
+IPS_INCORPORATION=consolidation/ips/[email protected].$(IPS_BRANCHID)
 
 VPANELS_REPO=http://localhost:20004
-VPANELS_BUILDID=$(BUILDID)
-VPANELS_INCORPORATION=consolidation/vpanels/[email protected].$(VPANELS_BUILDID)
+VPANELS_BRANCHID=$(BRANCHID)
+VPANELS_INCORPORATION=consolidation/vpanels/[email protected].$(VPANELS_BRANCHID)
 
 USERLAND_REPO=http://localhost:20005
-USERLAND_BUILDID=$(BUILDID)
-USERLAND_INCORPORATION=consolidation/userland/[email protected].$(USERLAND_BUILDID)
+USERLAND_BRANCHID=$(BRANCHID)
+USERLAND_INCORPORATION=consolidation/userland/[email protected].$(USERLAND_BRANCHID)
 
 L10N_REPO=http://localhost:20006
-L10N_BUILDID=$(BUILDID)
-L10N_INCORPORATION=consolidation/l10n/[email protected].$(L10N_BUILDID)
+L10N_BRANCHID=$(BRANCHID)
+L10N_INCORPORATION=consolidation/l10n/[email protected].$(L10N_BRANCHID)
 
 DESKTOP_REPO=http://localhost:20007
-DESKTOP_BUILDID=$(BUILDID)
-DESKTOP_GNOME_L10N_INCORPORATION=consolidation/gnome_l10n/[email protected].$(DESKTOP_BUILDID)
-DESKTOP_GNOME_INCORPORATION=consolidation/gnome/[email protected].$(DESKTOP_BUILDID)
+DESKTOP_BRANCHID=$(BRANCHID)
+DESKTOP_GNOME_L10N_INCORPORATION=consolidation/gnome_l10n/[email protected].$(DESKTOP_BRANCHID)
+DESKTOP_GNOME_INCORPORATION=consolidation/gnome/[email protected].$(DESKTOP_BRANCHID)
 
 CDE_REPO=http://localhost:20008
-CDE_BUILDID=$(BUILDID)
-CDE_INCORPORATION=consolidation/cde/[email protected].$(CDE_BUILDID)
+CDE_BRANCHID=$(BRANCHID)
+CDE_INCORPORATION=consolidation/cde/[email protected].$(CDE_BRANCHID)
 
 FOSS_REPO=http://localhost:20009
-FOSS_BUILDID=$(BUILDID)
+FOSS_BRANCHID=$(BRANCHID)
 
 CACAO_REPO=http://localhost:20010
-CACAO_BUILDID=$(BUILDID)
-CACAO_INCORPORATION=consolidation/cacao/[email protected].$(CACAO_BUILDID)
+CACAO_BRANCHID=$(BRANCHID)
+CACAO_INCORPORATION=consolidation/cacao/[email protected].$(CACAO_BRANCHID)
 
 CNS_REPO=http://localhost:20011
-CNS_BUILDID=$(BUILDID)
-CNS_INCORPORATION=consolidation/cns/[email protected].$(CNS_BUILDID)
+CNS_BRANCHID=$(BRANCHID)
+CNS_INCORPORATION=consolidation/cns/[email protected].$(CNS_BRANCHID)
 
 JDMK_REPO=http://localhost:20012
-JDMK_BUILDID=$(BUILDID)
-JDMK_INCORPORATION=consolidation/jdmk/[email protected].$(JDMK_BUILDID)
+JDMK_BRANCHID=$(BRANCHID)
+JDMK_INCORPORATION=consolidation/jdmk/[email protected].$(JDMK_BRANCHID)
 
 NVIDIA_REPO=http://localhost:20013
-NVIDIA_BUILDID=$(BUILDID)
-NVIDIA_INCORPORATION=consolidation/nvidia/[email protected].$(NVIDIA_BUILDID)
+NVIDIA_BRANCHID=$(BRANCHID)
+NVIDIA_INCORPORATION=consolidation/nvidia/[email protected].$(NVIDIA_BRANCHID)
 
 DEVPRO_REPO=http://localhost:20014
-DEVPRO_BUILDID=$(BUILDID)
-DEVPRO_INCORPORATION=consolidation/sunpro/[email protected].$(DEVPRO_BUILDID)
+DEVPRO_BRANCHID=$(BRANCHID)
+DEVPRO_INCORPORATION=consolidation/sunpro/[email protected].$(DEVPRO_BRANCHID)
 
 SOLARIS_RE_REPO=http://localhost:20015
-SOLARIS_RE_BUILDID=$(BUILDID)
-SOLARIS_RE_INCORPORATION=consolidation/solaris_re/[email protected].$(SOLARIS_RE_BUILDID)
+SOLARIS_RE_BRANCHID=$(BRANCHID)
+SOLARIS_RE_INCORPORATION=consolidation/solaris_re/[email protected].$(SOLARIS_RE_BRANCHID)
 
 MAN_REPO=http://localhost:20016
-MAN_BUILDID=$(BUILDID)
-MAN_INCORPORATION=consolidation/man/[email protected].$(MAN_BUILDID)
+MAN_BRANCHID=$(BRANCHID)
+MAN_INCORPORATION=consolidation/man/[email protected].$(MAN_BRANCHID)
 
 LDOMS_REPO=http://localhost:20017
-LDOMS_BUILDID=$(BUILDID)
-LDOMS_INCORPORATION=consolidation/ldoms/[email protected].$(LDOMS_BUILDID)
+LDOMS_BRANCHID=$(BRANCHID)
+LDOMS_INCORPORATION=consolidation/ldoms/[email protected].$(LDOMS_BRANCHID)
 
 SIC_TEAM_REPO=http://localhost:20018
-SIC_TEAM_BUILDID=$(BUILDID)
-SIC_TEAM_INCORPORATION=consolidation/sic_team/[email protected].$(SIC_TEAM_BUILDID)
+SIC_TEAM_BRANCHID=$(BRANCHID)
+SIC_TEAM_INCORPORATION=consolidation/sic_team/[email protected].$(SIC_TEAM_BRANCHID)
 
 SUNVTS_REPO=http://localhost:20019
-SUNVTS_BUILDID=$(BUILDID)
-SUNVTS_INCORPORATION=consolidation/SunVTS/[email protected].$(SUNVTS_BUILDID)
+SUNVTS_BRANCHID=$(BRANCHID)
+SUNVTS_INCORPORATION=consolidation/SunVTS/[email protected].$(SUNVTS_BRANCHID)
 
 JAVA_REPO=http://localhost:20020
-JAVA_BUILDID=$(BUILDID)
-JAVA_INCORPORATION=consolidation/java/[email protected].$(JAVA_BUILDID)
+JAVA_BRANCHID=$(BRANCHID)
+JAVA_INCORPORATION=consolidation/java/[email protected].$(JAVA_BRANCHID)
 
-BUILDID_NORESPIN=/usr/bin/echo $(BUILDID) | sed -e 's/\([0-9]\)[a-z]*$$/\1/g'
-
-REF_REPO=http://ipkg.sfbay/release
-REF_URIS=$(REF_REPO)@[email protected],5.11-0.$(BUILDID_NORESPIN:sh)
+REF_REPO=http://ipkg.us.oracle.com/release
+REF_URIS=$(REF_REPO)@[email protected],5.11-0.$(BRANCHID)
 
 JUST_THESE_PKGS=
 EXTRA_ENTIRE_CONTENTS=
@@ -267,8 +272,7 @@
 	-R $(JAVA_REPO)@$(JAVA_INCORPORATION) \
 	-E $(JAVA_INCORPORATION)
 
-SFW_CONSOLIDATION_OPTIONS = \
-	-U sfw
+SFW_CONSOLIDATION_OPTIONS =
 
 CONSOLIDATION_OPTIONS_136 = \
 	$(OSNET_CONSOLIDATION_OPTIONS)
@@ -331,7 +335,8 @@
 	$(SUNVTS_CONSOLIDATION_OPTIONS) \
 	$(JAVA_CONSOLIDATION_OPTIONS)
 CONSOLIDATION_OPTIONS_173 = $(CONSOLIDATION_OPTIONS_172)
-CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
+CONSOLIDATION_OPTIONS_174.0.0.0.0.0 = $(CONSOLIDATION_OPTIONS_172)
+CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BRANCHID))
 
 GLOBAL_CHATTRS_BASE=	\
 	reboot		\
@@ -421,10 +426,11 @@
 GLOBAL_CHATTRS_171 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_172 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_173 = $(GLOBAL_CHATTRS_124)
-GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
+GLOBAL_CHATTRS_174.0.0.0.0.0 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BRANCHID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
-	./importer.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \
+	./importer.py -b 0.$(BRANCHID) $(EXTRA_OPTIONS) -T \*.py \
 	$(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \
 	-p $(PROTO_AREA) $(EXTRA_ENTIRE_CONTENTS:%= -E %)
 
@@ -530,7 +536,8 @@
 ELIDED_FILES_171 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_172 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_173 = $(ELIDED_FILES_BASE)
-ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
+ELIDED_FILES_174.0.0.0.0.0 = $(ELIDED_FILES_BASE)
+ELIDED_FILES = $(ELIDED_FILES_$(BRANCHID))
 
 #
 # these files get placed into proto area from per-build cached versions
@@ -659,7 +666,8 @@
 CACHED_FILES_171 =
 CACHED_FILES_172 =
 CACHED_FILES_173 =
-CACHED_FILES = $(CACHED_FILES_$(BUILDID))
+CACHED_FILES_174.0.0.0.0.0 =
+CACHED_FILES = $(CACHED_FILES_$(BRANCHID))
 
 FIX_FILES_BASE =				\
 	$(CACHED_FILES)				\
@@ -815,7 +823,8 @@
 FIX_FILES_171 =
 FIX_FILES_172 =
 FIX_FILES_173 =
-FIX_FILES = $(FIX_FILES_$(BUILDID))
+FIX_FILES_174.0.0.0.0.0 =
+FIX_FILES = $(FIX_FILES_$(BRANCHID))
 
 JDKFILES = LICENSE README.html
 JREFILES = LICENSE README
@@ -936,40 +945,41 @@
 	170			\
 	171			\
 	172			\
-	173
+	173			\
+	174.0.0.0.0.0
 
 #
 # Starting in build 80, filelist.ramdisk began moving between various
 # packages.
 #
-FILELIST_RAMDISK_PKG_$(BUILDID)	= SUNWckr
-FILELIST_RAMDISK_PKG_79b	= SUNWcakr.i
-FILELIST_RAMDISK_PKG_75a	= SUNWcakr.i
-FILELIST_RAMDISK_PKG_74		= SUNWcakr.i
-FILELIST_RAMDISK_PKG_72		= SUNWcakr.i
-FILELIST_RAMDISK_PKG_71		= SUNWcakr.i
+FILELIST_RAMDISK_PKG_$(BRANCHID)	= SUNWckr
+FILELIST_RAMDISK_PKG_79b		= SUNWcakr.i
+FILELIST_RAMDISK_PKG_75a		= SUNWcakr.i
+FILELIST_RAMDISK_PKG_74			= SUNWcakr.i
+FILELIST_RAMDISK_PKG_72			= SUNWcakr.i
+FILELIST_RAMDISK_PKG_71			= SUNWcakr.i
 
-default:	173/redist_import
+default:	$(BRANCHID)/redist_import
 
 cluster.import:	$(WOS_PKGS)/.clustertoc Makefile
 	./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
 	sed "s/version 2.2.1a/version 2.2.1.1/" > $@
 
-proto/etc/user_attr.cdonly: proto $(BUILDID)/user_attr
-	( cat $(BUILDID)/user_attr; \
+proto/etc/user_attr.cdonly: proto $(BRANCHID)/user_attr
+	( cat $(BRANCHID)/user_attr; \
 	  echo "jack::::profiles=Primary Administrator;roles=root") > $@
 
-$(BUILDID)/driver_aliases:	$(BUILDID)/redist_cluster cluster.import
+$(BRANCHID)/driver_aliases:	$(BRANCHID)/redist_cluster cluster.import
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsd etc/driver_aliases | \
-	./driver_names.py $(INCLUDE_PATH_$(BUILDID)) \
-	$(BUILDID)/redist_cluster > $@
+	./driver_names.py $(INCLUDE_PATH_$(BRANCHID)) \
+	$(BRANCHID)/redist_cluster > $@
 
-$(BUILDID)/name_to_major:	$(BUILDID)/redist_cluster cluster.import
+$(BRANCHID)/name_to_major:	$(BRANCHID)/redist_cluster cluster.import
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsd etc/name_to_major | \
-	./driver_names.py $(INCLUDE_PATH_$(BUILDID)) \
-	$(BUILDID)/redist_cluster > $@
+	./driver_names.py $(INCLUDE_PATH_$(BRANCHID)) \
+	$(BRANCHID)/redist_cluster > $@
 
-$(BUILDID)/nsswitch.conf:	Makefile
+$(BRANCHID)/nsswitch.conf:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/nsswitch.files > $@
 
 proto/etc/X11/gdm/custom.conf:	proto Makefile
@@ -981,11 +991,12 @@
 			    continue }  { print $$0 }' > $@
 
 proto/boot/solaris/filelist.ramdisk:	proto
-	(./get_file_from_pkg.py $(WOS_PKGS)/$(FILELIST_RAMDISK_PKG_$(BUILDID)) \
+	(./get_file_from_pkg.py \
+	    $(WOS_PKGS)/$(FILELIST_RAMDISK_PKG_$(BRANCHID)) \
 	    boot/solaris/filelist.ramdisk; \
-	echo etc/zfs/zpool.cache) > $@
+	    echo etc/zfs/zpool.cache) > $@
 
-$(BUILDID)/pam.conf:
+$(BRANCHID)/pam.conf:
 	(./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/pam.conf;	\
 	echo "gdm-autologin auth  required    pam_unix_cred.so.1";	\
 	echo "gdm-autologin auth  sufficient  pam_allow.so.1";		\
@@ -1023,15 +1034,15 @@
 	'/MANSECTS/s/$$/,1openssl,3openssl,5openssl,7openssl/' \
 	> $@
 
-$(BUILDID)/ksh:	$(PROG)
+$(BRANCHID)/ksh:	$(PROG)
 	cp $(PROG) $@
 
-$(BUILDID)/shares.desktop:
+$(BRANCHID)/shares.desktop:
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWgnome-system-tools \
 	usr/share/applications/shares.desktop | \
 	./desktop_exec.sh /usr/lib/vp-shares > $@
 
-$(BUILDID)/services.desktop: proto
+$(BRANCHID)/services.desktop: proto
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWgnome-system-tools \
 	usr/share/applications/services.desktop | \
 	./desktop_exec.sh /usr/lib/vp-services > $@
@@ -1039,30 +1050,30 @@
 #
 # change root's default shell, homedir, password
 #
-$(BUILDID)/passwd:	Makefile
+$(BRANCHID)/passwd:	Makefile
 	(./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/passwd | nawk -F: \
 	'/^root/{ print "root:x:0:0:Super-User:/root:/usr/bin/bash";continue} {print $$0}') > $@
 
-$(BUILDID)/shadow:	Makefile
+$(BRANCHID)/shadow:	Makefile
 	(./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/shadow | nawk -F: \
 	'/^root/{ print "root:$$5$$VgppCOxA$$ycFmYW4ObRRHhtsGEygDdexk5bugqgSiaSR9niNCouC:14146::::::";continue} {print $$0}') > $@
 
-$(BUILDID)/sh:	Makefile
+$(BRANCHID)/sh:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr sbin/sh > $@
 
-$(BUILDID)/vi:	Makefile
+$(BRANCHID)/vi:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsu usr/bin/edit > $@
 
-$(BUILDID)/auth_attr:	Makefile
+$(BRANCHID)/auth_attr:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/security/auth_attr > $@
 
-$(BUILDID)/exec_attr:	Makefile
+$(BRANCHID)/exec_attr:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/security/exec_attr > $@
 
-$(BUILDID)/prof_attr:	Makefile
+$(BRANCHID)/prof_attr:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/security/prof_attr > $@
 
-$(BUILDID)/user_attr:	Makefile
+$(BRANCHID)/user_attr:	Makefile
 	./get_file_from_pkg.py $(WOS_PKGS)/SUNWcsr etc/user_attr > $@
 
 proto/usr/sbin/extract_hostid:	proto ../misc/extract_hostid
@@ -1074,8 +1085,8 @@
 $(JREFILES:%=proto/usr/jdk/instances/jdk1.6.0/jre/%):	proto DLJ/$(@F)
 	cp DLJ/$(@F) $@
 
-$(CACHED_FILES:%=proto/%):	proto $(BUILDID)/$(@F) Makefile
-	cat $(BUILDID)/$(@F) > $@
+$(CACHED_FILES:%=proto/%):	proto $(BRANCHID)/$(@F) Makefile
+	cat $(BRANCHID)/$(@F) > $@
 
 proto:	Makefile
 	mkdir -p proto/boot/grub
@@ -1191,42 +1202,43 @@
 INCLUDE_PATH_171 = 171:$(INCLUDE_PATH_170)
 INCLUDE_PATH_172 = 172:$(INCLUDE_PATH_171)
 INCLUDE_PATH_173 = 173:$(INCLUDE_PATH_172)
+INCLUDE_PATH_174.0.0.0.0.0 = 174.0.0.0.0.0:$(INCLUDE_PATH_173)
 
-import:	cluster.import $(FIX_FILES:%=$(BUILDID)/%)
+import:	cluster.import $(FIX_FILES:%=$(BRANCHID)/%)
 	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \
-		$(INCLUDE_PATH_$(BUILDID):%=-I %) $(BUILDID)/all.i386
+		$(INCLUDE_PATH_$(BRANCHID):%=-I %) $(BRANCHID)/all.i386
 
 %/import:
-	$(MAKE) BUILDID=$(@:%/import=%) import
+	$(MAKE) BRANCHID=$(@:%/import=%) import
 
-redist_import:	$(BUILDID)/redist_cluster $(FIX_FILES:%=$(BUILDID)/%)
+redist_import:	$(BRANCHID)/redist_cluster $(FIX_FILES:%=$(BRANCHID)/%)
 	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
-		$(JUST_THESE_PKGS:%=-j %) $(INCLUDE_PATH_$(BUILDID):%=-I %) \
-		$(CONSOLIDATION_OPTIONS) $(BUILDID)/redist_cluster
+		$(JUST_THESE_PKGS:%=-j %) $(INCLUDE_PATH_$(BRANCHID):%=-I %) \
+		$(CONSOLIDATION_OPTIONS) $(BRANCHID)/redist_cluster
 
 %/redist_import:
 	if test -z "$(JUST_THESE_PKGS)"; then \
 		$(MAKE) clobber; \
 	fi
-	$(MAKE) BUILDID=$(@:%/redist_import=%) redist_import
+	$(MAKE) BRANCHID=$(@:%/redist_import=%) redist_import
 
 $(UNBUNDLED_TARGETS:%=$(BUILDS)/%) $(UNBUNDLED_CLUSTERS:%=$(BUILDS)/%):
-	$(MAKE) BUILDID=$(@D) $(@F)
+	$(MAKE) BRANCHID=$(@D) $(@F)
 
 $(UNBUNDLED_TARGETS): unbundleds/$$(@:%.import=%)
 	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
-		$(INCLUDE_PATH_$(BUILDID):%=-I %) \
+		$(INCLUDE_PATH_$(BRANCHID):%=-I %) \
 		$(REF_URIS:%=-R %) $(JUST_THESE_PKGS:%=-j %) \
 		unbundleds/$(@:%.import=%)
 
 $(UNBUNDLED_CLUSTERS): unbundleds/$$(@:%.import=%)
 	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
-		$(INCLUDE_PATH_$(BUILDID):%=-I %) \
+		$(INCLUDE_PATH_$(BRANCHID):%=-I %) \
 		$(REF_URIS:%=-R %) $(JUST_THESE_PKGS:%=-j %) \
 		unbundleds/$(@:%.import=%)
 
 %/all_unbundleds:
-	$(MAKE) BUILDID=$(@D) $(@F)
+	$(MAKE) BRANCHID=$(@D) $(@F)
 
 all_unbundleds:	$(UNBUNDLED_TARGETS) $(UNBUNDLED_CLUSTERS)
 
@@ -1238,22 +1250,22 @@
 	./gen_os_files.py
 
 %/SUNWipkg %/backpublish:
-	$(MAKE) BUILDID=$(@D) $(@F)
+	$(MAKE) BRANCHID=$(@D) $(@F)
 
 SUNWipkg:
-	PKG_REPO=$(REPO) ./publish_ips $(BUILDID) SUNWipkg
+	PKG_REPO=$(REPO) ./publish_ips $(BRANCHID) SUNWipkg
 
 backpublish:
-	PKG_REPO=$(REPO) ./publish_ips $(BUILDID) SUNWipkg
-	PKG_REPO=$(REPO) ./publish_ips $(BUILDID) SUNWipkg-gui
-	PKG_REPO=$(REPO) ./publish_ips $(BUILDID) SUNWipkg-gui-l10n
-	PKG_REPO=$(REPO) ./publish_ips $(BUILDID) SUNWpython-cherrypy
-	PKG_REPO=$(REPO) ./publish_ips $(BUILDID) SUNWpython-pyopenssl
+	PKG_REPO=$(REPO) ./publish_ips $(BRANCHID) SUNWipkg
+	PKG_REPO=$(REPO) ./publish_ips $(BRANCHID) SUNWipkg-gui
+	PKG_REPO=$(REPO) ./publish_ips $(BRANCHID) SUNWipkg-gui-l10n
+	PKG_REPO=$(REPO) ./publish_ips $(BRANCHID) SUNWpython-cherrypy
+	PKG_REPO=$(REPO) ./publish_ips $(BRANCHID) SUNWpython-pyopenssl
 
 clean:
 	rm -f $(OBJS)
 	rm -rf proto
-	rm -f $(FIX_FILES:%=$(BUILDID)/%)
+	rm -f $(FIX_FILES:%=$(BRANCHID)/%)
 
 clobber: clean
 	rm -f $(PROG)
--- a/src/util/distro-import/importer.py	Sat Sep 17 10:17:12 2011 -0700
+++ b/src/util/distro-import/importer.py	Mon Sep 19 02:03:09 2011 -0700
@@ -19,6 +19,7 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
@@ -1866,11 +1867,14 @@
                 end_package(curpkg)
                 curpkg = None
 
-        # Generate entire consolidation if we're generating any consolidation
+        #
+        # Generate entire incorporation if we're generating any consolidation
         # incorporations
+        #
         if consolidation_incorporations:
                 curpkg = start_package("entire")
-                curpkg.summary = "incorporation to lock all system packages to same build"
+                curpkg.summary = "Incorporation to lock all system packages " \
+                    "to the same build"
                 curpkg.desc = "This package constrains " \
                     "system package versions to the same build.  WARNING: Proper " \
                     "system update and correct package selection depend on the " \
@@ -1887,7 +1891,9 @@
                     "variant.opensolaris.zone=nonglobal"))
 
                 for incorp in consolidation_incorporations:
-                        action = actions.fromstr("depend fmri=%s type=incorporate" % incorp)
+                        action = actions.fromstr(
+                            "depend fmri=%s type=incorporate "
+                            "facet.version-lock.%s=true" % (incorp, incorp))
                         action.attrs["importer.source"] = "auto-generated"
                         curpkg.actions.append(action)
                         action = actions.fromstr("depend fmri=%s type=require" % incorp)
@@ -1896,10 +1902,13 @@
                         curpkg.actions.append(action)
 
                 for extra in extra_entire_contents:
-                        action = actions.fromstr("depend fmri=%s type=incorporate" % extra)
+                        extra_noversion = extra.split("@")[0] # remove version
+                        action = actions.fromstr(
+                            "depend fmri=%s type=incorporate "
+                            "facet.version-lock.%s=true"
+                            % (extra, extra_noversion))
                         action.attrs["importer.source"] = "command-line"
                         curpkg.actions.append(action)
-                        extra_noversion = extra.split("@")[0] # remove version
                         action = actions.fromstr("depend fmri=%s type=require" % extra_noversion)
                         action.attrs["importer.source"] = "command-line"
                         action.attrs["importer.no-version"] = "true"
upstream/oracle/pkg-gate