17708 metapackage(s) needed for multi user desktop in170
authordavid.comay@oracle.com
Mon, 18 Jul 2011 15:05:43 -0700
changeset 2469 80afffe5bf5f
parent 2468 ce77b64883c4
child 2470 94ef1a17ad4f
17708 metapackage(s) needed for multi user desktop 18697 resync repository to snv_170 18703 trusted-desktop no longer needs to depend on solaris-small-server 18704 FCoE initiator should be included in the installation media 18708 drop system/zones/brand/ipkg from ips-incorporation pending move to ON
src/pkg/manifests/group%2ffeature%2fmulti-user-desktop.p5m
src/pkg/manifests/group%2ffeature%2ftrusted-desktop.p5m
src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m
src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m
src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m
src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m
src/pkg/transforms/incorp
src/util/distro-import/170/common/Redistributable
src/util/distro-import/170/redist_cluster
src/util/distro-import/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pkg/manifests/group%2ffeature%2fmulti-user-desktop.p5m	Mon Jul 18 15:05:43 2011 -0700
@@ -0,0 +1,426 @@
+#
+# 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/multi-user-desktop@$(PKGVERS)
+set name=pkg.description \
+    value="Provides an Oracle Solaris multi user desktop environment for use on a server"
+set name=pkg.summary value="Oracle Solaris Multi User Desktop"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Meta Packages/Group Packages"
+set name=variant.arch value=$(ARCH)
+depend fmri=audio/audio-utilities type=group
+depend fmri=benchmark/x11perf type=group
+depend fmri=codec/flac type=group
+depend fmri=codec/libtheora type=group
+depend fmri=codec/ogg-vorbis type=group
+depend fmri=codec/speex type=group
+depend fmri=communication/im/pidgin type=group
+depend fmri=crypto/gnupg type=group
+depend fmri=data/sgml-common type=group
+depend fmri=desktop/administration/nwam-manager type=group
+depend fmri=desktop/archive-manager/file-roller type=group
+depend fmri=desktop/calculator/gcalctool type=group
+depend fmri=desktop/cd-burning/brasero type=group
+depend fmri=desktop/character-map/gucharmap type=group
+depend fmri=desktop/gksu type=group
+depend fmri=desktop/pdf-viewer/evince type=group
+depend fmri=desktop/project-management/planner type=group
+depend fmri=desktop/remote-desktop/tigervnc type=group
+depend fmri=desktop/system-monitor/gnome-system-monitor type=group
+depend fmri=desktop/time-slider type=group
+depend fmri=desktop/time-tracking/hamster type=group
+depend fmri=desktop/window-manager/twm type=group
+depend fmri=desktop/xdg/menu-editor/alacarte type=group
+depend fmri=desktop/xdg/xdg-user-dirs-gtk type=group
+depend fmri=desktop/xdg/xdg-utils type=group
+depend fmri=desktop/xscreensaver type=group
+depend fmri=developer/documentation-tool/openjade type=group
+depend fmri=developer/documentation-tool/opensp type=group
+depend fmri=developer/gnome/gettext type=group
+depend fmri=developer/gnome/gnome-doc-utils type=group
+depend fmri=developer/java/jdk type=group
+depend fmri=developer/ui-designer/glade type=group
+depend fmri=diagnostic/ddu type=group
+depend fmri=diagnostic/ddu/locale type=group
+depend fmri=diagnostic/xload type=group
+depend fmri=documentation/gnome/gnome-user-docs type=group
+$(i386_ONLY)depend fmri=driver/audio/audio810 type=group
+$(i386_ONLY)depend fmri=driver/audio/audiocmi type=group
+$(i386_ONLY)depend fmri=driver/audio/audioemu10k type=group
+$(i386_ONLY)depend fmri=driver/audio/audiohd type=group
+$(i386_ONLY)depend fmri=driver/audio/audioixp type=group
+depend fmri=driver/audio/audiols type=group
+depend fmri=driver/audio/audiop16x type=group
+$(i386_ONLY)depend fmri=driver/audio/audiosolo type=group
+$(i386_ONLY)depend fmri=driver/audio/audiovia823x type=group
+depend fmri=driver/graphics/av1394 type=group
+depend fmri=driver/graphics/dcam1394 type=group
+depend fmri=driver/graphics/usbvc type=group
+depend fmri=driver/x11/winlock type=group
+depend fmri=editor/diagram/dia type=group
+depend fmri=editor/gedit type=group
+depend fmri=editor/vim type=group
+depend fmri=gnome/accessibility/gnome-a11y-libs type=group
+depend fmri=gnome/accessibility/orca type=group
+depend fmri=gnome/applet/gnome-applets type=group
+depend fmri=gnome/applet/gnome-fun-applets type=group
+depend fmri=gnome/applet/gnome-internet-applets type=group
+depend fmri=gnome/applet/gnome-intranet-applets type=group
+depend fmri=gnome/applet/gnome-mm-applets type=group
+depend fmri=gnome/applet/gnome-utility-applets type=group
+depend fmri=gnome/config/gconf type=group
+depend fmri=gnome/config/gconf/multi-user-desktop type=group
+depend fmri=gnome/disk-analyzer/baobab type=group
+depend fmri=gnome/file-manager/nautilus type=group
+depend fmri=gnome/ggv type=group
+depend fmri=gnome/gnome-audio type=group
+depend fmri=gnome/gnome-camera type=group
+depend fmri=gnome/gnome-dictionary type=group
+depend fmri=gnome/gnome-keyring type=group
+depend fmri=gnome/gnome-log-viewer type=group
+depend fmri=gnome/gnome-panel type=group
+depend fmri=gnome/gnome-power-manager type=group
+depend fmri=gnome/gnome-remote-desktop type=group
+depend fmri=gnome/gnome-screenshot type=group
+depend fmri=gnome/gnome-search-tool type=group
+depend fmri=gnome/gnome-session type=group
+depend fmri=gnome/help-viewer/yelp type=group
+depend fmri=gnome/locale/de type=group
+depend fmri=gnome/locale/es type=group
+depend fmri=gnome/locale/fr type=group
+depend fmri=gnome/locale/hi type=group
+depend fmri=gnome/locale/it type=group
+depend fmri=gnome/locale/ja type=group
+depend fmri=gnome/locale/ko type=group
+depend fmri=gnome/locale/pl type=group
+depend fmri=gnome/locale/pt_br type=group
+depend fmri=gnome/locale/rtl type=group
+depend fmri=gnome/locale/ru type=group
+depend fmri=gnome/locale/zh_cn type=group
+depend fmri=gnome/locale/zh_tw type=group
+depend fmri=gnome/media/gnome-media type=group
+depend fmri=gnome/media/gnome-media-player type=group
+depend fmri=gnome/preferences/control-center type=group
+depend fmri=gnome/speech/gnome-speech type=group
+depend fmri=gnome/speech/gnome-speech/driver/gnome-speech-espeak type=group
+depend fmri=gnome/theme/background/os-backgrounds type=group
+depend fmri=gnome/theme/gnome-icon-theme type=group
+depend fmri=gnome/theme/gnome-themes type=group
+depend fmri=gnome/theme/gtk2-engines type=group
+depend fmri=gnome/theme/hicolor-icon-theme type=group
+depend fmri=gnome/theme/nimbus type=group
+depend fmri=gnome/theme/sound/xdg-sound-theme type=group
+depend fmri=gnome/theme/tango-icon-theme type=group
+depend fmri=gnome/window-manager/metacity type=group
+depend fmri=gnome/zenity type=group
+depend fmri=image/dcraw type=group
+depend fmri=image/editor/gimp type=group
+depend fmri=image/editor/gimp/gimp-help type=group
+depend fmri=image/library/babl type=group
+depend fmri=image/library/gegl type=group
+depend fmri=image/library/libart type=group
+depend fmri=image/library/libexif type=group
+depend fmri=image/library/librsvg type=group
+depend fmri=image/scanner/xsane/sane-backends type=group
+depend fmri=image/viewer/eog type=group
+depend fmri=library/aalib type=group
+depend fmri=library/accessibility/brltty type=group
+depend fmri=library/audio/gstreamer type=group
+depend fmri=library/c++/glibmm type=group
+depend fmri=library/c++/sigcpp type=group
+depend fmri=library/demo/audio-samples type=group
+depend fmri=library/desktop/c++/cairomm type=group
+depend fmri=library/desktop/c++/gtkmm type=group
+depend fmri=library/desktop/c++/pangomm type=group
+depend fmri=library/desktop/evolution-data-server type=group
+depend fmri=library/desktop/gobject/gobject-introspection type=group
+depend fmri=library/desktop/gtk2/gtk-backend-cups type=group
+depend fmri=library/desktop/gtkhtml type=group
+depend fmri=library/desktop/gtksourceview type=group
+depend fmri=library/desktop/gtkspell type=group
+depend fmri=library/desktop/libgdata type=group
+depend fmri=library/desktop/libglade type=group
+depend fmri=library/desktop/libgnomecanvas type=group
+depend fmri=library/desktop/libgsf type=group
+depend fmri=library/desktop/libgweather type=group
+depend fmri=library/desktop/libsexy type=group
+depend fmri=library/desktop/libvisual type=group
+depend fmri=library/desktop/libxklavier type=group
+depend fmri=library/desktop/xdg/libcanberra type=group
+depend fmri=library/file-monitor/gamin type=group
+depend fmri=library/gc type=group
+depend fmri=library/gmime type=group
+depend fmri=library/gnome/gnome-component type=group
+depend fmri=library/gnome/gnome-keyring type=group
+depend fmri=library/gnome/gnome-libs type=group
+depend fmri=library/gnome/gnome-vfs type=group
+depend fmri=library/gnome/gvfs type=group
+depend fmri=library/gnome/libgnomekbd type=group
+depend fmri=library/gnome/print/gnome-print type=group
+depend fmri=library/gnutls type=group
+depend fmri=library/idnkit type=group
+depend fmri=library/java/javahelp type=group
+depend fmri=library/java/jss type=group
+depend fmri=library/lcms type=group
+depend fmri=library/libcroco type=group
+depend fmri=library/libdaemon type=group
+depend fmri=library/libgtop type=group
+depend fmri=library/libical type=group
+depend fmri=library/libnotify type=group
+depend fmri=library/liboil type=group
+depend fmri=library/libproxy type=group
+depend fmri=library/libproxy/libproxy-gnome type=group
+depend fmri=library/libsoup type=group
+depend fmri=library/libtasn1 type=group
+depend fmri=library/libtool/libltdl type=group
+depend fmri=library/libunique type=group
+depend fmri=library/media-player/totem-pl-parser type=group
+depend fmri=library/musicbrainz/libdiscid type=group
+depend fmri=library/musicbrainz/libmusicbrainz type=group
+depend fmri=library/myspell/dictionary/en type=group
+depend fmri=library/neon type=group
+depend fmri=library/perl-5/authen-pam type=group
+depend fmri=library/perl-5/xml-parser-512 type=group
+depend fmri=library/perl-5/xml-parser-584 type=group
+depend fmri=library/popt type=group
+depend fmri=library/pth type=group
+depend fmri=library/python-2/coherence-26 type=group
+depend fmri=library/python-2/libxml2-26 type=group
+depend fmri=library/python-2/libxsl-26 type=group
+depend fmri=library/python-2/locale-services type=group
+depend fmri=library/python-2/pyatspi-26 type=group
+depend fmri=library/python-2/pycairo-26 type=group
+depend fmri=library/python-2/pycups type=group
+depend fmri=library/python-2/pygobject-26 type=group
+depend fmri=library/python-2/pygtk2-26 type=group
+depend fmri=library/python-2/pygtksourceview2-26 type=group
+depend fmri=library/python-2/pyorbit-26 type=group
+depend fmri=library/python-2/python-dbus-26 type=group
+depend fmri=library/python-2/python-gnome-26 type=group
+depend fmri=library/python-2/python-gnome-desktop-26 type=group
+depend fmri=library/python-2/python-gnome-extras-26 type=group
+depend fmri=library/python-2/python-gst-26 type=group
+depend fmri=library/python-2/python-notify-26 type=group
+depend fmri=library/python-2/python-twisted-26 type=group
+depend fmri=library/python-2/python-xdg-26 type=group
+depend fmri=library/python-2/python-zope-interface-26 type=group
+depend fmri=library/python-2/pyyaml-26 type=group
+depend fmri=library/python-2/tkinter-26 type=group
+depend fmri=library/raptor type=group
+depend fmri=library/samba/libsmbclient type=group
+depend fmri=library/sdl type=group
+depend fmri=library/security/libassuan type=group
+depend fmri=library/security/libksba type=group
+depend fmri=library/slang type=group
+depend fmri=library/speech/espeak type=group
+depend fmri=library/spell-checking/enchant type=group
+depend fmri=library/xdg/consolekit type=group
+depend fmri=library/xdg/xdg-user-dirs type=group
+depend fmri=mail/thunderbird type=group
+depend fmri=mail/thunderbird/locale/de type=group
+depend fmri=mail/thunderbird/locale/es type=group
+depend fmri=mail/thunderbird/locale/fr type=group
+depend fmri=mail/thunderbird/locale/it type=group
+depend fmri=mail/thunderbird/locale/ja type=group
+depend fmri=mail/thunderbird/locale/ko type=group
+depend fmri=mail/thunderbird/locale/pl type=group
+depend fmri=mail/thunderbird/locale/pt_br type=group
+depend fmri=mail/thunderbird/locale/ru type=group
+depend fmri=mail/thunderbird/locale/zh_cn type=group
+depend fmri=mail/thunderbird/locale/zh_tw type=group
+depend fmri=mail/thunderbird/plugin/thunderbird-lightning type=group
+depend fmri=network/ftp/ncftp type=group
+depend fmri=package/pkg/package-manager type=group
+depend fmri=package/pkg/update-manager type=group
+depend fmri=print/cups/hal-cups-utils type=group
+depend fmri=print/cups/system-config-printer type=group
+depend fmri=print/filter/ghostscript type=group
+depend fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-other type=group
+depend fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-std type=group
+depend fmri=print/filter/gutenprint type=group
+depend fmri=print/filter/hplip type=group
+depend fmri=print/lp/compatibility/sunos4 type=group
+depend fmri=release/os-welcome type=group
+depend fmri=runtime/lua type=group
+depend fmri=runtime/tk-8 type=group
+depend fmri=service/network/wpa type=group
+depend fmri=service/postrun type=group
+depend fmri=system/display-manager/desktop-startup type=group
+depend fmri=system/display-manager/gdm type=group
+$(i386_ONLY)depend fmri=system/file-system/ntfsprogs type=group
+depend fmri=system/font/truetype/arphic-uming type=group
+depend fmri=system/font/truetype/dejavu type=group
+depend fmri=system/font/truetype/hanyang-ko-core type=group
+depend fmri=system/font/truetype/ipafont type=group
+depend fmri=system/font/truetype/liberation type=group
+depend fmri=system/font/truetype/lohit type=group
+depend fmri=system/font/xorg/iso8859-1 type=group
+depend fmri=system/font/xorg/xorg-core type=group
+$(sparc_ONLY)depend fmri=system/graphics/fbconfig type=group
+$(sparc_ONLY)depend fmri=system/graphics/fbconfig/fbconfig-ast type=group
+$(sparc_ONLY)depend fmri=system/graphics/fbconfig/fbconfig-efb type=group
+depend fmri=system/input-method/ibus type=group
+depend fmri=system/input-method/ibus/anthy type=group
+depend fmri=system/input-method/ibus/chewing type=group
+depend fmri=system/input-method/ibus/hangul type=group
+depend fmri=system/input-method/ibus/ibus-m17n type=group
+depend fmri=system/input-method/ibus/sayura type=group
+depend fmri=system/input-method/ibus/sunpinyin type=group
+depend fmri=system/input-method/ibus/xkbc type=group
+depend fmri=system/input-method/iiim type=group
+depend fmri=system/input-method/imf-startup type=group
+depend fmri=system/input-method/library/libanthy type=group
+depend fmri=system/input-method/library/libchewing type=group
+depend fmri=system/input-method/library/libdatrie type=group
+depend fmri=system/input-method/library/libhangul type=group
+depend fmri=system/input-method/library/libthai type=group
+depend fmri=system/input-method/library/m17n type=group
+depend fmri=system/input-method/library/m17n/contrib type=group
+depend fmri=system/library/dbus/dbus-x11 type=group
+depend fmri=system/library/iconv/unicode type=group
+depend fmri=system/library/libpcap type=group
+depend fmri=system/library/usb/libusb type=group
+depend fmri=system/library/usb/libusbugen type=group
+depend fmri=system/locale/support type=group
+depend fmri=system/management/rad type=group
+depend fmri=system/management/rad/client/rad-java type=group
+depend fmri=system/management/rad/client/rad-java/locale type=group
+depend fmri=system/management/rad/client/rad-python type=group
+depend fmri=system/management/rad/module/rad-smf type=group
+depend fmri=system/management/visual-panels-core type=group
+depend fmri=system/management/visual-panels-core/locale type=group
+depend fmri=system/management/visual-panels/panel-coreadm type=group
+depend fmri=system/management/visual-panels/panel-coreadm/locale type=group
+depend fmri=system/management/visual-panels/panel-firewall type=group
+depend fmri=system/management/visual-panels/panel-firewall/locale type=group
+depend fmri=system/management/visual-panels/panel-sharemgr type=group
+depend fmri=system/management/visual-panels/panel-smf type=group
+depend fmri=system/management/visual-panels/panel-smf/locale type=group
+depend fmri=system/management/visual-panels/panel-sysmon type=group
+depend fmri=system/management/visual-panels/panel-sysmon/locale type=group
+depend fmri=system/management/visual-panels/panel-time type=group
+depend fmri=system/management/visual-panels/panel-time/locale type=group
+depend fmri=system/network/avahi type=group
+$(i386_ONLY)depend fmri=system/storage/parted type=group
+depend fmri=terminal/gnome-terminal type=group
+depend fmri=terminal/xterm type=group
+depend fmri=web/browser/firefox type=group
+depend fmri=web/browser/firefox/locale/de_de type=group
+depend fmri=web/browser/firefox/locale/es_es type=group
+depend fmri=web/browser/firefox/locale/fr_fr type=group
+depend fmri=web/browser/firefox/locale/hi_in type=group
+depend fmri=web/browser/firefox/locale/it_it type=group
+depend fmri=web/browser/firefox/locale/ja_jp type=group
+depend fmri=web/browser/firefox/locale/ko_kr type=group
+depend fmri=web/browser/firefox/locale/pl_pl type=group
+depend fmri=web/browser/firefox/locale/pt_br type=group
+depend fmri=web/browser/firefox/locale/ru_ru type=group
+depend fmri=web/browser/firefox/locale/zh_cn type=group
+depend fmri=web/browser/firefox/locale/zh_tw type=group
+depend fmri=web/browser/firefox/multi-user-desktop type=group
+depend fmri=web/browser/firefox/plugin/firefox-flashplayer type=group
+depend fmri=web/browser/firefox/plugin/firefox-java type=group
+depend fmri=web/browser/w3m type=group
+depend fmri=web/data/firefox-bookmarks type=group
+depend fmri=x11/colormap-utilities type=group
+depend fmri=x11/compatibility/links-svid type=group
+depend fmri=x11/data/workspace-patterns type=group
+depend fmri=x11/data/xbitmaps type=group
+depend fmri=x11/data/xcursor-themes type=group
+depend fmri=x11/demo type=group
+depend fmri=x11/demo/mesa-demos type=group
+depend fmri=x11/diagnostic/x11-info-clients type=group
+depend fmri=x11/diagnostic/xev type=group
+depend fmri=x11/diagnostic/xscope type=group
+depend fmri=x11/documentation/xorg-docs type=group
+depend fmri=x11/font-utilities type=group
+depend fmri=x11/keyboard/data-xkb type=group
+depend fmri=x11/keyboard/xkb-utilities type=group
+depend fmri=x11/keyboard/xkbcomp type=group
+depend fmri=x11/library/dps type=group
+depend fmri=x11/library/libdmx type=group
+depend fmri=x11/library/libdrm type=group
+depend fmri=x11/library/libfs type=group
+depend fmri=x11/library/libowconfig type=group
+depend fmri=x11/library/libxcomposite type=group
+depend fmri=x11/library/libxcursor type=group
+depend fmri=x11/library/libxdamage type=group
+depend fmri=x11/library/libxevie type=group
+depend fmri=x11/library/libxfixes type=group
+depend fmri=x11/library/libxfont type=group
+depend fmri=x11/library/libxkbfile type=group
+depend fmri=x11/library/libxp type=group
+depend fmri=x11/library/libxrandr type=group
+depend fmri=x11/library/libxres type=group
+depend fmri=x11/library/libxscrnsaver type=group
+depend fmri=x11/library/libxv type=group
+depend fmri=x11/library/libxvmc type=group
+depend fmri=x11/library/libxxf86misc type=group
+depend fmri=x11/library/mesa type=group
+depend fmri=x11/library/toolkit/libxaw4 type=group
+depend fmri=x11/library/toolkit/libxaw5 type=group
+depend fmri=x11/library/xcb-util type=group
+depend fmri=x11/library/xtrans type=group
+depend fmri=x11/server/xephyr type=group
+depend fmri=x11/server/xorg type=group
+$(sparc_ONLY)depend fmri=x11/server/xorg/driver/xorg-efb type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-input-hotkey type=group
+depend fmri=x11/server/xorg/driver/xorg-input-keyboard type=group
+depend fmri=x11/server/xorg/driver/xorg-input-mouse type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-input-synaptics type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-input-vmmouse type=group
+depend fmri=x11/server/xorg/driver/xorg-video-ast type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-ati type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-cirrus type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-intel type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-mach64 type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-mga type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-nv type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-openchrome \
+    type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-r128 type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-trident type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-vesa type=group
+$(i386_ONLY)depend fmri=x11/server/xorg/driver/xorg-video-vmware type=group
+depend fmri=x11/server/xserver-common type=group
+depend fmri=x11/server/xvnc type=group
+depend fmri=x11/session/sessreg type=group
+depend fmri=x11/session/smproxy type=group
+depend fmri=x11/session/winsysck type=group
+depend fmri=x11/session/xauth type=group
+depend fmri=x11/session/xinit type=group
+depend fmri=x11/trusted/libxtsol type=group
+depend fmri=x11/x11-server-utilities type=group
+depend fmri=x11/x11-window-dump type=group
+depend fmri=x11/xcalc type=group
+depend fmri=x11/xclipboard type=group
+depend fmri=x11/xfd type=group
+depend fmri=x11/xfontsel type=group
+depend fmri=x11/xfs type=group
+depend fmri=x11/xfs/xfs-utilities type=group
+depend fmri=x11/xkill type=group
+depend fmri=x11/xlock type=group
+depend fmri=x11/xmag type=group
+depend fmri=x11/xvidtune type=group
--- a/src/pkg/manifests/group%2ffeature%2ftrusted-desktop.p5m	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/pkg/manifests/group%2ffeature%2ftrusted-desktop.p5m	Mon Jul 18 15:05:43 2011 -0700
@@ -71,7 +71,6 @@
 depend fmri=pkg:/gnome/trusted/trusted-stripe type=group
 depend fmri=pkg:/gnome/trusted/xagent type=group
 depend fmri=pkg:/gnome/zenity type=group
-depend fmri=pkg:/group/system/solaris-small-server type=require
 depend fmri=pkg:/image/gnome-backgrounds type=group
 depend fmri=pkg:/image/viewer/eog type=group
 depend fmri=pkg:/image/viewer/gthumb type=group
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m	Mon Jul 18 15:05:43 2011 -0700
@@ -30,8 +30,6 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Meta Packages/Group Packages"
 set name=variant.arch value=$(ARCH)
-depend fmri=SUNWcs type=group
-depend fmri=SUNWcsd type=group
 depend fmri=compress/bzip2 type=group
 depend fmri=compress/gzip type=group
 depend fmri=compress/p7zip type=group
@@ -42,7 +40,6 @@
 depend fmri=database/sqlite-3 type=group
 depend fmri=developer/base-developer-utilities type=group
 depend fmri=developer/debug/mdb type=group
-depend fmri=developer/debug/mdb/module/module-fibre-channel type=group
 depend fmri=developer/dtrace type=group
 depend fmri=developer/dtrace/toolkit type=group
 depend fmri=developer/macro/cpp type=group
@@ -63,7 +60,6 @@
 $(sparc_ONLY)depend fmri=driver/graphics/efb type=group
 $(i386_ONLY)depend fmri=driver/i86pc/fipe type=group
 $(i386_ONLY)depend fmri=driver/i86pc/ioat type=group
-$(i386_ONLY)depend fmri=driver/i86pc/platform type=group
 $(i386_ONLY)depend fmri=driver/management/bmc type=group
 depend fmri=driver/network/afe type=group
 $(i386_ONLY)depend fmri=driver/network/amd8111s type=group
@@ -80,12 +76,15 @@
 depend fmri=driver/network/chxge type=group
 depend fmri=driver/network/cxge type=group
 depend fmri=driver/network/dmfe type=group
+$(i386_ONLY)depend fmri=driver/network/dnet type=group
 depend fmri=driver/network/e1000g type=group
 $(i386_ONLY)depend fmri=driver/network/elxl type=group
 depend fmri=driver/network/emlxs type=group
 depend fmri=driver/network/eoib type=group
 $(sparc_ONLY)depend fmri=driver/network/eri type=group
 depend fmri=driver/network/fcip type=group
+depend fmri=driver/network/fcoe type=group
+depend fmri=driver/network/fcoei type=group
 depend fmri=driver/network/fcp type=group
 depend fmri=driver/network/fcsm type=group
 depend fmri=driver/network/fp type=group
@@ -97,6 +96,7 @@
 depend fmri=driver/network/ibdma type=group
 depend fmri=driver/network/ibp type=group
 depend fmri=driver/network/igb type=group
+$(i386_ONLY)depend fmri=driver/network/iprb type=group
 $(i386_ONLY)depend fmri=driver/network/ipw type=group
 $(i386_ONLY)depend fmri=driver/network/iwh type=group
 $(i386_ONLY)depend fmri=driver/network/iwi type=group
@@ -114,8 +114,8 @@
 depend fmri=driver/network/nxge type=group
 depend fmri=driver/network/ofk type=group
 depend fmri=driver/network/pcan type=group
+$(i386_ONLY)depend fmri=driver/network/pcn type=group
 depend fmri=driver/network/pcwl type=group
-$(i386_ONLY)depend fmri=driver/network/platform type=group
 $(sparc_ONLY)depend fmri=driver/network/qfe type=group
 depend fmri=driver/network/qlc type=group
 depend fmri=driver/network/qlcnic type=group
@@ -145,7 +145,9 @@
 depend fmri=driver/network/yge type=group
 $(i386_ONLY)depend fmri=driver/network/zyd type=group
 depend fmri=driver/pcmcia type=group
+$(i386_ONLY)depend fmri=driver/serial/asy type=group
 depend fmri=driver/serial/pcser type=group
+$(sparc_ONLY)depend fmri=driver/serial/se type=group
 depend fmri=driver/serial/usbftdi type=group
 depend fmri=driver/serial/usbsacm type=group
 depend fmri=driver/serial/usbser type=group
@@ -153,7 +155,6 @@
 depend fmri=driver/serial/usbsksp type=group
 depend fmri=driver/serial/usbsksp/usbs49_fw type=group
 depend fmri=driver/serial/usbsprl type=group
-$(sparc_ONLY)depend fmri=driver/sparc/platform type=group
 depend fmri=driver/storage/aac type=group
 $(i386_ONLY)depend fmri=driver/storage/adpu320 type=group
 $(i386_ONLY)depend fmri=driver/storage/ahci type=group
@@ -161,13 +162,15 @@
 $(i386_ONLY)depend fmri=driver/storage/ata type=group
 $(i386_ONLY)depend fmri=driver/storage/bcm_sata type=group
 depend fmri=driver/storage/blkdev type=group
+$(i386_ONLY)depend fmri=driver/storage/cmdk type=group
 $(i386_ONLY)depend fmri=driver/storage/cpqary3 type=group
-$(i386_ONLY)depend fmri=driver/storage/glm type=group
+depend fmri=driver/storage/glm type=group
 $(sparc_ONLY)depend fmri=driver/storage/ifp type=group
 $(i386_ONLY)depend fmri=driver/storage/imraid_sas type=group
 $(sparc_ONLY)depend fmri=driver/storage/isp type=group
 $(i386_ONLY)depend fmri=driver/storage/marvell88sx type=group
 $(i386_ONLY)depend fmri=driver/storage/mega_sas type=group
+depend fmri=driver/storage/mpt type=group
 depend fmri=driver/storage/mpt_sas type=group
 depend fmri=driver/storage/mr_sas type=group
 $(i386_ONLY)depend fmri=driver/storage/nv_sata type=group
@@ -183,6 +186,7 @@
 depend fmri=driver/storage/smp type=group
 $(sparc_ONLY)depend fmri=driver/storage/ssd type=group
 depend fmri=driver/usb type=group
+$(i386_ONLY)depend fmri=driver/x11/xsvc type=group
 $(i386_ONLY)depend fmri=driver/xvm/pv type=group
 depend fmri=editor/vim/vim-core type=group
 depend fmri=install/beadm type=group
@@ -207,7 +211,6 @@
 depend fmri=library/python-2/pyopenssl-26 type=group
 depend fmri=library/python-2/python-extra-26 type=group
 depend fmri=library/python-2/simplejson-26 type=group
-depend fmri=library/python-2/tkinter-26 type=group
 depend fmri=library/readline type=group
 depend fmri=library/security/openssl type=group
 depend fmri=library/security/trousers type=group
@@ -232,10 +235,9 @@
 depend fmri=runtime/perl-584 type=group
 depend fmri=runtime/perl-584/extra type=group
 depend fmri=runtime/python-26 type=group
-depend fmri=runtime/tcl-8 type=group
-depend fmri=runtime/tk-8 type=group
 depend fmri=security/sudo type=group
 depend fmri=service/fault-management type=group
+depend fmri=service/fault-management/fm-snmp-mib type=group
 depend fmri=service/file-system/smb type=group
 depend fmri=service/hal type=group
 $(sparc_ONLY)depend fmri=service/key-management/sun-fire-15000 type=group
@@ -254,6 +256,7 @@
 depend fmri=service/storage/media-volume-manager type=group
 depend fmri=service/storage/removable-media type=group
 depend fmri=shell/bash type=group
+depend fmri=shell/ksh type=group
 $(sparc_ONLY)depend fmri=storage/library/network-array type=group
 depend fmri=storage/mpathadm type=group
 depend fmri=storage/stmf type=group
@@ -261,18 +264,24 @@
 depend fmri=system/accounting/legacy type=group
 depend fmri=system/boot/grub type=group
 depend fmri=system/boot/wanboot type=group
+depend fmri=system/core-os type=group
 depend fmri=system/data/hardware-registry type=group
 depend fmri=system/data/keyboard/keytables type=group
 depend fmri=system/data/terminfo type=group
+depend fmri=system/data/terminfo/terminfo-core type=group
 depend fmri=system/data/timezone type=group
+depend fmri=system/device-administration type=group
 $(sparc_ONLY)depend \
     fmri=system/domain-service-processor-protocol/sparc-enterprise type=group
+depend fmri=system/dynamic-reconfiguration type=group
 $(sparc_ONLY)depend fmri=system/embedded-fcode-interpreter type=group
-depend fmri=system/extended-system-utilities type=group
 depend fmri=system/file-system/autofs type=group
+depend fmri=system/file-system/hsfs type=group
 depend fmri=system/file-system/nfs type=group
+depend fmri=system/file-system/pcfs type=group
 depend fmri=system/file-system/smb type=group
 depend fmri=system/file-system/udfs type=group
+depend fmri=system/file-system/ufs type=group
 depend fmri=system/file-system/zfs type=group
 depend fmri=system/flash/fwflash type=group
 depend fmri=system/fru-id type=group
@@ -281,13 +290,15 @@
 depend fmri=system/install/auto-install type=group
 depend fmri=system/install/auto-install/auto-install-common type=group
 depend fmri=system/install/tests type=group
-depend fmri=system/ipc type=group
 depend fmri=system/kernel type=group
 depend fmri=system/kernel/cpu-counters type=group
 $(sparc_ONLY)depend fmri=system/kernel/cpu/sun4v type=group
 depend fmri=system/kernel/dtrace/providers type=group
+$(i386_ONLY)depend fmri=system/kernel/dynamic-reconfiguration/i86pc type=group
 $(sparc_ONLY)depend fmri=system/kernel/dynamic-reconfiguration/sun-fire-15000 \
     type=group
+$(sparc_ONLY)depend fmri=system/kernel/dynamic-reconfiguration/sun-fire-880 \
+    type=group
 $(sparc_ONLY)depend \
     fmri=system/kernel/dynamic-reconfiguration/ultra-enterprise-10000 \
     type=group
@@ -301,6 +312,7 @@
 depend fmri=system/kernel/security/gss type=group
 depend fmri=system/kernel/suspend-resume type=group
 depend fmri=system/kernel/ultra-wideband type=group
+depend fmri=system/keyboard/keyboard-utilities type=group
 $(sparc_ONLY)depend fmri=system/ldoms type=group
 depend fmri=system/library type=group
 depend fmri=system/library/c++-runtime type=group
@@ -342,17 +354,14 @@
 depend fmri=system/scheduler/fss type=group
 depend fmri=system/storage/fibre-channel/port-utility type=group
 depend fmri=system/storage/luxadm type=group
+depend fmri=system/storage/raid-utilities type=group
+depend fmri=system/system-events type=group
+depend fmri=system/virtual-console type=group
 depend fmri=system/xopen/xcu4 type=group
 depend fmri=system/zones type=group
 depend fmri=terminal/resize type=group
 depend fmri=text/less type=group
 depend fmri=text/locale type=group
+depend fmri=text/spelling-utilities type=group
 depend fmri=web/curl type=group
 depend fmri=web/wget type=group
-depend fmri=x11/header/x11-protocols type=group
-depend fmri=x11/library/libpthread-stubs type=group
-depend fmri=x11/library/libx11 type=group
-depend fmri=x11/library/libxau type=group
-depend fmri=x11/library/libxcb type=group
-depend fmri=x11/library/libxdmcp type=group
-depend fmri=x11/library/libxext type=group
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m	Mon Jul 18 15:05:43 2011 -0700
@@ -30,8 +30,6 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Meta Packages/Group Packages"
 set name=variant.arch value=$(ARCH)
-depend fmri=SUNWcs type=group
-depend fmri=SUNWcsd type=group
 depend fmri=archiver/gnu-tar type=group
 depend fmri=audio/audio-utilities type=group
 depend fmri=benchmark/x11perf type=group
@@ -80,7 +78,6 @@
 depend fmri=developer/build/gnu-make type=group
 depend fmri=developer/build/make type=group
 depend fmri=developer/debug/mdb type=group
-depend fmri=developer/debug/mdb/module/module-fibre-channel type=group
 depend fmri=developer/documentation-tool/openjade type=group
 depend fmri=developer/documentation-tool/opensp type=group
 depend fmri=developer/dtrace type=group
@@ -133,7 +130,6 @@
 depend fmri=driver/graphics/usbvc type=group
 $(i386_ONLY)depend fmri=driver/i86pc/fipe type=group
 $(i386_ONLY)depend fmri=driver/i86pc/ioat type=group
-$(i386_ONLY)depend fmri=driver/i86pc/platform type=group
 $(i386_ONLY)depend fmri=driver/management/bmc type=group
 depend fmri=driver/network/afe type=group
 $(i386_ONLY)depend fmri=driver/network/amd8111s type=group
@@ -150,11 +146,14 @@
 depend fmri=driver/network/chxge type=group
 depend fmri=driver/network/cxge type=group
 depend fmri=driver/network/dmfe type=group
+$(i386_ONLY)depend fmri=driver/network/dnet type=group
 depend fmri=driver/network/e1000g type=group
 $(i386_ONLY)depend fmri=driver/network/elxl type=group
 depend fmri=driver/network/emlxs type=group
 $(sparc_ONLY)depend fmri=driver/network/eri type=group
 depend fmri=driver/network/fcip type=group
+depend fmri=driver/network/fcoe type=group
+depend fmri=driver/network/fcoei type=group
 depend fmri=driver/network/fcp type=group
 depend fmri=driver/network/fcsm type=group
 depend fmri=driver/network/fp type=group
@@ -163,6 +162,7 @@
 depend fmri=driver/network/hxge type=group
 depend fmri=driver/network/ib type=group
 depend fmri=driver/network/igb type=group
+$(i386_ONLY)depend fmri=driver/network/iprb type=group
 $(i386_ONLY)depend fmri=driver/network/ipw type=group
 $(i386_ONLY)depend fmri=driver/network/iwh type=group
 $(i386_ONLY)depend fmri=driver/network/iwi type=group
@@ -179,8 +179,8 @@
 $(i386_ONLY)depend fmri=driver/network/ntxn type=group
 depend fmri=driver/network/nxge type=group
 depend fmri=driver/network/pcan type=group
+$(i386_ONLY)depend fmri=driver/network/pcn type=group
 depend fmri=driver/network/pcwl type=group
-$(i386_ONLY)depend fmri=driver/network/platform type=group
 $(sparc_ONLY)depend fmri=driver/network/qfe type=group
 depend fmri=driver/network/qlc type=group
 depend fmri=driver/network/qlcnic type=group
@@ -204,8 +204,11 @@
 depend fmri=driver/network/xge type=group
 depend fmri=driver/network/yge type=group
 $(i386_ONLY)depend fmri=driver/network/zyd type=group
+depend fmri=driver/parallel/ecpp type=group
 depend fmri=driver/pcmcia type=group
+$(i386_ONLY)depend fmri=driver/serial/asy type=group
 depend fmri=driver/serial/pcser type=group
+$(sparc_ONLY)depend fmri=driver/serial/se type=group
 depend fmri=driver/serial/usbftdi type=group
 depend fmri=driver/serial/usbsacm type=group
 depend fmri=driver/serial/usbser type=group
@@ -213,7 +216,6 @@
 depend fmri=driver/serial/usbsksp type=group
 depend fmri=driver/serial/usbsksp/usbs49_fw type=group
 depend fmri=driver/serial/usbsprl type=group
-$(sparc_ONLY)depend fmri=driver/sparc/platform type=group
 depend fmri=driver/storage/aac type=group
 $(i386_ONLY)depend fmri=driver/storage/adpu320 type=group
 $(i386_ONLY)depend fmri=driver/storage/ahci type=group
@@ -221,13 +223,15 @@
 $(i386_ONLY)depend fmri=driver/storage/ata type=group
 $(i386_ONLY)depend fmri=driver/storage/bcm_sata type=group
 depend fmri=driver/storage/blkdev type=group
+$(i386_ONLY)depend fmri=driver/storage/cmdk type=group
 $(i386_ONLY)depend fmri=driver/storage/cpqary3 type=group
-$(i386_ONLY)depend fmri=driver/storage/glm type=group
+depend fmri=driver/storage/glm type=group
 $(sparc_ONLY)depend fmri=driver/storage/ifp type=group
 $(i386_ONLY)depend fmri=driver/storage/imraid_sas type=group
 $(sparc_ONLY)depend fmri=driver/storage/isp type=group
 $(i386_ONLY)depend fmri=driver/storage/marvell88sx type=group
 $(i386_ONLY)depend fmri=driver/storage/mega_sas type=group
+depend fmri=driver/storage/mpt type=group
 depend fmri=driver/storage/mpt_sas type=group
 depend fmri=driver/storage/mr_sas type=group
 $(i386_ONLY)depend fmri=driver/storage/nv_sata type=group
@@ -441,7 +445,6 @@
 depend fmri=library/security/libgpg-error type=group
 depend fmri=library/security/libksba type=group
 depend fmri=library/security/openssl type=group
-depend fmri=library/security/tcp-wrapper type=group
 depend fmri=library/security/trousers type=group
 depend fmri=library/slang type=group
 depend fmri=library/speech/espeak type=group
@@ -512,8 +515,10 @@
 depend fmri=runtime/tk-8 type=group
 depend fmri=security/bart type=group
 depend fmri=security/sudo type=group
+depend fmri=security/tcp-wrapper type=group
 depend fmri=service/diagnostic/spray type=group
 depend fmri=service/fault-management type=group
+depend fmri=service/fault-management/fm-snmp-mib type=group
 depend fmri=service/file-system/nfs type=group
 depend fmri=service/file-system/smb type=group
 depend fmri=service/gnome/desktop-cache type=group
@@ -546,6 +551,7 @@
 depend fmri=service/storage/rmt type=group
 depend fmri=shell/bash type=group
 depend fmri=shell/expect type=group
+depend fmri=shell/ksh type=group
 depend fmri=shell/pipe-viewer type=group
 depend fmri=shell/tcsh type=group
 depend fmri=shell/which type=group
@@ -557,23 +563,30 @@
 depend fmri=system/accounting/legacy type=group
 depend fmri=system/boot/grub type=group
 depend fmri=system/boot/wanboot type=group
+depend fmri=system/core-os type=group
 depend fmri=system/data/hardware-registry type=group
 depend fmri=system/data/keyboard/keytables type=group
 depend fmri=system/data/terminfo type=group
+depend fmri=system/data/terminfo/terminfo-core type=group
 depend fmri=system/data/timezone type=group
+depend fmri=system/device-administration type=group
+depend fmri=system/device-allocation type=group
 depend fmri=system/display-manager/desktop-startup type=group
 depend fmri=system/display-manager/gdm type=group
 $(sparc_ONLY)depend fmri=system/domain-configuration/sparc-enterprise \
     type=group
 $(sparc_ONLY)depend \
     fmri=system/domain-service-processor-protocol/sparc-enterprise type=group
+depend fmri=system/dynamic-reconfiguration type=group
 $(sparc_ONLY)depend fmri=system/embedded-fcode-interpreter type=group
-depend fmri=system/extended-system-utilities type=group
 depend fmri=system/file-system/autofs type=group
+depend fmri=system/file-system/hsfs type=group
 depend fmri=system/file-system/nfs type=group
 $(i386_ONLY)depend fmri=system/file-system/ntfsprogs type=group
+depend fmri=system/file-system/pcfs type=group
 depend fmri=system/file-system/smb type=group
 depend fmri=system/file-system/udfs type=group
+depend fmri=system/file-system/ufs type=group
 depend fmri=system/file-system/zfs type=group
 depend fmri=system/flash/fwflash type=group
 $(sparc_ONLY)depend fmri=system/floating-point-scrubber type=group
@@ -612,7 +625,6 @@
 depend fmri=system/install/configuration type=group
 depend fmri=system/install/locale type=group
 depend fmri=system/install/tests type=group
-depend fmri=system/ipc type=group
 depend fmri=system/kernel type=group
 depend fmri=system/kernel/cpu-counters type=group
 $(sparc_ONLY)depend fmri=system/kernel/cpu/sun4v type=group
@@ -636,10 +648,12 @@
 depend fmri=system/kernel/suspend-resume type=group
 depend fmri=system/kernel/ultra-wideband type=group
 depend fmri=system/keyboard/kbd_mode type=group
+depend fmri=system/keyboard/keyboard-utilities type=group
 $(sparc_ONLY)depend fmri=system/ldoms type=group
 depend fmri=system/library type=group
 depend fmri=system/library/c++-runtime type=group
 depend fmri=system/library/dbus type=group
+depend fmri=system/library/dbus/dbus-x11 type=group
 depend fmri=system/library/flex-runtime type=group
 depend fmri=system/library/fontconfig type=group
 depend fmri=system/library/freetype-2 type=group
@@ -682,6 +696,7 @@
 depend fmri=system/management/ipmitool type=group
 depend fmri=system/management/rad type=group
 depend fmri=system/management/rad/client/rad-java type=group
+depend fmri=system/management/rad/client/rad-java/locale type=group
 depend fmri=system/management/rad/client/rad-python type=group
 depend fmri=system/management/rad/module/rad-smf type=group
 depend fmri=system/management/service-tag type=group
@@ -689,12 +704,18 @@
 depend fmri=system/management/snmp/net-snmp/documentation type=group
 depend fmri=system/management/sysidtool type=group
 depend fmri=system/management/visual-panels-core type=group
+depend fmri=system/management/visual-panels-core/locale type=group
 depend fmri=system/management/visual-panels/panel-coreadm type=group
+depend fmri=system/management/visual-panels/panel-coreadm/locale type=group
 depend fmri=system/management/visual-panels/panel-firewall type=group
+depend fmri=system/management/visual-panels/panel-firewall/locale type=group
 depend fmri=system/management/visual-panels/panel-sharemgr type=group
 depend fmri=system/management/visual-panels/panel-smf type=group
+depend fmri=system/management/visual-panels/panel-smf/locale type=group
 depend fmri=system/management/visual-panels/panel-sysmon type=group
+depend fmri=system/management/visual-panels/panel-sysmon/locale type=group
 depend fmri=system/management/visual-panels/panel-time type=group
+depend fmri=system/management/visual-panels/panel-time/locale type=group
 depend fmri=system/manual type=group
 depend fmri=system/manual/locale/ca type=group
 depend fmri=system/manual/locale/ja type=group
@@ -712,6 +733,9 @@
 depend fmri=system/storage/fibre-channel/port-utility type=group
 depend fmri=system/storage/luxadm type=group
 $(i386_ONLY)depend fmri=system/storage/parted type=group
+depend fmri=system/storage/raid-utilities type=group
+depend fmri=system/system-events type=group
+depend fmri=system/virtual-console type=group
 depend fmri=system/xopen/xcu4 type=group
 depend fmri=system/zones type=group
 depend fmri=system/zones/brand/ipkg type=group
@@ -732,6 +756,7 @@
 depend fmri=text/groff/groff-core type=group
 depend fmri=text/less type=group
 depend fmri=text/locale type=group
+depend fmri=text/spelling-utilities type=group
 depend fmri=text/texinfo type=group
 depend fmri=web/browser/firefox type=group
 depend fmri=web/browser/firefox/locale/de_de type=group
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m	Mon Jul 18 15:05:43 2011 -0700
@@ -30,8 +30,6 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Meta Packages/Group Packages"
 set name=variant.arch value=$(ARCH)
-depend fmri=SUNWcs type=group
-depend fmri=SUNWcsd type=group
 depend fmri=archiver/gnu-tar type=group
 depend fmri=compress/bzip2 type=group
 depend fmri=compress/gzip type=group
@@ -46,7 +44,6 @@
 depend fmri=developer/build/gnu-make type=group
 depend fmri=developer/build/make type=group
 depend fmri=developer/debug/mdb type=group
-depend fmri=developer/debug/mdb/module/module-fibre-channel type=group
 depend fmri=developer/dtrace type=group
 depend fmri=developer/dtrace/toolkit type=group
 depend fmri=developer/library/xprofile type=group
@@ -78,11 +75,13 @@
 $(i386_ONLY)depend fmri=driver/graphics/nvidia type=group
 $(i386_ONLY)depend fmri=driver/i86pc/fipe type=group
 $(i386_ONLY)depend fmri=driver/i86pc/ioat type=group
-$(i386_ONLY)depend fmri=driver/i86pc/platform type=group
 $(i386_ONLY)depend fmri=driver/management/bmc type=group
 depend fmri=driver/network/afe type=group
 $(i386_ONLY)depend fmri=driver/network/amd8111s type=group
+$(i386_ONLY)depend fmri=driver/network/arn type=group
 $(i386_ONLY)depend fmri=driver/network/atge type=group
+$(i386_ONLY)depend fmri=driver/network/ath type=group
+$(i386_ONLY)depend fmri=driver/network/atu type=group
 $(i386_ONLY)depend fmri=driver/network/bfe type=group
 depend fmri=driver/network/bge type=group
 $(i386_ONLY)depend fmri=driver/network/bnx type=group
@@ -92,12 +91,15 @@
 depend fmri=driver/network/chxge type=group
 depend fmri=driver/network/cxge type=group
 depend fmri=driver/network/dmfe type=group
+$(i386_ONLY)depend fmri=driver/network/dnet type=group
 depend fmri=driver/network/e1000g type=group
 $(i386_ONLY)depend fmri=driver/network/elxl type=group
 depend fmri=driver/network/emlxs type=group
 depend fmri=driver/network/eoib type=group
 $(sparc_ONLY)depend fmri=driver/network/eri type=group
 depend fmri=driver/network/fcip type=group
+depend fmri=driver/network/fcoe type=group
+depend fmri=driver/network/fcoei type=group
 depend fmri=driver/network/fcp type=group
 depend fmri=driver/network/fcsm type=group
 depend fmri=driver/network/fp type=group
@@ -109,9 +111,16 @@
 depend fmri=driver/network/ibdma type=group
 depend fmri=driver/network/ibp type=group
 depend fmri=driver/network/igb type=group
+$(i386_ONLY)depend fmri=driver/network/iprb type=group
+$(i386_ONLY)depend fmri=driver/network/ipw type=group
+$(i386_ONLY)depend fmri=driver/network/iwh type=group
+$(i386_ONLY)depend fmri=driver/network/iwi type=group
+$(i386_ONLY)depend fmri=driver/network/iwk type=group
+$(i386_ONLY)depend fmri=driver/network/iwp type=group
 depend fmri=driver/network/ixgb type=group
 depend fmri=driver/network/ixgbe type=group
 $(i386_ONLY)depend fmri=driver/network/mcxe type=group
+$(i386_ONLY)depend fmri=driver/network/mwl type=group
 depend fmri=driver/network/mxfe type=group
 depend fmri=driver/network/myri10ge type=group
 $(i386_ONLY)depend fmri=driver/network/nge type=group
@@ -119,28 +128,43 @@
 $(i386_ONLY)depend fmri=driver/network/ntxn type=group
 depend fmri=driver/network/nxge type=group
 depend fmri=driver/network/ofk type=group
-$(i386_ONLY)depend fmri=driver/network/platform type=group
+depend fmri=driver/network/pcan type=group
+$(i386_ONLY)depend fmri=driver/network/pcn type=group
+depend fmri=driver/network/pcwl type=group
 $(sparc_ONLY)depend fmri=driver/network/qfe type=group
 depend fmri=driver/network/qlc type=group
 depend fmri=driver/network/qlcnic type=group
+$(i386_ONLY)depend fmri=driver/network/ral type=group
 depend fmri=driver/network/rds type=group
 depend fmri=driver/network/rdsv3 type=group
 depend fmri=driver/network/rge type=group
 depend fmri=driver/network/rpcib type=group
 depend fmri=driver/network/rtls type=group
+$(i386_ONLY)depend fmri=driver/network/rtw type=group
+$(i386_ONLY)depend fmri=driver/network/rum type=group
+$(i386_ONLY)depend fmri=driver/network/rwd type=group
+$(i386_ONLY)depend fmri=driver/network/rwn type=group
 depend fmri=driver/network/sdp type=group
 depend fmri=driver/network/sdpib type=group
 depend fmri=driver/network/sfe type=group
 $(sparc_ONLY)depend fmri=driver/network/socal type=group
 depend fmri=driver/network/sxge type=group
 depend fmri=driver/network/tavor type=group
+$(i386_ONLY)depend fmri=driver/network/uath type=group
+$(i386_ONLY)depend fmri=driver/network/ural type=group
+$(i386_ONLY)depend fmri=driver/network/urtw type=group
 depend fmri=driver/network/usbecm type=group
 depend fmri=driver/network/vr type=group
 depend fmri=driver/network/vxge type=group
+$(i386_ONLY)depend fmri=driver/network/wpi type=group
 depend fmri=driver/network/xge type=group
 depend fmri=driver/network/yge type=group
+$(i386_ONLY)depend fmri=driver/network/zyd type=group
+depend fmri=driver/parallel/ecpp type=group
 depend fmri=driver/pcmcia type=group
+$(i386_ONLY)depend fmri=driver/serial/asy type=group
 depend fmri=driver/serial/pcser type=group
+$(sparc_ONLY)depend fmri=driver/serial/se type=group
 depend fmri=driver/serial/usbftdi type=group
 depend fmri=driver/serial/usbsacm type=group
 depend fmri=driver/serial/usbser type=group
@@ -148,7 +172,6 @@
 depend fmri=driver/serial/usbsksp type=group
 depend fmri=driver/serial/usbsksp/usbs49_fw type=group
 depend fmri=driver/serial/usbsprl type=group
-$(sparc_ONLY)depend fmri=driver/sparc/platform type=group
 depend fmri=driver/storage/aac type=group
 $(i386_ONLY)depend fmri=driver/storage/adpu320 type=group
 $(i386_ONLY)depend fmri=driver/storage/ahci type=group
@@ -156,13 +179,15 @@
 $(i386_ONLY)depend fmri=driver/storage/ata type=group
 $(i386_ONLY)depend fmri=driver/storage/bcm_sata type=group
 depend fmri=driver/storage/blkdev type=group
+$(i386_ONLY)depend fmri=driver/storage/cmdk type=group
 $(i386_ONLY)depend fmri=driver/storage/cpqary3 type=group
-$(i386_ONLY)depend fmri=driver/storage/glm type=group
+depend fmri=driver/storage/glm type=group
 $(sparc_ONLY)depend fmri=driver/storage/ifp type=group
 $(i386_ONLY)depend fmri=driver/storage/imraid_sas type=group
 $(sparc_ONLY)depend fmri=driver/storage/isp type=group
 $(i386_ONLY)depend fmri=driver/storage/marvell88sx type=group
 $(i386_ONLY)depend fmri=driver/storage/mega_sas type=group
+depend fmri=driver/storage/mpt type=group
 depend fmri=driver/storage/mpt_sas type=group
 depend fmri=driver/storage/mr_sas type=group
 $(i386_ONLY)depend fmri=driver/storage/nv_sata type=group
@@ -178,6 +203,7 @@
 depend fmri=driver/storage/smp type=group
 $(sparc_ONLY)depend fmri=driver/storage/ssd type=group
 depend fmri=driver/usb type=group
+$(i386_ONLY)depend fmri=driver/x11/xsvc type=group
 $(i386_ONLY)depend fmri=driver/xvm/pv type=group
 depend fmri=editor/nano type=group
 depend fmri=editor/vim/vim-core type=group
@@ -224,19 +250,15 @@
 depend fmri=library/python-2/pyopenssl-26 type=group
 depend fmri=library/python-2/python-extra-26 type=group
 depend fmri=library/python-2/simplejson-26 type=group
-depend fmri=library/python-2/tkinter-26 type=group
 depend fmri=library/readline type=group
 depend fmri=library/security/libgpg-error type=group
 depend fmri=library/security/openssl type=group
-depend fmri=library/security/tcp-wrapper type=group
 depend fmri=library/security/trousers type=group
 depend fmri=library/unixodbc type=group
 depend fmri=library/zlib type=group
 depend fmri=media/cdrtools type=group
 depend fmri=naming/ldap type=group
 depend fmri=network/bridging type=group
-depend fmri=network/dhcp/dhcpmgr type=group
-depend fmri=network/dhcp/dhcpmgr/locale type=group
 depend fmri=network/dns/bind type=group
 depend fmri=network/finger type=group
 depend fmri=network/ftp type=group
@@ -276,11 +298,12 @@
 depend fmri=runtime/perl-584/manual type=group
 depend fmri=runtime/python-26 type=group
 depend fmri=runtime/tcl-8 type=group
-depend fmri=runtime/tk-8 type=group
 depend fmri=security/bart type=group
 depend fmri=security/sudo type=group
+depend fmri=security/tcp-wrapper type=group
 depend fmri=service/diagnostic/spray type=group
 depend fmri=service/fault-management type=group
+depend fmri=service/fault-management/fm-snmp-mib type=group
 depend fmri=service/file-system/nfs type=group
 depend fmri=service/file-system/smb type=group
 depend fmri=service/gnome/desktop-cache type=group
@@ -288,7 +311,7 @@
 $(sparc_ONLY)depend fmri=service/key-management/sun-fire-15000 type=group
 depend fmri=service/management/sysidtool type=group
 depend fmri=service/network/comsat type=group
-depend fmri=service/network/dhcp type=group
+depend fmri=service/network/dhcp/isc-dhcp type=group
 depend fmri=service/network/dns/bind type=group
 depend fmri=service/network/dns/mdns type=group
 depend fmri=service/network/finger type=group
@@ -313,6 +336,7 @@
 depend fmri=service/storage/rmt type=group
 depend fmri=shell/bash type=group
 depend fmri=shell/expect type=group
+depend fmri=shell/ksh type=group
 depend fmri=shell/pipe-viewer type=group
 depend fmri=shell/tcsh type=group
 depend fmri=shell/which type=group
@@ -324,20 +348,27 @@
 depend fmri=system/accounting/legacy type=group
 depend fmri=system/boot/grub type=group
 depend fmri=system/boot/wanboot type=group
+depend fmri=system/core-os type=group
 depend fmri=system/data/hardware-registry type=group
 depend fmri=system/data/keyboard/keytables type=group
 depend fmri=system/data/terminfo type=group
+depend fmri=system/data/terminfo/terminfo-core type=group
 depend fmri=system/data/timezone type=group
+depend fmri=system/device-administration type=group
+depend fmri=system/device-allocation type=group
 $(sparc_ONLY)depend fmri=system/domain-configuration/sparc-enterprise \
     type=group
 $(sparc_ONLY)depend \
     fmri=system/domain-service-processor-protocol/sparc-enterprise type=group
+depend fmri=system/dynamic-reconfiguration type=group
 $(sparc_ONLY)depend fmri=system/embedded-fcode-interpreter type=group
-depend fmri=system/extended-system-utilities type=group
 depend fmri=system/file-system/autofs type=group
+depend fmri=system/file-system/hsfs type=group
 depend fmri=system/file-system/nfs type=group
+depend fmri=system/file-system/pcfs type=group
 depend fmri=system/file-system/smb type=group
 depend fmri=system/file-system/udfs type=group
+depend fmri=system/file-system/ufs type=group
 depend fmri=system/file-system/zfs type=group
 depend fmri=system/flash/fwflash type=group
 $(sparc_ONLY)depend fmri=system/floating-point-scrubber type=group
@@ -349,7 +380,6 @@
 depend fmri=system/install/configuration type=group
 depend fmri=system/install/locale type=group
 depend fmri=system/install/tests type=group
-depend fmri=system/ipc type=group
 depend fmri=system/kernel type=group
 depend fmri=system/kernel/cpu-counters type=group
 $(sparc_ONLY)depend fmri=system/kernel/cpu/sun4v type=group
@@ -373,6 +403,7 @@
 depend fmri=system/kernel/suspend-resume type=group
 depend fmri=system/kernel/ultra-wideband type=group
 depend fmri=system/keyboard/kbd_mode type=group
+depend fmri=system/keyboard/keyboard-utilities type=group
 $(sparc_ONLY)depend fmri=system/ldoms type=group
 depend fmri=system/library type=group
 depend fmri=system/library/c++-runtime type=group
@@ -433,6 +464,9 @@
 depend fmri=system/scheduler/fss type=group
 depend fmri=system/storage/fibre-channel/port-utility type=group
 depend fmri=system/storage/luxadm type=group
+depend fmri=system/storage/raid-utilities type=group
+depend fmri=system/system-events type=group
+depend fmri=system/virtual-console type=group
 depend fmri=system/xopen/xcu4 type=group
 depend fmri=system/zones type=group
 depend fmri=system/zones/brand/ipkg type=group
@@ -451,6 +485,7 @@
 depend fmri=text/groff/groff-core type=group
 depend fmri=text/less type=group
 depend fmri=text/locale type=group
+depend fmri=text/spelling-utilities type=group
 depend fmri=text/texinfo type=group
 depend fmri=web/curl type=group
 depend fmri=web/server/apache-22 type=group
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m	Mon Jul 18 15:05:43 2011 -0700
@@ -30,8 +30,6 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Meta Packages/Group Packages"
 set name=variant.arch value=$(ARCH)
-depend fmri=SUNWcs type=group
-depend fmri=SUNWcsd type=group
 depend fmri=compress/bzip2 type=group
 depend fmri=compress/gzip type=group
 depend fmri=compress/unzip type=group
@@ -55,11 +53,13 @@
 depend fmri=service/management/sysidtool type=group
 depend fmri=service/network/ssh type=group
 depend fmri=shell/bash type=group
-depend fmri=system/extended-system-utilities type=group
+depend fmri=shell/ksh type=group
+depend fmri=system/core-os type=group
 depend fmri=system/file-system/autofs type=group
 depend fmri=system/file-system/nfs type=group
 depend fmri=system/install type=group
 depend fmri=system/install/configuration type=group
+depend fmri=system/kernel type=group
 depend fmri=system/library/install type=group
 depend fmri=system/linker type=group
 depend fmri=system/management/sysidtool type=group
@@ -68,3 +68,5 @@
 depend fmri=system/network/routing type=group
 depend fmri=terminal/resize type=group
 depend fmri=text/doctools type=group
+depend fmri=text/locale type=group
+depend fmri=text/spelling-utilities type=group
--- a/src/pkg/transforms/incorp	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/pkg/transforms/incorp	Mon Jul 18 15:05:43 2011 -0700
@@ -51,4 +51,12 @@
 # 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/170/common/Redistributable	Mon Jul 18 15:05:43 2011 -0700
@@ -0,0 +1,1505 @@
+package redistributable
+cluster redistributable
+summary "redistributable cluster"
+version 0.1
+depend archiver/gnu-tar
+depend archiver/unrar
+depend audio/audio-utilities
+depend audio/sox
+depend backup/areca
+depend backup/rdiff-backup
+depend benchmark/filebench
+depend benchmark/gtkperf
+depend benchmark/iperf
+depend benchmark/x11perf
+depend cde/calendar-manager-server
+depend cde/cde-runtime
+depend cde/cde-utilities
+depend cde/help-viewer
+depend codec/flac
+depend codec/libtheora
+depend codec/ogg-vorbis
+depend codec/speex
+depend communication/conferencing/ekiga
+depend communication/im/pidgin
+depend communication/pda/gnome-pilot
+depend communication/pda/pilot-link
+depend compatibility/ucb
+depend compress/bzip2
+depend compress/gzip
+depend compress/p7zip
+depend compress/unzip
+depend compress/zip
+depend consolidation/osnet/osnet-message-files
+depend crypto/ca-certificates
+depend crypto/gnupg
+depend crypto/pwgen
+depend data/docbook/docbook-dtds
+depend data/docbook/docbook-style-dsssl
+depend data/docbook/docbook-style-xsl
+depend data/iso-codes
+depend data/sgml-common
+depend data/xml-common
+depend database/mysql-50
+depend database/mysql-50/connector/jdbc
+depend database/mysql-50/tests
+depend database/mysql-51
+depend database/mysql-51/library
+depend database/mysql-51/tests
+depend database/mysql-common
+depend database/sqlite-3
+depend database/sqlite-3/documentation
+$(i386_ONLY)depend desktop/administration/gparted
+depend desktop/administration/nwam-manager
+depend desktop/archive-manager/file-roller
+$(i386_ONLY)depend desktop/avant-window-navigator
+depend desktop/calculator/gcalctool
+depend desktop/cd-burning/brasero
+depend desktop/cd-ripping/sound-juicer
+depend desktop/character-map/gucharmap
+depend desktop/compiz
+$(i386_ONLY)depend desktop/compiz/ccsm
+$(i386_ONLY)depend desktop/compiz/library/compizconfig-gconf
+$(i386_ONLY)depend desktop/compiz/library/libcompizconfig
+$(i386_ONLY)depend desktop/compiz/plugin/compiz-fusion-extra
+$(i386_ONLY)depend desktop/compiz/plugin/compiz-fusion-main
+depend desktop/file-manager/gnome-commander
+depend desktop/gftp
+depend desktop/gksu
+depend desktop/irc/xchat
+depend desktop/network/gnome-nettool
+depend desktop/pdf-viewer/evince
+depend desktop/project-management/openproj
+depend desktop/project-management/planner
+depend desktop/remote-desktop/rdesktop
+depend desktop/remote-desktop/tigervnc
+depend desktop/remote-desktop/tsclient
+depend desktop/remote-desktop/vinagre
+depend desktop/studio/jokosher
+depend desktop/synergy
+depend desktop/system-monitor/gkrellm
+depend desktop/system-monitor/gnome-system-monitor
+depend desktop/time-slider
+depend desktop/time-tracking/hamster
+depend desktop/torrent/transmission
+depend desktop/window-manager/twm
+depend desktop/window-manager/xcompmgr
+depend desktop/xdg/menu-editor/alacarte
+depend desktop/xdg/xdg-user-dirs-gtk
+depend desktop/xdg/xdg-utils
+depend desktop/xscreensaver
+depend desktop/xscreensaver/hacks
+depend desktop/xscreensaver/hacks/hacks-gl
+depend desktop/xscreensaver/hacks/rss-glx
+depend developer/appcert
+depend developer/apptrace
+depend developer/assembler
+depend developer/astdev
+depend developer/base-developer-utilities
+depend developer/bcc
+depend developer/build/ant
+depend developer/build/autoconf
+depend developer/build/autoconf/xorg-macros
+depend developer/build/autogen
+depend developer/build/automake-110
+depend developer/build/automake-19
+depend developer/build/cmake
+depend developer/build/gnu-make
+depend developer/build/imake
+depend developer/build/libtool
+depend developer/build/make
+depend developer/build/makedepend
+depend developer/build/onbld
+depend developer/debug/gdb
+depend developer/debug/mdb
+depend developer/documentation-tool/doxygen
+depend developer/documentation-tool/gtk-doc
+depend developer/documentation-tool/openjade
+depend developer/documentation-tool/opensp
+depend developer/driver/ftsafe
+depend developer/dtrace
+depend developer/dtrace/toolkit
+depend developer/fakeroot
+depend developer/gcc-3
+depend developer/gnome/devhelp
+depend developer/gnome/gettext
+depend developer/gnome/gnome-doc-utils
+depend developer/gnu-binutils
+depend developer/gperf
+depend developer/icu
+depend developer/java/jdk
+depend developer/java/jdk64
+depend developer/java/junit
+depend developer/lexer/flex
+depend developer/library/lint
+depend developer/library/profiled-libc
+depend developer/library/xprofile
+depend developer/macro/cpp
+depend developer/macro/gnu-m4
+depend developer/meld
+depend developer/openmpi-15
+depend developer/parser/antlr-2
+depend developer/parser/bison
+depend developer/python/pylint
+depend developer/quilt
+depend developer/swig
+depend developer/ui-designer/glade
+depend developer/vala
+depend developer/versioning/cvs
+depend developer/versioning/git
+depend developer/versioning/mercurial
+depend developer/versioning/sccs
+depend developer/versioning/subversion
+depend developer/xopen/xcu4
+$(i386_ONLY)depend diagnostic/acpidump
+depend diagnostic/bwm-ng
+depend diagnostic/constype
+depend diagnostic/cpu-counters
+depend diagnostic/ddu
+depend diagnostic/ddu/data
+depend diagnostic/ddu/library
+depend diagnostic/ddu/locale
+depend diagnostic/ddu/text
+depend diagnostic/fping
+depend diagnostic/httping
+depend diagnostic/iftop
+depend diagnostic/latencytop
+depend diagnostic/mrtg
+depend diagnostic/nmap
+depend diagnostic/powertop
+depend diagnostic/scanpci
+depend diagnostic/snoop
+depend diagnostic/snort
+depend diagnostic/spray
+depend diagnostic/tcpdump
+depend diagnostic/top
+depend diagnostic/wireshark
+depend diagnostic/xload
+depend document/viewer/xditview
+depend documentation/diveintopython
+depend documentation/gnome/gnome-devel-docs
+depend documentation/gnome/gnome-user-docs
+depend driver/audio
+$(i386_ONLY)depend driver/audio/audio810
+$(i386_ONLY)depend driver/audio/audiocmi
+$(i386_ONLY)depend driver/audio/audioemu10k
+$(i386_ONLY)depend driver/audio/audiohd
+$(i386_ONLY)depend driver/audio/audioixp
+depend driver/audio/audiols
+depend driver/audio/audiop16x
+$(i386_ONLY)depend driver/audio/audiosolo
+$(i386_ONLY)depend driver/audio/audiovia823x
+$(sparc_ONLY)depend driver/cpu/us
+depend driver/crypto/dca
+$(sparc_ONLY)depend driver/crypto/n2cp
+depend driver/crypto/tpm
+depend driver/firewire
+$(i386_ONLY)depend driver/graphics/agpgart
+$(sparc_ONLY)depend driver/graphics/ast
+$(i386_ONLY)depend driver/graphics/atiatom
+depend driver/graphics/av1394
+depend driver/graphics/dcam1394
+$(i386_ONLY)depend driver/graphics/drm
+$(sparc_ONLY)depend driver/graphics/efb
+$(i386_ONLY)depend driver/graphics/nvidia
+depend driver/graphics/usbvc
+$(i386_ONLY)depend driver/i86pc/fipe
+$(i386_ONLY)depend driver/i86pc/ioat
+$(i386_ONLY)depend driver/management/bmc
+depend driver/network/afe
+$(i386_ONLY)depend driver/network/amd8111s
+depend driver/network/arbel
+$(i386_ONLY)depend driver/network/arn
+$(i386_ONLY)depend driver/network/atge
+$(i386_ONLY)depend driver/network/ath
+$(i386_ONLY)depend driver/network/atu
+$(i386_ONLY)depend driver/network/bfe
+depend driver/network/bge
+$(i386_ONLY)depend driver/network/bnx
+$(i386_ONLY)depend driver/network/bnxe
+depend driver/network/bpf
+depend driver/network/ce
+depend driver/network/chxge
+depend driver/network/cxge
+depend driver/network/dmfe
+$(i386_ONLY)depend driver/network/dnet
+depend driver/network/e1000g
+$(i386_ONLY)depend driver/network/elxl
+depend driver/network/emlxs
+depend driver/network/eoib
+$(sparc_ONLY)depend driver/network/eri
+depend driver/network/fcip
+depend driver/network/fcoe
+depend driver/network/fcoei
+depend driver/network/fcoet
+depend driver/network/fcp
+depend driver/network/fcsm
+depend driver/network/fp
+$(sparc_ONLY)depend driver/network/ge
+depend driver/network/hermon
+depend driver/network/hme
+depend driver/network/hxge
+depend driver/network/ib
+depend driver/network/ibdma
+depend driver/network/ibp
+depend driver/network/igb
+$(i386_ONLY)depend driver/network/iprb
+$(i386_ONLY)depend driver/network/ipw
+$(i386_ONLY)depend driver/network/iwh
+$(i386_ONLY)depend driver/network/iwi
+$(i386_ONLY)depend driver/network/iwk
+$(i386_ONLY)depend driver/network/iwp
+depend driver/network/ixgb
+depend driver/network/ixgbe
+depend driver/network/llc2
+$(i386_ONLY)depend driver/network/mcxe
+$(i386_ONLY)depend driver/network/mwl
+depend driver/network/mxfe
+depend driver/network/myri10ge
+$(i386_ONLY)depend driver/network/nge
+$(sparc_ONLY)depend driver/network/niumx
+$(i386_ONLY)depend driver/network/ntxn
+depend driver/network/nxge
+depend driver/network/ofk
+depend driver/network/pcan
+$(i386_ONLY)depend driver/network/pcn
+depend driver/network/pcwl
+$(sparc_ONLY)depend driver/network/qfe
+depend driver/network/qlc
+depend driver/network/qlcnic
+$(i386_ONLY)depend driver/network/ral
+depend driver/network/rds
+depend driver/network/rdsv3
+depend driver/network/rge
+depend driver/network/rpcib
+depend driver/network/rtls
+$(i386_ONLY)depend driver/network/rtw
+$(i386_ONLY)depend driver/network/rum
+$(i386_ONLY)depend driver/network/rwd
+$(i386_ONLY)depend driver/network/rwn
+depend driver/network/sdp
+depend driver/network/sdpib
+depend driver/network/sfe
+$(sparc_ONLY)depend driver/network/socal
+depend driver/network/srpt
+depend driver/network/sxge
+depend driver/network/tavor
+$(i386_ONLY)depend driver/network/uath
+$(i386_ONLY)depend driver/network/ural
+$(i386_ONLY)depend driver/network/urtw
+depend driver/network/usbecm
+depend driver/network/vr
+depend driver/network/vxge
+$(i386_ONLY)depend driver/network/wpi
+depend driver/network/xge
+depend driver/network/yge
+$(i386_ONLY)depend driver/network/zyd
+depend driver/parallel/ecpp
+depend driver/pcmcia
+$(i386_ONLY)depend driver/serial/asy
+depend driver/serial/pcser
+$(sparc_ONLY)depend driver/serial/se
+depend driver/serial/usbftdi
+depend driver/serial/usbsacm
+depend driver/serial/usbser
+depend driver/serial/usbser_edge
+depend driver/serial/usbsksp
+depend driver/serial/usbsksp/usbs49_fw
+depend driver/serial/usbsprl
+depend driver/storage/aac
+$(i386_ONLY)depend driver/storage/adpu320
+$(i386_ONLY)depend driver/storage/ahci
+$(i386_ONLY)depend driver/storage/arcmsr
+$(i386_ONLY)depend driver/storage/ata
+$(i386_ONLY)depend driver/storage/bcm_sata
+depend driver/storage/blkdev
+$(i386_ONLY)depend driver/storage/cmdk
+$(i386_ONLY)depend driver/storage/cpqary3
+depend driver/storage/glm
+$(sparc_ONLY)depend driver/storage/ifp
+$(i386_ONLY)depend driver/storage/imraid_sas
+$(sparc_ONLY)depend driver/storage/isp
+$(i386_ONLY)depend driver/storage/marvell88sx
+$(i386_ONLY)depend driver/storage/mega_sas
+depend driver/storage/mpt
+depend driver/storage/mpt_sas
+depend driver/storage/mr_sas
+$(i386_ONLY)depend driver/storage/nv_sata
+depend driver/storage/pcata
+depend driver/storage/pmcs
+depend driver/storage/sbp2
+depend driver/storage/scsa1394
+$(i386_ONLY)depend driver/storage/scu
+$(i386_ONLY)depend driver/storage/sdcard
+depend driver/storage/ses
+$(sparc_ONLY)depend driver/storage/sf
+$(i386_ONLY)depend driver/storage/si3124
+depend driver/storage/smp
+$(sparc_ONLY)depend driver/storage/ssd
+depend driver/storage/sv
+depend driver/usb
+depend driver/x11/winlock
+$(i386_ONLY)depend driver/x11/xsvc
+$(i386_ONLY)depend driver/xvm/pv
+$(i386_ONLY)depend editor/blog/drivel
+depend editor/diagram/dia
+depend editor/gedit
+depend editor/gedit/gedit-plugins
+depend editor/ghex
+depend editor/gnu-emacs
+depend editor/gnu-emacs/gnu-emacs-gtk
+depend editor/gnu-emacs/gnu-emacs-lisp
+depend editor/gnu-emacs/gnu-emacs-no-x11
+depend editor/gnu-emacs/gnu-emacs-x11
+depend editor/gobby
+depend editor/gvim
+depend editor/hexedit
+depend editor/nano
+depend editor/vim
+depend editor/vim/vim-core
+depend editor/xedit
+depend file/filesync
+depend file/gnu-coreutils
+depend file/gnu-findutils
+depend file/lndir
+depend file/mc
+depend file/slocate
+depend file/tree
+depend games/gnome-games
+depend games/nethack
+depend gnome/accessibility/accerciser
+depend gnome/accessibility/dasher
+depend gnome/accessibility/gnome-a11y-libs
+depend gnome/accessibility/mousetweaks
+depend gnome/accessibility/orca
+depend gnome/applet/contact-lookup-applet
+depend gnome/applet/gnome-applets
+depend gnome/applet/gnome-fun-applets
+depend gnome/applet/gnome-internet-applets
+depend gnome/applet/gnome-intranet-applets
+depend gnome/applet/gnome-mm-applets
+depend gnome/applet/gnome-utility-applets
+depend gnome/cmdassist
+depend gnome/config/gconf
+depend gnome/config/gconf/gconf-editor
+depend gnome/config/gconf/multi-user-desktop
+depend gnome/crash-report/bug-buddy
+depend gnome/disk-analyzer/baobab
+depend gnome/documentation/locale/cs
+depend gnome/documentation/locale/de
+depend gnome/documentation/locale/es
+depend gnome/documentation/locale/extra
+depend gnome/documentation/locale/fr
+depend gnome/documentation/locale/hi
+depend gnome/documentation/locale/hu
+depend gnome/documentation/locale/it
+depend gnome/documentation/locale/ja
+depend gnome/documentation/locale/ko
+depend gnome/documentation/locale/noinst
+depend gnome/documentation/locale/pl
+depend gnome/documentation/locale/pt_br
+depend gnome/documentation/locale/rtl
+depend gnome/documentation/locale/sv
+depend gnome/documentation/locale/zh_cn
+depend gnome/documentation/locale/zh_hk
+depend gnome/documentation/locale/zh_tw
+depend gnome/file-manager/nautilus
+depend gnome/file-manager/nautilus/extension/nautilus-sendto
+depend gnome/ggv
+depend gnome/gnome-audio
+depend gnome/gnome-camera
+depend gnome/gnome-dictionary
+depend gnome/gnome-keyring
+depend gnome/gnome-log-viewer
+depend gnome/gnome-panel
+depend gnome/gnome-power-manager
+depend gnome/gnome-remote-desktop
+depend gnome/gnome-screenshot
+depend gnome/gnome-search-tool
+depend gnome/gnome-session
+depend gnome/help-viewer/yelp
+depend gnome/locale/cs
+depend gnome/locale/de
+depend gnome/locale/es
+depend gnome/locale/extra
+depend gnome/locale/fr
+depend gnome/locale/hg
+depend gnome/locale/hi
+depend gnome/locale/it
+depend gnome/locale/ja
+depend gnome/locale/ko
+depend gnome/locale/noinst
+depend gnome/locale/pl
+depend gnome/locale/pt_br
+depend gnome/locale/rtl
+depend gnome/locale/ru
+depend gnome/locale/sv
+depend gnome/locale/zh_cn
+depend gnome/locale/zh_hk
+depend gnome/locale/zh_tw
+depend gnome/media/gnome-media
+depend gnome/media/gnome-media-player
+depend gnome/media/sound-recorder
+depend gnome/preferences/control-center
+depend gnome/security/seahorse
+depend gnome/security/seahorse/seahorse-plugins
+depend gnome/speech/gnome-speech
+depend gnome/speech/gnome-speech/driver/gnome-speech-espeak
+depend gnome/theme/background/os-backgrounds
+depend gnome/theme/background/os-backgrounds-extra
+depend gnome/theme/blueprint
+depend gnome/theme/cursor/dmz-cursor
+depend gnome/theme/cursor/dmz-cursor-aa
+depend gnome/theme/gnome-icon-theme
+depend gnome/theme/gnome-themes
+depend gnome/theme/gnome-themes-extra
+depend gnome/theme/gtk2-engines
+depend gnome/theme/gtk2-engines-extra
+depend gnome/theme/hicolor-icon-theme
+depend gnome/theme/nimbus
+depend gnome/theme/nimbus-hires
+depend gnome/theme/sound/xdg-sound-theme
+depend gnome/theme/tango-icon-theme
+depend gnome/trusted/device-manager
+depend gnome/trusted/libgnometsol
+depend gnome/trusted/locale/de
+depend gnome/trusted/locale/es
+depend gnome/trusted/locale/fr
+depend gnome/trusted/locale/it
+depend gnome/trusted/locale/ja
+depend gnome/trusted/locale/ko
+depend gnome/trusted/locale/pt_br
+depend gnome/trusted/locale/ru
+depend gnome/trusted/locale/sv
+depend gnome/trusted/locale/zh_cn
+depend gnome/trusted/locale/zh_hk
+depend gnome/trusted/locale/zh_tw
+depend gnome/trusted/login-label-selector
+depend gnome/trusted/selection-manager
+depend gnome/trusted/trusted-stripe
+depend gnome/trusted/xagent
+depend gnome/window-manager/metacity
+depend gnome/zenity
+depend image/dcraw
+depend image/editor/bitmap
+depend image/editor/gimp
+depend image/editor/gimp/gimp-help
+depend image/editor/gimp/locale/cs
+depend image/editor/gimp/locale/de
+depend image/editor/gimp/locale/es
+depend image/editor/gimp/locale/extra
+depend image/editor/gimp/locale/fr
+depend image/editor/gimp/locale/it
+depend image/editor/gimp/locale/ko
+depend image/editor/gimp/locale/pl
+depend image/editor/gimp/locale/ru
+depend image/editor/gimp/locale/sv
+depend image/editor/gimp/locale/zh_cn
+depend image/editor/gimp/plugin/gimp-gtkam
+depend image/gnome-backgrounds
+depend image/gnuplot
+depend image/gocr
+depend image/imagemagick
+depend image/library/babl
+depend image/library/gegl
+depend image/library/libart
+depend image/library/libexif
+depend image/library/libjpeg
+depend image/library/libpng
+depend image/library/librsvg
+depend image/library/libtiff
+$(i386_ONLY)depend image/nvidia/cg-toolkit
+depend image/rrdtool
+depend image/scanner/xsane
+depend image/scanner/xsane/sane-backends
+depend image/scanner/xsane/sane-frontend
+depend image/viewer/eog
+depend image/viewer/eog/eog-plugins
+depend image/viewer/gqview
+depend image/viewer/gthumb
+depend image/webcam/cheese
+depend image/xcursorgen
+depend install/beadm
+depend install/distribution-constructor
+depend install/installadm
+depend install/js2ai
+depend library/aalib
+depend library/accessibility/brltty
+depend library/apr-13
+depend library/apr-13/documentation
+depend library/apr-util-13
+depend library/apr-util-13/apr-ldap
+depend library/apr-util-13/dbd-mysql
+depend library/apr-util-13/dbd-sqlite
+depend library/apr-util-13/documentation
+depend library/audio/gstreamer
+depend library/audio/gstreamer/plugin/gnonlin
+depend library/audio/libmikmod
+depend library/c++/glibmm
+depend library/c++/libxml++
+depend library/c++/net6
+depend library/c++/obby
+depend library/c++/sigcpp
+depend library/c++/stdcxx
+depend library/cacao
+depend library/cacao/cacao-dtrace
+depend library/database/gdbm
+depend library/demo/audio-samples
+depend library/desktop/atk
+depend library/desktop/c++/cairomm
+depend library/desktop/c++/gtkmm
+depend library/desktop/c++/pangomm
+depend library/desktop/cairo
+depend library/desktop/clutter
+depend library/desktop/clutter/clutter-gst
+depend library/desktop/clutter/clutter-gtk
+depend library/desktop/evolution-data-server
+depend library/desktop/gobject/gobject-introspection
+depend library/desktop/goffice
+depend library/desktop/gtk-vnc
+depend library/desktop/gtk2
+depend library/desktop/gtk2/gtk-backend-cups
+depend library/desktop/gtk2/gtk-backend-papi
+depend library/desktop/gtkhtml
+depend library/desktop/gtksourceview
+depend library/desktop/gtkspell
+depend library/desktop/libchamplain
+depend library/desktop/libgdata
+depend library/desktop/libgee
+depend library/desktop/libglade
+depend library/desktop/libgnomecanvas
+depend library/desktop/libgsf
+depend library/desktop/libgweather
+depend library/desktop/libsexy
+depend library/desktop/libvisual
+depend library/desktop/libxklavier
+depend library/desktop/pango
+depend library/desktop/search/tracker
+depend library/desktop/search/tracker/tracker-firefox
+depend library/desktop/xdg/icon-naming-utils
+depend library/desktop/xdg/libcanberra
+depend library/expat
+depend library/fastcgi
+depend library/fastcgi/documentation
+depend library/fftw-3
+depend library/file-monitor/gamin
+depend library/gc
+depend library/gd
+depend library/glib2
+depend library/gmime
+depend library/gmp
+depend library/gnome/gnome-component
+depend library/gnome/gnome-keyring
+depend library/gnome/gnome-libs
+depend library/gnome/gnome-vfs
+depend library/gnome/gvfs
+depend library/gnome/libgnomekbd
+depend library/gnome/print/gnome-print
+depend library/gnome/print/gnome-print/gnome-print-papi
+depend library/gnutls
+depend library/graphics/libmng
+depend library/graphics/pixman
+depend library/graphics/wxwidgets
+depend library/guile
+depend library/icu
+depend library/id3lib
+depend library/idnkit
+depend library/idnkit/header-idnkit
+depend library/ilmbase
+depend library/java/commons-collections
+depend library/java/commons-logging
+depend library/java/demo
+depend library/java/demo64
+depend library/java/grails
+depend library/java/host-config
+depend library/java/java-gnome
+depend library/java/java-gnome/java-libgconf
+depend library/java/java-gnome/java-libvte
+depend library/java/javadb
+depend library/java/javahelp
+depend library/java/jdmk-runtime
+depend library/java/jdom
+depend library/java/jss
+depend library/java/manual
+depend library/java/manual/locale/ja
+depend library/java/memcached-java
+depend library/java/qdox
+depend library/java/subversion
+depend library/java/swt
+depend library/lcms
+depend library/libadt_jni
+depend library/libconfuse
+depend library/libcroco
+depend library/libdaemon
+depend library/libevent
+depend library/libffi
+depend library/libfuse
+depend library/libgtop
+depend library/libical
+depend library/libidn
+depend library/libmemcached
+depend library/libmilter
+depend library/libnotify
+depend library/liboil
+depend library/libproxy
+depend library/libproxy/libproxy-gnome
+depend library/libproxy/libproxy-mozjs
+depend library/librsync
+depend library/libsigsegv
+depend library/libsndfile
+depend library/libsoup
+depend library/libtasn1
+depend library/libtecla
+depend library/libtool/libltdl
+depend library/libtorrent
+depend library/libunique
+depend library/libxml2
+depend library/libxslt
+depend library/media-player/totem-pl-parser
+depend library/medialib
+depend library/motif
+depend library/motif/libdpstkxm
+depend library/mpfr
+depend library/musicbrainz/libdiscid
+depend library/musicbrainz/libmusicbrainz
+depend library/myspell/dictionary/cs
+depend library/myspell/dictionary/de
+depend library/myspell/dictionary/en
+depend library/myspell/dictionary/es
+depend library/myspell/dictionary/extra
+depend library/myspell/dictionary/fr
+depend library/myspell/dictionary/hu
+depend library/myspell/dictionary/it
+depend library/myspell/dictionary/noinst
+depend library/myspell/dictionary/pl
+depend library/myspell/dictionary/pt_br
+depend library/myspell/dictionary/ru
+depend library/myspell/dictionary/sv
+depend library/ncurses
+depend library/neon
+depend library/nspr
+depend library/openexr
+depend library/openldap
+depend library/pcre
+depend library/perl-5/authen-pam
+depend library/perl-5/database-512
+depend library/perl-5/database-584
+depend library/perl-5/net-ssleay
+depend library/perl-5/pmtools
+depend library/perl-5/subversion
+depend library/perl-5/sun-solaris-510
+depend library/perl-5/sun-solaris-512
+depend library/perl-5/xml-parser-512
+depend library/perl-5/xml-parser-584
+depend library/perl-5/xml-simple-512
+depend library/perl-5/xml-simple-584
+depend library/popt
+depend library/print/cups-libs
+depend library/print/open-printing
+depend library/print/open-printing/ipp
+depend library/print/open-printing/lpd
+depend library/pth
+depend library/python-2/cherrypy
+depend library/python-2/coherence-26
+depend library/python-2/coverage
+depend library/python-2/cssutils-26
+depend library/python-2/ipython-26
+depend library/python-2/libxml2-26
+depend library/python-2/libxsl-26
+depend library/python-2/locale-services
+depend library/python-2/logilab-astng
+depend library/python-2/logilab-common
+depend library/python-2/lxml-26
+depend library/python-2/m2crypto
+depend library/python-2/mako
+depend library/python-2/ply
+depend library/python-2/pyatspi-26
+depend library/python-2/pybonjour
+depend library/python-2/pycairo-26
+depend library/python-2/pycups
+depend library/python-2/pycurl
+depend library/python-2/pygobject-26
+depend library/python-2/pygtk2-26
+depend library/python-2/pygtksourceview2-26
+depend library/python-2/pyopenssl-26
+depend library/python-2/pyorbit-26
+$(i386_ONLY)depend library/python-2/python-compizconfig-26
+depend library/python-2/python-dbus-26
+depend library/python-2/python-extra-26
+depend library/python-2/python-gnome-26
+depend library/python-2/python-gnome-desktop-26
+depend library/python-2/python-gnome-extras-26
+depend library/python-2/python-gst-26
+depend library/python-2/python-gtk-vnc-26
+depend library/python-2/python-imaging-26
+depend library/python-2/python-kstat
+depend library/python-2/python-mysql-26
+depend library/python-2/python-notify-26
+$(i386_ONLY)depend library/python-2/python-sexy-26
+depend library/python-2/python-smf
+depend library/python-2/python-twisted-26
+depend library/python-2/python-twisted-web2-26
+depend library/python-2/python-xdg-26
+depend library/python-2/python-zope-interface-26
+depend library/python-2/pywbem
+depend library/python-2/pyyaml-26
+depend library/python-2/setuptools-26
+depend library/python-2/simplejson-26
+depend library/python-2/subversion
+depend library/python-2/tkinter-26
+depend library/raptor
+depend library/readline
+depend library/samba/libsmbclient
+depend library/sdl
+depend library/security/gpgme
+depend library/security/libassuan
+depend library/security/libgpg-error
+depend library/security/libksba
+depend library/security/openssl
+depend library/security/openssl/openssl-fips-140
+depend library/security/pam/module/pam-consolekit
+depend library/security/pam/module/pam-pkcs11
+depend library/security/trousers
+depend library/slang
+depend library/slib
+depend library/speech/espeak
+depend library/spell-checking/enchant
+depend library/tooltalk
+depend library/unixodbc
+depend library/xdg/consolekit
+depend library/xdg/xdg-user-dirs
+depend library/xmlrpc-c
+depend library/zlib
+depend mail/evolution
+depend mail/evolution/connector/evolution-exchange
+depend mail/evolution/connector/evolution-webcal
+depend mail/fetchmail
+depend mail/mutt
+depend mail/procmail
+depend mail/thunderbird
+depend mail/thunderbird/locale/de
+depend mail/thunderbird/locale/es
+depend mail/thunderbird/locale/extra
+depend mail/thunderbird/locale/fr
+depend mail/thunderbird/locale/it
+depend mail/thunderbird/locale/ja
+depend mail/thunderbird/locale/ko
+depend mail/thunderbird/locale/pl
+depend mail/thunderbird/locale/pt_br
+depend mail/thunderbird/locale/ru
+depend mail/thunderbird/locale/sv
+depend mail/thunderbird/locale/zh_cn
+depend mail/thunderbird/locale/zh_tw
+depend mail/thunderbird/plugin/thunderbird-lightning
+depend media/cdrtools
+depend media/cdrw
+depend media/dvd+rw-tools
+depend media/mtx
+depend media/xorriso
+depend naming/ldap
+depend network/bridging
+depend network/chat/ircii
+depend network/chat/irssi
+depend network/dhcp/dhcpmgr
+depend network/dhcp/dhcpmgr/locale
+depend network/dns/bind
+depend network/dns/idnconv
+depend network/finger
+depend network/ftp
+depend network/ftp/lftp
+depend network/ftp/ncftp
+depend network/ipfilter
+depend network/iscsi/initiator
+depend network/iscsi/iser
+depend network/iscsi/target
+depend network/legacy-remote-utilities
+depend network/netcat
+depend network/nntp/slrn
+depend network/open-fabrics
+depend network/ping
+depend network/rsync
+depend network/rtorrent
+depend network/ssh
+depend network/ssh/ssh-key
+depend network/talk
+depend network/telnet
+depend network/whois
+depend package/pkg
+depend package/pkg/package-manager
+depend package/pkg/system-repository
+depend package/pkg/update-manager
+depend package/pkg/zones-proxy
+depend package/rpm
+depend package/svr4
+depend print/cups
+depend print/cups/filter/foomatic-db
+depend print/cups/filter/foomatic-db-engine
+depend print/cups/hal-cups-utils
+depend print/cups/system-config-printer
+depend print/filter/ghostscript
+depend print/filter/ghostscript/fonts/gnu-gs-fonts-other
+depend print/filter/ghostscript/fonts/gnu-gs-fonts-std
+depend print/filter/gutenprint
+depend print/filter/hplip
+depend print/lp
+depend print/lp/compatibility/sunos4
+depend print/lp/filter/a2ps
+depend print/lp/filter/foomatic-ppds
+depend print/lp/filter/foomatic-rip
+depend print/lp/filter/postscript-lp-filter
+depend print/lp/ipp/ipp-listener
+depend print/lp/ipp/libipp
+depend print/lp/print-client-commands
+depend print/lp/print-manager
+depend print/lp/print-manager/legacy
+depend print/mp
+depend print/psutils
+depend release/name
+depend release/notices
+depend release/os-welcome
+depend release/registration
+depend runtime/clisp
+depend runtime/erlang
+depend runtime/erlang/documentation
+depend runtime/java
+depend runtime/java/beanshell
+depend runtime/java/runtime64
+depend runtime/lua
+depend runtime/ocaml
+depend runtime/perl-510
+depend runtime/perl-510/extra
+depend runtime/perl-512
+depend runtime/perl-584
+depend runtime/perl-584/extra
+depend runtime/perl-584/manual
+depend runtime/python-26
+depend runtime/python-26/tests
+depend runtime/ruby-18
+depend runtime/tcl-8
+depend runtime/tcl-8/tcl-openssl
+depend runtime/tcl-8/tcl-sqlite-3
+depend runtime/tk-8
+depend security/bart
+depend security/pinentry
+depend security/sudo
+depend security/tcp-wrapper
+depend service/diagnostic/spray
+depend service/fault-management
+depend service/fault-management/asr-notify
+depend service/fault-management/fm-snmp-mib
+depend service/fault-management/smtp-notify
+depend service/fault-management/snmp-notify
+depend service/file-system/nfs
+depend service/file-system/smb
+depend service/gnome/desktop-cache
+depend service/hal
+$(sparc_ONLY)depend service/key-management/sun-fire-15000
+depend service/management/sysidtool
+depend service/memcached
+depend service/network/comsat
+depend service/network/dhcp
+depend service/network/dhcp/datastore/binfiles
+depend service/network/dhcp/isc-dhcp
+depend service/network/dns/bind
+depend service/network/dns/mdns
+depend service/network/finger
+depend service/network/ftp
+depend service/network/legacy
+depend service/network/legacy-remote-utilities
+depend service/network/lldp
+depend service/network/load-balancer/ilb
+depend service/network/nis
+depend service/network/ntp
+depend service/network/samba
+depend service/network/slp
+depend service/network/smtp/sendmail
+depend service/network/ssh
+depend service/network/talk
+depend service/network/telnet
+depend service/network/tftp
+depend service/network/uucp
+depend service/network/wpa
+depend service/opengl/ogl-select
+depend service/picl
+depend service/postrun
+depend service/resource-cap
+depend service/resource-pools
+depend service/resource-pools/poold
+depend service/security/gss
+depend service/security/kerberos-5
+depend service/security/stunnel
+depend service/storage/avs/cache-management
+depend service/storage/fibre-channel/fc-fabric
+depend service/storage/isns
+depend service/storage/media-volume-manager
+depend service/storage/ndmp
+depend service/storage/removable-media
+depend service/storage/rmt
+depend service/storage/virus-scan
+depend shell/bash
+depend shell/conflict
+depend shell/expect
+depend shell/ksh
+depend shell/ksh88
+depend shell/pipe-viewer
+depend shell/tcsh
+depend shell/which
+depend shell/zsh
+depend source/demo/ksh
+depend source/demo/mdb-examples
+depend source/demo/system
+depend source/locale/localedef
+depend source/network/pppdump
+depend source/security/tcp-wrapper
+$(i386_ONLY)depend source/system/grub
+depend storage/avs/point-in-time-copy
+depend storage/avs/remote-mirror
+depend storage/fsexam
+$(sparc_ONLY)depend storage/library/network-array
+depend storage/mpathadm
+depend storage/stmf
+depend storage/svm
+depend system/accounting/legacy
+depend system/boot/grub
+depend system/boot/network
+depend system/boot/wanboot
+depend system/boot/wanboot/internal
+depend system/core-os
+depend system/data/hardware-registry
+depend system/data/keyboard/keytables
+depend system/data/terminfo
+depend system/data/terminfo/terminfo-core
+depend system/data/timezone
+depend system/desktop/ldtp
+depend system/desktop/locale/cs
+depend system/desktop/locale/de
+depend system/desktop/locale/es
+depend system/desktop/locale/extra
+depend system/desktop/locale/fr
+depend system/desktop/locale/hu
+depend system/desktop/locale/it
+depend system/desktop/locale/ja
+depend system/desktop/locale/ko
+depend system/desktop/locale/noinst
+depend system/desktop/locale/pl
+depend system/desktop/locale/pt_br
+depend system/desktop/locale/rtl
+depend system/desktop/locale/ru
+depend system/desktop/locale/sv
+depend system/desktop/locale/zh_cn
+depend system/desktop/locale/zh_hk
+depend system/desktop/locale/zh_tw
+depend system/desktop/stardict
+depend system/device-administration
+depend system/device-allocation
+depend system/display-manager/desktop-startup
+depend system/display-manager/gdm
+depend system/display-manager/xdm
+$(sparc_ONLY)depend system/domain-configuration/sparc-enterprise
+$(sparc_ONLY)depend system/domain-service-processor-protocol/sparc-enterprise
+depend system/dtrace/tests
+depend system/dynamic-reconfiguration
+$(sparc_ONLY)depend system/embedded-fcode-interpreter
+depend system/fault-management/eversholt-utilities
+depend system/file-system/autofs
+depend system/file-system/hsfs
+depend system/file-system/nfs
+$(i386_ONLY)depend system/file-system/ntfsprogs
+depend system/file-system/pcfs
+depend system/file-system/shadow-migration
+depend system/file-system/smb
+depend system/file-system/udfs
+depend system/file-system/ufs
+depend system/file-system/uvfs
+depend system/file-system/zfs
+depend system/file-system/zfs/tests
+depend system/file/logrotate
+depend system/flash/fwflash
+$(sparc_ONLY)depend system/floating-point-scrubber
+depend system/font/daewoo-misc
+depend system/font/gnome-fonts
+depend system/font/isas-misc
+depend system/font/jis-misc
+depend system/font/misc-ethiopic
+depend system/font/misc-meltho
+depend system/font/sun-ja-bitmap
+depend system/font/sun-ja-bitmap-unicode
+depend system/font/truetype/arabeyes
+depend system/font/truetype/arphic-ukai
+depend system/font/truetype/arphic-uming
+depend system/font/truetype/bh-luxi
+depend system/font/truetype/bitstream-vera
+depend system/font/truetype/bpg-georgian
+depend system/font/truetype/dejavu
+depend system/font/truetype/fonts-core
+depend system/font/truetype/gentium
+depend system/font/truetype/google-droid
+depend system/font/truetype/hanyang-ko
+depend system/font/truetype/hanyang-ko-core
+depend system/font/truetype/indic-fonts-core
+depend system/font/truetype/ipafont
+depend system/font/truetype/ipafont-mincho
+depend system/font/truetype/kacst
+depend system/font/truetype/liberation
+depend system/font/truetype/lohit
+depend system/font/truetype/mgopen
+depend system/font/truetype/sil
+depend system/font/truetype/thai-scalable
+depend system/font/truetype/unfonts-ko-core
+depend system/font/truetype/unfonts-ko-extra
+depend system/font/truetype/unifont
+depend system/font/truetype/wqy-zenhei
+depend system/font/xorg/cyrillic
+depend system/font/xorg/iso8859-1
+depend system/font/xorg/iso8859-10
+depend system/font/xorg/iso8859-11
+depend system/font/xorg/iso8859-13
+depend system/font/xorg/iso8859-14
+depend system/font/xorg/iso8859-15
+depend system/font/xorg/iso8859-16
+depend system/font/xorg/iso8859-2
+depend system/font/xorg/iso8859-3
+depend system/font/xorg/iso8859-4
+depend system/font/xorg/iso8859-5
+depend system/font/xorg/iso8859-7
+depend system/font/xorg/iso8859-8
+depend system/font/xorg/iso8859-9
+depend system/font/xorg/xorg-core
+depend system/fru-id
+depend system/fru-id/platform
+$(sparc_ONLY)depend system/graphics/fbconfig
+$(sparc_ONLY)depend system/graphics/fbconfig/fbconfig-ast
+$(sparc_ONLY)depend system/graphics/fbconfig/fbconfig-efb
+depend system/header
+depend system/input-method/ibus
+depend system/input-method/ibus/anthy
+depend system/input-method/ibus/chewing
+depend system/input-method/ibus/hangul
+depend system/input-method/ibus/ibus-m17n
+depend system/input-method/ibus/pinyin
+depend system/input-method/ibus/sayura
+depend system/input-method/ibus/sunpinyin
+depend system/input-method/ibus/table
+depend system/input-method/ibus/table/array30
+depend system/input-method/ibus/table/cangjie
+depend system/input-method/ibus/table/cantonese
+depend system/input-method/ibus/table/cantonhk
+depend system/input-method/ibus/table/cns11643
+depend system/input-method/ibus/table/erbi
+depend system/input-method/ibus/table/jyutping
+depend system/input-method/ibus/table/quick
+depend system/input-method/ibus/table/rustrad
+depend system/input-method/ibus/table/stroke5
+depend system/input-method/ibus/table/thai
+depend system/input-method/ibus/table/translit
+depend system/input-method/ibus/table/viqr
+depend system/input-method/ibus/table/wu
+depend system/input-method/ibus/table/wubi
+depend system/input-method/ibus/table/xinhua
+depend system/input-method/ibus/table/yong
+depend system/input-method/ibus/table/zhengma
+depend system/input-method/ibus/table/zhuyin
+depend system/input-method/ibus/table/ziranma
+depend system/input-method/ibus/xkbc
+depend system/input-method/iiim
+depend system/input-method/iiim/anthy
+depend system/input-method/iiim/atok
+depend system/input-method/iiim/cle-core
+depend system/input-method/iiim/cle-open
+depend system/input-method/iiim/cle-sunpinyin
+depend system/input-method/iiim/hangul
+depend system/input-method/iiim/hkle-core
+depend system/input-method/iiim/hkle-open
+depend system/input-method/iiim/thaile
+depend system/input-method/iiim/twle-chewing
+depend system/input-method/iiim/twle-core
+depend system/input-method/iiim/twle-open
+depend system/input-method/iiim/wnn
+depend system/input-method/imf-startup
+depend system/input-method/library/libanthy
+depend system/input-method/library/libchewing
+depend system/input-method/library/libdatrie
+depend system/input-method/library/libhangul
+depend system/input-method/library/libthai
+depend system/input-method/library/m17n
+depend system/input-method/library/m17n/contrib
+depend system/input-method/scim
+depend system/input-method/scim/anthy
+depend system/input-method/scim/chewing
+depend system/input-method/scim/hangul
+depend system/input-method/scim/pinyin
+depend system/input-method/scim/scim-m17n
+depend system/input-method/scim/sunpinyin
+depend system/input-method/scim/table
+depend system/input-method/scim/table/chinese
+depend system/input-method/scim/table/extra
+depend system/input-method/scim/table/india
+depend system/input-method/scim/table/japanese
+depend system/input-method/scim/table/korean
+depend system/input-method/scim/thai
+depend system/install
+depend system/install/auto-install
+depend system/install/auto-install/auto-install-common
+depend system/install/configuration
+depend system/install/tests
+depend system/io/tests
+depend system/kernel
+depend system/kernel/cpu-counters
+$(sparc_ONLY)depend system/kernel/cpu/sun4v
+depend system/kernel/dtrace/providers
+$(i386_ONLY)depend system/kernel/dynamic-reconfiguration/i86pc
+$(sparc_ONLY)depend system/kernel/dynamic-reconfiguration/sun-fire-15000
+$(sparc_ONLY)depend system/kernel/dynamic-reconfiguration/sun-fire-880
+$(sparc_ONLY)depend system/kernel/dynamic-reconfiguration/ultra-enterprise-10000
+$(sparc_ONLY)depend system/kernel/inter-domain/ultra-enterprise-10000
+$(sparc_ONLY)depend system/kernel/io-performance-counters
+depend system/kernel/platform
+$(sparc_ONLY)depend system/kernel/platform/netra
+depend system/kernel/power
+depend system/kernel/secure-rpc
+depend system/kernel/security/gss
+depend system/kernel/suspend-resume
+depend system/kernel/ultra-wideband
+depend system/keyboard/kbd_mode
+depend system/keyboard/keyboard-utilities
+$(sparc_ONLY)depend system/ldoms
+$(sparc_ONLY)depend system/ldoms/ldomsmanager
+depend system/library
+depend system/library/bison-runtime
+depend system/library/c++-runtime
+depend system/library/dbus
+depend system/library/dbus/dbus-x11
+depend system/library/flex-runtime
+depend system/library/fontconfig
+depend system/library/freetype-2
+depend system/library/gcc-3-runtime
+depend system/library/iconv/extra
+depend system/library/iconv/unicode
+depend system/library/iconv/utf-8
+depend system/library/iconv/utf-8/manual
+depend system/library/iconv/xsh4/latin
+depend system/library/install
+depend system/library/install/libinstzones
+depend system/library/libdbus
+depend system/library/libdbus-glib
+depend system/library/libdiskmgt
+depend system/library/libdiskmgt/header-libdiskmgt
+depend system/library/libfcoe
+depend system/library/liblayout
+depend system/library/libnet
+depend system/library/libpcap
+depend system/library/math
+depend system/library/mozilla-nss
+depend system/library/openmp
+depend system/library/platform
+depend system/library/policykit
+depend system/library/processor
+depend system/library/security/gss
+depend system/library/security/gss/diffie-hellman
+depend system/library/security/gss/spnego
+depend system/library/security/libgcrypt
+depend system/library/security/libmcrypt
+depend system/library/security/libsasl
+depend system/library/security/pkcs11_kms
+depend system/library/security/rpcsec
+depend system/library/storage/fibre-channel/hbaapi
+depend system/library/storage/fibre-channel/libsun_fc
+depend system/library/storage/ima
+depend system/library/storage/libmpapi
+depend system/library/storage/libmpscsi_vhci
+depend system/library/storage/scsi-plugins
+depend system/library/sysidtool
+depend system/library/usb/libusb
+depend system/library/usb/libusbugen
+depend system/library/usb/openusb
+depend system/linker
+depend system/locale
+depend system/management/cim/pegasus
+depend system/management/freeipmi
+depend system/management/ilomconfig
+$(i386_ONLY)depend system/management/intel-amt
+depend system/management/ipmitool
+depend system/management/pcitool
+depend system/management/rad
+depend system/management/rad/client/rad-java
+depend system/management/rad/client/rad-java/locale
+depend system/management/rad/client/rad-python
+depend system/management/rad/module/rad-kstat
+depend system/management/rad/module/rad-smf
+depend system/management/rad/module/rad-zones-bridge
+depend system/management/service-tag
+depend system/management/snmp/net-snmp
+depend system/management/snmp/net-snmp/addons
+depend system/management/snmp/net-snmp/documentation
+depend system/management/sysidtool
+depend system/management/visual-panels-core
+depend system/management/visual-panels-core/locale
+depend system/management/visual-panels/panel-apache
+depend system/management/visual-panels/panel-apache/locale
+depend system/management/visual-panels/panel-coreadm
+depend system/management/visual-panels/panel-coreadm/locale
+depend system/management/visual-panels/panel-firewall
+depend system/management/visual-panels/panel-firewall/locale
+depend system/management/visual-panels/panel-sharemgr
+depend system/management/visual-panels/panel-smf
+depend system/management/visual-panels/panel-smf/locale
+depend system/management/visual-panels/panel-sysid
+depend system/management/visual-panels/panel-sysid/locale
+depend system/management/visual-panels/panel-sysmon
+depend system/management/visual-panels/panel-sysmon/locale
+depend system/management/visual-panels/panel-time
+depend system/management/visual-panels/panel-time/locale
+depend system/management/wbem/data-management
+depend system/management/wbem/resource-management
+depend system/management/wbem/sblim-cim-client
+depend system/management/wbem/wbemcli
+depend system/management/web/openwsman
+depend system/manual
+depend system/manual/locale/ca
+depend system/manual/locale/ja
+depend system/mozilla-nss
+depend system/network
+$(sparc_ONLY)depend system/network-console
+depend system/network/avahi
+depend system/network/http-cache-accelerator
+depend system/network/ipqos
+depend system/network/nis
+depend system/network/ppp
+depend system/network/ppp/pppdump
+depend system/network/ppp/tunnel
+depend system/network/routing
+depend system/network/routing/quagga
+depend system/network/routing/vrrp
+depend system/network/udapl
+depend system/network/udapl/udapl-tavor
+depend system/osnet/locale
+depend system/prerequisite/gnu
+depend system/scheduler/fss
+depend system/security/kerberos-5
+depend system/storage/fibre-channel/port-utility
+depend system/storage/luxadm
+$(i386_ONLY)depend system/storage/parted
+depend system/storage/raid-utilities
+depend system/storage/sasinfo
+depend system/storage/sg3_utils
+depend system/system-events
+depend system/test/sunvts
+depend system/test/sunvts/manual
+depend system/test/sunvts/tests
+depend system/trusted
+depend system/trusted/global-zone
+depend system/virtual-console
+depend system/xopen/xcu4
+depend system/xopen/xcu6
+depend system/zones
+depend system/zones/brand/ipkg
+depend system/zones/brand/s10
+depend system/zones/brand/sn1
+depend system/zones/internal
+depend terminal/conman
+depend terminal/dialog
+depend terminal/fbconsole
+depend terminal/gnome-terminal
+depend terminal/luit
+depend terminal/pconsole
+depend terminal/resize
+depend terminal/screen
+depend terminal/tack
+depend terminal/terminator
+depend terminal/xterm
+depend text/auto_ef
+depend text/convmv
+depend text/diffstat
+depend text/doctools
+depend text/doctools/ja
+depend text/gawk
+depend text/gnu-diffutils
+depend text/gnu-gettext
+depend text/gnu-grep
+depend text/gnu-patch
+depend text/gnu-sed
+depend text/groff
+depend text/groff/groff-core
+depend text/less
+depend text/locale
+depend text/o3read
+depend text/patchutils
+depend text/spelling-utilities
+depend text/texinfo
+depend text/tidy
+depend web/analytics/awstats
+depend web/analytics/webalizer
+depend web/browser/elinks
+depend web/browser/firefox
+depend web/browser/firefox/locale/de_de
+depend web/browser/firefox/locale/es_es
+depend web/browser/firefox/locale/extra
+depend web/browser/firefox/locale/fr_fr
+depend web/browser/firefox/locale/hi_in
+depend web/browser/firefox/locale/it_it
+depend web/browser/firefox/locale/ja_jp
+depend web/browser/firefox/locale/ko_kr
+depend web/browser/firefox/locale/pl_pl
+depend web/browser/firefox/locale/pt_br
+depend web/browser/firefox/locale/ru_ru
+depend web/browser/firefox/locale/sv_se
+depend web/browser/firefox/locale/zh_cn
+depend web/browser/firefox/locale/zh_tw
+depend web/browser/firefox/multi-user-desktop
+depend web/browser/firefox/plugin/firefox-flashplayer
+depend web/browser/firefox/plugin/firefox-java
+depend web/browser/links
+depend web/browser/lynx
+depend web/browser/w3m
+depend web/curl
+depend web/data/firefox-bookmarks
+depend web/editor/bluefish
+depend web/fastcgi/spawn-fcgi
+depend web/java-servlet/tomcat
+depend web/java-servlet/tomcat/tomcat-examples
+depend web/php-52
+depend web/php-52/documentation
+depend web/php-52/extension/php-apc
+depend web/php-52/extension/php-idn
+depend web/php-52/extension/php-memcache
+depend web/php-52/extension/php-mysql
+depend web/php-52/extension/php-pear
+depend web/php-52/extension/php-suhosin
+depend web/php-52/extension/php-tcpwrap
+depend web/php-52/extension/php-xdebug
+depend web/proxy/privoxy
+depend web/proxy/squid
+depend web/server/apache-22
+depend web/server/apache-22/documentation
+depend web/server/apache-22/module/apache-dtrace
+depend web/server/apache-22/module/apache-fcgid
+depend web/server/apache-22/module/apache-jk
+depend web/server/apache-22/module/apache-perl
+depend web/server/apache-22/module/apache-php5
+depend web/server/apache-22/module/apache-proxy_html
+depend web/server/apache-22/module/apache-security
+depend web/server/apache-22/module/apache-sed
+depend web/server/apache-22/module/apache-xml2enc
+depend web/server/ejabberd
+depend web/server/lighttpd-14
+depend web/wget
+depend x11/colormap-utilities
+depend x11/compatibility/links-svid
+depend x11/compatibility/links-xorg
+depend x11/data/workspace-patterns
+depend x11/data/xbitmaps
+depend x11/data/xcursor-themes
+depend x11/demo
+depend x11/demo/mesa-demos
+depend x11/diagnostic/x11-info-clients
+depend x11/diagnostic/xev
+depend x11/diagnostic/xscope
+depend x11/documentation/xorg-docs
+depend x11/font-utilities
+depend x11/header/rasterfile
+depend x11/header/x11-protocols
+depend x11/keyboard/accessx
+depend x11/keyboard/data-xkb
+depend x11/keyboard/xkb-utilities
+depend x11/keyboard/xkbcomp
+depend x11/library/dps
+depend x11/library/freeglut
+depend x11/library/libdga
+depend x11/library/libdmx
+depend x11/library/libdrm
+depend x11/library/libfontenc
+depend x11/library/libfs
+depend x11/library/libice
+depend x11/library/libowconfig
+depend x11/library/libpthread-stubs
+depend x11/library/libsm
+depend x11/library/libx11
+depend x11/library/libxau
+depend x11/library/libxcb
+depend x11/library/libxcomposite
+depend x11/library/libxcursor
+depend x11/library/libxdamage
+depend x11/library/libxdmcp
+depend x11/library/libxevie
+depend x11/library/libxext
+depend x11/library/libxfixes
+depend x11/library/libxfont
+depend x11/library/libxft
+depend x11/library/libxi
+depend x11/library/libxinerama
+depend x11/library/libxkbfile
+depend x11/library/libxmu
+depend x11/library/libxmuu
+depend x11/library/libxp
+depend x11/library/libxpm
+depend x11/library/libxrandr
+depend x11/library/libxrender
+depend x11/library/libxres
+depend x11/library/libxscrnsaver
+depend x11/library/libxtst
+depend x11/library/libxv
+depend x11/library/libxvmc
+depend x11/library/libxxf86misc
+depend x11/library/libxxf86vm
+depend x11/library/mesa
+depend x11/library/toolkit/libxaw4
+depend x11/library/toolkit/libxaw5
+depend x11/library/toolkit/libxaw7
+depend x11/library/toolkit/libxt
+depend x11/library/xcb-util
+depend x11/library/xtrans
+depend x11/network/x11-network-proxies
+depend x11/oclock
+depend x11/server/xdmx
+depend x11/server/xephyr
+depend x11/server/xorg
+$(sparc_ONLY)depend x11/server/xorg/driver/xorg-efb
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-input-acecad
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-input-hotkey
+depend x11/server/xorg/driver/xorg-input-keyboard
+depend x11/server/xorg/driver/xorg-input-mouse
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-input-synaptics
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-input-vmmouse
+depend x11/server/xorg/driver/xorg-input-void
+depend x11/server/xorg/driver/xorg-video-ast
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-ati
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-cirrus
+depend x11/server/xorg/driver/xorg-video-dummy
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-intel
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-mach64
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-mga
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-nv
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-openchrome
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-r128
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-trident
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-vesa
+$(i386_ONLY)depend x11/server/xorg/driver/xorg-video-vmware
+depend x11/server/xserver-common
+depend x11/server/xvfb
+depend x11/server/xvnc
+depend x11/session/sessreg
+depend x11/session/smproxy
+depend x11/session/winsysck
+depend x11/session/xauth
+depend x11/session/xinit
+depend x11/transset
+depend x11/trusted/libxtsol
+depend x11/trusted/trusted-xorg
+depend x11/x11-server-utilities
+depend x11/x11-window-dump
+depend x11/xbiff
+depend x11/xcalc
+depend x11/xclipboard
+depend x11/xclock
+depend x11/xconsole
+depend x11/xfd
+depend x11/xfontsel
+depend x11/xfs
+depend x11/xfs/xfs-utilities
+depend x11/xkill
+depend x11/xlock
+depend x11/xmag
+depend x11/xman
+depend x11/xt-resource-utilities
+depend x11/xvidtune
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/170/redist_cluster	Mon Jul 18 15:05:43 2011 -0700
@@ -0,0 +1,424 @@
+include common/database:mysql-50
+include common/database:mysql-50:connector:jdbc
+include common/database:mysql-50:tests
+include common/database:mysql-51
+include common/database:mysql-51:library
+include common/database:mysql-51:tests
+include common/database:mysql-common
+include common/developer:java:jdk
+include common/developer:java:jdk64
+include common/diagnostic:bwm-ng
+include common/driver:network:ce
+include common/library:c++:stdcxx
+include common/library:java:commons-logging
+include common/library:java:demo
+include common/library:java:demo64
+include common/library:java:grails
+include common/library:java:host-config
+include common/library:java:javadb
+include common/library:java:javahelp
+include common/library:java:jss
+include common/library:java:manual
+include common/library:java:manual:locale:ja
+include common/library:java:memcached-java
+include common/library:java:qdox
+include common/library:libconfuse
+include common/library:nspr
+include common/library:openldap
+include common/library:perl-5:net-ssleay
+include common/library:perl-5:pmtools
+include common/library:python-2:pywbem
+include common/library:xmlrpc-c
+include common/runtime:java
+include common/runtime:java:runtime64
+include common/runtime:perl-510
+include common/runtime:perl-510:extra
+include common/runtime:tcl-8:tcl-openssl
+include common/service:management:sysidtool
+include common/shell:conflict
+include common/system:library:libnet
+include common/system:library:libpcap
+include common/system:library:mozilla-nss
+include common/system:library:security:libmcrypt
+include common/system:library:sysidtool
+include common/system:management:product-registry
+include common/system:management:sysidtool
+include common/system:management:wbem:wbemcli
+include common/system:manual
+include common/system:mozilla-nss
+include common/system:network:routing:quagga
+include common/system:prerequisite:gnu
+include common/system:test:sunvts
+include common/system:test:sunvts:manual
+include common/system:test:sunvts:tests
+include common/terminal:pconsole
+include common/web:analytics:awstats
+include common/web:browser:links
+include common/web:php-52
+include common/web:php-52:documentation
+include common/web:php-52:extension:php-apc
+include common/web:php-52:extension:php-idn
+include common/web:php-52:extension:php-memcache
+include common/web:php-52:extension:php-mysql
+include common/web:php-52:extension:php-pear
+include common/web:php-52:extension:php-suhosin
+include common/web:php-52:extension:php-tcpwrap
+include common/web:php-52:extension:php-xdebug
+include common/web:proxy:privoxy
+include common/web:server:apache-22:module:apache-php5
+$(sparc_ONLY)include sparc/driver:network:ge
+$(sparc_ONLY)include sparc/system:ldoms:ldomsmanager
+# 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
+$(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
+$(i386_ONLY)include common/SUNWpl5m
+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
+include common/SUNWvtss
+$(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: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/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:tcl-8:snack
+include common/service:database:postgres-82
+include common/service:database:postgres-83
+include common/service:database:postgres-84
+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:management:powerman
+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: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/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
+include common/SUNWcedu
+$(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
+$(i386_ONLY)include common/SUNWproduct-registry-root
+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
+# Group packages.
+include common/Amp
+include common/GccDev
+include common/Redistributable
--- a/src/util/distro-import/Makefile	Sat Jul 16 08:45:13 2011 -0700
+++ b/src/util/distro-import/Makefile	Mon Jul 18 15:05:43 2011 -0700
@@ -275,6 +275,7 @@
 	$(DEVPRO_CONSOLIDATION_OPTIONS)
 CONSOLIDATION_OPTIONS_169 = $(CONSOLIDATION_OPTIONS_168) \
 	$(SOLARIS_RE_CONSOLIDATION_OPTIONS)
+CONSOLIDATION_OPTIONS_170 = $(CONSOLIDATION_OPTIONS_169)
 CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
 
 GLOBAL_CHATTRS_BASE=	\
@@ -361,6 +362,7 @@
 GLOBAL_CHATTRS_167 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_168 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_169 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS_170 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
@@ -466,6 +468,7 @@
 ELIDED_FILES_167 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_168 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_169 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_170 = $(ELIDED_FILES_BASE)
 ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
 
 #
@@ -591,6 +594,7 @@
 CACHED_FILES_167 =
 CACHED_FILES_168 =
 CACHED_FILES_169 =
+CACHED_FILES_170 =
 CACHED_FILES = $(CACHED_FILES_$(BUILDID))
 
 FIX_FILES_BASE =				\
@@ -743,6 +747,7 @@
 FIX_FILES_167 =
 FIX_FILES_168 =
 FIX_FILES_169 =
+FIX_FILES_170 =
 FIX_FILES = $(FIX_FILES_$(BUILDID))
 
 JDKFILES = LICENSE README.html
@@ -860,7 +865,8 @@
 	166			\
 	167			\
 	168			\
-	169
+	169			\
+	170
 
 #
 # Starting in build 80, filelist.ramdisk began moving between various
@@ -873,7 +879,7 @@
 FILELIST_RAMDISK_PKG_72		= SUNWcakr.i
 FILELIST_RAMDISK_PKG_71		= SUNWcakr.i
 
-default:	169/redist_import
+default:	170/redist_import
 
 cluster.import:	$(WOS_PKGS)/.clustertoc Makefile
 	./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
@@ -1111,6 +1117,7 @@
 INCLUDE_PATH_167 = 167:$(INCLUDE_PATH_166)
 INCLUDE_PATH_168 = 168:$(INCLUDE_PATH_167)
 INCLUDE_PATH_169 = 169:$(INCLUDE_PATH_168)
+INCLUDE_PATH_170 = 170:$(INCLUDE_PATH_169)
 
 import:	cluster.import $(FIX_FILES:%=$(BUILDID)/%)
 	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \