18215 Remove print/lp/compatibility/sunos4 package from default installations in173
authordavid.comay@oracle.com
Thu, 25 Aug 2011 17:46:35 -0700
changeset 2526 fb7642dbd923
parent 2525 da7f59c69ec2
child 2527 19bead0d2dfa
18215 Remove print/lp/compatibility/sunos4 package from default installations 18849 resync repository to snv_173 18850 Java 6 refactoring and versioning needs some work 18851 Update OpenOffice import to account for 3.3.0 changes
src/pkg/manifests/group%2ffeature%2fmulti-user-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/util/distro-import/173/common/Redistributable
src/util/distro-import/173/common/developer:java:jdk-6
src/util/distro-import/173/common/library:java:java-demo-6
src/util/distro-import/173/common/library:java:javahelp
src/util/distro-import/173/common/runtime:java:jre-6
src/util/distro-import/173/redist_cluster
src/util/distro-import/Makefile
src/util/distro-import/unbundleds/OpenOffice
src/util/publish/set-publisher.transforms
--- a/src/pkg/manifests/group%2ffeature%2fmulti-user-desktop.p5m	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/pkg/manifests/group%2ffeature%2fmulti-user-desktop.p5m	Thu Aug 25 17:46:35 2011 -0700
@@ -60,12 +60,13 @@
 depend type=group fmri=developer/documentation-tool/opensp
 depend type=group fmri=developer/gnome/gettext
 depend type=group fmri=developer/gnome/gnome-doc-utils
-depend type=group fmri=developer/java/jdk
+depend type=group fmri=developer/java/jdk-6
 depend type=group fmri=developer/ui-designer/glade
 depend type=group fmri=diagnostic/ddu
 depend type=group fmri=diagnostic/ddu/locale
 depend type=group fmri=diagnostic/xload
 depend type=group fmri=documentation/gnome/gnome-user-docs
+depend type=group fmri=driver/audio/audio-usb
 $(i386_ONLY)depend type=group fmri=driver/audio/audio810
 $(i386_ONLY)depend type=group fmri=driver/audio/audiocmi
 $(i386_ONLY)depend type=group fmri=driver/audio/audioemu10k
@@ -75,9 +76,9 @@
 depend type=group fmri=driver/audio/audiop16x
 $(i386_ONLY)depend type=group fmri=driver/audio/audiosolo
 $(i386_ONLY)depend type=group fmri=driver/audio/audiovia823x
-depend type=group fmri=driver/graphics/av1394
-depend type=group fmri=driver/graphics/dcam1394
 depend type=group fmri=driver/graphics/usbvc
+depend type=group fmri=driver/ieee-1394/av1394
+depend type=group fmri=driver/ieee-1394/dcam1394
 depend type=group fmri=driver/x11/winlock
 depend type=group fmri=editor/diagram/dia
 depend type=group fmri=editor/gedit
@@ -260,7 +261,6 @@
 depend type=group fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-std
 depend type=group fmri=print/filter/gutenprint
 depend type=group fmri=print/filter/hplip
-depend type=group fmri=print/lp/compatibility/sunos4
 depend type=group fmri=release/os-welcome
 depend type=group fmri=runtime/lua
 depend type=group fmri=runtime/tk-8
@@ -297,6 +297,7 @@
 depend type=group fmri=system/input-method/library/libthai
 depend type=group fmri=system/input-method/library/m17n
 depend type=group fmri=system/input-method/library/m17n/contrib
+depend type=group fmri=system/io/audio
 depend type=group fmri=system/library/dbus/dbus-x11
 depend type=group fmri=system/library/iconv/unicode
 depend type=group fmri=system/library/libpcap
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m	Thu Aug 25 17:46:35 2011 -0700
@@ -40,8 +40,6 @@
 depend type=group fmri=database/sqlite-3
 depend type=group fmri=developer/base-developer-utilities
 depend type=group fmri=developer/debug/mdb
-depend type=group fmri=developer/dtrace
-depend type=group fmri=developer/dtrace/toolkit
 depend type=group fmri=developer/macro/cpp
 $(i386_ONLY)depend type=group fmri=diagnostic/acpidump
 depend type=group fmri=diagnostic/cpu-counters
@@ -50,98 +48,77 @@
 depend type=group fmri=diagnostic/scanpci
 depend type=group fmri=diagnostic/snoop
 depend type=group fmri=diagnostic/spray
-depend type=group fmri=driver/audio
+depend type=group fmri=diagnostic/tcpdump
 $(sparc_ONLY)depend type=group fmri=driver/cpu/us
 depend type=group fmri=driver/crypto/dca
 $(sparc_ONLY)depend type=group fmri=driver/crypto/n2cp
 depend type=group fmri=driver/crypto/tpm
-depend type=group fmri=driver/firewire
+depend type=group fmri=driver/fc/emlxs
+depend type=group fmri=driver/fc/qlc
+$(sparc_ONLY)depend type=group fmri=driver/fc/socal
 $(sparc_ONLY)depend type=group fmri=driver/graphics/ast
 $(sparc_ONLY)depend type=group fmri=driver/graphics/efb
-$(i386_ONLY)depend type=group fmri=driver/i86pc/fipe
-$(i386_ONLY)depend type=group fmri=driver/i86pc/ioat
+depend type=group fmri=driver/infiniband/connectx
+depend type=group fmri=driver/infiniband/tavor
 $(i386_ONLY)depend type=group fmri=driver/management/bmc
-depend type=group fmri=driver/network/afe
-$(i386_ONLY)depend type=group fmri=driver/network/amd8111s
-$(i386_ONLY)depend type=group fmri=driver/network/arn
-$(i386_ONLY)depend type=group fmri=driver/network/atge
-$(i386_ONLY)depend type=group fmri=driver/network/ath
-$(i386_ONLY)depend type=group fmri=driver/network/atu
-$(i386_ONLY)depend type=group fmri=driver/network/bfe
-depend type=group fmri=driver/network/bge
-$(i386_ONLY)depend type=group fmri=driver/network/bnx
-$(i386_ONLY)depend type=group fmri=driver/network/bnxe
-depend type=group fmri=driver/network/bpf
-depend type=group fmri=driver/network/chxge
-depend type=group fmri=driver/network/cxge
-depend type=group fmri=driver/network/dmfe
-$(i386_ONLY)depend type=group fmri=driver/network/dnet
-depend type=group fmri=driver/network/e1000g
-$(i386_ONLY)depend type=group fmri=driver/network/elxl
-depend type=group fmri=driver/network/emlxs
-depend type=group fmri=driver/network/eoib
-$(sparc_ONLY)depend type=group fmri=driver/network/eri
-depend type=group fmri=driver/network/fcip
-depend type=group fmri=driver/network/fcoe
-depend type=group fmri=driver/network/fcoei
-depend type=group fmri=driver/network/fcp
-depend type=group fmri=driver/network/fcsm
-depend type=group fmri=driver/network/fp
-depend type=group fmri=driver/network/hermon
-depend type=group fmri=driver/network/hme
-depend type=group fmri=driver/network/hxge
-depend type=group fmri=driver/network/ib
-depend type=group fmri=driver/network/ibdma
-depend type=group fmri=driver/network/ibp
-depend type=group fmri=driver/network/igb
-$(i386_ONLY)depend type=group fmri=driver/network/iprb
-$(i386_ONLY)depend type=group fmri=driver/network/ipw
-$(i386_ONLY)depend type=group fmri=driver/network/iwh
-$(i386_ONLY)depend type=group fmri=driver/network/iwi
-$(i386_ONLY)depend type=group fmri=driver/network/iwk
-$(i386_ONLY)depend type=group fmri=driver/network/iwp
-depend type=group fmri=driver/network/ixgb
-depend type=group fmri=driver/network/ixgbe
-$(i386_ONLY)depend type=group fmri=driver/network/mcxe
-$(i386_ONLY)depend type=group fmri=driver/network/mwl
-depend type=group fmri=driver/network/mxfe
-depend type=group fmri=driver/network/myri10ge
-$(i386_ONLY)depend type=group fmri=driver/network/nge
-$(sparc_ONLY)depend type=group fmri=driver/network/niumx
-$(i386_ONLY)depend type=group fmri=driver/network/ntxn
-depend type=group fmri=driver/network/nxge
-depend type=group fmri=driver/network/ofk
-depend type=group fmri=driver/network/pcan
-$(i386_ONLY)depend type=group fmri=driver/network/pcn
-depend type=group fmri=driver/network/pcwl
-$(sparc_ONLY)depend type=group fmri=driver/network/qfe
-depend type=group fmri=driver/network/qlc
-depend type=group fmri=driver/network/qlcnic
-$(i386_ONLY)depend type=group fmri=driver/network/ral
-depend type=group fmri=driver/network/rds
-depend type=group fmri=driver/network/rdsv3
-depend type=group fmri=driver/network/rge
-depend type=group fmri=driver/network/rpcib
-depend type=group fmri=driver/network/rtls
-$(i386_ONLY)depend type=group fmri=driver/network/rtw
-$(i386_ONLY)depend type=group fmri=driver/network/rum
-$(i386_ONLY)depend type=group fmri=driver/network/rwd
-$(i386_ONLY)depend type=group fmri=driver/network/rwn
-depend type=group fmri=driver/network/sdp
-depend type=group fmri=driver/network/sdpib
-depend type=group fmri=driver/network/sfe
-$(sparc_ONLY)depend type=group fmri=driver/network/socal
-depend type=group fmri=driver/network/tavor
-$(i386_ONLY)depend type=group fmri=driver/network/uath
-$(i386_ONLY)depend type=group fmri=driver/network/ural
-$(i386_ONLY)depend type=group fmri=driver/network/urtw
-depend type=group fmri=driver/network/usbecm
-depend type=group fmri=driver/network/vr
-depend type=group fmri=driver/network/vxge
-$(i386_ONLY)depend type=group fmri=driver/network/wpi
-depend type=group fmri=driver/network/xge
-depend type=group fmri=driver/network/yge
-$(i386_ONLY)depend type=group fmri=driver/network/zyd
+depend type=group fmri=driver/network/ethernet/afe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/amd8111s
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/atge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bfe
+depend type=group fmri=driver/network/ethernet/bge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnx
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnxe
+depend type=group fmri=driver/network/ethernet/chxge
+depend type=group fmri=driver/network/ethernet/cxge
+depend type=group fmri=driver/network/ethernet/dmfe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/dnet
+depend type=group fmri=driver/network/ethernet/e1000g
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/elxl
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/eri
+depend type=group fmri=driver/network/ethernet/hme
+depend type=group fmri=driver/network/ethernet/hxge
+depend type=group fmri=driver/network/ethernet/igb
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/iprb
+depend type=group fmri=driver/network/ethernet/ixgb
+depend type=group fmri=driver/network/ethernet/ixgbe
+depend type=group fmri=driver/network/ethernet/mxfe
+depend type=group fmri=driver/network/ethernet/myri10ge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/nge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/ntxn
+depend type=group fmri=driver/network/ethernet/nxge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/pcn
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/qfe
+depend type=group fmri=driver/network/ethernet/qlcnic
+depend type=group fmri=driver/network/ethernet/rge
+depend type=group fmri=driver/network/ethernet/rtls
+depend type=group fmri=driver/network/ethernet/sfe
+depend type=group fmri=driver/network/ethernet/sxge
+depend type=group fmri=driver/network/ethernet/usbecm
+depend type=group fmri=driver/network/ethernet/vr
+depend type=group fmri=driver/network/ethernet/vxge
+depend type=group fmri=driver/network/ethernet/xge
+depend type=group fmri=driver/network/ethernet/yge
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/arn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/atu
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ipw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwh
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwk
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwp
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/mwl
+depend type=group fmri=driver/network/wlan/pcan
+depend type=group fmri=driver/network/wlan/pcwl
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ral
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rum
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwd
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/uath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ural
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/urtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/wpi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/zyd
 depend type=group fmri=driver/pcmcia
 $(i386_ONLY)depend type=group fmri=driver/serial/asy
 depend type=group fmri=driver/serial/pcser
@@ -183,11 +160,9 @@
 $(i386_ONLY)depend type=group fmri=driver/storage/si3124
 depend type=group fmri=driver/storage/smp
 $(sparc_ONLY)depend type=group fmri=driver/storage/ssd
-depend type=group fmri=driver/usb
 $(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 $(i386_ONLY)depend type=group fmri=driver/xvm/pv
 depend type=group fmri=editor/vim/vim-core
-depend type=group fmri=install/beadm
 depend type=group fmri=library/apr-13
 depend type=group fmri=library/apr-util-13
 depend type=group fmri=library/database/gdbm
@@ -221,8 +196,6 @@
 depend type=group fmri=network/bridging
 depend type=group fmri=network/ftp
 depend type=group fmri=network/ipfilter
-depend type=group fmri=network/iscsi/initiator
-depend type=group fmri=network/iscsi/iser
 depend type=group fmri=network/legacy-remote-utilities
 depend type=group fmri=network/ping
 depend type=group fmri=network/rsync
@@ -240,13 +213,7 @@
 depend type=group fmri=runtime/perl-584/extra
 depend type=group fmri=runtime/python-26
 depend type=group fmri=security/sudo
-depend type=group fmri=service/fault-management
-depend type=group fmri=service/fault-management/asr-notify
-depend type=group fmri=service/fault-management/fm-snmp-mib
-depend type=group fmri=service/fault-management/smtp-notify
-depend type=group fmri=service/fault-management/snmp-notify
 depend type=group fmri=service/file-system/smb
-depend type=group fmri=service/hal
 $(sparc_ONLY)depend type=group fmri=service/key-management/sun-fire-15000
 depend type=group fmri=service/network/dns/mdns
 depend type=group fmri=service/network/ntp
@@ -254,20 +221,14 @@
 depend type=group fmri=service/network/ssh
 depend type=group fmri=service/network/tftp
 depend type=group fmri=service/network/wpa
-depend type=group fmri=service/picl
-depend type=group fmri=service/resource-pools
 depend type=group fmri=service/security/gss
 depend type=group fmri=service/security/kerberos-5
-depend type=group fmri=service/storage/fibre-channel/fc-fabric
-depend type=group fmri=service/storage/media-volume-manager
-depend type=group fmri=service/storage/removable-media
 depend type=group fmri=shell/bash
 depend type=group fmri=shell/ksh
 $(sparc_ONLY)depend type=group fmri=storage/library/network-array
-depend type=group fmri=storage/mpathadm
-depend type=group fmri=storage/stmf
 depend type=group fmri=storage/svm
-depend type=group fmri=system/accounting/legacy
+depend type=group fmri=system/accounting/legacy-accounting
+depend type=group fmri=system/boot-environment-utilities
 depend type=group fmri=system/boot/grub
 depend type=group fmri=system/boot/wanboot
 depend type=group fmri=system/core-os
@@ -277,10 +238,18 @@
 depend type=group fmri=system/data/terminfo/terminfo-core
 depend type=group fmri=system/data/timezone
 depend type=group fmri=system/device-administration
+$(sparc_ONLY)depend type=group fmri=system/domain-configuration/sparc-enterprise
 $(sparc_ONLY)depend type=group \
     fmri=system/domain-service-processor-protocol/sparc-enterprise
+depend type=group fmri=system/dtrace
+depend type=group fmri=system/dtrace/dtrace-toolkit
 depend type=group fmri=system/dynamic-reconfiguration
 $(sparc_ONLY)depend type=group fmri=system/embedded-fcode-interpreter
+depend type=group fmri=system/fault-management
+depend type=group fmri=system/fault-management/asr-notify
+depend type=group fmri=system/fault-management/fm-snmp-mib
+depend type=group fmri=system/fault-management/smtp-notify
+depend type=group fmri=system/fault-management/snmp-notify
 depend type=group fmri=system/file-system/autofs
 depend type=group fmri=system/file-system/hsfs
 depend type=group fmri=system/file-system/nfs
@@ -289,26 +258,36 @@
 depend type=group fmri=system/file-system/udfs
 depend type=group fmri=system/file-system/ufs
 depend type=group fmri=system/file-system/zfs
-depend type=group fmri=system/flash/fwflash
+depend type=group fmri=system/firmware-utilities
 depend type=group fmri=system/fru-id
-depend type=group fmri=system/fru-id/platform
+depend type=group fmri=system/hal
 depend type=group fmri=system/install
 depend type=group fmri=system/install/auto-install
 depend type=group fmri=system/install/auto-install/auto-install-common
 depend type=group fmri=system/install/tests
+depend type=group fmri=system/io/fc/fc-fabric
+depend type=group fmri=system/io/fc/fc-port
+depend type=group fmri=system/io/fc/fc-san-management
+depend type=group fmri=system/io/fc/fc-scsi
+depend type=group fmri=system/io/fc/ip-over-fc
+depend type=group fmri=system/io/ieee-1394
+depend type=group fmri=system/io/infiniband
+depend type=group fmri=system/io/infiniband/ethernet-over-ib
+depend type=group fmri=system/io/infiniband/ib-device-mgt-agent
+depend type=group fmri=system/io/infiniband/ib-sockets-direct
+depend type=group fmri=system/io/infiniband/ip-over-ib
+depend type=group fmri=system/io/infiniband/open-fabrics
+depend type=group fmri=system/io/infiniband/reliable-datagram-sockets
+depend type=group fmri=system/io/infiniband/reliable-datagram-sockets-v3
+depend type=group fmri=system/io/infiniband/rpc-over-rdma
+depend type=group fmri=system/io/infiniband/udapl
+depend type=group fmri=system/io/ultra-wideband
+depend type=group fmri=system/io/usb
 depend type=group fmri=system/kernel
 depend type=group fmri=system/kernel/cpu-counters
 $(sparc_ONLY)depend type=group fmri=system/kernel/cpu/sun4v
-depend type=group fmri=system/kernel/dtrace/providers
-$(i386_ONLY)depend type=group fmri=system/kernel/dynamic-reconfiguration/i86pc
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/dynamic-reconfiguration/sun-fire-15000
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/dynamic-reconfiguration/sun-fire-880
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/dynamic-reconfiguration/ultra-enterprise-10000
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/inter-domain/ultra-enterprise-10000
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/fipe
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/ioat
 $(sparc_ONLY)depend type=group fmri=system/kernel/io-performance-counters
 depend type=group fmri=system/kernel/platform
 $(sparc_ONLY)depend type=group fmri=system/kernel/platform/netra
@@ -316,7 +295,6 @@
 depend type=group fmri=system/kernel/secure-rpc
 depend type=group fmri=system/kernel/security/gss
 depend type=group fmri=system/kernel/suspend-resume
-depend type=group fmri=system/kernel/ultra-wideband
 depend type=group fmri=system/keyboard/keyboard-utilities
 $(sparc_ONLY)depend type=group fmri=system/ldoms
 depend type=group fmri=system/library
@@ -327,8 +305,7 @@
 depend type=group fmri=system/library/install
 depend type=group fmri=system/library/libdbus
 depend type=group fmri=system/library/libdbus-glib
-depend type=group fmri=system/library/libdiskmgt
-depend type=group fmri=system/library/libfcoe
+depend type=group fmri=system/library/libpcap
 depend type=group fmri=system/library/math
 depend type=group fmri=system/library/openmp
 depend type=group fmri=system/library/platform
@@ -339,28 +316,44 @@
 depend type=group fmri=system/library/security/gss/spnego
 depend type=group fmri=system/library/security/libsasl
 depend type=group fmri=system/library/security/rpcsec
-depend type=group fmri=system/library/storage/fibre-channel/hbaapi
-depend type=group fmri=system/library/storage/fibre-channel/libsun_fc
-depend type=group fmri=system/library/storage/ima
-depend type=group fmri=system/library/storage/libmpapi
-depend type=group fmri=system/library/storage/libmpscsi_vhci
+depend type=group fmri=system/library/storage/libdiskmgt
+depend type=group fmri=system/library/storage/libfcoe
 depend type=group fmri=system/library/storage/scsi-plugins
+depend type=group fmri=system/library/storage/snia-hbaapi
+depend type=group fmri=system/library/storage/snia-ima
+depend type=group fmri=system/library/storage/snia-mpapi
+depend type=group fmri=system/library/storage/t11-sm-hba
 depend type=group fmri=system/linker
 $(i386_ONLY)depend type=group fmri=system/management/intel-amt
 depend type=group fmri=system/management/snmp/net-snmp
 depend type=group fmri=system/network
 $(sparc_ONLY)depend type=group fmri=system/network-console
+depend type=group fmri=system/network/bpf
 depend type=group fmri=system/network/nis
+depend type=group fmri=system/network/ppp
+depend type=group fmri=system/network/ppp/pppdump
+depend type=group fmri=system/network/ppp/tunnel
 depend type=group fmri=system/network/routing
+depend type=group fmri=system/picl
 depend type=group fmri=system/prerequisite/gnu
+depend type=group fmri=system/resource-mgmt/resource-pools
 depend type=group fmri=system/scheduler/fss
-depend type=group fmri=system/storage/fibre-channel/port-utility
-depend type=group fmri=system/storage/luxadm
+depend type=group fmri=system/storage/fc-utilities
+depend type=group fmri=system/storage/fcoe
+depend type=group fmri=system/storage/fcoe/fcoe-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-iser
+depend type=group fmri=system/storage/media-volume-manager
+depend type=group fmri=system/storage/multipath-utilities
 depend type=group fmri=system/storage/raid-utilities
+depend type=group fmri=system/storage/removable-media
+depend type=group fmri=system/storage/sas-utilities
+depend type=group fmri=system/storage/scsi-target-mode-framework
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
 depend type=group fmri=system/xopen/xcu4
 depend type=group fmri=system/zones
+depend type=group fmri=system/zones/brand/brand-solaris
 depend type=group fmri=terminal/resize
 depend type=group fmri=text/less
 depend type=group fmri=text/locale
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m	Thu Aug 25 17:46:35 2011 -0700
@@ -79,11 +79,9 @@
 depend type=group fmri=developer/debug/mdb
 depend type=group fmri=developer/documentation-tool/openjade
 depend type=group fmri=developer/documentation-tool/opensp
-depend type=group fmri=developer/dtrace
-depend type=group fmri=developer/dtrace/toolkit
 depend type=group fmri=developer/gnome/gettext
 depend type=group fmri=developer/gnome/gnome-doc-utils
-depend type=group fmri=developer/java/jdk
+depend type=group fmri=developer/java/jdk-6
 depend type=group fmri=developer/library/xprofile
 depend type=group fmri=developer/macro/cpp
 depend type=group fmri=developer/ui-designer/glade
@@ -100,10 +98,11 @@
 depend type=group fmri=diagnostic/scanpci
 depend type=group fmri=diagnostic/snoop
 depend type=group fmri=diagnostic/spray
+depend type=group fmri=diagnostic/tcpdump
 depend type=group fmri=diagnostic/top
 depend type=group fmri=diagnostic/xload
 depend type=group fmri=documentation/gnome/gnome-user-docs
-depend type=group fmri=driver/audio
+depend type=group fmri=driver/audio/audio-usb
 $(i386_ONLY)depend type=group fmri=driver/audio/audio810
 $(i386_ONLY)depend type=group fmri=driver/audio/audiocmi
 $(i386_ONLY)depend type=group fmri=driver/audio/audioemu10k
@@ -117,90 +116,77 @@
 depend type=group fmri=driver/crypto/dca
 $(sparc_ONLY)depend type=group fmri=driver/crypto/n2cp
 depend type=group fmri=driver/crypto/tpm
-depend type=group fmri=driver/firewire
+depend type=group fmri=driver/fc/emlxs
+depend type=group fmri=driver/fc/qlc
+$(sparc_ONLY)depend type=group fmri=driver/fc/socal
 $(i386_ONLY)depend type=group fmri=driver/graphics/agpgart
 $(sparc_ONLY)depend type=group fmri=driver/graphics/ast
 $(i386_ONLY)depend type=group fmri=driver/graphics/atiatom
-depend type=group fmri=driver/graphics/av1394
-depend type=group fmri=driver/graphics/dcam1394
 $(i386_ONLY)depend type=group fmri=driver/graphics/drm
 $(sparc_ONLY)depend type=group fmri=driver/graphics/efb
 $(i386_ONLY)depend type=group fmri=driver/graphics/nvidia
 depend type=group fmri=driver/graphics/usbvc
-$(i386_ONLY)depend type=group fmri=driver/i86pc/fipe
-$(i386_ONLY)depend type=group fmri=driver/i86pc/ioat
+depend type=group fmri=driver/ieee-1394/av1394
+depend type=group fmri=driver/ieee-1394/dcam1394
 $(i386_ONLY)depend type=group fmri=driver/management/bmc
-depend type=group fmri=driver/network/afe
-$(i386_ONLY)depend type=group fmri=driver/network/amd8111s
-$(i386_ONLY)depend type=group fmri=driver/network/arn
-$(i386_ONLY)depend type=group fmri=driver/network/atge
-$(i386_ONLY)depend type=group fmri=driver/network/ath
-$(i386_ONLY)depend type=group fmri=driver/network/atu
-$(i386_ONLY)depend type=group fmri=driver/network/bfe
-depend type=group fmri=driver/network/bge
-$(i386_ONLY)depend type=group fmri=driver/network/bnx
-$(i386_ONLY)depend type=group fmri=driver/network/bnxe
-depend type=group fmri=driver/network/bpf
-depend type=group fmri=driver/network/chxge
-depend type=group fmri=driver/network/cxge
-depend type=group fmri=driver/network/dmfe
-$(i386_ONLY)depend type=group fmri=driver/network/dnet
-depend type=group fmri=driver/network/e1000g
-$(i386_ONLY)depend type=group fmri=driver/network/elxl
-depend type=group fmri=driver/network/emlxs
-$(sparc_ONLY)depend type=group fmri=driver/network/eri
-depend type=group fmri=driver/network/fcip
-depend type=group fmri=driver/network/fcoe
-depend type=group fmri=driver/network/fcoei
-depend type=group fmri=driver/network/fcp
-depend type=group fmri=driver/network/fcsm
-depend type=group fmri=driver/network/fp
-depend type=group fmri=driver/network/hme
-depend type=group fmri=driver/network/hxge
-depend type=group fmri=driver/network/ib
-depend type=group fmri=driver/network/igb
-$(i386_ONLY)depend type=group fmri=driver/network/iprb
-$(i386_ONLY)depend type=group fmri=driver/network/ipw
-$(i386_ONLY)depend type=group fmri=driver/network/iwh
-$(i386_ONLY)depend type=group fmri=driver/network/iwi
-$(i386_ONLY)depend type=group fmri=driver/network/iwk
-$(i386_ONLY)depend type=group fmri=driver/network/iwp
-depend type=group fmri=driver/network/ixgb
-depend type=group fmri=driver/network/ixgbe
-$(i386_ONLY)depend type=group fmri=driver/network/mcxe
-$(i386_ONLY)depend type=group fmri=driver/network/mwl
-depend type=group fmri=driver/network/mxfe
-depend type=group fmri=driver/network/myri10ge
-$(i386_ONLY)depend type=group fmri=driver/network/nge
-$(sparc_ONLY)depend type=group fmri=driver/network/niumx
-$(i386_ONLY)depend type=group fmri=driver/network/ntxn
-depend type=group fmri=driver/network/nxge
-depend type=group fmri=driver/network/pcan
-$(i386_ONLY)depend type=group fmri=driver/network/pcn
-depend type=group fmri=driver/network/pcwl
-$(sparc_ONLY)depend type=group fmri=driver/network/qfe
-depend type=group fmri=driver/network/qlc
-depend type=group fmri=driver/network/qlcnic
-$(i386_ONLY)depend type=group fmri=driver/network/ral
-depend type=group fmri=driver/network/rge
-depend type=group fmri=driver/network/rtls
-$(i386_ONLY)depend type=group fmri=driver/network/rtw
-$(i386_ONLY)depend type=group fmri=driver/network/rum
-$(i386_ONLY)depend type=group fmri=driver/network/rwd
-$(i386_ONLY)depend type=group fmri=driver/network/rwn
-depend type=group fmri=driver/network/sfe
-$(sparc_ONLY)depend type=group fmri=driver/network/socal
-depend type=group fmri=driver/network/sxge
-$(i386_ONLY)depend type=group fmri=driver/network/uath
-$(i386_ONLY)depend type=group fmri=driver/network/ural
-$(i386_ONLY)depend type=group fmri=driver/network/urtw
-depend type=group fmri=driver/network/usbecm
-depend type=group fmri=driver/network/vr
-depend type=group fmri=driver/network/vxge
-$(i386_ONLY)depend type=group fmri=driver/network/wpi
-depend type=group fmri=driver/network/xge
-depend type=group fmri=driver/network/yge
-$(i386_ONLY)depend type=group fmri=driver/network/zyd
+depend type=group fmri=driver/network/ethernet/afe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/amd8111s
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/atge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bfe
+depend type=group fmri=driver/network/ethernet/bge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnx
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnxe
+depend type=group fmri=driver/network/ethernet/chxge
+depend type=group fmri=driver/network/ethernet/cxge
+depend type=group fmri=driver/network/ethernet/dmfe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/dnet
+depend type=group fmri=driver/network/ethernet/e1000g
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/elxl
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/eri
+depend type=group fmri=driver/network/ethernet/hme
+depend type=group fmri=driver/network/ethernet/hxge
+depend type=group fmri=driver/network/ethernet/igb
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/iprb
+depend type=group fmri=driver/network/ethernet/ixgb
+depend type=group fmri=driver/network/ethernet/ixgbe
+depend type=group fmri=driver/network/ethernet/mxfe
+depend type=group fmri=driver/network/ethernet/myri10ge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/nge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/ntxn
+depend type=group fmri=driver/network/ethernet/nxge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/pcn
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/qfe
+depend type=group fmri=driver/network/ethernet/qlcnic
+depend type=group fmri=driver/network/ethernet/rge
+depend type=group fmri=driver/network/ethernet/rtls
+depend type=group fmri=driver/network/ethernet/sfe
+depend type=group fmri=driver/network/ethernet/sxge
+depend type=group fmri=driver/network/ethernet/usbecm
+depend type=group fmri=driver/network/ethernet/vr
+depend type=group fmri=driver/network/ethernet/vxge
+depend type=group fmri=driver/network/ethernet/xge
+depend type=group fmri=driver/network/ethernet/yge
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/arn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/atu
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ipw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwh
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwk
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwp
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/mwl
+depend type=group fmri=driver/network/wlan/pcan
+depend type=group fmri=driver/network/wlan/pcwl
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ral
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rum
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwd
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/uath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ural
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/urtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/wpi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/zyd
 depend type=group fmri=driver/parallel/ecpp
 depend type=group fmri=driver/pcmcia
 $(i386_ONLY)depend type=group fmri=driver/serial/asy
@@ -243,7 +229,6 @@
 $(i386_ONLY)depend type=group fmri=driver/storage/si3124
 depend type=group fmri=driver/storage/smp
 $(sparc_ONLY)depend type=group fmri=driver/storage/ssd
-depend type=group fmri=driver/usb
 depend type=group fmri=driver/x11/winlock
 $(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 $(i386_ONLY)depend type=group fmri=driver/xvm/pv
@@ -316,7 +301,6 @@
 depend type=group fmri=image/library/libtiff
 depend type=group fmri=image/scanner/xsane/sane-backends
 depend type=group fmri=image/viewer/eog
-depend type=group fmri=install/beadm
 depend type=group fmri=library/aalib
 depend type=group fmri=library/accessibility/brltty
 depend type=group fmri=library/apr-13
@@ -397,6 +381,7 @@
 depend type=group fmri=library/perl-5/authen-pam
 depend type=group fmri=library/perl-5/sun-solaris-512
 depend type=group fmri=library/perl-5/xml-parser-512
+depend type=group fmri=library/perl-5/xml-parser-584
 depend type=group fmri=library/popt
 depend type=group fmri=library/print/cups-libs
 depend type=group fmri=library/print/open-printing
@@ -473,8 +458,6 @@
 depend type=group fmri=network/ftp
 depend type=group fmri=network/ftp/ncftp
 depend type=group fmri=network/ipfilter
-depend type=group fmri=network/iscsi/initiator
-depend type=group fmri=network/iscsi/iser
 depend type=group fmri=network/legacy-remote-utilities
 depend type=group fmri=network/ping
 depend type=group fmri=network/rsync
@@ -498,13 +481,11 @@
 depend type=group fmri=print/filter/ghostscript/fonts/gnu-gs-fonts-std
 depend type=group fmri=print/filter/gutenprint
 depend type=group fmri=print/filter/hplip
-depend type=group fmri=print/lp/compatibility/sunos4
-depend type=group fmri=print/lp/print-client-commands
 depend type=group fmri=release/name
 depend type=group fmri=release/notices
 depend type=group fmri=release/os-welcome
 depend type=group fmri=release/registration
-depend type=group fmri=runtime/java
+depend type=group fmri=runtime/java/jre-6
 depend type=group fmri=runtime/perl-512
 depend type=group fmri=runtime/perl-584
 depend type=group fmri=runtime/perl-584/extra
@@ -516,15 +497,9 @@
 depend type=group fmri=security/sudo
 depend type=group fmri=security/tcp-wrapper
 depend type=group fmri=service/diagnostic/spray
-depend type=group fmri=service/fault-management
-depend type=group fmri=service/fault-management/asr-notify
-depend type=group fmri=service/fault-management/fm-snmp-mib
-depend type=group fmri=service/fault-management/smtp-notify
-depend type=group fmri=service/fault-management/snmp-notify
 depend type=group fmri=service/file-system/nfs
 depend type=group fmri=service/file-system/smb
 depend type=group fmri=service/gnome/desktop-cache
-depend type=group fmri=service/hal
 $(sparc_ONLY)depend type=group fmri=service/key-management/sun-fire-15000
 depend type=group fmri=service/network/comsat
 depend type=group fmri=service/network/dns/mdns
@@ -532,7 +507,6 @@
 depend type=group fmri=service/network/ftp
 depend type=group fmri=service/network/legacy-remote-utilities
 depend type=group fmri=service/network/ntp
-depend type=group fmri=service/network/samba
 depend type=group fmri=service/network/slp
 depend type=group fmri=service/network/smtp/sendmail
 depend type=group fmri=service/network/ssh
@@ -541,15 +515,9 @@
 depend type=group fmri=service/network/tftp
 depend type=group fmri=service/network/wpa
 depend type=group fmri=service/opengl/ogl-select
-depend type=group fmri=service/picl
 depend type=group fmri=service/postrun
-depend type=group fmri=service/resource-pools
-depend type=group fmri=service/resource-pools/poold
 depend type=group fmri=service/security/gss
 depend type=group fmri=service/security/kerberos-5
-depend type=group fmri=service/storage/fibre-channel/fc-fabric
-depend type=group fmri=service/storage/media-volume-manager
-depend type=group fmri=service/storage/removable-media
 depend type=group fmri=service/storage/rmt
 depend type=group fmri=shell/bash
 depend type=group fmri=shell/expect
@@ -559,10 +527,9 @@
 depend type=group fmri=shell/which
 depend type=group fmri=shell/zsh
 $(sparc_ONLY)depend type=group fmri=storage/library/network-array
-depend type=group fmri=storage/mpathadm
-depend type=group fmri=storage/stmf
 depend type=group fmri=storage/svm
-depend type=group fmri=system/accounting/legacy
+depend type=group fmri=system/accounting/legacy-accounting
+depend type=group fmri=system/boot-environment-utilities
 depend type=group fmri=system/boot/grub
 depend type=group fmri=system/boot/wanboot
 depend type=group fmri=system/core-os
@@ -578,8 +545,15 @@
 $(sparc_ONLY)depend type=group fmri=system/domain-configuration/sparc-enterprise
 $(sparc_ONLY)depend type=group \
     fmri=system/domain-service-processor-protocol/sparc-enterprise
+depend type=group fmri=system/dtrace
+depend type=group fmri=system/dtrace/dtrace-toolkit
 depend type=group fmri=system/dynamic-reconfiguration
 $(sparc_ONLY)depend type=group fmri=system/embedded-fcode-interpreter
+depend type=group fmri=system/fault-management
+depend type=group fmri=system/fault-management/asr-notify
+depend type=group fmri=system/fault-management/fm-snmp-mib
+depend type=group fmri=system/fault-management/smtp-notify
+depend type=group fmri=system/fault-management/snmp-notify
 depend type=group fmri=system/file-system/autofs
 depend type=group fmri=system/file-system/hsfs
 depend type=group fmri=system/file-system/nfs
@@ -589,7 +563,7 @@
 depend type=group fmri=system/file-system/udfs
 depend type=group fmri=system/file-system/ufs
 depend type=group fmri=system/file-system/zfs
-depend type=group fmri=system/flash/fwflash
+depend type=group fmri=system/firmware-utilities
 $(sparc_ONLY)depend type=group fmri=system/floating-point-scrubber
 depend type=group fmri=system/font/truetype/arphic-uming
 depend type=group fmri=system/font/truetype/dejavu
@@ -600,10 +574,10 @@
 depend type=group fmri=system/font/xorg/iso8859-1
 depend type=group fmri=system/font/xorg/xorg-core
 depend type=group fmri=system/fru-id
-depend type=group fmri=system/fru-id/platform
 $(sparc_ONLY)depend type=group fmri=system/graphics/fbconfig
 $(sparc_ONLY)depend type=group fmri=system/graphics/fbconfig/fbconfig-ast
 $(sparc_ONLY)depend type=group fmri=system/graphics/fbconfig/fbconfig-efb
+depend type=group fmri=system/hal
 depend type=group fmri=system/input-method/ibus
 depend type=group fmri=system/input-method/ibus/anthy
 depend type=group fmri=system/input-method/ibus/chewing
@@ -626,19 +600,21 @@
 depend type=group fmri=system/install/configuration
 depend type=group fmri=system/install/locale
 depend type=group fmri=system/install/tests
+depend type=group fmri=system/io/audio
+depend type=group fmri=system/io/fc/fc-fabric
+depend type=group fmri=system/io/fc/fc-port
+depend type=group fmri=system/io/fc/fc-san-management
+depend type=group fmri=system/io/fc/fc-scsi
+depend type=group fmri=system/io/fc/ip-over-fc
+depend type=group fmri=system/io/ieee-1394
+depend type=group fmri=system/io/infiniband
+depend type=group fmri=system/io/ultra-wideband
+depend type=group fmri=system/io/usb
 depend type=group fmri=system/kernel
 depend type=group fmri=system/kernel/cpu-counters
 $(sparc_ONLY)depend type=group fmri=system/kernel/cpu/sun4v
-depend type=group fmri=system/kernel/dtrace/providers
-$(i386_ONLY)depend type=group fmri=system/kernel/dynamic-reconfiguration/i86pc
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/dynamic-reconfiguration/sun-fire-15000
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/dynamic-reconfiguration/sun-fire-880
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/dynamic-reconfiguration/ultra-enterprise-10000
-$(sparc_ONLY)depend type=group \
-    fmri=system/kernel/inter-domain/ultra-enterprise-10000
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/fipe
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/ioat
 $(sparc_ONLY)depend type=group fmri=system/kernel/io-performance-counters
 depend type=group fmri=system/kernel/platform
 $(sparc_ONLY)depend type=group fmri=system/kernel/platform/netra
@@ -646,7 +622,6 @@
 depend type=group fmri=system/kernel/secure-rpc
 depend type=group fmri=system/kernel/security/gss
 depend type=group fmri=system/kernel/suspend-resume
-depend type=group fmri=system/kernel/ultra-wideband
 depend type=group fmri=system/keyboard/kbd_mode
 depend type=group fmri=system/keyboard/keyboard-utilities
 $(sparc_ONLY)depend type=group fmri=system/ldoms
@@ -658,14 +633,12 @@
 depend type=group fmri=system/library/fontconfig
 depend type=group fmri=system/library/freetype-2
 depend type=group fmri=system/library/gcc-3-runtime
+depend type=group fmri=system/library/gcc-45-runtime
 depend type=group fmri=system/library/iconv/unicode
 depend type=group fmri=system/library/iconv/utf-8
-depend type=group fmri=system/library/iconv/utf-8/manual
 depend type=group fmri=system/library/install
 depend type=group fmri=system/library/libdbus
 depend type=group fmri=system/library/libdbus-glib
-depend type=group fmri=system/library/libdiskmgt
-depend type=group fmri=system/library/libfcoe
 depend type=group fmri=system/library/libpcap
 depend type=group fmri=system/library/math
 depend type=group fmri=system/library/openmp
@@ -678,12 +651,13 @@
 depend type=group fmri=system/library/security/libgcrypt
 depend type=group fmri=system/library/security/libsasl
 depend type=group fmri=system/library/security/rpcsec
-depend type=group fmri=system/library/storage/fibre-channel/hbaapi
-depend type=group fmri=system/library/storage/fibre-channel/libsun_fc
-depend type=group fmri=system/library/storage/ima
-depend type=group fmri=system/library/storage/libmpapi
-depend type=group fmri=system/library/storage/libmpscsi_vhci
+depend type=group fmri=system/library/storage/libdiskmgt
+depend type=group fmri=system/library/storage/libfcoe
 depend type=group fmri=system/library/storage/scsi-plugins
+depend type=group fmri=system/library/storage/snia-hbaapi
+depend type=group fmri=system/library/storage/snia-ima
+depend type=group fmri=system/library/storage/snia-mpapi
+depend type=group fmri=system/library/storage/t11-sm-hba
 depend type=group fmri=system/library/usb/libusb
 depend type=group fmri=system/library/usb/libusbugen
 depend type=group fmri=system/linker
@@ -717,22 +691,34 @@
 depend type=group fmri=system/network
 $(sparc_ONLY)depend type=group fmri=system/network-console
 depend type=group fmri=system/network/avahi
+depend type=group fmri=system/network/bpf
 depend type=group fmri=system/network/nis
 depend type=group fmri=system/network/ppp
 depend type=group fmri=system/network/ppp/pppdump
 depend type=group fmri=system/network/ppp/tunnel
 depend type=group fmri=system/network/routing
+depend type=group fmri=system/picl
 depend type=group fmri=system/prerequisite/gnu
+depend type=group fmri=system/resource-mgmt/resource-pools
 depend type=group fmri=system/scheduler/fss
-depend type=group fmri=system/storage/fibre-channel/port-utility
-depend type=group fmri=system/storage/luxadm
+depend type=group fmri=system/storage/fc-utilities
+depend type=group fmri=system/storage/fcoe
+depend type=group fmri=system/storage/fcoe/fcoe-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-iser
+depend type=group fmri=system/storage/media-volume-manager
+depend type=group fmri=system/storage/multipath-utilities
 $(i386_ONLY)depend type=group fmri=system/storage/parted
 depend type=group fmri=system/storage/raid-utilities
+depend type=group fmri=system/storage/removable-media
+depend type=group fmri=system/storage/sas-utilities
+depend type=group fmri=system/storage/scsi-target-mode-framework
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
 depend type=group fmri=system/xopen/xcu4
 depend type=group fmri=system/zones
-depend type=group fmri=system/zones/brand/solaris
+depend type=group fmri=system/zones/brand/brand-solaris
+depend type=group fmri=system/zones/brand/brand-solaris10
 depend type=group fmri=terminal/fbconsole
 depend type=group fmri=terminal/gnome-terminal
 depend type=group fmri=terminal/luit
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m	Thu Aug 25 17:46:35 2011 -0700
@@ -44,8 +44,6 @@
 depend type=group fmri=developer/build/gnu-make
 depend type=group fmri=developer/build/make
 depend type=group fmri=developer/debug/mdb
-depend type=group fmri=developer/dtrace
-depend type=group fmri=developer/dtrace/toolkit
 depend type=group fmri=developer/library/xprofile
 depend type=group fmri=developer/macro/cpp
 depend type=group fmri=developer/versioning/sccs
@@ -54,110 +52,89 @@
 depend type=group fmri=diagnostic/cpu-counters
 depend type=group fmri=diagnostic/ddu/data
 depend type=group fmri=diagnostic/ddu/library
+depend type=group fmri=diagnostic/ddu/locale
 depend type=group fmri=diagnostic/ddu/text
 depend type=group fmri=diagnostic/latencytop
 depend type=group fmri=diagnostic/powertop
 depend type=group fmri=diagnostic/scanpci
 depend type=group fmri=diagnostic/snoop
 depend type=group fmri=diagnostic/spray
+depend type=group fmri=diagnostic/tcpdump
 depend type=group fmri=diagnostic/top
-depend type=group fmri=driver/audio
 $(sparc_ONLY)depend type=group fmri=driver/cpu/us
 depend type=group fmri=driver/crypto/dca
 $(sparc_ONLY)depend type=group fmri=driver/crypto/n2cp
 depend type=group fmri=driver/crypto/tpm
-depend type=group fmri=driver/firewire
+depend type=group fmri=driver/fc/emlxs
+depend type=group fmri=driver/fc/qlc
+$(sparc_ONLY)depend type=group fmri=driver/fc/socal
 $(i386_ONLY)depend type=group fmri=driver/graphics/agpgart
 $(sparc_ONLY)depend type=group fmri=driver/graphics/ast
 $(i386_ONLY)depend type=group fmri=driver/graphics/atiatom
 $(i386_ONLY)depend type=group fmri=driver/graphics/drm
 $(sparc_ONLY)depend type=group fmri=driver/graphics/efb
 $(i386_ONLY)depend type=group fmri=driver/graphics/nvidia
-$(i386_ONLY)depend type=group fmri=driver/i86pc/fipe
-$(i386_ONLY)depend type=group fmri=driver/i86pc/ioat
+depend type=group fmri=driver/infiniband/connectx
+depend type=group fmri=driver/infiniband/tavor
 $(i386_ONLY)depend type=group fmri=driver/management/bmc
-depend type=group fmri=driver/network/afe
-$(i386_ONLY)depend type=group fmri=driver/network/amd8111s
-$(i386_ONLY)depend type=group fmri=driver/network/arn
-$(i386_ONLY)depend type=group fmri=driver/network/atge
-$(i386_ONLY)depend type=group fmri=driver/network/ath
-$(i386_ONLY)depend type=group fmri=driver/network/atu
-$(i386_ONLY)depend type=group fmri=driver/network/bfe
-depend type=group fmri=driver/network/bge
-$(i386_ONLY)depend type=group fmri=driver/network/bnx
-$(i386_ONLY)depend type=group fmri=driver/network/bnxe
-depend type=group fmri=driver/network/bpf
-depend type=group fmri=driver/network/chxge
-depend type=group fmri=driver/network/cxge
-depend type=group fmri=driver/network/dmfe
-$(i386_ONLY)depend type=group fmri=driver/network/dnet
-depend type=group fmri=driver/network/e1000g
-$(i386_ONLY)depend type=group fmri=driver/network/elxl
-depend type=group fmri=driver/network/emlxs
-depend type=group fmri=driver/network/eoib
-$(sparc_ONLY)depend type=group fmri=driver/network/eri
-depend type=group fmri=driver/network/fcip
-depend type=group fmri=driver/network/fcoe
-depend type=group fmri=driver/network/fcoei
-depend type=group fmri=driver/network/fcp
-depend type=group fmri=driver/network/fcsm
-depend type=group fmri=driver/network/fp
-depend type=group fmri=driver/network/hermon
-depend type=group fmri=driver/network/hme
-depend type=group fmri=driver/network/hxge
-depend type=group fmri=driver/network/ib
-depend type=group fmri=driver/network/ibdma
-depend type=group fmri=driver/network/ibp
-depend type=group fmri=driver/network/igb
-$(i386_ONLY)depend type=group fmri=driver/network/iprb
-$(i386_ONLY)depend type=group fmri=driver/network/ipw
-$(i386_ONLY)depend type=group fmri=driver/network/iwh
-$(i386_ONLY)depend type=group fmri=driver/network/iwi
-$(i386_ONLY)depend type=group fmri=driver/network/iwk
-$(i386_ONLY)depend type=group fmri=driver/network/iwp
-depend type=group fmri=driver/network/ixgb
-depend type=group fmri=driver/network/ixgbe
-$(i386_ONLY)depend type=group fmri=driver/network/mcxe
-$(i386_ONLY)depend type=group fmri=driver/network/mwl
-depend type=group fmri=driver/network/mxfe
-depend type=group fmri=driver/network/myri10ge
-$(i386_ONLY)depend type=group fmri=driver/network/nge
-$(sparc_ONLY)depend type=group fmri=driver/network/niumx
-$(i386_ONLY)depend type=group fmri=driver/network/ntxn
-depend type=group fmri=driver/network/nxge
-depend type=group fmri=driver/network/ofk
-depend type=group fmri=driver/network/pcan
-$(i386_ONLY)depend type=group fmri=driver/network/pcn
-depend type=group fmri=driver/network/pcwl
-$(sparc_ONLY)depend type=group fmri=driver/network/qfe
-depend type=group fmri=driver/network/qlc
-depend type=group fmri=driver/network/qlcnic
-$(i386_ONLY)depend type=group fmri=driver/network/ral
-depend type=group fmri=driver/network/rds
-depend type=group fmri=driver/network/rdsv3
-depend type=group fmri=driver/network/rge
-depend type=group fmri=driver/network/rpcib
-depend type=group fmri=driver/network/rtls
-$(i386_ONLY)depend type=group fmri=driver/network/rtw
-$(i386_ONLY)depend type=group fmri=driver/network/rum
-$(i386_ONLY)depend type=group fmri=driver/network/rwd
-$(i386_ONLY)depend type=group fmri=driver/network/rwn
-depend type=group fmri=driver/network/sdp
-depend type=group fmri=driver/network/sdpib
-depend type=group fmri=driver/network/sfe
-$(sparc_ONLY)depend type=group fmri=driver/network/socal
-depend type=group fmri=driver/network/sxge
-depend type=group fmri=driver/network/tavor
-$(i386_ONLY)depend type=group fmri=driver/network/uath
-$(i386_ONLY)depend type=group fmri=driver/network/ural
-$(i386_ONLY)depend type=group fmri=driver/network/urtw
-depend type=group fmri=driver/network/usbecm
-depend type=group fmri=driver/network/vr
-depend type=group fmri=driver/network/vxge
-$(i386_ONLY)depend type=group fmri=driver/network/wpi
-depend type=group fmri=driver/network/xge
-depend type=group fmri=driver/network/yge
-$(i386_ONLY)depend type=group fmri=driver/network/zyd
+depend type=group fmri=driver/network/ethernet/afe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/amd8111s
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/atge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bfe
+depend type=group fmri=driver/network/ethernet/bge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnx
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/bnxe
+depend type=group fmri=driver/network/ethernet/chxge
+depend type=group fmri=driver/network/ethernet/cxge
+depend type=group fmri=driver/network/ethernet/dmfe
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/dnet
+depend type=group fmri=driver/network/ethernet/e1000g
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/elxl
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/eri
+depend type=group fmri=driver/network/ethernet/hme
+depend type=group fmri=driver/network/ethernet/hxge
+depend type=group fmri=driver/network/ethernet/igb
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/iprb
+depend type=group fmri=driver/network/ethernet/ixgb
+depend type=group fmri=driver/network/ethernet/ixgbe
+depend type=group fmri=driver/network/ethernet/mxfe
+depend type=group fmri=driver/network/ethernet/myri10ge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/nge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/ntxn
+depend type=group fmri=driver/network/ethernet/nxge
+$(i386_ONLY)depend type=group fmri=driver/network/ethernet/pcn
+$(sparc_ONLY)depend type=group fmri=driver/network/ethernet/qfe
+depend type=group fmri=driver/network/ethernet/qlcnic
+depend type=group fmri=driver/network/ethernet/rge
+depend type=group fmri=driver/network/ethernet/rtls
+depend type=group fmri=driver/network/ethernet/sfe
+depend type=group fmri=driver/network/ethernet/sxge
+depend type=group fmri=driver/network/ethernet/usbecm
+depend type=group fmri=driver/network/ethernet/vr
+depend type=group fmri=driver/network/ethernet/vxge
+depend type=group fmri=driver/network/ethernet/xge
+depend type=group fmri=driver/network/ethernet/yge
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/arn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/atu
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ipw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwh
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwk
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/iwp
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/mwl
+depend type=group fmri=driver/network/wlan/pcan
+depend type=group fmri=driver/network/wlan/pcwl
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ral
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rum
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwd
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/rwn
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/uath
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/ural
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/urtw
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/wpi
+$(i386_ONLY)depend type=group fmri=driver/network/wlan/zyd
 depend type=group fmri=driver/parallel/ecpp
 depend type=group fmri=driver/pcmcia
 $(i386_ONLY)depend type=group fmri=driver/serial/asy
@@ -200,7 +177,6 @@
 $(i386_ONLY)depend type=group fmri=driver/storage/si3124
 depend type=group fmri=driver/storage/smp
 $(sparc_ONLY)depend type=group fmri=driver/storage/ssd
-depend type=group fmri=driver/usb
 $(i386_ONLY)depend type=group fmri=driver/x11/xsvc
 $(i386_ONLY)depend type=group fmri=driver/xvm/pv
 depend type=group fmri=editor/nano
@@ -212,7 +188,6 @@
 depend type=group fmri=image/library/libjpeg
 depend type=group fmri=image/library/libpng
 depend type=group fmri=image/library/libtiff
-depend type=group fmri=install/beadm
 depend type=group fmri=install/installadm
 depend type=group fmri=library/apr-13
 depend type=group fmri=library/apr-util-13
@@ -235,10 +210,10 @@
 depend type=group fmri=library/nspr
 depend type=group fmri=library/pcre
 depend type=group fmri=library/perl-5/sun-solaris-512
+depend type=group fmri=library/perl-5/xml-parser-512
+depend type=group fmri=library/perl-5/xml-parser-584
 depend type=group fmri=library/print/cups-libs
 depend type=group fmri=library/print/open-printing
-depend type=group fmri=library/print/open-printing/ipp
-depend type=group fmri=library/print/open-printing/lpd
 depend type=group fmri=library/python-2/cherrypy-26
 depend type=group fmri=library/python-2/lxml-26
 depend type=group fmri=library/python-2/m2crypto-26
@@ -263,8 +238,6 @@
 depend type=group fmri=network/finger
 depend type=group fmri=network/ftp
 depend type=group fmri=network/ipfilter
-depend type=group fmri=network/iscsi/initiator
-depend type=group fmri=network/iscsi/iser
 depend type=group fmri=network/legacy-remote-utilities
 depend type=group fmri=network/open-fabrics
 depend type=group fmri=network/ping
@@ -280,18 +253,13 @@
 depend type=group fmri=package/rpm
 depend type=group fmri=package/svr4
 depend type=group fmri=print/cups
-depend type=group fmri=print/lp
-depend type=group fmri=print/lp/filter/a2ps
+depend type=group fmri=print/filter/a2ps
 depend type=group fmri=print/lp/filter/foomatic-ppds
 depend type=group fmri=print/lp/filter/foomatic-rip
-depend type=group fmri=print/lp/filter/postscript-lp-filter
-depend type=group fmri=print/lp/ipp/ipp-listener
-depend type=group fmri=print/lp/ipp/libipp
-depend type=group fmri=print/lp/print-client-commands
 depend type=group fmri=release/name
 depend type=group fmri=release/notices
 depend type=group fmri=release/registration
-depend type=group fmri=runtime/java
+depend type=group fmri=runtime/java/jre-6
 depend type=group fmri=runtime/perl-512
 depend type=group fmri=runtime/perl-584
 depend type=group fmri=runtime/perl-584/extra
@@ -301,15 +269,9 @@
 depend type=group fmri=security/sudo
 depend type=group fmri=security/tcp-wrapper
 depend type=group fmri=service/diagnostic/spray
-depend type=group fmri=service/fault-management
-depend type=group fmri=service/fault-management/asr-notify
-depend type=group fmri=service/fault-management/fm-snmp-mib
-depend type=group fmri=service/fault-management/smtp-notify
-depend type=group fmri=service/fault-management/snmp-notify
 depend type=group fmri=service/file-system/nfs
 depend type=group fmri=service/file-system/smb
 depend type=group fmri=service/gnome/desktop-cache
-depend type=group fmri=service/hal
 $(sparc_ONLY)depend type=group fmri=service/key-management/sun-fire-15000
 depend type=group fmri=service/network/comsat
 depend type=group fmri=service/network/dhcp/isc-dhcp
@@ -326,14 +288,8 @@
 depend type=group fmri=service/network/telnet
 depend type=group fmri=service/network/tftp
 depend type=group fmri=service/opengl/ogl-select
-depend type=group fmri=service/picl
-depend type=group fmri=service/resource-pools
-depend type=group fmri=service/resource-pools/poold
 depend type=group fmri=service/security/gss
 depend type=group fmri=service/security/kerberos-5
-depend type=group fmri=service/storage/fibre-channel/fc-fabric
-depend type=group fmri=service/storage/media-volume-manager
-depend type=group fmri=service/storage/removable-media
 depend type=group fmri=service/storage/rmt
 depend type=group fmri=shell/bash
 depend type=group fmri=shell/expect
@@ -343,10 +299,9 @@
 depend type=group fmri=shell/which
 depend type=group fmri=shell/zsh
 $(sparc_ONLY)depend type=group fmri=storage/library/network-array
-depend type=group fmri=storage/mpathadm
-depend type=group fmri=storage/stmf
 depend type=group fmri=storage/svm
-depend type=group fmri=system/accounting/legacy
+depend type=group fmri=system/accounting/legacy-accounting
+depend type=group fmri=system/boot-environment-utilities
 depend type=group fmri=system/boot/grub
 depend type=group fmri=system/boot/wanboot
 depend type=group fmri=system/core-os
@@ -360,8 +315,15 @@
 $(sparc_ONLY)depend type=group fmri=system/domain-configuration/sparc-enterprise
 $(sparc_ONLY)depend type=group \
     fmri=system/domain-service-processor-protocol/sparc-enterprise
+depend type=group fmri=system/dtrace
+depend type=group fmri=system/dtrace/dtrace-toolkit
 depend type=group fmri=system/dynamic-reconfiguration
 $(sparc_ONLY)depend type=group fmri=system/embedded-fcode-interpreter
+depend type=group fmri=system/fault-management
+depend type=group fmri=system/fault-management/asr-notify
+depend type=group fmri=system/fault-management/fm-snmp-mib
+depend type=group fmri=system/fault-management/smtp-notify
+depend type=group fmri=system/fault-management/snmp-notify
 depend type=group fmri=system/file-system/autofs
 depend type=group fmri=system/file-system/hsfs
 depend type=group fmri=system/file-system/nfs
@@ -370,20 +332,37 @@
 depend type=group fmri=system/file-system/udfs
 depend type=group fmri=system/file-system/ufs
 depend type=group fmri=system/file-system/zfs
-depend type=group fmri=system/flash/fwflash
+depend type=group fmri=system/firmware-utilities
 $(sparc_ONLY)depend type=group fmri=system/floating-point-scrubber
 depend type=group fmri=system/fru-id
-depend type=group fmri=system/fru-id/platform
+depend type=group fmri=system/hal
 depend type=group fmri=system/install
 depend type=group fmri=system/install/auto-install
 depend type=group fmri=system/install/auto-install/auto-install-common
 depend type=group fmri=system/install/configuration
 depend type=group fmri=system/install/locale
 depend type=group fmri=system/install/tests
+depend type=group fmri=system/io/fc/fc-fabric
+depend type=group fmri=system/io/fc/fc-port
+depend type=group fmri=system/io/fc/fc-san-management
+depend type=group fmri=system/io/fc/fc-scsi
+depend type=group fmri=system/io/fc/ip-over-fc
+depend type=group fmri=system/io/ieee-1394
+depend type=group fmri=system/io/infiniband
+depend type=group fmri=system/io/infiniband/ethernet-over-ib
+depend type=group fmri=system/io/infiniband/ib-device-mgt-agent
+depend type=group fmri=system/io/infiniband/ib-sockets-direct
+depend type=group fmri=system/io/infiniband/ip-over-ib
+depend type=group fmri=system/io/infiniband/open-fabrics
+depend type=group fmri=system/io/infiniband/reliable-datagram-sockets
+depend type=group fmri=system/io/infiniband/reliable-datagram-sockets-v3
+depend type=group fmri=system/io/infiniband/rpc-over-rdma
+depend type=group fmri=system/io/infiniband/udapl
+depend type=group fmri=system/io/ultra-wideband
+depend type=group fmri=system/io/usb
 depend type=group fmri=system/kernel
 depend type=group fmri=system/kernel/cpu-counters
 $(sparc_ONLY)depend type=group fmri=system/kernel/cpu/sun4v
-depend type=group fmri=system/kernel/dtrace/providers
 $(i386_ONLY)depend type=group fmri=system/kernel/dynamic-reconfiguration/i86pc
 $(sparc_ONLY)depend type=group \
     fmri=system/kernel/dynamic-reconfiguration/sun-fire-15000
@@ -391,6 +370,8 @@
     fmri=system/kernel/dynamic-reconfiguration/sun-fire-880
 $(sparc_ONLY)depend type=group \
     fmri=system/kernel/dynamic-reconfiguration/ultra-enterprise-10000
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/fipe
+$(i386_ONLY)depend type=group fmri=system/kernel/i86pc/ioat
 $(sparc_ONLY)depend type=group \
     fmri=system/kernel/inter-domain/ultra-enterprise-10000
 $(sparc_ONLY)depend type=group fmri=system/kernel/io-performance-counters
@@ -400,10 +381,10 @@
 depend type=group fmri=system/kernel/secure-rpc
 depend type=group fmri=system/kernel/security/gss
 depend type=group fmri=system/kernel/suspend-resume
-depend type=group fmri=system/kernel/ultra-wideband
 depend type=group fmri=system/keyboard/kbd_mode
 depend type=group fmri=system/keyboard/keyboard-utilities
 $(sparc_ONLY)depend type=group fmri=system/ldoms
+$(sparc_ONLY)depend type=group fmri=system/ldoms/ldomsmanager
 depend type=group fmri=system/library
 depend type=group fmri=system/library/c++-runtime
 depend type=group fmri=system/library/dbus
@@ -411,13 +392,12 @@
 depend type=group fmri=system/library/fontconfig
 depend type=group fmri=system/library/freetype-2
 depend type=group fmri=system/library/gcc-3-runtime
+depend type=group fmri=system/library/gcc-45-runtime
 depend type=group fmri=system/library/iconv/utf-8
-depend type=group fmri=system/library/iconv/utf-8/manual
 depend type=group fmri=system/library/install
 depend type=group fmri=system/library/libdbus
 depend type=group fmri=system/library/libdbus-glib
-depend type=group fmri=system/library/libdiskmgt
-depend type=group fmri=system/library/libfcoe
+depend type=group fmri=system/library/libpcap
 depend type=group fmri=system/library/math
 depend type=group fmri=system/library/openmp
 depend type=group fmri=system/library/platform
@@ -429,12 +409,13 @@
 depend type=group fmri=system/library/security/libgcrypt
 depend type=group fmri=system/library/security/libsasl
 depend type=group fmri=system/library/security/rpcsec
-depend type=group fmri=system/library/storage/fibre-channel/hbaapi
-depend type=group fmri=system/library/storage/fibre-channel/libsun_fc
-depend type=group fmri=system/library/storage/ima
-depend type=group fmri=system/library/storage/libmpapi
-depend type=group fmri=system/library/storage/libmpscsi_vhci
+depend type=group fmri=system/library/storage/libdiskmgt
+depend type=group fmri=system/library/storage/libfcoe
 depend type=group fmri=system/library/storage/scsi-plugins
+depend type=group fmri=system/library/storage/snia-hbaapi
+depend type=group fmri=system/library/storage/snia-ima
+depend type=group fmri=system/library/storage/snia-mpapi
+depend type=group fmri=system/library/storage/t11-sm-hba
 depend type=group fmri=system/linker
 depend type=group fmri=system/locale
 depend type=group fmri=system/management/ilomconfig
@@ -448,23 +429,35 @@
 depend type=group fmri=system/manual/locale
 depend type=group fmri=system/network
 $(sparc_ONLY)depend type=group fmri=system/network-console
+depend type=group fmri=system/network/bpf
 depend type=group fmri=system/network/nis
 depend type=group fmri=system/network/ppp
 depend type=group fmri=system/network/ppp/pppdump
 depend type=group fmri=system/network/ppp/tunnel
 depend type=group fmri=system/network/routing
-depend type=group fmri=system/network/udapl
-depend type=group fmri=system/network/udapl/udapl-tavor
+depend type=group fmri=system/picl
 depend type=group fmri=system/prerequisite/gnu
+depend type=group fmri=system/resource-mgmt/dynamic-resource-pools
+depend type=group fmri=system/resource-mgmt/resource-caps
+depend type=group fmri=system/resource-mgmt/resource-pools
 depend type=group fmri=system/scheduler/fss
-depend type=group fmri=system/storage/fibre-channel/port-utility
-depend type=group fmri=system/storage/luxadm
+depend type=group fmri=system/storage/fc-utilities
+depend type=group fmri=system/storage/fcoe
+depend type=group fmri=system/storage/fcoe/fcoe-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-initiator
+depend type=group fmri=system/storage/iscsi/iscsi-iser
+depend type=group fmri=system/storage/media-volume-manager
+depend type=group fmri=system/storage/multipath-utilities
 depend type=group fmri=system/storage/raid-utilities
+depend type=group fmri=system/storage/removable-media
+depend type=group fmri=system/storage/sas-utilities
+depend type=group fmri=system/storage/scsi-target-mode-framework
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
 depend type=group fmri=system/xopen/xcu4
 depend type=group fmri=system/zones
-depend type=group fmri=system/zones/brand/solaris
+depend type=group fmri=system/zones/brand/brand-solaris
+depend type=group fmri=system/zones/brand/brand-solaris10
 depend type=group fmri=terminal/fbconsole
 depend type=group fmri=terminal/luit
 depend type=group fmri=terminal/resize
@@ -495,14 +488,19 @@
 depend type=group fmri=x11/library/libx11
 depend type=group fmri=x11/library/libxau
 depend type=group fmri=x11/library/libxcb
+depend type=group fmri=x11/library/libxcomposite
+depend type=group fmri=x11/library/libxcursor
+depend type=group fmri=x11/library/libxdamage
 depend type=group fmri=x11/library/libxdmcp
 depend type=group fmri=x11/library/libxext
+depend type=group fmri=x11/library/libxfixes
 depend type=group fmri=x11/library/libxft
 depend type=group fmri=x11/library/libxi
 depend type=group fmri=x11/library/libxinerama
 depend type=group fmri=x11/library/libxmu
 depend type=group fmri=x11/library/libxmuu
 depend type=group fmri=x11/library/libxpm
+depend type=group fmri=x11/library/libxrandr
 depend type=group fmri=x11/library/libxrender
 depend type=group fmri=x11/library/libxtst
 depend type=group fmri=x11/library/libxxf86vm
--- a/src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m	Thu Aug 25 17:46:35 2011 -0700
@@ -34,7 +34,6 @@
 depend type=group fmri=compress/gzip
 depend type=group fmri=compress/unzip
 depend type=group fmri=compress/zip
-depend type=group fmri=developer/dtrace
 depend type=group fmri=diagnostic/snoop
 depend type=group fmri=diagnostic/spray
 depend type=group fmri=editor/vim/vim-core
@@ -55,6 +54,7 @@
 depend type=group fmri=shell/ksh
 depend type=group fmri=system/core-os
 depend type=group fmri=system/data/timezone
+depend type=group fmri=system/dtrace
 depend type=group fmri=system/file-system/autofs
 depend type=group fmri=system/file-system/nfs
 depend type=group fmri=system/install
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/173/common/Redistributable	Thu Aug 25 17:46:35 2011 -0700
@@ -0,0 +1,1483 @@
+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/berkeleydb-5
+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/fakeroot
+depend developer/gcc-3
+depend developer/gcc-45
+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-6
+depend developer/java/jdk-7
+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/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/wireshark/tshark
+depend diagnostic/wireshark/wireshark-common
+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/audio-usb
+$(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/fc/emlxs
+depend driver/fc/qlc
+$(sparc_ONLY)depend driver/fc/socal
+$(i386_ONLY)depend driver/graphics/agpgart
+$(sparc_ONLY)depend driver/graphics/ast
+$(i386_ONLY)depend driver/graphics/atiatom
+$(i386_ONLY)depend driver/graphics/drm
+$(sparc_ONLY)depend driver/graphics/efb
+$(i386_ONLY)depend driver/graphics/nvidia
+depend driver/graphics/usbvc
+depend driver/ieee-1394/av1394
+depend driver/ieee-1394/dcam1394
+$(i386_ONLY)depend driver/infiniband/connectx
+depend driver/infiniband/connectx
+depend driver/infiniband/tavor
+$(i386_ONLY)depend driver/management/bmc
+depend driver/network/ethernet/afe
+$(i386_ONLY)depend driver/network/ethernet/amd8111s
+$(i386_ONLY)depend driver/network/ethernet/atge
+$(i386_ONLY)depend driver/network/ethernet/bfe
+depend driver/network/ethernet/bge
+$(i386_ONLY)depend driver/network/ethernet/bnx
+$(i386_ONLY)depend driver/network/ethernet/bnxe
+depend driver/network/ethernet/chxge
+depend driver/network/ethernet/cxge
+depend driver/network/ethernet/dmfe
+$(i386_ONLY)depend driver/network/ethernet/dnet
+depend driver/network/ethernet/e1000g
+$(i386_ONLY)depend driver/network/ethernet/elxl
+$(sparc_ONLY)depend driver/network/ethernet/eri
+depend driver/network/ethernet/hme
+depend driver/network/ethernet/hxge
+depend driver/network/ethernet/igb
+$(i386_ONLY)depend driver/network/ethernet/iprb
+depend driver/network/ethernet/ixgb
+depend driver/network/ethernet/ixgbe
+depend driver/network/ethernet/mxfe
+depend driver/network/ethernet/myri10ge
+$(i386_ONLY)depend driver/network/ethernet/nge
+$(i386_ONLY)depend driver/network/ethernet/ntxn
+depend driver/network/ethernet/nxge
+$(i386_ONLY)depend driver/network/ethernet/pcn
+$(sparc_ONLY)depend driver/network/ethernet/qfe
+depend driver/network/ethernet/qlcnic
+depend driver/network/ethernet/rge
+depend driver/network/ethernet/rtls
+depend driver/network/ethernet/sfe
+depend driver/network/ethernet/sxge
+depend driver/network/ethernet/usbecm
+depend driver/network/ethernet/vr
+depend driver/network/ethernet/vxge
+depend driver/network/ethernet/xge
+depend driver/network/ethernet/yge
+$(i386_ONLY)depend driver/network/wlan/arn
+$(i386_ONLY)depend driver/network/wlan/ath
+$(i386_ONLY)depend driver/network/wlan/atu
+$(i386_ONLY)depend driver/network/wlan/ipw
+$(i386_ONLY)depend driver/network/wlan/iwh
+$(i386_ONLY)depend driver/network/wlan/iwi
+$(i386_ONLY)depend driver/network/wlan/iwk
+$(i386_ONLY)depend driver/network/wlan/iwp
+$(i386_ONLY)depend driver/network/wlan/mwl
+depend driver/network/wlan/pcan
+depend driver/network/wlan/pcwl
+$(i386_ONLY)depend driver/network/wlan/ral
+$(i386_ONLY)depend driver/network/wlan/rtw
+$(i386_ONLY)depend driver/network/wlan/rum
+$(i386_ONLY)depend driver/network/wlan/rwd
+$(i386_ONLY)depend driver/network/wlan/rwn
+$(i386_ONLY)depend driver/network/wlan/uath
+$(i386_ONLY)depend driver/network/wlan/ural
+$(i386_ONLY)depend driver/network/wlan/urtw
+$(i386_ONLY)depend driver/network/wlan/wpi
+$(i386_ONLY)depend driver/network/wlan/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/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/graphviz
+depend image/graphviz/graphviz-java
+depend image/graphviz/graphviz-lua
+depend image/graphviz/graphviz-ocaml
+depend image/graphviz/graphviz-perl-512
+depend image/graphviz/graphviz-php
+depend image/graphviz/graphviz-python-26
+depend image/graphviz/graphviz-ruby
+depend image/graphviz/graphviz-sharp
+depend image/graphviz/graphviz-tcl
+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/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/apache-commons-logging
+depend library/java/commons-collections
+depend library/java/grails
+depend library/java/java-demo-6
+depend library/java/java-demo-7
+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/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/mpc
+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-512
+depend library/perl-5/net-ssleay-584
+depend library/perl-5/pmtools-512
+depend library/perl-5/pmtools-584
+depend library/perl-5/subversion
+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/pth
+depend library/python-2/cherrypy-26
+depend library/python-2/coherence-26
+depend library/python-2/coverage-26
+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-26
+depend library/python-2/mako-26
+depend library/python-2/ply-26
+depend library/python-2/pyatspi-26
+depend library/python-2/pybonjour-26
+depend library/python-2/pycairo-26
+depend library/python-2/pycups
+depend library/python-2/pycurl-26
+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/python-2/tkinter-27
+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/nss
+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/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/a2ps
+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/filter/foomatic-ppds
+depend print/lp/filter/foomatic-rip
+depend print/lp/print-manager
+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/beanshell
+depend runtime/java/jre-6
+depend runtime/java/jre-7
+depend runtime/lua
+depend runtime/ocaml
+depend runtime/perl-512
+depend runtime/perl-584
+depend runtime/perl-584/extra
+depend runtime/python-26
+depend runtime/python-26/tests
+depend runtime/python-27
+depend runtime/python-27/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/nss-utilities
+depend security/pinentry
+depend security/sudo
+depend security/tcp-wrapper
+depend service/diagnostic/spray
+depend service/file-system/nfs
+depend service/file-system/smb
+depend service/gnome/desktop-cache
+$(sparc_ONLY)depend service/key-management/sun-fire-15000
+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-network-services
+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/postrun
+depend service/security/gss
+depend service/security/kerberos-5
+depend service/security/stunnel
+depend service/storage/isns
+depend service/storage/ndmp
+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/avs-cache-management
+depend storage/avs/avs-point-in-time-copy
+depend storage/avs/avs-remote-mirror
+depend storage/fsexam
+$(sparc_ONLY)depend storage/library/network-array
+depend storage/svm
+depend system/accounting/legacy-accounting
+depend system/boot-environment-utilities
+depend system/boot/grub
+depend system/boot/network
+depend system/boot/wanboot
+depend system/boot/wanboot/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-26
+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
+depend system/dtrace/dtrace-toolkit
+depend system/dynamic-reconfiguration
+$(sparc_ONLY)depend system/embedded-fcode-interpreter
+depend system/fault-management
+depend system/fault-management/asr-notify
+depend system/fault-management/eversholt-utilities
+depend system/fault-management/fm-snmp-mib
+depend system/fault-management/smtp-notify
+depend system/fault-management/snmp-notify
+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/logrotate
+depend system/firmware-utilities
+$(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
+$(sparc_ONLY)depend system/graphics/fbconfig
+$(sparc_ONLY)depend system/graphics/fbconfig/fbconfig-ast
+$(sparc_ONLY)depend system/graphics/fbconfig/fbconfig-efb
+depend system/hal
+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/audio
+depend system/io/fc/fc-fabric
+depend system/io/fc/fc-port
+depend system/io/fc/fc-san-management
+depend system/io/fc/fc-scsi
+depend system/io/fc/ip-over-fc
+depend system/io/ieee-1394
+depend system/io/infiniband
+depend system/io/infiniband/ethernet-over-ib
+depend system/io/infiniband/ib-device-mgt-agent
+depend system/io/infiniband/ib-sockets-direct
+depend system/io/infiniband/ip-over-ib
+depend system/io/infiniband/open-fabrics
+depend system/io/infiniband/reliable-datagram-sockets
+depend system/io/infiniband/reliable-datagram-sockets-v3
+depend system/io/infiniband/rpc-over-rdma
+depend system/io/infiniband/udapl
+depend system/io/test-drivers
+depend system/io/ultra-wideband
+depend system/io/usb
+depend system/kernel
+depend system/kernel/cpu-counters
+$(sparc_ONLY)depend system/kernel/cpu/sun4v
+$(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
+$(i386_ONLY)depend system/kernel/i86pc/fipe
+$(i386_ONLY)depend system/kernel/i86pc/ioat
+$(sparc_ONLY)depend system/kernel/inter-domain/ultra-enterprise-10000
+$(sparc_ONLY)depend system/kernel/io-performance-counters
+$(sparc_ONLY)depend system/kernel/platform
+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/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/gcc-45-runtime
+depend system/library/iconv/extra
+depend system/library/iconv/unicode
+depend system/library/iconv/utf-8
+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/liblayout
+depend system/library/libnet
+depend system/library/libpcap
+depend system/library/math
+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/libdiskmgt
+depend system/library/storage/libfcoe
+depend system/library/storage/scsi-plugins
+depend system/library/storage/snia-hbaapi
+depend system/library/storage/snia-ima
+depend system/library/storage/snia-mpapi
+depend system/library/storage/t11-sm-hba
+depend system/library/usb/libusb
+depend system/library/usb/libusbugen
+depend system/library/usb/openusb
+depend system/linker
+depend system/locale
+depend system/locale/extra
+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/ocm
+depend system/management/pcitool
+depend system/management/rad
+depend system/management/rad/client/rad-java
+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/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-smf
+depend system/management/visual-panels/panel-smf/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/sblim-cim-client
+depend system/management/wbem/wbem-data-management
+depend system/management/wbem/wbem-resource-management
+depend system/management/wbem/wbemcli
+depend system/management/web/openwsman
+depend system/manual
+depend system/manual/locale
+depend system/network
+$(sparc_ONLY)depend system/network-console
+depend system/network/avahi
+depend system/network/bpf
+depend system/network/http-cache-accelerator
+depend system/network/ipqos
+depend system/network/llc2
+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/osnet/locale
+depend system/picl
+depend system/prerequisite/gnu
+depend system/resource-mgmt/dynamic-resource-pools
+depend system/resource-mgmt/resource-caps
+depend system/resource-mgmt/resource-pools
+depend system/scheduler/fss
+depend system/security/kerberos-5
+depend system/storage/fc-utilities
+depend system/storage/fcoe
+depend system/storage/fcoe/fcoe-initiator
+depend system/storage/fcoe/fcoe-target
+depend system/storage/iscsi/iscsi-initiator
+depend system/storage/iscsi/iscsi-iser
+depend system/storage/iscsi/iscsi-target
+depend system/storage/media-volume-manager
+depend system/storage/multipath-utilities
+$(i386_ONLY)depend system/storage/parted
+depend system/storage/raid-utilities
+depend system/storage/removable-media
+depend system/storage/sas-utilities
+depend system/storage/scsi-rdma/scsi-rdma-target
+depend system/storage/scsi-target-mode-framework
+depend system/storage/sg3_utils
+depend system/system-events
+depend system/test/sunvts
+depend system/trusted
+depend system/trusted/trusted-global-zone
+depend system/virtual-console
+depend system/xopen/xcu4
+depend system/xopen/xcu6
+depend system/zones
+depend system/zones/brand/brand-solaris
+depend system/zones/brand/brand-solaris10
+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/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/173/common/developer:java:jdk-6	Thu Aug 25 17:46:35 2011 -0700
@@ -0,0 +1,46 @@
+package developer/java/jdk-6
+consolidation "ub_javavm"
+classification "Development/Java"
+import SUNWj6dev
+import SUNWj6dvx
+add link path=usr/bin/HtmlConverter target=../java/bin/HtmlConverter
+add link path=usr/bin/appletviewer target=../java/bin/appletviewer
+add link path=usr/bin/apt target=../java/bin/apt
+add link path=usr/bin/extcheck target=../java/bin/extcheck
+add link path=usr/bin/idlj target=../java/bin/idlj
+add link path=usr/bin/jar target=../java/bin/jar
+add link path=usr/bin/jarsigner target=../java/bin/jarsigner
+add link path=usr/bin/javac target=../java/bin/javac
+add link path=usr/bin/javadoc target=../java/bin/javadoc
+add link path=usr/bin/javah target=../java/bin/javah
+add link path=usr/bin/javap target=../java/bin/javap
+add link path=usr/bin/jdb target=../java/bin/jdb
+add link path=usr/bin/native2ascii target=../java/bin/native2ascii
+add link path=usr/bin/rmic target=../java/bin/rmic
+add link path=usr/bin/serialver target=../java/bin/serialver
+version 1.6.0.0
+end package
+
+package developer/java/jdk
+consolidation "ub_javavm"
+renamed 173
+depend developer/java/jdk-6
+end package
+
+package SUNWj6dev
+consolidation "ub_javavm"
+renamed 133
+depend developer/java/jdk
+end package
+
+package developer/java/jdk64
+consolidation "ub_javavm"
+renamed 173
+depend developer/java/jdk-6
+end package
+
+package SUNWj6dvx
+consolidation "ub_javavm"
+renamed 133
+depend developer/java/jdk64
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/173/common/library:java:java-demo-6	Thu Aug 25 17:46:35 2011 -0700
@@ -0,0 +1,31 @@
+package library/java/java-demo-6
+consolidation "ub_javavm"
+classification "Development/Java"
+import SUNWj6dmo
+import SUNWj6dmx
+version 1.6.0.0
+end package
+
+package library/java/demo
+consolidation "ub_javavm"
+renamed 173
+depend library/java/java-demo-6
+end package
+
+package SUNWj6dmo
+consolidation "ub_javavm"
+renamed 133
+depend library/java/demo
+end package
+
+package library/java/demo64
+consolidation "ub_javavm"
+renamed 173
+depend library/java/java-demo-6
+end package
+
+package SUNWj6dmx
+consolidation "ub_javavm"
+renamed 133
+depend library/java/demo64
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/173/common/library:java:javahelp	Thu Aug 25 17:46:35 2011 -0700
@@ -0,0 +1,11 @@
+package library/java/javahelp
+consolidation "ub_javavm"
+classification "Development/Java"
+import SUNWjhrt
+end package
+
+package SUNWjhrt
+consolidation "ub_javavm"
+renamed 133
+depend library/java/javahelp
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/173/common/runtime:java:jre-6	Thu Aug 25 17:46:35 2011 -0700
@@ -0,0 +1,265 @@
+package runtime/java/jre-6
+consolidation "ub_javavm"
+classification "Development/Java"
+import SUNWj6rt
+drop usr/jdk/instances/jdk1.6.0/jre/lib/$(ARCH)/motif21/libmawt.so
+chattr usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc \
+    path=usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.5.11.bfc
+chattr \
+    usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src \
+    path=usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.5.11.properties.src
+
+import SUNWj6rtx
+drop usr/jdk/instances/jdk1.6.0/jre/lib/$(ARCH64)/motif21/libmawt.so
+
+import SUNWj6man
+
+import SUNWj6jmp
+
+import SUNWj6cfg
+chattr etc/.java/.systemPrefs/.system.lock \
+    original_name=SUNWj6cfg:etc/.java/.systemPrefs/.system.lock
+chattr etc/.java/.systemPrefs/.systemRootModFile \
+    original_name=SUNWj6cfg:etc/.java/.systemPrefs/.systemRootModFile
+
+chattr_glob usr/jdk/instances/jdk1.6.0/jre/lib/desktop/applications/*.desktop \
+    type file \
+    restart_fmri=svc:/application/desktop-cache/desktop-mime-cache:default
+chattr_glob usr/jdk/instances/jdk1.6.0/jre/lib/desktop/icons/* type file \
+    restart_fmri=svc:/application/desktop-cache/icon-cache:default
+chattr_glob usr/jdk/instances/jdk1.6.0/jre/lib/desktop/mime/packages/*.xml \
+    type file \
+    restart_fmri=svc:/application/desktop-cache/mime-types-cache:default
+chattr_glob usr/jdk/instances/jdk1.6.0/man/* type file facet.doc.man=true
+chattr_glob usr/jdk/instances/jdk1.6.0/man/ja/* type file \
+    facet.locale.ja_JP=true
+chattr_glob usr/jdk/instances/jdk1.6.0/man/ja_JP.PCK/* type file \
+    facet.locale.ja_JP=true
+chattr_glob usr/jdk/instances/jdk1.6.0/man/ja_JP.UTF-8/* type file \
+    facet.locale.ja_JP=true
+
+add link path=usr/bin/ControlPanel target=../java/jre/bin/ControlPanel
+add link path=usr/bin/java target=../java/bin/java
+add link path=usr/bin/javaws target=../java/bin/javaws
+add link path=usr/bin/jcontrol target=../java/jre/bin/jcontrol
+add link path=usr/bin/keytool target=../java/bin/keytool
+add link path=usr/bin/orbd target=../java/bin/orbd
+add link path=usr/bin/policytool target=../java/bin/policytool
+add link path=usr/bin/rmid target=../java/bin/rmid
+add link path=usr/bin/rmiregistry target=../java/bin/rmiregistry
+add link path=usr/bin/servertool target=../java/bin/servertool
+add link path=usr/bin/tnameserv target=../java/bin/tnameserv
+add link path=usr/java target=jdk/jdk1.6.0_26
+add link path=usr/jdk/jdk1.6.0_26 target=instances/jdk1.6.0
+add link path=usr/jdk/latest target=jdk1.6.0_26
+
+add link path=usr/share/applications/sun_java.desktop \
+    target=../../jdk/instances/jdk1.6.0/jre/lib/desktop/applications/sun_java.desktop
+add link path=usr/share/applications/sun-java.desktop \
+    target=../../jdk/instances/jdk1.6.0/jre/lib/desktop/applications/sun-java.desktop
+add link path=usr/share/applications/sun-javaws.desktop \
+    target=../../jdk/instances/jdk1.6.0/jre/lib/desktop/applications/sun-javaws.desktop
+
+add link path=/usr/share/mime/packages/x-java-archive.xml \
+    target=../../../jdk/instances/jdk1.6.0/jre/lib/desktop/mime/packages/x-java-archive.xml
+add link path=/usr/share/mime/packages/x-java-jnlp-file.xml \
+    target=../../../jdk/instances/jdk1.6.0/jre/lib/desktop/mime/packages/x-java-jnlp-file.xml
+
+# --------------------------- hicolor theme ----------------------------
+
+# 16x16 resolution - apps
+add link path=usr/share/icons/hicolor/16x16/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/16x16/apps/sun-java.png
+add link path=usr/share/icons/hicolor/16x16/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png
+add link path=usr/share/icons/hicolor/16x16/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png
+
+# 48x48 resolution - apps
+add link path=usr/share/icons/hicolor/48x48/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png
+add link path=usr/share/icons/hicolor/48x48/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png
+add link path=usr/share/icons/hicolor/48x48/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png
+
+# 16x16 resolution - mimetypes
+add link path=usr/share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png
+
+# 48x48 resolution - mimetypes
+add link path=usr/share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png
+
+# ----------------------- HighContrast theme ------------------------
+
+# 16x16 resolution - apps
+add link path=usr/share/icons/HighContrast/16x16/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png
+add link path=usr/share/icons/HighContrast/16x16/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png
+add link path=usr/share/icons/HighContrast/16x16/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png
+
+# 48x48 resolution - apps
+add link path=usr/share/icons/HighContrast/48x48/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png
+add link path=usr/share/icons/HighContrast/48x48/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png
+add link path=usr/share/icons/HighContrast/48x48/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png
+
+# 16x16 resolution - mimetypes
+add link path=usr/share/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png
+
+# 48x48 resolution - mimetypes
+add link path=usr/share/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png
+
+# -------------------- HighContrastInverse theme ---------------------
+
+# 16x16 resolution - apps
+add link path=usr/share/icons/HighContrastInverse/16x16/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png
+add link path=usr/share/icons/HighContrastInverse/16x16/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png
+add link path=usr/share/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png
+
+# 48x48 resolution - apps
+add link path=usr/share/icons/HighContrastInverse/48x48/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png
+add link path=usr/share/icons/HighContrastInverse/48x48/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png
+add link path=usr/share/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png
+
+# 16x16 resolution - mimetypes
+add link path=usr/share/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png
+
+# 48x48 resolution - mimetypes
+add link path=usr/share/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png
+
+# ------------------------ LowContrast theme -------------------------
+
+# 16x16 resolution - apps
+add link path=usr/share/icons/LowContrast/16x16/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png
+add link path=usr/share/icons/LowContrast/16x16/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png
+add link path=usr/share/icons/LowContrast/16x16/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png
+
+# 48x48 resolution - apps
+add link path=usr/share/icons/LowContrast/48x48/apps/sun-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png
+add link path=usr/share/icons/LowContrast/48x48/apps/sun-javaws.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png
+add link path=usr/share/icons/LowContrast/48x48/apps/sun-jcontrol.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png
+
+# 16x16 resolution - mimetypes
+add link path=usr/share/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png
+
+# 48x48 resolution - mimetypes
+add link path=usr/share/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png
+add link path=usr/share/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
+add link path=usr/share/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png \
+    target=../../../../../jdk/instances/jdk1.6.0/jre/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png
+
+version 1.6.0.0
+end package
+
+package runtime/java
+consolidation "ub_javavm"
+renamed 173
+depend runtime/java/jre-6
+end package
+
+package SUNWj6rt
+consolidation "ub_javavm"
+renamed 133
+depend runtime/java
+end package
+
+package runtime/java/runtime64
+consolidation "ub_javavm"
+renamed 173
+depend runtime/java/jre-6
+end package
+
+package SUNWj6rtx
+consolidation "ub_javavm"
+renamed 133
+depend runtime/java/runtime64
+end package
+
+package library/java/manual
+consolidation "ub_javavm"
+renamed 173
+depend runtime/java/jre-6
+end package
+
+package SUNWj6man
+consolidation "ub_javavm"
+renamed 133
+depend library/java/manual
+end package
+
+package library/java/manual/locale/ja
+consolidation "ub_javavm"
+renamed 173
+depend runtime/java/jre-6
+end package
+
+package SUNWj6jmp
+consolidation "ub_javavm"
+renamed 133
+depend library/java/manual/locale/ja
+end package
+
+package library/java/host-config
+consolidation "ub_javavm"
+renamed 173
+depend runtime/java/jre-6
+end package
+
+package SUNWj6cfg
+consolidation "ub_javavm"
+renamed 133
+depend library/java/host-config
+end package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/173/redist_cluster	Thu Aug 25 17:46:35 2011 -0700
@@ -0,0 +1,370 @@
+include common/developer:java:jdk-6
+include common/library:java:java-demo-6
+include common/library:java:javadb
+include common/library:java:javahelp
+include common/runtime:java:jre-6
+# Include statements for obsoleted packages.
+$(i386_ONLY)include common/FSWfontconfig-devel-docs
+$(i386_ONLY)include common/FSWxorg-devel-docs
+$(i386_ONLY)include common/FSWxwpft
+$(i386_ONLY)include common/Hypervisor
+$(i386_ONLY)include common/SUNWadmc
+$(i386_ONLY)include common/SUNWaspell
+$(i386_ONLY)include common/SUNWaspell-en
+$(i386_ONLY)include common/SUNWbrg
+$(i386_ONLY)include common/SUNWccccfg
+$(i386_ONLY)include common/SUNWccccr
+$(i386_ONLY)include common/SUNWccfw
+$(i386_ONLY)include common/SUNWccfwctrl
+$(i386_ONLY)include common/SUNWccinv
+$(i386_ONLY)include common/SUNWccsign
+$(i386_ONLY)include common/SUNWcctpx
+$(i386_ONLY)include common/SUNWciu8
+$(i386_ONLY)include common/SUNWcsmauth
+$(i386_ONLY)include common/SUNWeuxwe
+$(i386_ONLY)include common/SUNWgnome-media-mp3
+$(i386_ONLY)include common/SUNWgnu-libiconv
+$(i386_ONLY)include common/SUNWhiu8
+$(i386_ONLY)include common/SUNWiniu8
+$(i386_ONLY)include common/SUNWkiu8
+$(i386_ONLY)include common/SUNWladm
+$(i386_ONLY)include common/SUNWlccom
+$(i386_ONLY)include common/SUNWlcl
+include common/SUNWpostgr
+include common/SUNWpostgr-contrib
+include common/SUNWpostgr-docs
+include common/SUNWpostgr-libs
+include common/SUNWpostgr-pl
+include common/SUNWpostgr-server
+$(i386_ONLY)include common/SUNWpostgr-server-data
+$(i386_ONLY)include common/SUNWppro
+$(i386_ONLY)include common/SUNWppro-plugin-sunos-base
+$(i386_ONLY)include common/SUNWsam
+$(i386_ONLY)include common/SUNWscn-base
+$(i386_ONLY)include common/SUNWscnprm
+$(i386_ONLY)include common/SUNWscnsom
+$(i386_ONLY)include common/SUNWsensor
+include common/SUNWsfdoc
+include common/SUNWsfinf
+include common/SUNWsfman
+include common/SUNWsfwhea
+$(i386_ONLY)include common/SUNWtiu8
+$(i386_ONLY)include common/SUNWulcf
+$(i386_ONLY)include common/SUNWupdatemgr
+include common/SUNWusbccid
+$(i386_ONLY)include common/SUNWuxlcf
+$(i386_ONLY)include common/SUNWxi18n
+$(i386_ONLY)include common/SUNWxsun-keytables
+$(i386_ONLY)include common/SUNWxwhl
+include common/benchmark:bonnieplus
+include common/benchmark:iozone
+include common/benchmark:sysbench
+include common/database:mysql-4
+include common/database:mysql-4:tests
+include common/database:mysql-50
+include common/database:mysql-50:connector:jdbc
+include common/database:mysql-50:tests
+include common/database:postgres-82
+include common/database:postgres-82:connector:jdbc
+include common/database:postgres-82:contrib
+include common/database:postgres-82:developer
+include common/database:postgres-82:documentation
+include common/database:postgres-82:language-bindings
+include common/database:postgres-82:library
+include common/database:postgres-82:pgtcl
+include common/database:postgres-83
+include common/database:postgres-83:connector:jdbc
+include common/database:postgres-83:contrib
+include common/database:postgres-83:developer
+include common/database:postgres-83:documentation
+include common/database:postgres-83:language-bindings
+include common/database:postgres-83:library
+include common/database:postgres-83:pgbouncer
+include common/database:postgres-83:pgtcl
+include common/database:postgres-84
+include common/database:postgres-84:contrib
+include common/database:postgres-84:developer
+include common/database:postgres-84:documentation
+include common/database:postgres-84:language-bindings
+include common/database:postgres-84:library
+include common/database:postgres-84:tests
+include common/database:postgres-common
+include common/database:postgres:library:c++:libpqxx
+include common/database:postgres:pg_upgrade
+include common/database:postgres:pgadmin
+include common/database:postgres:pgtcl
+include common/database:yaz
+include common/desktop:remote-desktop:turbovnc
+include common/developer:documentation-tool:epydoc
+include common/developer:imperius
+include common/developer:konkretcmpi
+include common/developer:parser:antlr-3
+include common/diagnostic:bwm-ng
+include common/driver:network:ce
+include common/editor:bvi
+include common/editor:jedit
+include common/image:virtualgl
+include common/library:apr-util-13:dbd-pgsql
+include common/library:desktop:gtk1
+include common/library:fftw-2
+include common/library:glib1
+include common/library:java:activation
+include common/library:java:asm
+include common/library:java:cglib
+include common/library:java:dom4j
+include common/library:java:drools
+include common/library:java:janino
+include common/library:java:jarjar
+include common/library:java:javamail
+include common/library:java:jaxb
+include common/library:java:jaxen-core
+include common/library:java:jdt-core
+include common/library:java:jettison
+include common/library:java:jexcelapi
+include common/library:java:joda-time
+include common/library:java:jrexx
+include common/library:java:log4j
+include common/library:java:mvel
+include common/library:java:pullparser
+include common/library:java:relaxngdatatype
+include common/library:java:saaj
+include common/library:java:stringtemplate
+include common/library:java:trove
+include common/library:java:wiseman
+include common/library:java:xom
+include common/library:java:xpp3-min
+include common/library:java:xsdlib
+include common/library:java:xstream
+include common/library:libosip2
+include common/library:perl-5:postgres-dbi
+include common/library:python-2:libxml2-24
+include common/library:python-2:libxsl-24
+include common/library:python-2:lxml-24
+include common/library:python-2:pyopenssl-24
+$(i386_ONLY)include common/loc/SUNWauaos
+$(i386_ONLY)include common/loc/SUNWauaow
+$(i386_ONLY)include common/loc/SUNWcadis
+$(i386_ONLY)include common/loc/SUNWcadma
+$(i386_ONLY)include common/loc/SUNWcamos
+$(i386_ONLY)include common/loc/SUNWcamow
+$(i386_ONLY)include common/loc/SUNWcbrg
+$(i386_ONLY)include common/loc/SUNWceuos
+$(i386_ONLY)include common/loc/SUNWceuow
+$(i386_ONLY)include common/loc/SUNWcladm
+$(i386_ONLY)include common/loc/SUNWcleue
+$(i386_ONLY)include common/loc/SUNWcpprou
+$(i386_ONLY)include common/loc/SUNWcupdatemgru
+$(i386_ONLY)include common/loc/SUNWcwsr2
+$(i386_ONLY)include common/loc/SUNWdbrg
+$(i386_ONLY)include common/loc/SUNWdedis
+$(i386_ONLY)include common/loc/SUNWdedma
+$(i386_ONLY)include common/loc/SUNWdeiso1
+$(i386_ONLY)include common/loc/SUNWdews2
+$(i386_ONLY)include common/loc/SUNWdladm
+$(i386_ONLY)include common/loc/SUNWdpprou
+$(i386_ONLY)include common/loc/SUNWdupdatemgru
+$(i386_ONLY)include common/loc/SUNWdxplt
+$(i386_ONLY)include common/loc/SUNWebrg
+$(i386_ONLY)include common/loc/SUNWeeuos
+$(i386_ONLY)include common/loc/SUNWeeuow
+$(i386_ONLY)include common/loc/SUNWeladm
+$(i386_ONLY)include common/loc/SUNWepprou
+$(i386_ONLY)include common/loc/SUNWesdis
+$(i386_ONLY)include common/loc/SUNWesdma
+$(i386_ONLY)include common/loc/SUNWesiso1
+$(i386_ONLY)include common/loc/SUNWesws2
+$(i386_ONLY)include common/loc/SUNWeu8os
+$(i386_ONLY)include common/loc/SUNWeuluf
+$(i386_ONLY)include common/loc/SUNWeupdatemgru
+$(i386_ONLY)include common/loc/SUNWexplt
+$(i386_ONLY)include common/loc/SUNWfbrg
+$(i386_ONLY)include common/loc/SUNWfladm
+$(i386_ONLY)include common/loc/SUNWfpprou
+$(i386_ONLY)include common/loc/SUNWfrdis
+$(i386_ONLY)include common/loc/SUNWfrdma
+$(i386_ONLY)include common/loc/SUNWfriso1
+$(i386_ONLY)include common/loc/SUNWfrws2
+$(i386_ONLY)include common/loc/SUNWfupdatemgru
+$(i386_ONLY)include common/loc/SUNWfxplt
+$(i386_ONLY)include common/loc/SUNWhadis
+$(i386_ONLY)include common/loc/SUNWhadma
+$(i386_ONLY)include common/loc/SUNWhbrg
+$(i386_ONLY)include common/loc/SUNWhkeue
+$(i386_ONLY)include common/loc/SUNWhladm
+$(i386_ONLY)include common/loc/SUNWhleue
+$(i386_ONLY)include common/loc/SUNWhpprou
+$(i386_ONLY)include common/loc/SUNWhupdatemgru
+$(i386_ONLY)include common/loc/SUNWhwsr2
+$(i386_ONLY)include common/loc/SUNWi13cs
+$(i386_ONLY)include common/loc/SUNWi15cs
+$(i386_ONLY)include common/loc/SUNWi1cs
+$(i386_ONLY)include common/loc/SUNWi2cs
+$(i386_ONLY)include common/loc/SUNWi5cs
+$(i386_ONLY)include common/loc/SUNWi7cs
+$(i386_ONLY)include common/loc/SUNWi9cs
+$(i386_ONLY)include common/loc/SUNWibrg
+$(i386_ONLY)include common/loc/SUNWiiimf-in-indicle
+$(i386_ONLY)include common/loc/SUNWiiimf-ko-kole
+$(i386_ONLY)include common/loc/SUNWiladm
+$(i386_ONLY)include common/loc/SUNWindt
+$(i386_ONLY)include common/loc/SUNWinleu
+$(i386_ONLY)include common/loc/SUNWinplt
+$(i386_ONLY)include common/loc/SUNWipprou
+$(i386_ONLY)include common/loc/SUNWitdis
+$(i386_ONLY)include common/loc/SUNWitdma
+$(i386_ONLY)include common/loc/SUNWitiso1
+$(i386_ONLY)include common/loc/SUNWitws2
+$(i386_ONLY)include common/loc/SUNWiupdatemgru
+$(i386_ONLY)include common/loc/SUNWixplt
+$(i386_ONLY)include common/loc/SUNWjadis
+$(i386_ONLY)include common/loc/SUNWjadma
+$(i386_ONLY)include common/loc/SUNWjbrg
+$(i386_ONLY)include common/loc/SUNWjladm
+$(i386_ONLY)include common/loc/SUNWjpprou
+$(i386_ONLY)include common/loc/SUNWjtsu
+$(i386_ONLY)include common/loc/SUNWjupdatemgru
+$(i386_ONLY)include common/loc/SUNWjws2
+$(i386_ONLY)include common/loc/SUNWjxplt
+$(i386_ONLY)include common/loc/SUNWkadis
+$(i386_ONLY)include common/loc/SUNWkadma
+$(i386_ONLY)include common/loc/SUNWkbrg
+$(i386_ONLY)include common/loc/SUNWkladm
+$(i386_ONLY)include common/loc/SUNWkleue
+$(i386_ONLY)include common/loc/SUNWkpprou
+$(i386_ONLY)include common/loc/SUNWktsu
+$(i386_ONLY)include common/loc/SUNWkupdatemgru
+$(i386_ONLY)include common/loc/SUNWkwsr2
+$(i386_ONLY)include common/loc/SUNWlocaledefsrc
+$(i386_ONLY)include common/loc/SUNWmeaos
+$(i386_ONLY)include common/loc/SUNWmeaow
+$(i386_ONLY)include common/loc/SUNWnafos
+$(i386_ONLY)include common/loc/SUNWnafow
+$(i386_ONLY)include common/loc/SUNWnamos
+$(i386_ONLY)include common/loc/SUNWnamow
+$(i386_ONLY)include common/loc/SUNWneuos
+$(i386_ONLY)include common/loc/SUNWneuow
+$(i386_ONLY)include common/loc/SUNWsamos
+$(i386_ONLY)include common/loc/SUNWsamow
+$(i386_ONLY)include common/loc/SUNWsbrg
+$(i386_ONLY)include common/loc/SUNWseuos
+$(i386_ONLY)include common/loc/SUNWseuow
+$(i386_ONLY)include common/loc/SUNWsladm
+$(i386_ONLY)include common/loc/SUNWspprou
+$(i386_ONLY)include common/loc/SUNWsupdatemgru
+$(i386_ONLY)include common/loc/SUNWsvdis
+$(i386_ONLY)include common/loc/SUNWsvdma
+$(i386_ONLY)include common/loc/SUNWsviso1
+$(i386_ONLY)include common/loc/SUNWsxplt
+$(i386_ONLY)include common/loc/SUNWweuos
+$(i386_ONLY)include common/loc/SUNWweuow
+include common/network:tor
+include common/runtime:dosbox
+include common/runtime:java:jruby
+include common/runtime:perl-510
+include common/runtime:perl-510:extra
+include common/runtime:tcl-8:snack
+include common/service:database:postgres-82
+include common/service:database:postgres-83
+include common/service:database:postgres-84
+include common/service:management:sysidtool
+include common/service:network:load-balancer:pen
+include common/service:network:sip:ser
+include common/service:network:sip:ser:administration
+include common/shell:pdsh
+include common/shell:shmux
+$(i386_ONLY)include common/slim_cd
+include common/system:library:sysidtool
+include common/system:management:powerman
+include common/system:management:product-registry
+include common/system:management:sysidtool
+include common/system:management:wbem:cimple
+include common/system:management:webmin
+include common/terminal:mrxvt
+include common/text:dwdiff
+include common/text:idzebra
+include common/web:aget
+include common/web:analytics:awstats
+include common/web:php-52:extension:php-pgsql
+include common/web:server:apache-13
+include common/web:server:apache-13:documentation
+$(i386_ONLY)include i386/SUNWxvmhvm
+$(i386_ONLY)include i386/system:library:libvirt
+$(i386_ONLY)include i386/system:storage:vdiskadm
+$(i386_ONLY)include i386/system:virtinst
+$(i386_ONLY)include i386/system:xvm:header-xvm
+$(i386_ONLY)include i386/system:xvm:xvmstore
+$(i386_ONLY)include i386/web:urlgrabber
+$(sparc_ONLY)include sparc/SUNWafb
+$(sparc_ONLY)include sparc/SUNWafbcf
+$(sparc_ONLY)include sparc/SUNWafbw
+$(sparc_ONLY)include sparc/SUNWffb
+$(sparc_ONLY)include sparc/SUNWffbcf
+$(sparc_ONLY)include sparc/SUNWffbw
+$(sparc_ONLY)include sparc/SUNWgfb
+$(sparc_ONLY)include sparc/SUNWgfbcf
+$(sparc_ONLY)include sparc/SUNWgfbw
+$(sparc_ONLY)include sparc/SUNWifb
+$(sparc_ONLY)include sparc/SUNWifbcf
+$(sparc_ONLY)include sparc/SUNWifbw
+$(sparc_ONLY)include sparc/SUNWjfb
+$(sparc_ONLY)include sparc/SUNWjfbcf
+$(sparc_ONLY)include sparc/SUNWjfbw
+$(sparc_ONLY)include sparc/SUNWm64
+$(sparc_ONLY)include sparc/SUNWm64cf
+$(sparc_ONLY)include sparc/SUNWm64w
+$(sparc_ONLY)include sparc/SUNWnfbcf
+$(sparc_ONLY)include sparc/SUNWpfbcf
+$(sparc_ONLY)include sparc/SUNWzulu
+$(sparc_ONLY)include sparc/SUNWzuluc
+$(sparc_ONLY)include sparc/SUNWzuluw
+$(sparc_ONLY)include sparc/TSIpgx
+$(sparc_ONLY)include sparc/TSIpgxw
+$(sparc_ONLY)include sparc/driver:graphics:kfb
+$(sparc_ONLY)include sparc/driver:network:ge
+$(sparc_ONLY)include sparc/system:graphics:fbconfig:fbconfig-kfb
+$(sparc_ONLY)include sparc/x11:server:xorg:driver:xorg-kfb
+# Include statements for renamed packages.
+$(i386_ONLY)include common/FSWxorg-client-docs
+$(i386_ONLY)include common/FSWxorg-client-programs
+$(i386_ONLY)include common/FSWxorg-clientlibs
+$(i386_ONLY)include common/FSWxorg-data
+$(i386_ONLY)include common/FSWxorg-headers
+$(i386_ONLY)include common/FSWxwrtl
+$(i386_ONLY)include common/SUNWapch2
+$(i386_ONLY)include common/SUNWapch22m-php5
+$(i386_ONLY)include common/SUNWapch2d
+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	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/util/distro-import/Makefile	Thu Aug 25 17:46:35 2011 -0700
@@ -330,6 +330,7 @@
 	$(SIC_TEAM_CONSOLIDATION_OPTIONS) \
 	$(SUNVTS_CONSOLIDATION_OPTIONS) \
 	$(JAVA_CONSOLIDATION_OPTIONS)
+CONSOLIDATION_OPTIONS_173 = $(CONSOLIDATION_OPTIONS_172)
 CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
 
 GLOBAL_CHATTRS_BASE=	\
@@ -419,6 +420,7 @@
 GLOBAL_CHATTRS_170 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_171 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_172 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS_173 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
@@ -527,6 +529,7 @@
 ELIDED_FILES_170 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_171 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_172 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_173 = $(ELIDED_FILES_BASE)
 ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
 
 #
@@ -655,6 +658,7 @@
 CACHED_FILES_170 =
 CACHED_FILES_171 =
 CACHED_FILES_172 =
+CACHED_FILES_173 =
 CACHED_FILES = $(CACHED_FILES_$(BUILDID))
 
 FIX_FILES_BASE =				\
@@ -810,6 +814,7 @@
 FIX_FILES_170 =
 FIX_FILES_171 =
 FIX_FILES_172 =
+FIX_FILES_173 =
 FIX_FILES = $(FIX_FILES_$(BUILDID))
 
 JDKFILES = LICENSE README.html
@@ -930,7 +935,8 @@
 	169			\
 	170			\
 	171			\
-	172
+	172			\
+	173
 
 #
 # Starting in build 80, filelist.ramdisk began moving between various
@@ -943,7 +949,7 @@
 FILELIST_RAMDISK_PKG_72		= SUNWcakr.i
 FILELIST_RAMDISK_PKG_71		= SUNWcakr.i
 
-default:	172/redist_import
+default:	173/redist_import
 
 cluster.import:	$(WOS_PKGS)/.clustertoc Makefile
 	./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
@@ -1184,6 +1190,7 @@
 INCLUDE_PATH_170 = 170:$(INCLUDE_PATH_169)
 INCLUDE_PATH_171 = 171:$(INCLUDE_PATH_170)
 INCLUDE_PATH_172 = 172:$(INCLUDE_PATH_171)
+INCLUDE_PATH_173 = 173:$(INCLUDE_PATH_172)
 
 import:	cluster.import $(FIX_FILES:%=$(BUILDID)/%)
 	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \
--- a/src/util/distro-import/unbundleds/OpenOffice	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/util/distro-import/unbundleds/OpenOffice	Thu Aug 25 17:46:35 2011 -0700
@@ -1,48 +1,48 @@
 package office/openoffice
 classification "Applications/Office"
 summary "OpenOffice.org Office Productivity Suite"
-version 3.2.1
-import ooo-bundled-extensions
-import ooobasis32-base
-import ooobasis32-binfilter
-import ooobasis32-calc
-import ooobasis32-core01
-import ooobasis32-core02
-import ooobasis32-core03
-import ooobasis32-core04
-import ooobasis32-core05
-import ooobasis32-core06
-import ooobasis32-core07
-import ooobasis32-draw
-import ooobasis32-en-US
-import ooobasis32-en-US-base
-import ooobasis32-en-US-binfilter
-import ooobasis32-en-US-calc
-import ooobasis32-en-US-draw
-import ooobasis32-en-US-help
-import ooobasis32-en-US-impress
-import ooobasis32-en-US-math
-import ooobasis32-en-US-res
-import ooobasis32-en-US-writer
-import ooobasis32-gnome-integratn
-import ooobasis32-graphicfilter
-import ooobasis32-images
-import ooobasis32-impress
-import ooobasis32-javafilter
-import ooobasis32-math
-import ooobasis32-ooofonts
-import ooobasis32-oooimprovement
-import ooobasis32-ooolinguistic
-import ooobasis32-pyuno
-import ooobasis32-testtool
-import ooobasis32-writer
-import ooobasis32-xsltfilter
+version 3.3.0
+import ooobasis33-base
+import ooobasis33-binfilter
+import ooobasis33-calc
+import ooobasis33-core01
+import ooobasis33-core02
+import ooobasis33-core03
+import ooobasis33-core04
+import ooobasis33-core05
+import ooobasis33-core06
+import ooobasis33-core07
+import ooobasis33-draw
+import ooobasis33-en-US
+import ooobasis33-en-US-base
+import ooobasis33-en-US-binfilter
+import ooobasis33-en-US-calc
+import ooobasis33-en-US-draw
+import ooobasis33-en-US-help
+import ooobasis33-en-US-impress
+import ooobasis33-en-US-math
+import ooobasis33-en-US-res
+import ooobasis33-en-US-writer
+import ooobasis33-gnome-integratn
+import ooobasis33-graphicfilter
+import ooobasis33-images
+import ooobasis33-impress
+import ooobasis33-javafilter
+import ooobasis33-math
+import ooobasis33-ooofonts
+import ooobasis33-oooimprovement
+import ooobasis33-ooolinguistic
+import ooobasis33-pyuno
+import ooobasis33-testtool
+import ooobasis33-writer
+import ooobasis33-xsltfilter
 import openofficeorg3
 import openofficeorg3-desktop-int
 drop etc/mailcap
 drop etc/mime.types
 drop share/mime
 drop share/mime/packages
+import openofficeorg-ure
 import openofficeorg3-base
 import openofficeorg3-calc
 import openofficeorg3-dict-en
@@ -51,7 +51,6 @@
 import openofficeorg3-impress
 import openofficeorg3-math
 import openofficeorg3-writer
-import openofficeorg-ure
 add depend [email protected] type=optional
 # add actuators for desktop files under /opt as these are not picked up
 # by the default global rules
@@ -59,29 +58,203 @@
     restart_fmri=svc:/application/desktop-cache/desktop-mime-cache:default
 end package
 
-package office/openoffice/openoffice-sdk
+package office/openoffice/locale/ar
+classification "Applications/Office"
+summary "Arabic localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ar
+import ooobasis33-ar-base
+import ooobasis33-ar-binfilter
+import ooobasis33-ar-calc
+import ooobasis33-ar-draw
+import ooobasis33-ar-help
+import ooobasis33-ar-impress
+import ooobasis33-ar-math
+import ooobasis33-ar-res
+import ooobasis33-ar-writer
+import openofficeorg3-ar
+depend office/openoffice
+end package
+
+package office/openoffice/locale/as
+classification "Applications/Office"
+summary "Assamese localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-as
+import ooobasis33-as-base
+import ooobasis33-as-binfilter
+import ooobasis33-as-calc
+import ooobasis33-as-draw
+import ooobasis33-as-help
+import ooobasis33-as-impress
+import ooobasis33-as-math
+import ooobasis33-as-res
+import ooobasis33-as-writer
+import openofficeorg3-as
+depend office/openoffice
+end package
+
+package office/openoffice/locale/ast
+classification "Applications/Office"
+summary "Asturian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ast
+import ooobasis33-ast-base
+import ooobasis33-ast-binfilter
+import ooobasis33-ast-calc
+import ooobasis33-ast-draw
+import ooobasis33-ast-help
+import ooobasis33-ast-impress
+import ooobasis33-ast-math
+import ooobasis33-ast-res
+import ooobasis33-ast-writer
+import openofficeorg3-ast
+depend office/openoffice
+end package
+
+package office/openoffice/locale/be-BY
+classification "Applications/Office"
+summary "Belarusian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-be-BY
+import ooobasis33-be-BY-base
+import ooobasis33-be-BY-binfilter
+import ooobasis33-be-BY-calc
+import ooobasis33-be-BY-draw
+import ooobasis33-be-BY-help
+import ooobasis33-be-BY-impress
+import ooobasis33-be-BY-math
+import ooobasis33-be-BY-res
+import ooobasis33-be-BY-writer
+import openofficeorg3-be-BY
+depend office/openoffice
+end package
+
+package office/openoffice/locale/bg
 classification "Applications/Office"
-summary "Software Development Kit for OpenOffice.org"
-version 3.2.1
-import ooobasis32-sdk
+summary "Bulgarian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-bg
+import ooobasis33-bg-base
+import ooobasis33-bg-binfilter
+import ooobasis33-bg-calc
+import ooobasis33-bg-draw
+import ooobasis33-bg-help
+import ooobasis33-bg-impress
+import ooobasis33-bg-math
+import ooobasis33-bg-res
+import ooobasis33-bg-writer
+import openofficeorg3-bg
+depend office/openoffice
+end package
+
+package office/openoffice/locale/bn
+classification "Applications/Office"
+summary "Bengali localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-bn
+import ooobasis33-bn-base
+import ooobasis33-bn-binfilter
+import ooobasis33-bn-calc
+import ooobasis33-bn-draw
+import ooobasis33-bn-help
+import ooobasis33-bn-impress
+import ooobasis33-bn-math
+import ooobasis33-bn-res
+import ooobasis33-bn-writer
+import openofficeorg3-bn
+depend office/openoffice
+end package
+
+package office/openoffice/locale/ca
+classification "Applications/Office"
+summary "Catalan localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ca
+import ooobasis33-ca-base
+import ooobasis33-ca-binfilter
+import ooobasis33-ca-calc
+import ooobasis33-ca-draw
+import ooobasis33-ca-help
+import ooobasis33-ca-impress
+import ooobasis33-ca-math
+import ooobasis33-ca-res
+import ooobasis33-ca-writer
+import openofficeorg3-ca
+import openofficeorg3-dict-ca
 depend office/openoffice
-add depend [email protected] type=optional
+end package
+
+package office/openoffice/locale/ca-XV
+classification "Applications/Office"
+summary "Catalan (Valencian) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ca-XV
+import ooobasis33-ca-XV-base
+import ooobasis33-ca-XV-binfilter
+import ooobasis33-ca-XV-calc
+import ooobasis33-ca-XV-draw
+import ooobasis33-ca-XV-help
+import ooobasis33-ca-XV-impress
+import ooobasis33-ca-XV-math
+import ooobasis33-ca-XV-res
+import ooobasis33-ca-XV-writer
+import openofficeorg3-ca-XV
+depend office/openoffice
+end package
+
+package office/openoffice/locale/cs
+classification "Applications/Office"
+summary "Czech localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-cs
+import ooobasis33-cs-base
+import ooobasis33-cs-binfilter
+import ooobasis33-cs-calc
+import ooobasis33-cs-draw
+import ooobasis33-cs-help
+import ooobasis33-cs-impress
+import ooobasis33-cs-math
+import ooobasis33-cs-res
+import ooobasis33-cs-writer
+import openofficeorg3-cs
+import openofficeorg3-dict-cs
+depend office/openoffice
+end package
+
+package office/openoffice/locale/da
+classification "Applications/Office"
+summary "Danish localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-da
+import ooobasis33-da-base
+import ooobasis33-da-binfilter
+import ooobasis33-da-calc
+import ooobasis33-da-draw
+import ooobasis33-da-help
+import ooobasis33-da-impress
+import ooobasis33-da-math
+import ooobasis33-da-res
+import ooobasis33-da-writer
+import openofficeorg3-da
+import openofficeorg3-dict-da
+depend office/openoffice
 end package
 
 package office/openoffice/locale/de
 classification "Applications/Office"
 summary "German localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-de
-import ooobasis32-de-base
-import ooobasis32-de-binfilter
-import ooobasis32-de-calc
-import ooobasis32-de-draw
-import ooobasis32-de-help
-import ooobasis32-de-impress
-import ooobasis32-de-math
-import ooobasis32-de-res
-import ooobasis32-de-writer
+version 3.3.0
+import ooobasis33-de
+import ooobasis33-de-base
+import ooobasis33-de-binfilter
+import ooobasis33-de-calc
+import ooobasis33-de-draw
+import ooobasis33-de-help
+import ooobasis33-de-impress
+import ooobasis33-de-math
+import ooobasis33-de-res
+import ooobasis33-de-writer
 import openofficeorg3-de
 import openofficeorg3-dict-de-AT
 import openofficeorg3-dict-de-CH
@@ -90,158 +263,689 @@
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/dz
+classification "Applications/Office"
+summary "Dzongkha localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-dz
+import ooobasis33-dz-base
+import ooobasis33-dz-binfilter
+import ooobasis33-dz-calc
+import ooobasis33-dz-draw
+import ooobasis33-dz-help
+import ooobasis33-dz-impress
+import ooobasis33-dz-math
+import ooobasis33-dz-res
+import ooobasis33-dz-writer
+import openofficeorg3-dz
+depend office/openoffice
+end package
+
+package office/openoffice/locale/el
+classification "Applications/Office"
+summary "Greek localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-el
+import ooobasis33-el-base
+import ooobasis33-el-binfilter
+import ooobasis33-el-calc
+import ooobasis33-el-draw
+import ooobasis33-el-help
+import ooobasis33-el-impress
+import ooobasis33-el-math
+import ooobasis33-el-res
+import ooobasis33-el-writer
+import openofficeorg3-el
+depend office/openoffice
+end package
+
+package office/openoffice/locale/en-GB
+classification "Applications/Office"
+summary "English (British) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-en-GB
+import ooobasis33-en-GB-base
+import ooobasis33-en-GB-binfilter
+import ooobasis33-en-GB-calc
+import ooobasis33-en-GB-draw
+import ooobasis33-en-GB-help
+import ooobasis33-en-GB-impress
+import ooobasis33-en-GB-math
+import ooobasis33-en-GB-res
+import ooobasis33-en-GB-writer
+import openofficeorg3-en-GB
+depend office/openoffice
+end package
+
+package office/openoffice/locale/eo
+classification "Applications/Office"
+summary "Esperanto localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-eo
+import ooobasis33-eo-base
+import ooobasis33-eo-binfilter
+import ooobasis33-eo-calc
+import ooobasis33-eo-draw
+import ooobasis33-eo-help
+import ooobasis33-eo-impress
+import ooobasis33-eo-math
+import ooobasis33-eo-res
+import ooobasis33-eo-writer
+import openofficeorg3-eo
+depend office/openoffice
+end package
+
 package office/openoffice/locale/es
 classification "Applications/Office"
 summary "Spanish localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-es
-import ooobasis32-es-base
-import ooobasis32-es-binfilter
-import ooobasis32-es-calc
-import ooobasis32-es-draw
-import ooobasis32-es-help
-import ooobasis32-es-impress
-import ooobasis32-es-math
-import ooobasis32-es-res
-import ooobasis32-es-writer
+version 3.3.0
+import ooobasis33-es
+import ooobasis33-es-base
+import ooobasis33-es-binfilter
+import ooobasis33-es-calc
+import ooobasis33-es-draw
+import ooobasis33-es-help
+import ooobasis33-es-impress
+import ooobasis33-es-math
+import ooobasis33-es-res
+import ooobasis33-es-writer
 import openofficeorg3-dict-es
 import openofficeorg3-es
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/et
+classification "Applications/Office"
+summary "Estonian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-et
+import ooobasis33-et-base
+import ooobasis33-et-binfilter
+import ooobasis33-et-calc
+import ooobasis33-et-draw
+import ooobasis33-et-help
+import ooobasis33-et-impress
+import ooobasis33-et-math
+import ooobasis33-et-res
+import ooobasis33-et-writer
+import openofficeorg3-dict-et
+import openofficeorg3-et
+depend office/openoffice
+end package
+
+package office/openoffice/locale/eu
+classification "Applications/Office"
+summary "Basque localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-eu
+import ooobasis33-eu-base
+import ooobasis33-eu-binfilter
+import ooobasis33-eu-calc
+import ooobasis33-eu-draw
+import ooobasis33-eu-help
+import ooobasis33-eu-impress
+import ooobasis33-eu-math
+import ooobasis33-eu-res
+import ooobasis33-eu-writer
+import openofficeorg3-eu
+depend office/openoffice
+end package
+
+package office/openoffice/locale/fi
+classification "Applications/Office"
+summary "Finnish localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-fi
+import ooobasis33-fi-base
+import ooobasis33-fi-binfilter
+import ooobasis33-fi-calc
+import ooobasis33-fi-draw
+import ooobasis33-fi-help
+import ooobasis33-fi-impress
+import ooobasis33-fi-math
+import ooobasis33-fi-res
+import ooobasis33-fi-writer
+import openofficeorg3-fi
+depend office/openoffice
+end package
+
 package office/openoffice/locale/fr
 classification "Applications/Office"
 summary "French localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-fr
-import ooobasis32-fr-base
-import ooobasis32-fr-binfilter
-import ooobasis32-fr-calc
-import ooobasis32-fr-draw
-import ooobasis32-fr-help
-import ooobasis32-fr-impress
-import ooobasis32-fr-math
-import ooobasis32-fr-res
-import ooobasis32-fr-writer
+version 3.3.0
+import ooobasis33-fr
+import ooobasis33-fr-base
+import ooobasis33-fr-binfilter
+import ooobasis33-fr-calc
+import ooobasis33-fr-draw
+import ooobasis33-fr-help
+import ooobasis33-fr-impress
+import ooobasis33-fr-math
+import ooobasis33-fr-res
+import ooobasis33-fr-writer
 import openofficeorg3-dict-fr
 import openofficeorg3-fr
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/ga
+classification "Applications/Office"
+summary "Irish localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ga
+import ooobasis33-ga-base
+import ooobasis33-ga-binfilter
+import ooobasis33-ga-calc
+import ooobasis33-ga-draw
+import ooobasis33-ga-help
+import ooobasis33-ga-impress
+import ooobasis33-ga-math
+import ooobasis33-ga-res
+import ooobasis33-ga-writer
+import openofficeorg3-ga
+depend office/openoffice
+end package
+
+package office/openoffice/locale/gl
+classification "Applications/Office"
+summary "Galician localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-gl
+import ooobasis33-gl-base
+import ooobasis33-gl-binfilter
+import ooobasis33-gl-calc
+import ooobasis33-gl-draw
+import ooobasis33-gl-help
+import ooobasis33-gl-impress
+import ooobasis33-gl-math
+import ooobasis33-gl-res
+import ooobasis33-gl-writer
+import openofficeorg3-dict-gl
+import openofficeorg3-gl
+depend office/openoffice
+end package
+
+package office/openoffice/locale/gu
+classification "Applications/Office"
+summary "Gujarati localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-gu
+import ooobasis33-gu-base
+import ooobasis33-gu-binfilter
+import ooobasis33-gu-calc
+import ooobasis33-gu-draw
+import ooobasis33-gu-help
+import ooobasis33-gu-impress
+import ooobasis33-gu-math
+import ooobasis33-gu-res
+import ooobasis33-gu-writer
+import openofficeorg3-gu
+depend office/openoffice
+end package
+
+package office/openoffice/locale/he
+classification "Applications/Office"
+summary "Hebrew localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-he
+import ooobasis33-he-base
+import ooobasis33-he-binfilter
+import ooobasis33-he-calc
+import ooobasis33-he-draw
+import ooobasis33-he-help
+import ooobasis33-he-impress
+import ooobasis33-he-math
+import ooobasis33-he-res
+import ooobasis33-he-writer
+import openofficeorg3-dict-he
+import openofficeorg3-he
+depend office/openoffice
+end package
+
+package office/openoffice/locale/hi
+classification "Applications/Office"
+summary "Hindi localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-hi
+import ooobasis33-hi-base
+import ooobasis33-hi-binfilter
+import ooobasis33-hi-calc
+import ooobasis33-hi-draw
+import ooobasis33-hi-help
+import ooobasis33-hi-impress
+import ooobasis33-hi-math
+import ooobasis33-hi-res
+import ooobasis33-hi-writer
+import openofficeorg3-hi
+depend office/openoffice
+end package
+
 package office/openoffice/locale/hu
 classification "Applications/Office"
 summary "Hungarian localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-hu
-import ooobasis32-hu-base
-import ooobasis32-hu-binfilter
-import ooobasis32-hu-calc
-import ooobasis32-hu-draw
-import ooobasis32-hu-help
-import ooobasis32-hu-impress
-import ooobasis32-hu-math
-import ooobasis32-hu-res
-import ooobasis32-hu-writer
+version 3.3.0
+import ooobasis33-hu
+import ooobasis33-hu-base
+import ooobasis33-hu-binfilter
+import ooobasis33-hu-calc
+import ooobasis33-hu-draw
+import ooobasis33-hu-help
+import ooobasis33-hu-impress
+import ooobasis33-hu-math
+import ooobasis33-hu-res
+import ooobasis33-hu-writer
 import openofficeorg3-dict-hu
 import openofficeorg3-hu
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
-package office/openoffice/locale/it
+package office/openoffice/locale/id
+classification "Applications/Office"
+summary "Indonesian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-id
+import ooobasis33-id-base
+import ooobasis33-id-binfilter
+import ooobasis33-id-calc
+import ooobasis33-id-draw
+import ooobasis33-id-help
+import ooobasis33-id-impress
+import ooobasis33-id-math
+import ooobasis33-id-res
+import ooobasis33-id-writer
+import openofficeorg3-id
+depend office/openoffice
+end package
+
+package office/openoffice/locale/is
 classification "Applications/Office"
-summary "Italian localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-it
-import ooobasis32-it-base
-import ooobasis32-it-binfilter
-import ooobasis32-it-calc
-import ooobasis32-it-draw
-import ooobasis32-it-help
-import ooobasis32-it-impress
-import ooobasis32-it-math
-import ooobasis32-it-res
-import ooobasis32-it-writer
-import openofficeorg3-dict-it
-import openofficeorg3-it
+summary "Icelandic localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-is
+import ooobasis33-is-base
+import ooobasis33-is-binfilter
+import ooobasis33-is-calc
+import ooobasis33-is-draw
+import ooobasis33-is-help
+import ooobasis33-is-impress
+import ooobasis33-is-math
+import ooobasis33-is-res
+import ooobasis33-is-writer
+import openofficeorg3-is
 depend office/openoffice
-add depend [email protected] type=optional
+end package
+
+package office/openoffice/locale/it
+add set name=pkg.obsolete value=true
+version 3.2.1-1
 end package
 
 package office/openoffice/locale/ja
 classification "Applications/Office"
 summary "Japanese localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-ja
-import ooobasis32-ja-base
-import ooobasis32-ja-binfilter
-import ooobasis32-ja-calc
-import ooobasis32-ja-draw
-import ooobasis32-ja-help
-import ooobasis32-ja-impress
-import ooobasis32-ja-math
-import ooobasis32-ja-res
-import ooobasis32-ja-writer
+version 3.3.0
+import ooobasis33-ja
+import ooobasis33-ja-base
+import ooobasis33-ja-binfilter
+import ooobasis33-ja-calc
+import ooobasis33-ja-draw
+import ooobasis33-ja-help
+import ooobasis33-ja-impress
+import ooobasis33-ja-math
+import ooobasis33-ja-res
+import ooobasis33-ja-writer
 import openofficeorg3-ja
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/ka
+classification "Applications/Office"
+summary "Georgian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ka
+import ooobasis33-ka-base
+import ooobasis33-ka-binfilter
+import ooobasis33-ka-calc
+import ooobasis33-ka-draw
+import ooobasis33-ka-help
+import ooobasis33-ka-impress
+import ooobasis33-ka-math
+import ooobasis33-ka-res
+import ooobasis33-ka-writer
+import openofficeorg3-ka
+depend office/openoffice
+end package
+
+package office/openoffice/locale/km
+classification "Applications/Office"
+summary "Khmer localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-km
+import ooobasis33-km-base
+import ooobasis33-km-binfilter
+import ooobasis33-km-calc
+import ooobasis33-km-draw
+import ooobasis33-km-help
+import ooobasis33-km-impress
+import ooobasis33-km-math
+import ooobasis33-km-res
+import ooobasis33-km-writer
+import openofficeorg3-km
+depend office/openoffice
+end package
+
+package office/openoffice/locale/kn
+classification "Applications/Office"
+summary "Kannada localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-kn
+import ooobasis33-kn-base
+import ooobasis33-kn-binfilter
+import ooobasis33-kn-calc
+import ooobasis33-kn-draw
+import ooobasis33-kn-help
+import ooobasis33-kn-impress
+import ooobasis33-kn-math
+import ooobasis33-kn-res
+import ooobasis33-kn-writer
+import openofficeorg3-kn
+depend office/openoffice
+end package
+
 package office/openoffice/locale/ko
 classification "Applications/Office"
 summary "Korean localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-ko
-import ooobasis32-ko-base
-import ooobasis32-ko-binfilter
-import ooobasis32-ko-calc
-import ooobasis32-ko-draw
-import ooobasis32-ko-help
-import ooobasis32-ko-impress
-import ooobasis32-ko-math
-import ooobasis32-ko-res
-import ooobasis32-ko-writer
+version 3.3.0
+import ooobasis33-ko
+import ooobasis33-ko-base
+import ooobasis33-ko-binfilter
+import ooobasis33-ko-calc
+import ooobasis33-ko-draw
+import ooobasis33-ko-help
+import ooobasis33-ko-impress
+import ooobasis33-ko-math
+import ooobasis33-ko-res
+import ooobasis33-ko-writer
 import openofficeorg3-ko
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/ku
+classification "Applications/Office"
+summary "Kurdish localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ku
+import ooobasis33-ku-base
+import ooobasis33-ku-binfilter
+import ooobasis33-ku-calc
+import ooobasis33-ku-draw
+import ooobasis33-ku-help
+import ooobasis33-ku-impress
+import ooobasis33-ku-math
+import ooobasis33-ku-res
+import ooobasis33-ku-writer
+import openofficeorg3-dict-ku-TR
+import openofficeorg3-ku
+depend office/openoffice
+end package
+
+package office/openoffice/locale/lt
+classification "Applications/Office"
+summary "Lithuanian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-lt
+import ooobasis33-lt-base
+import ooobasis33-lt-binfilter
+import ooobasis33-lt-calc
+import ooobasis33-lt-draw
+import ooobasis33-lt-help
+import ooobasis33-lt-impress
+import ooobasis33-lt-math
+import ooobasis33-lt-res
+import ooobasis33-lt-writer
+import openofficeorg3-dict-lt
+import openofficeorg3-lt
+depend office/openoffice
+end package
+
+package office/openoffice/locale/lv
+classification "Applications/Office"
+summary "Latvian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-lv
+import ooobasis33-lv-base
+import ooobasis33-lv-binfilter
+import ooobasis33-lv-calc
+import ooobasis33-lv-draw
+import ooobasis33-lv-help
+import ooobasis33-lv-impress
+import ooobasis33-lv-math
+import ooobasis33-lv-res
+import ooobasis33-lv-writer
+import openofficeorg3-lv
+depend office/openoffice
+end package
+
+package office/openoffice/locale/mk
+classification "Applications/Office"
+summary "Macedonian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-mk
+import ooobasis33-mk-base
+import ooobasis33-mk-binfilter
+import ooobasis33-mk-calc
+import ooobasis33-mk-draw
+import ooobasis33-mk-help
+import ooobasis33-mk-impress
+import ooobasis33-mk-math
+import ooobasis33-mk-res
+import ooobasis33-mk-writer
+import openofficeorg3-mk
+depend office/openoffice
+end package
+
+package office/openoffice/locale/ml
+classification "Applications/Office"
+summary "Malayalam localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ml
+import ooobasis33-ml-base
+import ooobasis33-ml-binfilter
+import ooobasis33-ml-calc
+import ooobasis33-ml-draw
+import ooobasis33-ml-help
+import ooobasis33-ml-impress
+import ooobasis33-ml-math
+import ooobasis33-ml-res
+import ooobasis33-ml-writer
+import openofficeorg3-ml
+depend office/openoffice
+end package
+
+package office/openoffice/locale/mr
+classification "Applications/Office"
+summary "Marathi localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-mr
+import ooobasis33-mr-base
+import ooobasis33-mr-binfilter
+import ooobasis33-mr-calc
+import ooobasis33-mr-draw
+import ooobasis33-mr-help
+import ooobasis33-mr-impress
+import ooobasis33-mr-math
+import ooobasis33-mr-res
+import ooobasis33-mr-writer
+import openofficeorg3-mr
+depend office/openoffice
+end package
+
+package office/openoffice/locale/my
+classification "Applications/Office"
+summary "Burmese localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-my
+import ooobasis33-my-base
+import ooobasis33-my-binfilter
+import ooobasis33-my-calc
+import ooobasis33-my-draw
+import ooobasis33-my-help
+import ooobasis33-my-impress
+import ooobasis33-my-math
+import ooobasis33-my-res
+import ooobasis33-my-writer
+import openofficeorg3-my
+depend office/openoffice
+end package
+
+package office/openoffice/locale/nb
+classification "Applications/Office"
+summary "Norwegian (Bokmal) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-nb
+import ooobasis33-nb-base
+import ooobasis33-nb-binfilter
+import ooobasis33-nb-calc
+import ooobasis33-nb-draw
+import ooobasis33-nb-help
+import ooobasis33-nb-impress
+import ooobasis33-nb-math
+import ooobasis33-nb-res
+import ooobasis33-nb-writer
+import openofficeorg3-dict-no
+import openofficeorg3-nb
+depend office/openoffice
+end package
+
 package office/openoffice/locale/nl
 classification "Applications/Office"
 summary "Dutch localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-nl
-import ooobasis32-nl-base
-import ooobasis32-nl-binfilter
-import ooobasis32-nl-calc
-import ooobasis32-nl-draw
-import ooobasis32-nl-help
-import ooobasis32-nl-impress
-import ooobasis32-nl-math
-import ooobasis32-nl-res
-import ooobasis32-nl-writer
+version 3.3.0
+import ooobasis33-nl
+import ooobasis33-nl-base
+import ooobasis33-nl-binfilter
+import ooobasis33-nl-calc
+import ooobasis33-nl-draw
+import ooobasis33-nl-help
+import ooobasis33-nl-impress
+import ooobasis33-nl-math
+import ooobasis33-nl-res
+import ooobasis33-nl-writer
 import openofficeorg3-dict-nl
 import openofficeorg3-nl
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/nn
+classification "Applications/Office"
+summary "Norwegian (Nynorsk) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-nn
+import ooobasis33-nn-base
+import ooobasis33-nn-binfilter
+import ooobasis33-nn-calc
+import ooobasis33-nn-draw
+import ooobasis33-nn-help
+import ooobasis33-nn-impress
+import ooobasis33-nn-math
+import ooobasis33-nn-res
+import ooobasis33-nn-writer
+import openofficeorg3-nn
+depend office/openoffice
+end package
+
+package office/openoffice/locale/oc
+classification "Applications/Office"
+summary "Occitan localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-oc
+import ooobasis33-oc-base
+import ooobasis33-oc-binfilter
+import ooobasis33-oc-calc
+import ooobasis33-oc-draw
+import ooobasis33-oc-help
+import ooobasis33-oc-impress
+import ooobasis33-oc-math
+import ooobasis33-oc-res
+import ooobasis33-oc-writer
+import openofficeorg3-oc
+depend office/openoffice
+end package
+
+package office/openoffice/locale/om
+classification "Applications/Office"
+summary "Oromo localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-om
+import ooobasis33-om-base
+import ooobasis33-om-binfilter
+import ooobasis33-om-calc
+import ooobasis33-om-draw
+import ooobasis33-om-help
+import ooobasis33-om-impress
+import ooobasis33-om-math
+import ooobasis33-om-res
+import ooobasis33-om-writer
+import openofficeorg3-om
+depend office/openoffice
+end package
+
+package office/openoffice/locale/or
+classification "Applications/Office"
+summary "Oriya localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-or
+import ooobasis33-or-base
+import ooobasis33-or-binfilter
+import ooobasis33-or-calc
+import ooobasis33-or-draw
+import ooobasis33-or-help
+import ooobasis33-or-impress
+import ooobasis33-or-math
+import ooobasis33-or-res
+import ooobasis33-or-writer
+import openofficeorg3-or
+depend office/openoffice
+end package
+
+package office/openoffice/locale/pa-IN
+classification "Applications/Office"
+summary "Punjabi localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-pa-IN
+import ooobasis33-pa-IN-base
+import ooobasis33-pa-IN-binfilter
+import ooobasis33-pa-IN-calc
+import ooobasis33-pa-IN-draw
+import ooobasis33-pa-IN-help
+import ooobasis33-pa-IN-impress
+import ooobasis33-pa-IN-math
+import ooobasis33-pa-IN-res
+import ooobasis33-pa-IN-writer
+import openofficeorg3-pa-IN
+depend office/openoffice
+end package
+
 package office/openoffice/locale/pl
 classification "Applications/Office"
 summary "Polish localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-pl
-import ooobasis32-pl-base
-import ooobasis32-pl-binfilter
-import ooobasis32-pl-calc
-import ooobasis32-pl-draw
-import ooobasis32-pl-help
-import ooobasis32-pl-impress
-import ooobasis32-pl-math
-import ooobasis32-pl-res
-import ooobasis32-pl-writer
+version 3.3.0
+import ooobasis33-pl
+import ooobasis33-pl-base
+import ooobasis33-pl-binfilter
+import ooobasis33-pl-calc
+import ooobasis33-pl-draw
+import ooobasis33-pl-help
+import ooobasis33-pl-impress
+import ooobasis33-pl-math
+import ooobasis33-pl-res
+import ooobasis33-pl-writer
 import openofficeorg3-dict-pl
 import openofficeorg3-pl
 depend office/openoffice
@@ -250,18 +954,18 @@
 
 package office/openoffice/locale/pt
 classification "Applications/Office"
-summary "Portuguese localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-pt
-import ooobasis32-pt-base
-import ooobasis32-pt-binfilter
-import ooobasis32-pt-calc
-import ooobasis32-pt-draw
-import ooobasis32-pt-help
-import ooobasis32-pt-impress
-import ooobasis32-pt-math
-import ooobasis32-pt-res
-import ooobasis32-pt-writer
+summary "Portuguese (European) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-pt
+import ooobasis33-pt-base
+import ooobasis33-pt-binfilter
+import ooobasis33-pt-calc
+import ooobasis33-pt-draw
+import ooobasis33-pt-help
+import ooobasis33-pt-impress
+import ooobasis33-pt-math
+import ooobasis33-pt-res
+import ooobasis33-pt-writer
 import openofficeorg3-dict-pt
 import openofficeorg3-pt
 depend office/openoffice
@@ -270,77 +974,335 @@
 
 package office/openoffice/locale/pt-BR
 classification "Applications/Office"
-summary "Portuguese Brazilian localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-pt-BR
-import ooobasis32-pt-BR-base
-import ooobasis32-pt-BR-binfilter
-import ooobasis32-pt-BR-calc
-import ooobasis32-pt-BR-draw
-import ooobasis32-pt-BR-help
-import ooobasis32-pt-BR-impress
-import ooobasis32-pt-BR-math
-import ooobasis32-pt-BR-res
-import ooobasis32-pt-BR-writer
+summary "Portuguese (Brazilian) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-pt-BR
+import ooobasis33-pt-BR-base
+import ooobasis33-pt-BR-binfilter
+import ooobasis33-pt-BR-calc
+import ooobasis33-pt-BR-draw
+import ooobasis33-pt-BR-help
+import ooobasis33-pt-BR-impress
+import ooobasis33-pt-BR-math
+import ooobasis33-pt-BR-res
+import ooobasis33-pt-BR-writer
 import openofficeorg3-pt-BR
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/ro
+classification "Applications/Office"
+summary "Romanian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ro
+import ooobasis33-ro-base
+import ooobasis33-ro-binfilter
+import ooobasis33-ro-calc
+import ooobasis33-ro-draw
+import ooobasis33-ro-help
+import ooobasis33-ro-impress
+import ooobasis33-ro-math
+import ooobasis33-ro-res
+import ooobasis33-ro-writer
+import openofficeorg3-dict-ro
+import openofficeorg3-ro
+depend office/openoffice
+end package
+
 package office/openoffice/locale/ru
 classification "Applications/Office"
 summary "Russian localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-ru
-import ooobasis32-ru-base
-import ooobasis32-ru-binfilter
-import ooobasis32-ru-calc
-import ooobasis32-ru-draw
-import ooobasis32-ru-help
-import ooobasis32-ru-impress
-import ooobasis32-ru-math
-import ooobasis32-ru-res
-import ooobasis32-ru-writer
+version 3.3.0
+import ooobasis33-ru
+import ooobasis33-ru-base
+import ooobasis33-ru-binfilter
+import ooobasis33-ru-calc
+import ooobasis33-ru-draw
+import ooobasis33-ru-help
+import ooobasis33-ru-impress
+import ooobasis33-ru-math
+import ooobasis33-ru-res
+import ooobasis33-ru-writer
 import openofficeorg3-dict-ru
 import openofficeorg3-ru
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/sh
+classification "Applications/Office"
+summary "Serbian (Cyrillic) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-sh
+import ooobasis33-sh-base
+import ooobasis33-sh-binfilter
+import ooobasis33-sh-calc
+import ooobasis33-sh-draw
+import ooobasis33-sh-help
+import ooobasis33-sh-impress
+import ooobasis33-sh-math
+import ooobasis33-sh-res
+import ooobasis33-sh-writer
+import openofficeorg3-sh
+depend office/openoffice
+end package
+
+package office/openoffice/locale/si
+classification "Applications/Office"
+summary "Sinhala localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-si
+import ooobasis33-si-base
+import ooobasis33-si-binfilter
+import ooobasis33-si-calc
+import ooobasis33-si-draw
+import ooobasis33-si-help
+import ooobasis33-si-impress
+import ooobasis33-si-math
+import ooobasis33-si-res
+import ooobasis33-si-writer
+import openofficeorg3-si
+depend office/openoffice
+end package
+
+package office/openoffice/locale/sk
+classification "Applications/Office"
+summary "Slovak localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-sk
+import ooobasis33-sk-base
+import ooobasis33-sk-binfilter
+import ooobasis33-sk-calc
+import ooobasis33-sk-draw
+import ooobasis33-sk-help
+import ooobasis33-sk-impress
+import ooobasis33-sk-math
+import ooobasis33-sk-res
+import ooobasis33-sk-writer
+import openofficeorg3-dict-sk
+import openofficeorg3-sk
+depend office/openoffice
+end package
+
+package office/openoffice/locale/sl
+classification "Applications/Office"
+summary "Slovenian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-sl
+import ooobasis33-sl-base
+import ooobasis33-sl-binfilter
+import ooobasis33-sl-calc
+import ooobasis33-sl-draw
+import ooobasis33-sl-help
+import ooobasis33-sl-impress
+import ooobasis33-sl-math
+import ooobasis33-sl-res
+import ooobasis33-sl-writer
+import openofficeorg3-dict-sl
+import openofficeorg3-sl
+depend office/openoffice
+end package
+
+package office/openoffice/locale/sr
+classification "Applications/Office"
+summary "Serbian (Latin) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-sr
+import ooobasis33-sr-base
+import ooobasis33-sr-binfilter
+import ooobasis33-sr-calc
+import ooobasis33-sr-draw
+import ooobasis33-sr-help
+import ooobasis33-sr-impress
+import ooobasis33-sr-math
+import ooobasis33-sr-res
+import ooobasis33-sr-writer
+import openofficeorg3-dict-sr
+import openofficeorg3-sr
+depend office/openoffice
+end package
+
 package office/openoffice/locale/sv
 classification "Applications/Office"
 summary "Swedish localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-sv
-import ooobasis32-sv-base
-import ooobasis32-sv-binfilter
-import ooobasis32-sv-calc
-import ooobasis32-sv-draw
-import ooobasis32-sv-help
-import ooobasis32-sv-impress
-import ooobasis32-sv-math
-import ooobasis32-sv-res
-import ooobasis32-sv-writer
+version 3.3.0
+import ooobasis33-sv
+import ooobasis33-sv-base
+import ooobasis33-sv-binfilter
+import ooobasis33-sv-calc
+import ooobasis33-sv-draw
+import ooobasis33-sv-help
+import ooobasis33-sv-impress
+import ooobasis33-sv-math
+import ooobasis33-sv-res
+import ooobasis33-sv-writer
 import openofficeorg3-dict-sv
 import openofficeorg3-sv
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/locale/ta
+classification "Applications/Office"
+summary "Tamil localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ta
+import ooobasis33-ta-base
+import ooobasis33-ta-binfilter
+import ooobasis33-ta-calc
+import ooobasis33-ta-draw
+import ooobasis33-ta-help
+import ooobasis33-ta-impress
+import ooobasis33-ta-math
+import ooobasis33-ta-res
+import ooobasis33-ta-writer
+import openofficeorg3-ta
+depend office/openoffice
+end package
+
+package office/openoffice/locale/te
+classification "Applications/Office"
+summary "Telugu localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-te
+import ooobasis33-te-base
+import ooobasis33-te-binfilter
+import ooobasis33-te-calc
+import ooobasis33-te-draw
+import ooobasis33-te-help
+import ooobasis33-te-impress
+import ooobasis33-te-math
+import ooobasis33-te-res
+import ooobasis33-te-writer
+import openofficeorg3-te
+depend office/openoffice
+end package
+
+package office/openoffice/locale/th
+classification "Applications/Office"
+summary "Thai localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-th
+import ooobasis33-th-base
+import ooobasis33-th-binfilter
+import ooobasis33-th-calc
+import ooobasis33-th-draw
+import ooobasis33-th-help
+import ooobasis33-th-impress
+import ooobasis33-th-math
+import ooobasis33-th-res
+import ooobasis33-th-writer
+import openofficeorg3-dict-th
+import openofficeorg3-th
+depend office/openoffice
+end package
+
+package office/openoffice/locale/tr
+classification "Applications/Office"
+summary "Turkish localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-tr
+import ooobasis33-tr-base
+import ooobasis33-tr-binfilter
+import ooobasis33-tr-calc
+import ooobasis33-tr-draw
+import ooobasis33-tr-help
+import ooobasis33-tr-impress
+import ooobasis33-tr-math
+import ooobasis33-tr-res
+import ooobasis33-tr-writer
+import openofficeorg3-tr
+depend office/openoffice
+end package
+
+package office/openoffice/locale/ug
+classification "Applications/Office"
+summary "Uyghur localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-ug
+import ooobasis33-ug-base
+import ooobasis33-ug-binfilter
+import ooobasis33-ug-calc
+import ooobasis33-ug-draw
+import ooobasis33-ug-help
+import ooobasis33-ug-impress
+import ooobasis33-ug-math
+import ooobasis33-ug-res
+import ooobasis33-ug-writer
+import openofficeorg3-ug
+depend office/openoffice
+end package
+
+package office/openoffice/locale/uk
+classification "Applications/Office"
+summary "Ukrainian localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-uk
+import ooobasis33-uk-base
+import ooobasis33-uk-binfilter
+import ooobasis33-uk-calc
+import ooobasis33-uk-draw
+import ooobasis33-uk-help
+import ooobasis33-uk-impress
+import ooobasis33-uk-math
+import ooobasis33-uk-res
+import ooobasis33-uk-writer
+import openofficeorg3-uk
+depend office/openoffice
+end package
+
+package office/openoffice/locale/uz
+classification "Applications/Office"
+summary "Uzbek localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-uz
+import ooobasis33-uz-base
+import ooobasis33-uz-binfilter
+import ooobasis33-uz-calc
+import ooobasis33-uz-draw
+import ooobasis33-uz-help
+import ooobasis33-uz-impress
+import ooobasis33-uz-math
+import ooobasis33-uz-res
+import ooobasis33-uz-writer
+import openofficeorg3-uz
+depend office/openoffice
+end package
+
+package office/openoffice/locale/vi
+classification "Applications/Office"
+summary "Vietnamese localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-vi
+import ooobasis33-vi-base
+import ooobasis33-vi-binfilter
+import ooobasis33-vi-calc
+import ooobasis33-vi-draw
+import ooobasis33-vi-help
+import ooobasis33-vi-impress
+import ooobasis33-vi-math
+import ooobasis33-vi-res
+import ooobasis33-vi-writer
+import openofficeorg3-dict-vi
+import openofficeorg3-vi
+depend office/openoffice
+end package
+
 package office/openoffice/locale/zh-CN
 classification "Applications/Office"
-summary "Simplified Chinese localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-zh-CN
-import ooobasis32-zh-CN-base
-import ooobasis32-zh-CN-binfilter
-import ooobasis32-zh-CN-calc
-import ooobasis32-zh-CN-draw
-import ooobasis32-zh-CN-help
-import ooobasis32-zh-CN-impress
-import ooobasis32-zh-CN-math
-import ooobasis32-zh-CN-res
-import ooobasis32-zh-CN-writer
+summary "Chinese (simplified) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-zh-CN
+import ooobasis33-zh-CN-base
+import ooobasis33-zh-CN-binfilter
+import ooobasis33-zh-CN-calc
+import ooobasis33-zh-CN-draw
+import ooobasis33-zh-CN-help
+import ooobasis33-zh-CN-impress
+import ooobasis33-zh-CN-math
+import ooobasis33-zh-CN-res
+import ooobasis33-zh-CN-writer
 import openofficeorg3-zh-CN
 depend office/openoffice
 add depend [email protected] type=optional
@@ -348,35 +1310,38 @@
 
 package office/openoffice/locale/zh-TW
 classification "Applications/Office"
-summary "Traditional Chinese localization for OpenOffice.org"
-version 3.2.1
-import ooobasis32-zh-TW
-import ooobasis32-zh-TW-base
-import ooobasis32-zh-TW-binfilter
-import ooobasis32-zh-TW-calc
-import ooobasis32-zh-TW-draw
-import ooobasis32-zh-TW-help
-import ooobasis32-zh-TW-impress
-import ooobasis32-zh-TW-math
-import ooobasis32-zh-TW-res
-import ooobasis32-zh-TW-writer
+summary "Chinese (traditional) localization for OpenOffice.org"
+version 3.3.0
+import ooobasis33-zh-TW
+import ooobasis33-zh-TW-base
+import ooobasis33-zh-TW-binfilter
+import ooobasis33-zh-TW-calc
+import ooobasis33-zh-TW-draw
+import ooobasis33-zh-TW-help
+import ooobasis33-zh-TW-impress
+import ooobasis33-zh-TW-math
+import ooobasis33-zh-TW-res
+import ooobasis33-zh-TW-writer
 import openofficeorg3-zh-TW
 depend office/openoffice
 add depend [email protected] type=optional
 end package
 
+package office/openoffice/openoffice-sdk
+classification "Applications/Office"
+summary "Software Development Kit (SDK) for OpenOffice.org"
+version 3.3.0
+import ooobasis33-sdk
+depend office/openoffice
+add depend [email protected] type=optional
+end package
+
 package openoffice
 add set name=pkg.renamed value=true
 depend office/openoffice
 version 3.1.0-1
 end package
 
-package openoffice-sdk
-add set name=pkg.renamed value=true
-depend office/openoffice/openoffice-sdk
-version 3.1.0-1
-end package
-
 package openoffice-de
 add set name=pkg.renamed value=true
 depend office/openoffice/locale/de
@@ -402,9 +1367,8 @@
 end package
 
 package openoffice-it
-add set name=pkg.renamed value=true
-depend office/openoffice/locale/it
-version 3.1.0-1
+add set name=pkg.obsolete value=true
+version 3.1.0-2
 end package
 
 package openoffice-ja
@@ -449,6 +1413,12 @@
 version 3.1.0-1
 end package
 
+package openoffice-sdk
+add set name=pkg.renamed value=true
+depend office/openoffice/openoffice-sdk
+version 3.1.0-1
+end package
+
 package openoffice-sv
 add set name=pkg.renamed value=true
 depend office/openoffice/locale/sv
@@ -466,4 +1436,3 @@
 depend office/openoffice/locale/zh-TW
 version 3.1.0-1
 end package
-
--- a/src/util/publish/set-publisher.transforms	Thu Aug 25 17:05:15 2011 -0700
+++ b/src/util/publish/set-publisher.transforms	Thu Aug 25 17:46:35 2011 -0700
@@ -1,16 +1,1 @@
 <transform set name=pkg.fmri -> edit value pkg://[^/]+/ pkg://solaris/>
-
-#
-# Temporary work-around to prevent obsoletion of Python 2.4 on update as
-# there are still unbundled consumers.
-#
-<transform depend fmri=(pkg:/)?SUNWPython@.* type=incorporate \
-    -> edit fmri .* [email protected],5.11-0.133>
-<transform depend fmri=(pkg:/)?runtime/python-24@.* type=incorporate \
-    -> edit fmri .* runtime/[email protected]>
-
-#
-# Temporary work-around to allow developer/macro/cpp package to be
-# set-publisher'ed until legacy action has been corrected.
-#
-<transform legacy pkg=SUNWcpp -> drop>