12347 new dependencies required for developer/opensolaris/osnet
authorLiane Praza <Liane.Praza@Sun.COM>
Thu, 05 Nov 2009 11:54:51 -0800
changeset 1471 7526bfca96f9
parent 1470 0775809e07bd
child 1472 c50eb141435a
12347 new dependencies required for developer/opensolaris/osnet 12463 need consolidation incorporations
src/util/distro-import/00/common/SUNW1394h
src/util/distro-import/00/common/SUNWDTraceToolkit
src/util/distro-import/00/common/SUNWPython-extra
src/util/distro-import/00/common/SUNWTiff
src/util/distro-import/00/common/SUNWa2ps
src/util/distro-import/00/common/SUNWacc
src/util/distro-import/00/common/SUNWaclg
src/util/distro-import/00/common/SUNWadmap
src/util/distro-import/00/common/SUNWadmlib-sysid
src/util/distro-import/00/common/SUNWadmr
src/util/distro-import/00/common/SUNWapct
src/util/distro-import/00/common/SUNWarbel
src/util/distro-import/00/common/SUNWarc
src/util/distro-import/00/common/SUNWatfs
src/util/distro-import/00/common/SUNWauda
src/util/distro-import/00/common/SUNWaudf
src/util/distro-import/00/common/SUNWaudit
src/util/distro-import/00/common/SUNWautoef
src/util/distro-import/00/common/SUNWbart
src/util/distro-import/00/common/SUNWbcc
src/util/distro-import/00/common/SUNWbip
src/util/distro-import/00/common/SUNWbison
src/util/distro-import/00/common/SUNWbnu
src/util/distro-import/00/common/SUNWbrltty
src/util/distro-import/00/common/SUNWbs
src/util/distro-import/00/common/SUNWbtool
src/util/distro-import/00/common/SUNWcacaodtrace
src/util/distro-import/00/common/SUNWcdrw
src/util/distro-import/00/common/SUNWcea
src/util/distro-import/00/common/SUNWcfpl
src/util/distro-import/00/common/SUNWcnetr
src/util/distro-import/00/common/SUNWcns
src/util/distro-import/00/common/SUNWcpcu
src/util/distro-import/00/common/SUNWcpp
src/util/distro-import/00/common/SUNWcstl
src/util/distro-import/00/common/SUNWctpls
src/util/distro-import/00/common/SUNWdbus
src/util/distro-import/00/common/SUNWdhcm
src/util/distro-import/00/common/SUNWdhcs
src/util/distro-import/00/common/SUNWdhcsb
src/util/distro-import/00/common/SUNWdmgt
src/util/distro-import/00/common/SUNWdpl
src/util/distro-import/00/common/SUNWdtrc
src/util/distro-import/00/common/SUNWdvdrw
src/util/distro-import/00/common/SUNWesu
src/util/distro-import/00/common/SUNWevolution
src/util/distro-import/00/common/SUNWevolution-data-server
src/util/distro-import/00/common/SUNWevolution-exchange
src/util/distro-import/00/common/SUNWevolution-jescs
src/util/distro-import/00/common/SUNWevolution-libs
src/util/distro-import/00/common/SUNWevolution-webcal
src/util/distro-import/00/common/SUNWfchba
src/util/distro-import/00/common/SUNWfcmdb
src/util/distro-import/00/common/SUNWffilters
src/util/distro-import/00/common/SUNWflac
src/util/distro-import/00/common/SUNWfsexam
src/util/distro-import/00/common/SUNWfss
src/util/distro-import/00/common/SUNWfwdcu
src/util/distro-import/00/common/SUNWfwflash
src/util/distro-import/00/common/SUNWgcmn
src/util/distro-import/00/common/SUNWgetting-started-guide
src/util/distro-import/00/common/SUNWgksu
src/util/distro-import/00/common/SUNWgmake
src/util/distro-import/00/common/SUNWgnome-a11y-dasher
src/util/distro-import/00/common/SUNWgnome-a11y-gok
src/util/distro-import/00/common/SUNWgnome-a11y-reader
src/util/distro-import/00/common/SUNWgnome-a11y-speech
src/util/distro-import/00/common/SUNWgnome-applets
src/util/distro-import/00/common/SUNWgnome-archive-mgr
src/util/distro-import/00/common/SUNWgnome-audio
src/util/distro-import/00/common/SUNWgnome-base-libs-java
src/util/distro-import/00/common/SUNWgnome-calculator
src/util/distro-import/00/common/SUNWgnome-cd
src/util/distro-import/00/common/SUNWgnome-cd-burner
src/util/distro-import/00/common/SUNWgnome-common-devel
src/util/distro-import/00/common/SUNWgnome-component
src/util/distro-import/00/common/SUNWgnome-config
src/util/distro-import/00/common/SUNWgnome-config-editor
src/util/distro-import/00/common/SUNWgnome-config-java
src/util/distro-import/00/common/SUNWgnome-desklets
src/util/distro-import/00/common/SUNWgnome-desklets-extra
src/util/distro-import/00/common/SUNWgnome-desktop-prefs
src/util/distro-import/00/common/SUNWgnome-devhelp
src/util/distro-import/00/common/SUNWgnome-dialog
src/util/distro-import/00/common/SUNWgnome-dictionary
src/util/distro-import/00/common/SUNWgnome-disk-analyzer
src/util/distro-import/00/common/SUNWgnome-fun-applets
src/util/distro-import/00/common/SUNWgnome-gtksourceview
src/util/distro-import/00/common/SUNWgnome-gui-test
src/util/distro-import/00/common/SUNWgnome-hex-editor
src/util/distro-import/00/common/SUNWgnome-im-client
src/util/distro-import/00/common/SUNWgnome-img-editor
src/util/distro-import/00/common/SUNWgnome-img-organizer
src/util/distro-import/00/common/SUNWgnome-intranet-applets
src/util/distro-import/00/common/SUNWgnome-log-viewer
src/util/distro-import/00/common/SUNWgnome-media
src/util/distro-import/00/common/SUNWgnome-media-apps
src/util/distro-import/00/common/SUNWgnome-meeting
src/util/distro-import/00/common/SUNWgnome-menu-editor
src/util/distro-import/00/common/SUNWgnome-mm-applets
src/util/distro-import/00/common/SUNWgnome-panel
src/util/distro-import/00/common/SUNWgnome-pdf-viewer
src/util/distro-import/00/common/SUNWgnome-pilot
src/util/distro-import/00/common/SUNWgnome-print
src/util/distro-import/00/common/SUNWgnome-ps-viewer
src/util/distro-import/00/common/SUNWgnome-python-desktop
src/util/distro-import/00/common/SUNWgnome-python-libs
src/util/distro-import/00/common/SUNWgnome-remote-desktop
src/util/distro-import/00/common/SUNWgnome-screenshot
src/util/distro-import/00/common/SUNWgnome-search-tool
src/util/distro-import/00/common/SUNWgnome-session
src/util/distro-import/00/common/SUNWgnome-sound-recorder
src/util/distro-import/00/common/SUNWgnome-spell
src/util/distro-import/00/common/SUNWgnome-system-monitor
src/util/distro-import/00/common/SUNWgnome-system-tools
src/util/distro-import/00/common/SUNWgnome-terminal
src/util/distro-import/00/common/SUNWgnome-terminal-java
src/util/distro-import/00/common/SUNWgnome-text-editor
src/util/distro-import/00/common/SUNWgnome-themes
src/util/distro-import/00/common/SUNWgnome-ui-designer
src/util/distro-import/00/common/SUNWgnome-user-docs
src/util/distro-import/00/common/SUNWgnome-utility-applets
src/util/distro-import/00/common/SUNWgnome-vfs
src/util/distro-import/00/common/SUNWgnome-wm
src/util/distro-import/00/common/SUNWgnu-which
src/util/distro-import/00/common/SUNWgnutls
src/util/distro-import/00/common/SUNWgpch
src/util/distro-import/00/common/SUNWgsfot
src/util/distro-import/00/common/SUNWgsfst
src/util/distro-import/00/common/SUNWgss
src/util/distro-import/00/common/SUNWgssc
src/util/distro-import/00/common/SUNWgssdh
src/util/distro-import/00/common/SUNWgssk
src/util/distro-import/00/common/SUNWgtkperf
src/util/distro-import/00/common/SUNWgzip
src/util/distro-import/00/common/SUNWhal
src/util/distro-import/00/common/SUNWhwdata
src/util/distro-import/00/common/SUNWibsdpu
src/util/distro-import/00/common/SUNWicu
src/util/distro-import/00/common/SUNWicud
src/util/distro-import/00/common/SUNWidnd
src/util/distro-import/00/common/SUNWidnl
src/util/distro-import/00/common/SUNWidnu
src/util/distro-import/00/common/SUNWima
src/util/distro-import/00/common/SUNWimagick
src/util/distro-import/00/common/SUNWipc
src/util/distro-import/00/common/SUNWipfh
src/util/distro-import/00/common/SUNWippcore
src/util/distro-import/00/common/SUNWippl
src/util/distro-import/00/common/SUNWiscsitgt
src/util/distro-import/00/common/SUNWislcc
src/util/distro-import/00/common/SUNWiso-codes
src/util/distro-import/00/common/SUNWisolc
src/util/distro-import/00/common/SUNWj6cfg
src/util/distro-import/00/common/SUNWjdmk-base
src/util/distro-import/00/common/SUNWjhrt
src/util/distro-import/00/common/SUNWjpg
src/util/distro-import/00/common/SUNWjre-config-plugin
src/util/distro-import/00/common/SUNWjss
src/util/distro-import/00/common/SUNWkdc
src/util/distro-import/00/common/SUNWkey
src/util/distro-import/00/common/SUNWkrb
src/util/distro-import/00/common/SUNWlexpt
src/util/distro-import/00/common/SUNWlibC
src/util/distro-import/00/common/SUNWlibcroco
src/util/distro-import/00/common/SUNWlibexif
src/util/distro-import/00/common/SUNWlibgcrypt
src/util/distro-import/00/common/SUNWlibgpg-error
src/util/distro-import/00/common/SUNWlibgtop
src/util/distro-import/00/common/SUNWlibm
src/util/distro-import/00/common/SUNWlibms
src/util/distro-import/00/common/SUNWliboil
src/util/distro-import/00/common/SUNWlibpopt
src/util/distro-import/00/common/SUNWlibrsvg
src/util/distro-import/00/common/SUNWlibsasl
src/util/distro-import/00/common/SUNWlibsdl
src/util/distro-import/00/common/SUNWlibtheora
src/util/distro-import/00/common/SUNWlibusbugen
src/util/distro-import/00/common/SUNWlldap
src/util/distro-import/00/common/SUNWloc
src/util/distro-import/00/common/SUNWlp-cmds
src/util/distro-import/00/common/SUNWlpr-cmds
src/util/distro-import/00/common/SUNWluxop
src/util/distro-import/00/common/SUNWlxsl
src/util/distro-import/00/common/SUNWmda
src/util/distro-import/00/common/SUNWmdbdm
src/util/distro-import/00/common/SUNWmddr
src/util/distro-import/00/common/SUNWmibii
src/util/distro-import/00/common/SUNWmlib
src/util/distro-import/00/common/SUNWmpsvplr
src/util/distro-import/00/common/SUNWmusicbrainz
src/util/distro-import/00/common/SUNWmyspell-dictionary-en
src/util/distro-import/00/common/SUNWmysql-base
src/util/distro-import/00/common/SUNWmysqlt
src/util/distro-import/00/common/SUNWneon
src/util/distro-import/00/common/SUNWnis
src/util/distro-import/00/common/SUNWogg-vorbis
src/util/distro-import/00/common/SUNWopenjade
src/util/distro-import/00/common/SUNWopensp
src/util/distro-import/00/common/SUNWosdem
src/util/distro-import/00/common/SUNWpapi
src/util/distro-import/00/common/SUNWpc
src/util/distro-import/00/common/SUNWpcmcu
src/util/distro-import/00/common/SUNWperl-authen-pam
src/util/distro-import/00/common/SUNWperl-xml-parser
src/util/distro-import/00/common/SUNWperl584core
src/util/distro-import/00/common/SUNWperl584usr
src/util/distro-import/00/common/SUNWpiclh
src/util/distro-import/00/common/SUNWpilot-link
src/util/distro-import/00/common/SUNWpng
src/util/distro-import/00/common/SUNWpolkit
src/util/distro-import/00/common/SUNWpoold
src/util/distro-import/00/common/SUNWpostgr-82-jdbc
src/util/distro-import/00/common/SUNWpostgr-82-tcl
src/util/distro-import/00/common/SUNWpostrun
src/util/distro-import/00/common/SUNWppm
src/util/distro-import/00/common/SUNWpppdt
src/util/distro-import/00/common/SUNWpppg
src/util/distro-import/00/common/SUNWpppgS
src/util/distro-import/00/common/SUNWpr
src/util/distro-import/00/common/SUNWprd
src/util/distro-import/00/common/SUNWprint-monitor
src/util/distro-import/00/common/SUNWps
src/util/distro-import/00/common/SUNWpsf
src/util/distro-import/00/common/SUNWpsm-ipp
src/util/distro-import/00/common/SUNWpsm-lpd
src/util/distro-import/00/common/SUNWpsutils
src/util/distro-import/00/common/SUNWqlcu
src/util/distro-import/00/common/SUNWqos
src/util/distro-import/00/common/SUNWqosu
src/util/distro-import/00/common/SUNWrcap
src/util/distro-import/00/common/SUNWrcmdc
src/util/distro-import/00/common/SUNWrcmds
src/util/distro-import/00/common/SUNWrmvolmgr
src/util/distro-import/00/common/SUNWrmwb
src/util/distro-import/00/common/SUNWroute
src/util/distro-import/00/common/SUNWrpm
src/util/distro-import/00/common/SUNWrsg
src/util/distro-import/00/common/SUNWrsgk
src/util/distro-import/00/common/SUNWrsmo
src/util/distro-import/00/common/SUNWsacom
src/util/distro-import/00/common/SUNWsasnm
src/util/distro-import/00/common/SUNWsbp2
src/util/distro-import/00/common/SUNWscplp
src/util/distro-import/00/common/SUNWserweb
src/util/distro-import/00/common/SUNWslp
src/util/distro-import/00/common/SUNWsmapi
src/util/distro-import/00/common/SUNWsmedia
src/util/distro-import/00/common/SUNWspeex
src/util/distro-import/00/common/SUNWspnego
src/util/distro-import/00/common/SUNWssh
src/util/distro-import/00/common/SUNWsshcu
src/util/distro-import/00/common/SUNWsvn
src/util/distro-import/00/common/SUNWsvn-java
src/util/distro-import/00/common/SUNWsvn-perl
src/util/distro-import/00/common/SUNWsvn-python
src/util/distro-import/00/common/SUNWtcpdS
src/util/distro-import/00/common/SUNWtecla
src/util/distro-import/00/common/SUNWter
src/util/distro-import/00/common/SUNWtftp
src/util/distro-import/00/common/SUNWthunderbird
src/util/distro-import/00/common/SUNWthunderbird-calendar
src/util/distro-import/00/common/SUNWtls
src/util/distro-import/00/common/SUNWtlsd
src/util/distro-import/00/common/SUNWtlsu
src/util/distro-import/00/common/SUNWtnetc
src/util/distro-import/00/common/SUNWtnetd
src/util/distro-import/00/common/SUNWtnfd
src/util/distro-import/00/common/SUNWtoo
src/util/distro-import/00/common/SUNWucbt
src/util/distro-import/00/common/SUNWudapl
src/util/distro-import/00/common/SUNWudf
src/util/distro-import/00/common/SUNWugenu
src/util/distro-import/00/common/SUNWuiu8
src/util/distro-import/00/common/SUNWuium
src/util/distro-import/00/common/SUNWukspfw
src/util/distro-import/00/common/SUNWusbccid
src/util/distro-import/00/common/SUNWusbs
src/util/distro-import/00/common/SUNWusbu
src/util/distro-import/00/common/SUNWvts
src/util/distro-import/00/common/SUNWvtsmn
src/util/distro-import/00/common/SUNWvtss
src/util/distro-import/00/common/SUNWvtsts
src/util/distro-import/00/common/SUNWwbsup
src/util/distro-import/00/common/SUNWwlan
src/util/distro-import/00/common/SUNWwpa
src/util/distro-import/00/common/SUNWxcu4
src/util/distro-import/00/common/SUNWxcu6
src/util/distro-import/00/common/SUNWxcursor-themes
src/util/distro-import/00/common/SUNWxorg-client-docs
src/util/distro-import/00/common/SUNWxorg-client-programs
src/util/distro-import/00/common/SUNWxorg-clientlibs
src/util/distro-import/00/common/SUNWxorg-compatlinks
src/util/distro-import/00/common/SUNWxorg-graphics-ddx
src/util/distro-import/00/common/SUNWxscreensaver-hacks
src/util/distro-import/00/common/SUNWxwfs
src/util/distro-import/00/common/SUNWxwmod
src/util/distro-import/00/common/SUNWyp
src/util/distro-import/00/common/SUNWzip
src/util/distro-import/00/common/loc/SUNWcdhcm
src/util/distro-import/00/common/loc/SUNWcos
src/util/distro-import/00/common/loc/SUNWcxwsvr
src/util/distro-import/00/common/loc/SUNWddhcm
src/util/distro-import/00/common/loc/SUNWdeos
src/util/distro-import/00/common/loc/SUNWdexwsvr
src/util/distro-import/00/common/loc/SUNWedhcm
src/util/distro-import/00/common/loc/SUNWesos
src/util/distro-import/00/common/loc/SUNWesxwsvr
src/util/distro-import/00/common/loc/SUNWfdhcm
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-de-DE
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-es-ES
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-extra
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-fr-FR
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-it-IT
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ja-JP
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ko-KR
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-pl-PL
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-pt-BR
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ru-RU
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-sv-SE
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-zh-CN
src/util/distro-import/00/common/loc/SUNWfirefoxl10n-zh-TW
src/util/distro-import/00/common/loc/SUNWfros
src/util/distro-import/00/common/loc/SUNWfrxwsvr
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-de
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-es
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-fr
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-it
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ja
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ko
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ptBR
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-sv
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhCN
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhHK
src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhTW
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-cs
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-de
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-es
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-fr
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-hu
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-it
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ja
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ko
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-pl
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ptBR
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ru
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-sv
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhCN
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhHK
src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhTW
src/util/distro-import/00/common/loc/SUNWhdhcm
src/util/distro-import/00/common/loc/SUNWhkxwsvr
src/util/distro-import/00/common/loc/SUNWhos
src/util/distro-import/00/common/loc/SUNWhxwsvr
src/util/distro-import/00/common/loc/SUNWidhcm
src/util/distro-import/00/common/loc/SUNWitos
src/util/distro-import/00/common/loc/SUNWitxwsvr
src/util/distro-import/00/common/loc/SUNWjdhcm
src/util/distro-import/00/common/loc/SUNWjdoc
src/util/distro-import/00/common/loc/SUNWjos
src/util/distro-import/00/common/loc/SUNWjxwsvr
src/util/distro-import/00/common/loc/SUNWkdhcm
src/util/distro-import/00/common/loc/SUNWkos
src/util/distro-import/00/common/loc/SUNWkxwsvr
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-cs
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-de
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-es
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-extra
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-fr
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-hu
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-it
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-pl
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-ptBR
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-ru
src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-sv
src/util/distro-import/00/common/loc/SUNWplxwsvr
src/util/distro-import/00/common/loc/SUNWptxwsvr
src/util/distro-import/00/common/loc/SUNWruxwsvr
src/util/distro-import/00/common/loc/SUNWsdhcm
src/util/distro-import/00/common/loc/SUNWstardict
src/util/distro-import/00/common/loc/SUNWsvos
src/util/distro-import/00/common/loc/SUNWsvxwsvr
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-de
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-es
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-fr
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-it
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ja
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ko
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ptBR
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ru
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-sv
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhCN
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhHK
src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhTW
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-de-DE
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-es-ES
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-extra
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-fr-FR
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-it-IT
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ja-JP
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ko-KR
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-pl-PL
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-pt-BR
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ru-RU
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-sv-SE
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-zh-CN
src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-zh-TW
src/util/distro-import/00/i386/SUNWagph
src/util/distro-import/00/sparc/SUNWbcp
src/util/distro-import/00/sparc/SUNWcg6h
src/util/distro-import/00/sparc/SUNWdcs
src/util/distro-import/00/sparc/SUNWdrcr
src/util/distro-import/00/sparc/SUNWfbc
src/util/distro-import/00/sparc/SUNWfruid
src/util/distro-import/00/sparc/SUNWfruip
src/util/distro-import/00/sparc/SUNWhmdu
src/util/distro-import/00/sparc/SUNWkfbcf
src/util/distro-import/00/sparc/SUNWkfbw
src/util/distro-import/00/sparc/SUNWluxopr
src/util/distro-import/00/sparc/SUNWpstl
src/util/distro-import/00/sparc/SUNWsfdr
src/util/distro-import/100a/common/SUNWapr13doc
src/util/distro-import/100a/common/SUNWapu13doc
src/util/distro-import/100a/common/SUNWcheese
src/util/distro-import/100a/common/SUNWddu-l10n
src/util/distro-import/100a/common/SUNWespeak
src/util/distro-import/100a/common/SUNWgnome-a11y-speech-espeak
src/util/distro-import/100a/common/SUNWgnome-nettool
src/util/distro-import/100a/common/SUNWgnome-time-slider
src/util/distro-import/100a/common/SUNWgnu-emacs
src/util/distro-import/100a/common/SUNWgnu-emacs-el
src/util/distro-import/100a/common/SUNWgnu-emacs-gtk
src/util/distro-import/100a/common/SUNWgnu-emacs-nox
src/util/distro-import/100a/common/SUNWgnu-emacs-x
src/util/distro-import/100a/common/SUNWgobby
src/util/distro-import/100a/common/SUNWgscr
src/util/distro-import/100a/common/SUNWipkg-um
src/util/distro-import/100a/common/SUNWirssi
src/util/distro-import/100a/common/SUNWjruby
src/util/distro-import/100a/common/SUNWlibxmlpp
src/util/distro-import/100a/common/SUNWnet6
src/util/distro-import/100a/common/SUNWobby
src/util/distro-import/100a/common/SUNWopenproj
src/util/distro-import/100a/common/SUNWplanner
src/util/distro-import/100a/common/SUNWpowertop
src/util/distro-import/100a/common/SUNWprivoxy
src/util/distro-import/100a/common/SUNWscreen
src/util/distro-import/100a/common/SUNWslocate
src/util/distro-import/100a/common/SUNWswig
src/util/distro-import/100a/common/SUNWterminator
src/util/distro-import/100a/common/SUNWtop
src/util/distro-import/100a/common/SUNWzfs-auto-snapshot
src/util/distro-import/100a/common/loc/SUNWttf-hanyang-ko
src/util/distro-import/100a/common/loc/SUNWttf-hanyang-ko-core
src/util/distro-import/100a/i386/SUNWvdisk
src/util/distro-import/101/common/FSWxorg-fonts
src/util/distro-import/101/common/FSWxorg-fonts-core
src/util/distro-import/101/common/FSWxorg-fonts-cyrillic
src/util/distro-import/101/common/FSWxorg-fonts-daewoo
src/util/distro-import/101/common/FSWxorg-fonts-ethiopic
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-10
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-13
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-14
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-16
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-2
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-3
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-4
src/util/distro-import/101/common/FSWxorg-fonts-iso8859-9
src/util/distro-import/101/common/FSWxorg-fonts-jiskan
src/util/distro-import/101/common/FSWxorg-fonts-syriac
src/util/distro-import/101/common/FSWxorg-fonts-vera
src/util/distro-import/101/common/SUNWgawk
src/util/distro-import/101/common/SUNWncurses
src/util/distro-import/101/common/SUNWswt
src/util/distro-import/101/common/SUNWxwacx
src/util/distro-import/101/common/SUNWxwpmn
src/util/distro-import/101a/common/OSOLvpanels-mysql
src/util/distro-import/101a/common/OSOLvpanels-sysid
src/util/distro-import/101a/common/SUNWgccruntime
src/util/distro-import/101a/common/SUNWgnome-camera
src/util/distro-import/101a/common/SUNWgnome-camera-img-editor-plugin
src/util/distro-import/101a/common/SUNWjavadb
src/util/distro-import/101a/common/SUNWpmdbdpg
src/util/distro-import/101a/common/SUNWpython-lxml
src/util/distro-import/102/common/SUNWbonnieplus
src/util/distro-import/102/common/SUNWgit
src/util/distro-import/102/common/SUNWopenldap
src/util/distro-import/103/common/SUNWdoxygen
src/util/distro-import/103/common/SUNWfping
src/util/distro-import/103/common/SUNWhexedit
src/util/distro-import/103/common/SUNWmpathadm
src/util/distro-import/103/i386/SUNWgrubS
src/util/distro-import/104/common/SUNWcimserver
src/util/distro-import/104/common/SUNWcmake
src/util/distro-import/104/common/SUNWfoomatic-db
src/util/distro-import/104/common/SUNWfoomatic-db-engine
src/util/distro-import/104/common/SUNWgrails
src/util/distro-import/104/common/SUNWquilt
src/util/distro-import/104/common/SUNWwebalizer
src/util/distro-import/105/common/SUNWant
src/util/distro-import/105/common/SUNWcar
src/util/distro-import/105/common/SUNWgnome-sys-suspend
src/util/distro-import/105/common/SUNWkvm
src/util/distro-import/105/common/SUNWlablgtk
src/util/distro-import/105/common/SUNWm17n
src/util/distro-import/105/common/SUNWmdb
src/util/distro-import/105/common/SUNWmrxvt
src/util/distro-import/105/common/SUNWocaml
src/util/distro-import/105/common/SUNWpicl
src/util/distro-import/105/common/SUNWpl5m
src/util/distro-import/105/common/SUNWpl5p
src/util/distro-import/105/common/SUNWpl5u
src/util/distro-import/105/common/SUNWpl5v
src/util/distro-import/105/common/SUNWpython-cherrypy
src/util/distro-import/105/common/SUNWpython-mako
src/util/distro-import/105/common/SUNWrdiff-backup
src/util/distro-import/105/common/SUNWscim-m17n
src/util/distro-import/105/common/SUNWslim-utils
src/util/distro-import/105/common/SUNWunison
src/util/distro-import/105/common/SUNWvncviewer
src/util/distro-import/105/common/SUNWxwice
src/util/distro-import/105/i386/SUNWcakrx
src/util/distro-import/105/i386/SUNWcarx
src/util/distro-import/106/common/SUNWcacaort
src/util/distro-import/106/common/SUNWdia
src/util/distro-import/106/common/SUNWdiveintopython
src/util/distro-import/106/common/SUNWfirefox-bookmark
src/util/distro-import/106/common/SUNWgnome-a11y-libs
src/util/distro-import/106/common/SUNWgnome-keyring-manager
src/util/distro-import/106/common/SUNWgtk-vnc
src/util/distro-import/106/common/SUNWhamster
src/util/distro-import/106/common/SUNWinstall
src/util/distro-import/106/common/SUNWinstall-test
src/util/distro-import/106/common/SUNWipmi
src/util/distro-import/106/common/SUNWjunit
src/util/distro-import/106/common/SUNWlibpigment
src/util/distro-import/106/common/SUNWlibpigment-python24
src/util/distro-import/106/common/SUNWlibpigment-python25
src/util/distro-import/106/common/SUNWlynx
src/util/distro-import/106/common/SUNWnmap
src/util/distro-import/106/common/SUNWpcre
src/util/distro-import/106/common/SUNWpython-pyopenssl
src/util/distro-import/106/common/SUNWpython-twisted-web2
src/util/distro-import/106/common/SUNWpython25-twisted
src/util/distro-import/106/common/SUNWpython25-twisted-web2
src/util/distro-import/106/common/SUNWseahorse
src/util/distro-import/106/common/SUNWvscankr
src/util/distro-import/106/common/SUNWxvnc
src/util/distro-import/106/common/loc/SUNWlang-ja-extra
src/util/distro-import/106/common/loc/SUNWlang-ko-extra
src/util/distro-import/106/common/loc/SUNWlang-zhCN-extra
src/util/distro-import/106/common/loc/SUNWlang-zhHK-extra
src/util/distro-import/106/common/loc/SUNWlang-zhTW-extra
src/util/distro-import/106/sparc/SUNWastfbcf
src/util/distro-import/107/common/SUNWbabl
src/util/distro-import/107/common/SUNWcodeina
src/util/distro-import/107/common/SUNWcups-manager
src/util/distro-import/107/common/SUNWfftw2
src/util/distro-import/107/common/SUNWfftw3
src/util/distro-import/107/common/SUNWgegl
src/util/distro-import/107/common/SUNWgftp
src/util/distro-import/107/common/SUNWgkrellm
src/util/distro-import/107/common/SUNWgnome-a11y-mousetweaks
src/util/distro-import/107/common/SUNWgnome-media-center
src/util/distro-import/107/common/SUNWlibical
src/util/distro-import/107/common/SUNWlibsndfile
src/util/distro-import/107/common/SUNWpython24-simplejson
src/util/distro-import/107/common/SUNWpython25-simplejson
src/util/distro-import/107/common/SUNWpyyaml24
src/util/distro-import/107/common/SUNWpyyaml25
src/util/distro-import/107/common/SUNWsongbird
src/util/distro-import/107/common/SUNWxorg-doc
src/util/distro-import/107/common/loc/SUNWgnome-l10nmessages-extra
src/util/distro-import/107/common/loc/SUNWpostgr-l10n-ja
src/util/distro-import/107/common/loc/SUNWttf-unfonts-ko-core
src/util/distro-import/107/common/loc/SUNWttf-unfonts-ko-extra
src/util/distro-import/107/common/loc/SUNWttf-wqy-zenhei
src/util/distro-import/107/i386/SUNWclutter
src/util/distro-import/107/i386/SUNWclutter-gst
src/util/distro-import/107/i386/SUNWclutter-gtk
src/util/distro-import/107/sparc/SUNWefbw
src/util/distro-import/107/sparc/SUNWnfb
src/util/distro-import/107/sparc/SUNWnfbcf
src/util/distro-import/107/sparc/SUNWnfbw
src/util/distro-import/107/sparc/SUNWpfb
src/util/distro-import/107/sparc/SUNWpfbcf
src/util/distro-import/107/sparc/SUNWpfbw
src/util/distro-import/108/common/SUNWgnu-findutils
src/util/distro-import/108/common/SUNWgvim
src/util/distro-import/108/common/SUNWipkg-gui
src/util/distro-import/108/common/SUNWlibvisual
src/util/distro-import/109/common/SUNWPython26-extra
src/util/distro-import/109/common/SUNWgnome-python26-libs
src/util/distro-import/109/common/SUNWkonkretcmpi
src/util/distro-import/109/common/SUNWonbld
src/util/distro-import/109/common/SUNWpython26-setuptools
src/util/distro-import/109/common/SUNWruby18
src/util/distro-import/109/common/SUNWsg3utils
src/util/distro-import/109/common/SUNWsimplewbem
src/util/distro-import/109/common/SUNWtree
src/util/distro-import/109/common/SUNWzsh
src/util/distro-import/109/common/loc/SUNWman-l10n-ja
src/util/distro-import/109/common/loc/SUNWpostgr-82-l10n-ja
src/util/distro-import/109/sparc/SUNWefbcf
src/util/distro-import/110/common/SUNWSblimCimClient
src/util/distro-import/110/common/SUNWauto-install
src/util/distro-import/110/common/SUNWauto-install-common
src/util/distro-import/110/common/SUNWcfcl
src/util/distro-import/110/common/SUNWdoc
src/util/distro-import/110/common/SUNWdtbas
src/util/distro-import/110/common/SUNWimac
src/util/distro-import/110/common/SUNWinstalladm-tools
src/util/distro-import/110/common/SUNWlibmcrypt
src/util/distro-import/110/common/SUNWlighttpd14
src/util/distro-import/110/common/SUNWlua
src/util/distro-import/110/common/SUNWmpapi
src/util/distro-import/110/common/SUNWpostgr
src/util/distro-import/110/common/SUNWpostgr-contrib
src/util/distro-import/110/common/SUNWpostgr-docs
src/util/distro-import/110/common/SUNWpostgr-libs
src/util/distro-import/110/common/SUNWpostgr-pl
src/util/distro-import/110/common/SUNWpostgr-server
src/util/distro-import/110/common/SUNWpython-ply
src/util/distro-import/110/common/SUNWpython24-ctypes
src/util/distro-import/110/common/SUNWsblimwbemcli
src/util/distro-import/110/common/SUNWsprot
src/util/distro-import/110/common/SUNWsshd
src/util/distro-import/110/common/loc/SUNWlang-ar
src/util/distro-import/110/common/loc/SUNWlang-be
src/util/distro-import/110/common/loc/SUNWlang-bg
src/util/distro-import/110/common/loc/SUNWlang-ca
src/util/distro-import/110/common/loc/SUNWlang-cs
src/util/distro-import/110/common/loc/SUNWlang-da
src/util/distro-import/110/common/loc/SUNWlang-deDE
src/util/distro-import/110/common/loc/SUNWlang-el
src/util/distro-import/110/common/loc/SUNWlang-enUS
src/util/distro-import/110/common/loc/SUNWlang-esES
src/util/distro-import/110/common/loc/SUNWlang-et
src/util/distro-import/110/common/loc/SUNWlang-fi
src/util/distro-import/110/common/loc/SUNWlang-frFR
src/util/distro-import/110/common/loc/SUNWlang-he
src/util/distro-import/110/common/loc/SUNWlang-hi
src/util/distro-import/110/common/loc/SUNWlang-hr
src/util/distro-import/110/common/loc/SUNWlang-hu
src/util/distro-import/110/common/loc/SUNWlang-id
src/util/distro-import/110/common/loc/SUNWlang-is
src/util/distro-import/110/common/loc/SUNWlang-it
src/util/distro-import/110/common/loc/SUNWlang-ja
src/util/distro-import/110/common/loc/SUNWlang-ka
src/util/distro-import/110/common/loc/SUNWlang-kk
src/util/distro-import/110/common/loc/SUNWlang-ko
src/util/distro-import/110/common/loc/SUNWlang-lt
src/util/distro-import/110/common/loc/SUNWlang-lv
src/util/distro-import/110/common/loc/SUNWlang-mk
src/util/distro-import/110/common/loc/SUNWlang-ms
src/util/distro-import/110/common/loc/SUNWlang-mt
src/util/distro-import/110/common/loc/SUNWlang-nb
src/util/distro-import/110/common/loc/SUNWlang-nl
src/util/distro-import/110/common/loc/SUNWlang-nn
src/util/distro-import/110/common/loc/SUNWlang-pl
src/util/distro-import/110/common/loc/SUNWlang-pt
src/util/distro-import/110/common/loc/SUNWlang-ptBR
src/util/distro-import/110/common/loc/SUNWlang-ro
src/util/distro-import/110/common/loc/SUNWlang-ru
src/util/distro-import/110/common/loc/SUNWlang-sh
src/util/distro-import/110/common/loc/SUNWlang-sk
src/util/distro-import/110/common/loc/SUNWlang-sl
src/util/distro-import/110/common/loc/SUNWlang-sq
src/util/distro-import/110/common/loc/SUNWlang-sr
src/util/distro-import/110/common/loc/SUNWlang-sv
src/util/distro-import/110/common/loc/SUNWlang-th
src/util/distro-import/110/common/loc/SUNWlang-tr
src/util/distro-import/110/common/loc/SUNWlang-uk
src/util/distro-import/110/common/loc/SUNWlang-vi
src/util/distro-import/110/common/loc/SUNWlang-zhCN
src/util/distro-import/110/common/loc/SUNWlang-zhHK
src/util/distro-import/110/common/loc/SUNWlang-zhTW
src/util/distro-import/110/common/loc/SUNWpostgr-83-l10n-ja
src/util/distro-import/110/common/loc/SUNWttf-google-droid
src/util/distro-import/110/sparc/SUNWafb
src/util/distro-import/110/sparc/SUNWafbcf
src/util/distro-import/110/sparc/SUNWafbw
src/util/distro-import/110/sparc/SUNWffb
src/util/distro-import/110/sparc/SUNWffbcf
src/util/distro-import/110/sparc/SUNWffbw
src/util/distro-import/110/sparc/SUNWgfb
src/util/distro-import/110/sparc/SUNWgfbcf
src/util/distro-import/110/sparc/SUNWgfbw
src/util/distro-import/110/sparc/SUNWifb
src/util/distro-import/110/sparc/SUNWifbcf
src/util/distro-import/110/sparc/SUNWifbw
src/util/distro-import/110/sparc/SUNWjfb
src/util/distro-import/110/sparc/SUNWjfbcf
src/util/distro-import/110/sparc/SUNWjfbw
src/util/distro-import/110/sparc/SUNWm64
src/util/distro-import/110/sparc/SUNWm64cf
src/util/distro-import/110/sparc/SUNWm64w
src/util/distro-import/110/sparc/SUNWzulu
src/util/distro-import/110/sparc/SUNWzuluc
src/util/distro-import/110/sparc/SUNWzuluw
src/util/distro-import/110/sparc/TSIpgx
src/util/distro-import/110/sparc/TSIpgxw
src/util/distro-import/111/common/SUNWgnu-nano
src/util/distro-import/111/common/SUNWm17n-contrib
src/util/distro-import/111/common/SUNWmysql51
src/util/distro-import/111/common/SUNWmysql51lib
src/util/distro-import/111/common/SUNWopenwsman
src/util/distro-import/111/common/SUNWsquid
src/util/distro-import/111/common/SUNWvim
src/util/distro-import/111a/common/OSOLvpanels
src/util/distro-import/111a/common/OSOLvpanels-apache
src/util/distro-import/111a/common/SUNWapch22m-security
src/util/distro-import/111a/common/SUNWgnu-idn
src/util/distro-import/111a/common/SUNWmysql51test
src/util/distro-import/111a/common/SUNWsmbfskr
src/util/distro-import/111a/common/SUNWswmt
src/util/distro-import/111a/common/SUNWtsg
src/util/distro-import/111a/common/loc/SUNWgetting-started-l10n-extra
src/util/distro-import/116/common/SUNWImperius
src/util/distro-import/116/common/SUNWactivation
src/util/distro-import/116/common/SUNWaget
src/util/distro-import/116/common/SUNWantlr
src/util/distro-import/116/common/SUNWantlr2
src/util/distro-import/116/common/SUNWaudh
src/util/distro-import/116/common/SUNWavahi-bridge-dsd
src/util/distro-import/116/common/SUNWawstats
src/util/distro-import/116/common/SUNWbinutils
src/util/distro-import/116/common/SUNWbwm-ng
src/util/distro-import/116/common/SUNWcairo
src/util/distro-import/116/common/SUNWcglib
src/util/distro-import/116/common/SUNWclisp
src/util/distro-import/116/common/SUNWconflict
src/util/distro-import/116/common/SUNWconvmv
src/util/distro-import/116/common/SUNWdbus-bindings
src/util/distro-import/116/common/SUNWdbus-glib
src/util/distro-import/116/common/SUNWdbus-python24
src/util/distro-import/116/common/SUNWdbus-python26
src/util/distro-import/116/common/SUNWdesktop-cache
src/util/distro-import/116/common/SUNWdesktop-startup
src/util/distro-import/116/common/SUNWdom4j
src/util/distro-import/116/common/SUNWdrools
src/util/distro-import/116/common/SUNWdwdiff
src/util/distro-import/116/common/SUNWelinks
src/util/distro-import/116/common/SUNWepydoc
src/util/distro-import/116/common/SUNWfcgi
src/util/distro-import/116/common/SUNWfcgi-doc
src/util/distro-import/116/common/SUNWfcoeu
src/util/distro-import/116/common/SUNWglib2
src/util/distro-import/116/common/SUNWgm4
src/util/distro-import/116/common/SUNWgnome-a11y-libs-python24
src/util/distro-import/116/common/SUNWgnome-a11y-libs-python26
src/util/distro-import/116/common/SUNWgnome-base-libs
src/util/distro-import/116/common/SUNWgnome-display-mgr
src/util/distro-import/116/common/SUNWgnome-dtstart
src/util/distro-import/116/common/SUNWgnome-media-player
src/util/distro-import/116/common/SUNWgnome-python-extras
src/util/distro-import/116/common/SUNWgnome-python26-extras
src/util/distro-import/116/common/SUNWgnu-dbm
src/util/distro-import/116/common/SUNWgnu-readline
src/util/distro-import/116/common/SUNWgocr
src/util/distro-import/116/common/SUNWgrub
src/util/distro-import/116/common/SUNWgst-python
src/util/distro-import/116/common/SUNWgst-python26
src/util/distro-import/116/common/SUNWgtar
src/util/distro-import/116/common/SUNWgtk-doc
src/util/distro-import/116/common/SUNWgtk-vnc-python26
src/util/distro-import/116/common/SUNWgtk2
src/util/distro-import/116/common/SUNWhal-cups-utils
src/util/distro-import/116/common/SUNWhttping
src/util/distro-import/116/common/SUNWibdma
src/util/distro-import/116/common/SUNWiftop
src/util/distro-import/116/common/SUNWio-tools
src/util/distro-import/116/common/SUNWiperf
src/util/distro-import/116/common/SUNWjanino
src/util/distro-import/116/common/SUNWjarjar
src/util/distro-import/116/common/SUNWjavamail
src/util/distro-import/116/common/SUNWjaxb
src/util/distro-import/116/common/SUNWjaxen-core
src/util/distro-import/116/common/SUNWjdom
src/util/distro-import/116/common/SUNWjdtcore
src/util/distro-import/116/common/SUNWjettison
src/util/distro-import/116/common/SUNWjodatime
src/util/distro-import/116/common/SUNWjxl
src/util/distro-import/116/common/SUNWlibart
src/util/distro-import/116/common/SUNWlibatk
src/util/distro-import/116/common/SUNWlibcanberra
src/util/distro-import/116/common/SUNWlibconfuse
src/util/distro-import/116/common/SUNWlibglade
src/util/distro-import/116/common/SUNWlibgnomecanvas
src/util/distro-import/116/common/SUNWlibproxy
src/util/distro-import/116/common/SUNWlibsigsegv
src/util/distro-import/116/common/SUNWlibunique
src/util/distro-import/116/common/SUNWlibusb
src/util/distro-import/116/common/SUNWlog4j
src/util/distro-import/116/common/SUNWmrtg
src/util/distro-import/116/common/SUNWmvel
src/util/distro-import/116/common/SUNWmysql-python
src/util/distro-import/116/common/SUNWntp
src/util/distro-import/116/common/SUNWobjectasm
src/util/distro-import/116/common/SUNWpango
src/util/distro-import/116/common/SUNWpatchutils
src/util/distro-import/116/common/SUNWpciaccess
src/util/distro-import/116/common/SUNWpen
src/util/distro-import/116/common/SUNWperl-pmtools
src/util/distro-import/116/common/SUNWpixman
src/util/distro-import/116/common/SUNWpowerman
src/util/distro-import/116/common/SUNWpull-parser
src/util/distro-import/116/common/SUNWpwgen
src/util/distro-import/116/common/SUNWpython26-cssutils
src/util/distro-import/116/common/SUNWpython26-imaging
src/util/distro-import/116/common/SUNWpython26-notify
src/util/distro-import/116/common/SUNWpython26-pyopenssl
src/util/distro-import/116/common/SUNWpython26-simplejson
src/util/distro-import/116/common/SUNWpython26-twisted
src/util/distro-import/116/common/SUNWpython26-twisted-web2
src/util/distro-import/116/common/SUNWpython26-xdg
src/util/distro-import/116/common/SUNWpython26-zope-interface
src/util/distro-import/116/common/SUNWpyyaml26
src/util/distro-import/116/common/SUNWrelaxngDatatype
src/util/distro-import/116/common/SUNWrmodu
src/util/distro-import/116/common/SUNWsaaj
src/util/distro-import/116/common/SUNWslrn
src/util/distro-import/116/common/SUNWstringtemplate
src/util/distro-import/116/common/SUNWsudo
src/util/distro-import/116/common/SUNWtor
src/util/distro-import/116/common/SUNWtotem-pl-parser
src/util/distro-import/116/common/SUNWunixodbc
src/util/distro-import/116/common/SUNWunrar
src/util/distro-import/116/common/SUNWuwb
src/util/distro-import/116/common/SUNWwiseman
src/util/distro-import/116/common/SUNWxom
src/util/distro-import/116/common/SUNWxorg-cfg
src/util/distro-import/116/common/SUNWxorg-devel-docs
src/util/distro-import/116/common/SUNWxorg-xkb
src/util/distro-import/116/common/SUNWxpp3min
src/util/distro-import/116/common/SUNWxsdlib
src/util/distro-import/116/common/SUNWxstream
src/util/distro-import/116/common/SUNWxwdem
src/util/distro-import/116/common/loc/SUNWmyspell-dictionary-noinst
src/util/distro-import/116/i386/NVDAcg
src/util/distro-import/116/i386/SUNWbrasero
src/util/distro-import/116/i386/SUNWdrivel
src/util/distro-import/116/i386/SUNWlibpigment-python26
src/util/distro-import/116/i386/SUNWntfsprogs
src/util/distro-import/116/i386/SUNWparted
src/util/distro-import/116/i386/SUNWrmod
src/util/distro-import/116/i386/SUNWrmodr
src/util/distro-import/117/common/SUNWaconf
src/util/distro-import/117/common/SUNWareca
src/util/distro-import/117/common/SUNWconman
src/util/distro-import/117/common/SUNWperl-net-ssleay
src/util/distro-import/118/common/SUNWcedu
src/util/distro-import/118/common/SUNWdosbox
src/util/distro-import/118/common/SUNWejabberd
src/util/distro-import/118/common/SUNWiozone
src/util/distro-import/118/common/SUNWlibxmlrpc-c
src/util/distro-import/118/common/SUNWlogilab-astng
src/util/distro-import/118/common/SUNWlogilab-common
src/util/distro-import/118/common/SUNWmfrun
src/util/distro-import/118/common/SUNWopenssl
src/util/distro-import/118/common/SUNWpconsole
src/util/distro-import/118/common/SUNWshmux
src/util/distro-import/118/common/SUNWsnort
src/util/distro-import/118/common/SUNWtcat
src/util/distro-import/118/common/SUNWtltk
src/util/distro-import/118/common/SUNWxwplr
src/util/distro-import/119/common/SUNWaalib
src/util/distro-import/119/common/SUNWautogen
src/util/distro-import/119/common/SUNWbeanshell
src/util/distro-import/119/common/SUNWbvi
src/util/distro-import/119/common/SUNWcommons-collections
src/util/distro-import/119/common/SUNWfcprt
src/util/distro-import/119/common/SUNWguile
src/util/distro-import/119/common/SUNWlibosip2
src/util/distro-import/119/common/SUNWnfsc
src/util/distro-import/119/common/SUNWnfsckr
src/util/distro-import/119/common/SUNWnfss
src/util/distro-import/119/common/SUNWnfsskr
src/util/distro-import/119/common/SUNWpipe-viewer
src/util/distro-import/119/common/SUNWpylint
src/util/distro-import/119/common/SUNWsmbskr
src/util/distro-import/119/common/SUNWzfskr
src/util/distro-import/120/common/OSOLvpanels-sharemgr
src/util/distro-import/120/common/SUNWjedit
src/util/distro-import/120/common/SUNWlibtorrent
src/util/distro-import/120/common/SUNWlibyaz
src/util/distro-import/120/common/SUNWncft
src/util/distro-import/120/common/SUNWnet-snmp-addons
src/util/distro-import/120/common/SUNWnet-snmp-core
src/util/distro-import/120/common/SUNWnet-snmp-doc
src/util/distro-import/120/common/SUNWnet-snmp-utils
src/util/distro-import/120/common/SUNWpdsh
src/util/distro-import/120/common/SUNWpywbem
src/util/distro-import/120/common/SUNWrtorrent
src/util/distro-import/120/common/SUNWsfwdemo
src/util/distro-import/120/common/SUNWsmagt
src/util/distro-import/120/common/SUNWsmcmd
src/util/distro-import/120/common/SUNWsmdoc
src/util/distro-import/120/common/SUNWsmmgr
src/util/distro-import/120/common/SUNWts
src/util/distro-import/120/common/SUNWxprint-server
src/util/distro-import/120/common/SUNWxwpft
src/util/distro-import/120/common/SUNWxwrtl
src/util/distro-import/120/common/SUNWxwslb
src/util/distro-import/120/common/loc/SUNWttf-gentium
src/util/distro-import/120/common/loc/SUNWttf-kacst
src/util/distro-import/120/common/loc/SUNWttf-unifont
src/util/distro-import/120/i386/SUNWxorg-mesa
src/util/distro-import/121/common/SUNWbind
src/util/distro-import/121/common/SUNWbindc
src/util/distro-import/121/common/SUNWipkg
src/util/distro-import/121/common/SUNWpython-pycurl
src/util/distro-import/121/common/SUNWxwinc
src/util/distro-import/121/common/SUNWxwxft
src/util/distro-import/121/i386/SUNWxvm
src/util/distro-import/121/i386/SUNWxvmdom
src/util/distro-import/121/i386/SUNWxvmipa
src/util/distro-import/122/common/SUNWapu13
src/util/distro-import/122/common/SUNWapu13-ldap
src/util/distro-import/122/common/SUNWapu13dbd-mysql
src/util/distro-import/122/common/SUNWapu13dbd-pgsql
src/util/distro-import/122/common/SUNWapu13dbd-sqlite
src/util/distro-import/122/common/SUNWcsl
src/util/distro-import/122/common/SUNWdfbh
src/util/distro-import/122/common/SUNWfreeipmi
src/util/distro-import/122/common/SUNWgnu-coreutils
src/util/distro-import/122/common/SUNWlftp
src/util/distro-import/122/common/SUNWperl510core
src/util/distro-import/122/common/SUNWperl510usr
src/util/distro-import/122/common/SUNWrss-glx
src/util/distro-import/122/common/SUNWscp
src/util/distro-import/122/common/SUNWxwsvr
src/util/distro-import/122/common/SUNWzoneint
src/util/distro-import/122/common/osnet-dev
src/util/distro-import/122/i386/SUNWdfb
src/util/distro-import/122/sparc/SUNWust
src/util/distro-import/123/common/SUNWPython
src/util/distro-import/123/common/SUNWcurl
src/util/distro-import/123/common/SUNWflexlex
src/util/distro-import/123/common/SUNWflexruntime
src/util/distro-import/123/common/SUNWgsed
src/util/distro-import/123/common/SUNWless
src/util/distro-import/123/common/SUNWlibstdcxx4
src/util/distro-import/123/common/SUNWmercurial
src/util/distro-import/123/common/SUNWsound-exchange
src/util/distro-import/123/common/SUNWsqlite3
src/util/distro-import/123/common/SUNWsqlite3docs
src/util/distro-import/123/common/SUNWsqlite3tcl
src/util/distro-import/123/common/SUNWsysbench
src/util/distro-import/123/common/SUNWtcsh
src/util/distro-import/123/common/loc/SUNWlang-af
src/util/distro-import/123/common/loc/SUNWlang-as
src/util/distro-import/123/common/loc/SUNWlang-az
src/util/distro-import/123/common/loc/SUNWlang-bn
src/util/distro-import/123/common/loc/SUNWlang-gu
src/util/distro-import/123/common/loc/SUNWlang-kn
src/util/distro-import/123/common/loc/SUNWlang-ky
src/util/distro-import/123/common/loc/SUNWlang-ml
src/util/distro-import/123/common/loc/SUNWlang-mr
src/util/distro-import/123/common/loc/SUNWlang-or
src/util/distro-import/123/common/loc/SUNWlang-pa
src/util/distro-import/123/common/loc/SUNWttf-mgopen
src/util/distro-import/123/i386/SUNWvirt-manager
src/util/distro-import/124/common/SUNWGlib
src/util/distro-import/124/common/SUNWGtk
src/util/distro-import/124/common/SUNWbeadm
src/util/distro-import/124/common/SUNWcmdassist
src/util/distro-import/124/common/SUNWcompiz
src/util/distro-import/124/common/SUNWdesktop-search-firefox
src/util/distro-import/124/common/SUNWdesktop-search-thunderbird
src/util/distro-import/124/common/SUNWfirefox-apoc-adapter
src/util/distro-import/124/common/SUNWfreetype2
src/util/distro-import/124/common/SUNWgcc
src/util/distro-import/124/common/SUNWghostscript
src/util/distro-import/124/common/SUNWgir-repository
src/util/distro-import/124/common/SUNWgnome-a11y-speech-freetts
src/util/distro-import/124/common/SUNWgnome-python26-desktop
src/util/distro-import/124/common/SUNWgnonlin
src/util/distro-import/124/common/SUNWgobject-introspection
src/util/distro-import/124/common/SUNWgui-install
src/util/distro-import/124/common/SUNWj6dev
src/util/distro-import/124/common/SUNWj6dmo
src/util/distro-import/124/common/SUNWj6dmx
src/util/distro-import/124/common/SUNWj6dvx
src/util/distro-import/124/common/SUNWj6man
src/util/distro-import/124/common/SUNWj6rt
src/util/distro-import/124/common/SUNWj6rtx
src/util/distro-import/124/common/SUNWjokosher
src/util/distro-import/124/common/SUNWjrexx
src/util/distro-import/124/common/SUNWmysql
src/util/distro-import/124/common/SUNWperl584man
src/util/distro-import/124/common/SUNWpgadmin3
src/util/distro-import/124/common/SUNWqdox
src/util/distro-import/124/common/SUNWquagga
src/util/distro-import/124/common/SUNWraptor
src/util/distro-import/124/common/SUNWser
src/util/distro-import/124/common/SUNWsfdoc
src/util/distro-import/124/common/SUNWsfinf
src/util/distro-import/124/common/SUNWsfman
src/util/distro-import/124/common/SUNWsfwhea
src/util/distro-import/124/common/SUNWtack
src/util/distro-import/124/common/SUNWtrove
src/util/distro-import/124/common/SUNWtss
src/util/distro-import/124/common/SUNWvinagre
src/util/distro-import/124/common/SUNWwebmin
src/util/distro-import/124/common/SUNWxscreensaver
src/util/distro-import/124/common/SUNWxscreensaver-hacks-gl
src/util/distro-import/124/common/loc/SUNWj6jmp
src/util/distro-import/124/i386/SUNWclutter-cairo
src/util/distro-import/124/i386/SUNWmoovida
src/util/distro-import/124/i386/SUNWmoovida-plugins
src/util/distro-import/124/sparc/SUNWpdu
src/util/distro-import/125/common/SUNW1394
src/util/distro-import/125/common/SUNWaac
src/util/distro-import/125/common/SUNWafe
src/util/distro-import/125/common/SUNWapch22m-jk
src/util/distro-import/125/common/SUNWaudd
src/util/distro-import/125/common/SUNWaudiols
src/util/distro-import/125/common/SUNWaudiop16x
src/util/distro-import/125/common/SUNWav1394
src/util/distro-import/125/common/SUNWbridge
src/util/distro-import/125/common/SUNWced
src/util/distro-import/125/common/SUNWchxge
src/util/distro-import/125/common/SUNWcpc
src/util/distro-import/125/common/SUNWcpr
src/util/distro-import/125/common/SUNWcs
src/util/distro-import/125/common/SUNWcsd
src/util/distro-import/125/common/SUNWdcaf
src/util/distro-import/125/common/SUNWdmfe
src/util/distro-import/125/common/SUNWdtrp
src/util/distro-import/125/common/SUNWemlxs
src/util/distro-import/125/common/SUNWfcip
src/util/distro-import/125/common/SUNWfcoe
src/util/distro-import/125/common/SUNWfcoei
src/util/distro-import/125/common/SUNWfcoet
src/util/distro-import/125/common/SUNWfcp
src/util/distro-import/125/common/SUNWfcsm
src/util/distro-import/125/common/SUNWfctl
src/util/distro-import/125/common/SUNWfmd
src/util/distro-import/125/common/SUNWftdu
src/util/distro-import/125/common/SUNWfwdc
src/util/distro-import/125/common/SUNWggrp
src/util/distro-import/125/common/SUNWgnu-diffutils
src/util/distro-import/125/common/SUNWhermon
src/util/distro-import/125/common/SUNWhmd
src/util/distro-import/125/common/SUNWhxge
src/util/distro-import/125/common/SUNWib
src/util/distro-import/125/common/SUNWibsdp
src/util/distro-import/125/common/SUNWibsdpib
src/util/distro-import/125/common/SUNWibus
src/util/distro-import/125/common/SUNWibus-anthy
src/util/distro-import/125/common/SUNWibus-chewing
src/util/distro-import/125/common/SUNWibus-hangul
src/util/distro-import/125/common/SUNWibus-m17n
src/util/distro-import/125/common/SUNWibus-pinyin
src/util/distro-import/125/common/SUNWibus-table
src/util/distro-import/125/common/SUNWibus-table-data-array30
src/util/distro-import/125/common/SUNWibus-table-data-cangjie
src/util/distro-import/125/common/SUNWibus-table-data-erbi
src/util/distro-import/125/common/SUNWibus-table-data-quick
src/util/distro-import/125/common/SUNWibus-table-data-translit
src/util/distro-import/125/common/SUNWibus-table-data-wubi
src/util/distro-import/125/common/SUNWibus-table-data-xinhua
src/util/distro-import/125/common/SUNWibus-table-data-yong
src/util/distro-import/125/common/SUNWibus-table-data-zhengma
src/util/distro-import/125/common/SUNWidzebra
src/util/distro-import/125/common/SUNWigb
src/util/distro-import/125/common/SUNWii
src/util/distro-import/125/common/SUNWiiimf-ja-anthy
src/util/distro-import/125/common/SUNWiiimf-ko-hangul
src/util/distro-import/125/common/SUNWiiimf-th-thaile
src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-core
src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-open
src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-sunpinyin
src/util/distro-import/125/common/SUNWiiimf-zhHK-hkle-core
src/util/distro-import/125/common/SUNWiiimf-zhHK-hkle-open
src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-chewing
src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-core
src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-open
src/util/distro-import/125/common/SUNWintgige
src/util/distro-import/125/common/SUNWipf
src/util/distro-import/125/common/SUNWipoib
src/util/distro-import/125/common/SUNWiscsi
src/util/distro-import/125/common/SUNWiscsidm
src/util/distro-import/125/common/SUNWiscsit
src/util/distro-import/125/common/SUNWixgb
src/util/distro-import/125/common/SUNWixgbe
src/util/distro-import/125/common/SUNWlatencytop
src/util/distro-import/125/common/SUNWldtp
src/util/distro-import/125/common/SUNWllc
src/util/distro-import/125/common/SUNWmd
src/util/distro-import/125/common/SUNWmms
src/util/distro-import/125/common/SUNWmptsas
src/util/distro-import/125/common/SUNWmrsas
src/util/distro-import/125/common/SUNWmxfe
src/util/distro-import/125/common/SUNWmyri10ge
src/util/distro-import/125/common/SUNWnca
src/util/distro-import/125/common/SUNWnxge
src/util/distro-import/125/common/SUNWpacket
src/util/distro-import/125/common/SUNWpcan
src/util/distro-import/125/common/SUNWpcelx
src/util/distro-import/125/common/SUNWpcmci
src/util/distro-import/125/common/SUNWpcmem
src/util/distro-import/125/common/SUNWpcser
src/util/distro-import/125/common/SUNWpcwl
src/util/distro-import/125/common/SUNWpd
src/util/distro-import/125/common/SUNWpkgcmds
src/util/distro-import/125/common/SUNWpm
src/util/distro-import/125/common/SUNWpool
src/util/distro-import/125/common/SUNWpostgr-82-client
src/util/distro-import/125/common/SUNWpostgr-82-contrib
src/util/distro-import/125/common/SUNWpostgr-82-devel
src/util/distro-import/125/common/SUNWpostgr-82-docs
src/util/distro-import/125/common/SUNWpostgr-82-libs
src/util/distro-import/125/common/SUNWpostgr-82-pl
src/util/distro-import/125/common/SUNWpostgr-82-server
src/util/distro-import/125/common/SUNWpostgr-83-client
src/util/distro-import/125/common/SUNWpostgr-83-contrib
src/util/distro-import/125/common/SUNWpostgr-83-devel
src/util/distro-import/125/common/SUNWpostgr-83-docs
src/util/distro-import/125/common/SUNWpostgr-83-libs
src/util/distro-import/125/common/SUNWpostgr-83-pl
src/util/distro-import/125/common/SUNWpostgr-83-server
src/util/distro-import/125/common/SUNWpppd
src/util/distro-import/125/common/SUNWpsdpr
src/util/distro-import/125/common/SUNWqlc
src/util/distro-import/125/common/SUNWrdc
src/util/distro-import/125/common/SUNWrds
src/util/distro-import/125/common/SUNWrge
src/util/distro-import/125/common/SUNWrpcib
src/util/distro-import/125/common/SUNWrsm
src/util/distro-import/125/common/SUNWrsync
src/util/distro-import/125/common/SUNWscm
src/util/distro-import/125/common/SUNWscsa1394
src/util/distro-import/125/common/SUNWsdcard
src/util/distro-import/125/common/SUNWsfe
src/util/distro-import/125/common/SUNWsmbfs
src/util/distro-import/125/common/SUNWsmbs
src/util/distro-import/125/common/SUNWsmpd
src/util/distro-import/125/common/SUNWspsv
src/util/distro-import/125/common/SUNWsrpt
src/util/distro-import/125/common/SUNWsynergy
src/util/distro-import/125/common/SUNWtavor
src/util/distro-import/125/common/SUNWtnfc
src/util/distro-import/125/common/SUNWtpm
src/util/distro-import/125/common/SUNWuacm
src/util/distro-import/125/common/SUNWudaplt
src/util/distro-import/125/common/SUNWuedg
src/util/distro-import/125/common/SUNWuftdi
src/util/distro-import/125/common/SUNWugen
src/util/distro-import/125/common/SUNWuksp
src/util/distro-import/125/common/SUNWuprl
src/util/distro-import/125/common/SUNWusb
src/util/distro-import/125/common/SUNWusbvc
src/util/distro-import/125/common/SUNWvr
src/util/distro-import/125/common/SUNWvscan
src/util/distro-import/125/common/SUNWwxwidgets
src/util/distro-import/125/common/SUNWxdm
src/util/distro-import/125/common/SUNWxge
src/util/distro-import/125/common/SUNWxwdv
src/util/distro-import/125/common/SUNWxwopt
src/util/distro-import/125/common/SUNWxwplt
src/util/distro-import/125/common/SUNWyge
src/util/distro-import/125/common/SUNWzfs
src/util/distro-import/125/common/SUNWzone
src/util/distro-import/125/common/loc/SUNWlang-hy
src/util/distro-import/125/common/loc/SUNWlang-ks
src/util/distro-import/125/common/loc/SUNWlang-ku
src/util/distro-import/125/common/loc/SUNWlang-sa
src/util/distro-import/125/common/loc/SUNWlang-zhSG
src/util/distro-import/125/common/loc/SUNWttf-bpg-georgian
src/util/distro-import/125/common/loc/SUNWttf-sil
src/util/distro-import/125/i386/BRCMbnx
src/util/distro-import/125/i386/NVDAgraphics
src/util/distro-import/125/i386/SUNWGParted
src/util/distro-import/125/i386/SUNWad810
src/util/distro-import/125/i386/SUNWadixp
src/util/distro-import/125/i386/SUNWadpu320
src/util/distro-import/125/i386/SUNWagp
src/util/distro-import/125/i386/SUNWahci
src/util/distro-import/125/i386/SUNWamd8111s
src/util/distro-import/125/i386/SUNWamr
src/util/distro-import/125/i386/SUNWamt
src/util/distro-import/125/i386/SUNWarcmsr
src/util/distro-import/125/i386/SUNWarn
src/util/distro-import/125/i386/SUNWatge
src/util/distro-import/125/i386/SUNWatheros
src/util/distro-import/125/i386/SUNWatigfx
src/util/distro-import/125/i386/SUNWatu
src/util/distro-import/125/i386/SUNWaudiocmi
src/util/distro-import/125/i386/SUNWaudiohd
src/util/distro-import/125/i386/SUNWaudiosolo
src/util/distro-import/125/i386/SUNWaudiovia97
src/util/distro-import/125/i386/SUNWbcmsata
src/util/distro-import/125/i386/SUNWbfe
src/util/distro-import/125/i386/SUNWdcopy
src/util/distro-import/125/i386/SUNWdrmr
src/util/distro-import/125/i386/SUNWfipe
src/util/distro-import/125/i386/SUNWipw
src/util/distro-import/125/i386/SUNWiwh
src/util/distro-import/125/i386/SUNWiwi
src/util/distro-import/125/i386/SUNWiwk
src/util/distro-import/125/i386/SUNWlsimega
src/util/distro-import/125/i386/SUNWlx
src/util/distro-import/125/i386/SUNWmegasas
src/util/distro-import/125/i386/SUNWmv88sx
src/util/distro-import/125/i386/SUNWnge
src/util/distro-import/125/i386/SUNWntxn
src/util/distro-import/125/i386/SUNWnvsata
src/util/distro-import/125/i386/SUNWos86r
src/util/distro-import/125/i386/SUNWpsdcr
src/util/distro-import/125/i386/SUNWpsdir
src/util/distro-import/125/i386/SUNWralink
src/util/distro-import/125/i386/SUNWrtls
src/util/distro-import/125/i386/SUNWrtw
src/util/distro-import/125/i386/SUNWrum
src/util/distro-import/125/i386/SUNWrwd
src/util/distro-import/125/i386/SUNWrwn
src/util/distro-import/125/i386/SUNWsi3124
src/util/distro-import/125/i386/SUNWuath
src/util/distro-import/125/i386/SUNWural
src/util/distro-import/125/i386/SUNWurtw
src/util/distro-import/125/i386/SUNWvia823x
src/util/distro-import/125/i386/SUNWwpi
src/util/distro-import/125/i386/SUNWxdt
src/util/distro-import/125/i386/SUNWxsvc
src/util/distro-import/125/i386/SUNWxvmpv
src/util/distro-import/125/i386/SUNWzyd
src/util/distro-import/125/sparc/SUNWastfb
src/util/distro-import/125/sparc/SUNWcg6
src/util/distro-import/125/sparc/SUNWcti2
src/util/distro-import/125/sparc/SUNWcvc
src/util/distro-import/125/sparc/SUNWdrr
src/util/distro-import/125/sparc/SUNWdscp
src/util/distro-import/125/sparc/SUNWefb
src/util/distro-import/125/sparc/SUNWefc
src/util/distro-import/125/sparc/SUNWerid
src/util/distro-import/125/sparc/SUNWged
src/util/distro-import/125/sparc/SUNWidn
src/util/distro-import/125/sparc/SUNWiopc
src/util/distro-import/125/sparc/SUNWkfb
src/util/distro-import/125/sparc/SUNWldom
src/util/distro-import/125/sparc/SUNWluxd
src/util/distro-import/125/sparc/SUNWluxl
src/util/distro-import/125/sparc/SUNWn2cp
src/util/distro-import/125/sparc/SUNWniumx
src/util/distro-import/125/sparc/SUNWqfed
src/util/distro-import/125/sparc/SUNWsckm
src/util/distro-import/125/sparc/SUNWssad
src/util/distro-import/125/sparc/SUNWstc
src/util/distro-import/125/sparc/SUNWus
src/util/distro-import/126/common/OSOLvpanels-firewall
src/util/distro-import/126/common/SUNWPython26
src/util/distro-import/126/common/SUNWapch22m-php52
src/util/distro-import/126/common/SUNWbash
src/util/distro-import/126/common/SUNWcakr
src/util/distro-import/126/common/SUNWcups
src/util/distro-import/126/common/SUNWcups-libs
src/util/distro-import/126/common/SUNWfakeroot
src/util/distro-import/126/common/SUNWgdb
src/util/distro-import/126/common/SUNWgnu-mp
src/util/distro-import/126/common/SUNWgnu-mpfr
src/util/distro-import/126/common/SUNWgtk2-print-cups
src/util/distro-import/126/common/SUNWgtk2-print-papi
src/util/distro-import/126/common/SUNWhea
src/util/distro-import/126/common/SUNWhpijs
src/util/distro-import/126/common/SUNWman
src/util/distro-import/126/common/SUNWmysql-python26
src/util/distro-import/126/common/SUNWphp52
src/util/distro-import/126/common/SUNWphp52-mysql
src/util/distro-import/126/common/SUNWphp52-pear
src/util/distro-import/126/common/SUNWphp52-pgsql
src/util/distro-import/126/common/SUNWphp52d
src/util/distro-import/126/common/SUNWpmcs
src/util/distro-import/126/common/SUNWpycups
src/util/distro-import/126/common/SUNWsra
src/util/distro-import/126/common/SUNWstmf
src/util/distro-import/126/common/SUNWwget
src/util/distro-import/126/common/SUNWwireshark
src/util/distro-import/126/common/SUNWxwman
src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-cs
src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-hu
src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-pl
src/util/distro-import/126/i386/OSOLvpanels-hypervisor
src/util/distro-import/126/i386/SUNWmwl
src/util/distro-import/127/common/SUNWapch22
src/util/distro-import/127/common/SUNWapch22d
src/util/distro-import/127/common/SUNWapch22m-sed
src/util/distro-import/127/common/SUNWapr13
src/util/distro-import/127/common/SUNWbge
src/util/distro-import/127/common/SUNWckr
src/util/distro-import/127/common/SUNWfontconfig
src/util/distro-import/127/common/SUNWfontconfig-docs
src/util/distro-import/127/common/SUNWgimpprint
src/util/distro-import/127/common/SUNWgutenprint
src/util/distro-import/127/common/SUNWlibsmbclient
src/util/distro-import/127/common/SUNWmemcached
src/util/distro-import/127/common/SUNWmkcd
src/util/distro-import/127/common/SUNWmutt
src/util/distro-import/127/common/SUNWmysql5
src/util/distro-import/127/common/SUNWmysql5test
src/util/distro-import/127/common/SUNWpostgr-84-client
src/util/distro-import/127/common/SUNWpostgr-84-contrib
src/util/distro-import/127/common/SUNWpostgr-84-devel
src/util/distro-import/127/common/SUNWpostgr-84-docs
src/util/distro-import/127/common/SUNWpostgr-84-libs
src/util/distro-import/127/common/SUNWpostgr-84-pl
src/util/distro-import/127/common/SUNWpostgr-84-server
src/util/distro-import/127/common/SUNWpostgr-84-tests
src/util/distro-import/127/common/SUNWpostgr-common
src/util/distro-import/127/common/SUNWpostgr-libpqxx
src/util/distro-import/127/common/SUNWpostgr-tcl
src/util/distro-import/127/common/SUNWpython24-cssutils
src/util/distro-import/127/common/SUNWpython25-cssutils
src/util/distro-import/127/common/SUNWpython26-lxml
src/util/distro-import/127/common/SUNWs10brand
src/util/distro-import/127/common/SUNWses
src/util/distro-import/127/common/SUNWsmba
src/util/distro-import/127/common/SUNWxorg-server
src/util/distro-import/127/i386/SUNWacpidump
src/util/distro-import/127/sparc/SUNWwbsd
src/util/distro-import/71/common/SUNWcacaowsvr
src/util/distro-import/71/common/SUNWgd2
src/util/distro-import/71/common/SUNWgnu-automake-110
src/util/distro-import/71/common/SUNWgnu-automake-19
src/util/distro-import/71/common/SUNWtidy
src/util/distro-import/72/common/SUNWastdev
src/util/distro-import/72/common/SUNWdsd
src/util/distro-import/72/common/SUNWxorg-tsol-module
src/util/distro-import/75a/common/SUNWIPython
src/util/distro-import/75a/common/SUNWgnome-crash-report
src/util/distro-import/75a/common/SUNWgnome-devel-docs
src/util/distro-import/75a/common/SUNWgnome-img-viewer
src/util/distro-import/75a/common/SUNWlibdaemon
src/util/distro-import/75a/common/SUNWtgnome-tsol-libs
src/util/distro-import/75a/common/SUNWtgnome-tsoljdsdevmgr
src/util/distro-import/75a/common/SUNWtgnome-tsoljdslabel
src/util/distro-import/75a/common/SUNWtgnome-tsoljdsselmgr
src/util/distro-import/75a/common/SUNWtgnome-tstripe
src/util/distro-import/75a/common/SUNWtgnome-xagent
src/util/distro-import/75a/i386/SUNWurlgrabber
src/util/distro-import/75a/i386/SUNWvirtinst
src/util/distro-import/76/common/SUNWfilebench
src/util/distro-import/76/common/SUNWgnome-doc-utils
src/util/distro-import/76/common/loc/SUNWgnome-l10ndocument-extra
src/util/distro-import/77/common/SUNWisns
src/util/distro-import/77/common/SUNWtexi
src/util/distro-import/78/common/SUNWlibevent
src/util/distro-import/78/common/SUNWlibtool
src/util/distro-import/78/common/SUNWltdl
src/util/distro-import/79b/common/SUNWp7zip
src/util/distro-import/79b/common/SUNWpmdbi
src/util/distro-import/80/common/SUNWndmp
src/util/distro-import/80/common/SUNWnetcat
src/util/distro-import/80/common/SUNWservicetag
src/util/distro-import/80/common/SUNWstosreg
src/util/distro-import/81/common/SUNWexpect
src/util/distro-import/82/common/SUNWgamin
src/util/distro-import/83/common/SUNWgnome-help-viewer
src/util/distro-import/83/common/SUNWgnome-img-editor-help
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-cs
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-de
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-es
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-extra
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-fr
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-it
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-ko
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-ru
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-sv
src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-zhCN
src/util/distro-import/84/common/SUNWftp
src/util/distro-import/85/common/SUNWapch
src/util/distro-import/85/common/SUNWapchd
src/util/distro-import/85/common/SUNWcairomm
src/util/distro-import/85/common/SUNWccsm
src/util/distro-import/85/common/SUNWcompiz-fusion-extra
src/util/distro-import/85/common/SUNWcompiz-fusion-main
src/util/distro-import/85/common/SUNWcompizconfig-gconf
src/util/distro-import/85/common/SUNWcompizconfig-python
src/util/distro-import/85/common/SUNWglibmm
src/util/distro-import/85/common/SUNWgtkmm
src/util/distro-import/85/common/SUNWid3lib
src/util/distro-import/85/common/SUNWiiimf
src/util/distro-import/85/common/SUNWlibcompizconfig
src/util/distro-import/85/common/SUNWlibgc
src/util/distro-import/85/common/SUNWlibgmime
src/util/distro-import/85/common/SUNWlibopenusb
src/util/distro-import/85/common/SUNWlibsexy
src/util/distro-import/85/common/SUNWpython-imaging
src/util/distro-import/85/common/SUNWpython-setuptools
src/util/distro-import/85/common/SUNWpython-twisted
src/util/distro-import/85/common/SUNWpython-xdg
src/util/distro-import/85/common/SUNWpython-zope-interface
src/util/distro-import/85/common/SUNWrdesktop
src/util/distro-import/85/common/SUNWrrdtool
src/util/distro-import/85/common/SUNWsexy-python
src/util/distro-import/85/common/SUNWsigcpp
src/util/distro-import/85/common/SUNWxdg-user-dirs
src/util/distro-import/85/common/SUNWxdg-utils
src/util/distro-import/85/common/loc/SUNWcsdhcm
src/util/distro-import/85/common/loc/SUNWcsos
src/util/distro-import/85/common/loc/SUNWgnome-l10ndocument-rtl
src/util/distro-import/85/common/loc/SUNWgnome-l10nmessages-rtl
src/util/distro-import/86/common/SUNWcvs
src/util/distro-import/86/common/SUNWddu
src/util/distro-import/86/common/SUNWdistro-license-copyright
src/util/distro-import/86/common/SUNWgnome-a11y-poke
src/util/distro-import/86/common/SUNWgnome-fonts
src/util/distro-import/86/common/SUNWgnome-xml
src/util/distro-import/86/common/SUNWiconv-extra
src/util/distro-import/86/common/SUNWiconv-unicode
src/util/distro-import/86/common/SUNWinstall-l10n
src/util/distro-import/86/common/SUNWinstall-libs
src/util/distro-import/86/common/SUNWlibanthy
src/util/distro-import/86/common/SUNWlibchewing
src/util/distro-import/86/common/SUNWlibhangul
src/util/distro-import/86/common/SUNWmp
src/util/distro-import/86/common/SUNWsolnm
src/util/distro-import/86/common/SUNWwsr2
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-de
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-es
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-fr
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-it
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ja
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ko
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ptBR
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ru
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-sv
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhCN
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhHK
src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhTW
src/util/distro-import/86/common/loc/SUNWlang-ar-extra
src/util/distro-import/86/common/loc/SUNWlang-bg-extra
src/util/distro-import/86/common/loc/SUNWlang-ca-extra
src/util/distro-import/86/common/loc/SUNWlang-common
src/util/distro-import/86/common/loc/SUNWlang-common-extra
src/util/distro-import/86/common/loc/SUNWlang-cs-extra
src/util/distro-import/86/common/loc/SUNWlang-da-extra
src/util/distro-import/86/common/loc/SUNWlang-de
src/util/distro-import/86/common/loc/SUNWlang-de-extra
src/util/distro-import/86/common/loc/SUNWlang-el-extra
src/util/distro-import/86/common/loc/SUNWlang-en
src/util/distro-import/86/common/loc/SUNWlang-en-extra
src/util/distro-import/86/common/loc/SUNWlang-es
src/util/distro-import/86/common/loc/SUNWlang-es-extra
src/util/distro-import/86/common/loc/SUNWlang-et-extra
src/util/distro-import/86/common/loc/SUNWlang-fi-extra
src/util/distro-import/86/common/loc/SUNWlang-fr
src/util/distro-import/86/common/loc/SUNWlang-fr-extra
src/util/distro-import/86/common/loc/SUNWlang-he-extra
src/util/distro-import/86/common/loc/SUNWlang-hr-extra
src/util/distro-import/86/common/loc/SUNWlang-hu-extra
src/util/distro-import/86/common/loc/SUNWlang-is-extra
src/util/distro-import/86/common/loc/SUNWlang-it-extra
src/util/distro-import/86/common/loc/SUNWlang-lt-extra
src/util/distro-import/86/common/loc/SUNWlang-lv-extra
src/util/distro-import/86/common/loc/SUNWlang-mk-extra
src/util/distro-import/86/common/loc/SUNWlang-nl-extra
src/util/distro-import/86/common/loc/SUNWlang-no-extra
src/util/distro-import/86/common/loc/SUNWlang-pl-extra
src/util/distro-import/86/common/loc/SUNWlang-pt-extra
src/util/distro-import/86/common/loc/SUNWlang-ptBR-extra
src/util/distro-import/86/common/loc/SUNWlang-ro-extra
src/util/distro-import/86/common/loc/SUNWlang-ru-extra
src/util/distro-import/86/common/loc/SUNWlang-sh-extra
src/util/distro-import/86/common/loc/SUNWlang-sk-extra
src/util/distro-import/86/common/loc/SUNWlang-sl-extra
src/util/distro-import/86/common/loc/SUNWlang-sq-extra
src/util/distro-import/86/common/loc/SUNWlang-sr-extra
src/util/distro-import/86/common/loc/SUNWlang-sv-extra
src/util/distro-import/86/common/loc/SUNWlang-th-extra
src/util/distro-import/86/common/loc/SUNWlang-tr-extra
src/util/distro-import/86/common/loc/SUNWttf-arabeyes
src/util/distro-import/86/common/loc/SUNWttf-arphic-ukai
src/util/distro-import/86/common/loc/SUNWttf-arphic-uming
src/util/distro-import/86/common/loc/SUNWttf-ipafont
src/util/distro-import/87/common/SUNWgnu-mc
src/util/distro-import/87/common/SUNWlibmemcached
src/util/distro-import/87/common/SUNWmemcached-java
src/util/distro-import/87/common/SUNWpostgr-83-tcl
src/util/distro-import/87/common/SUNWpostgr-jdbc
src/util/distro-import/87/common/SUNWpostgr-upgrade
src/util/distro-import/87/common/SUNWpysqlite
src/util/distro-import/87/common/SUNWtcpd
src/util/distro-import/88/common/SUNWTcl
src/util/distro-import/88/common/SUNWTk
src/util/distro-import/88/common/SUNWdiffstat
src/util/distro-import/88/common/SUNWlxml
src/util/distro-import/88/common/SUNWnethack
src/util/distro-import/88/common/SUNWsane-backend
src/util/distro-import/88/common/SUNWsane-frontend
src/util/distro-import/88/common/SUNWscsip
src/util/distro-import/88/common/SUNWtvnc
src/util/distro-import/88/common/SUNWvgl
src/util/distro-import/88/common/SUNWzlib
src/util/distro-import/88/sparc/SUNWfs
src/util/distro-import/89/common/SUNWbzip
src/util/distro-import/89/common/SUNWgnu-gperf
src/util/distro-import/89/common/SUNWlcms
src/util/distro-import/89/common/SUNWlibmng
src/util/distro-import/89/common/SUNWpostgr-82-server-data-root
src/util/distro-import/89/common/SUNWpostgr-server-data
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-cs
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-de
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-es
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-extra
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-fr
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-hu
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-it
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ja
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ko
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-noinst
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-pl
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ptBR
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-rtl
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ru
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-sv
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhCN
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhHK
src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhTW
src/util/distro-import/89/common/loc/SUNWgnome-l10ndocument-noinst
src/util/distro-import/89/common/loc/SUNWgnome-l10nmessages-noinst
src/util/distro-import/90/common/SUNWdcraw
src/util/distro-import/90/common/SUNWfetchmail
src/util/distro-import/90/common/SUNWpgbouncer-pg83
src/util/distro-import/90/common/SUNWprocmail
src/util/distro-import/90/common/SUNWslang
src/util/distro-import/90/common/SUNWsndm
src/util/distro-import/90/common/SUNWtcltls
src/util/distro-import/92/common/SUNWgnome-character-map
src/util/distro-import/92/common/SUNWgnome-file-mgr
src/util/distro-import/92/common/SUNWgnome-games
src/util/distro-import/92/common/SUNWgnome-gvfs
src/util/distro-import/92/common/SUNWgnome-internet-applets
src/util/distro-import/92/common/SUNWgnome-power-manager
src/util/distro-import/92/common/SUNWgnu-gettext
src/util/distro-import/92/common/SUNWlibsoup
src/util/distro-import/92/common/SUNWlinks
src/util/distro-import/92/common/SUNWmysql5jdbc
src/util/distro-import/92/common/SUNWsolaris-devel-docs
src/util/distro-import/92/common/SUNWxdg-user-dirs-gtk
src/util/distro-import/92/common/loc/SUNWgnome-img-editor-help-pl
src/util/distro-import/92/i386/SUNWlibvirt
src/util/distro-import/93/common/SUNWlibpcap
src/util/distro-import/93/common/SUNWslib
src/util/distro-import/93/i386/SUNWpsh
src/util/distro-import/94/common/SUNWerlang
src/util/distro-import/94/common/SUNWerlang-doc
src/util/distro-import/94/common/SUNWircii
src/util/distro-import/94/common/SUNWlibrsync
src/util/distro-import/94/common/SUNWpampkcs11
src/util/distro-import/94/common/SUNWxorg-headers
src/util/distro-import/94/common/loc/SUNWttf-thai-scalable
src/util/distro-import/95/common/SUNWfirefox
src/util/distro-import/95/common/SUNWicdc
src/util/distro-import/95/common/SUNWilmbase
src/util/distro-import/95/common/SUNWlogrotate
src/util/distro-import/95/common/SUNWopenexr
src/util/distro-import/95/common/SUNWsnack
src/util/distro-import/95/common/SUNWstunnel
src/util/distro-import/95/common/SUNWunzip
src/util/distro-import/96/common/SUNWipkg-gui-l10n
src/util/distro-import/96/common/SUNWlibdatrie
src/util/distro-import/96/common/SUNWlibgsf
src/util/distro-import/96/common/SUNWlibthai
src/util/distro-import/96/common/SUNWscim
src/util/distro-import/96/common/SUNWscim-anthy
src/util/distro-import/96/common/SUNWscim-chewing
src/util/distro-import/96/common/SUNWscim-hangul
src/util/distro-import/96/common/SUNWscim-pinyin
src/util/distro-import/96/common/SUNWscim-sunpinyin
src/util/distro-import/96/common/SUNWscim-tables
src/util/distro-import/96/common/SUNWscim-tables-chinese
src/util/distro-import/96/common/SUNWscim-tables-extra
src/util/distro-import/96/common/SUNWscim-tables-india
src/util/distro-import/96/common/SUNWscim-tables-japanese
src/util/distro-import/96/common/SUNWscim-tables-korean
src/util/distro-import/96/common/SUNWscim-thai
src/util/distro-import/96/common/SUNWw3m
src/util/distro-import/97/common/SUNWapch22m-dtrace
src/util/distro-import/97/common/SUNWapch22m-fcgid
src/util/distro-import/97/common/SUNWopensolaris-welcome
src/util/distro-import/97/common/SUNWsrh
src/util/distro-import/98/common/SUNWdesktop-search
src/util/distro-import/98/common/SUNWipkg-brand
src/util/distro-import/98/common/SUNWmtx
src/util/distro-import/98/common/loc/SUNWlang-mt-extra
src/util/distro-import/98/common/loc/SUNWlang-nb-extra
src/util/distro-import/98/common/loc/SUNWlang-nn-extra
src/util/distro-import/99/common/SUNWPython25
src/util/distro-import/99/common/SUNWapch22m-php5
src/util/distro-import/99/common/SUNWbluefish
src/util/distro-import/99/common/SUNWcontact-lookup-applet
src/util/distro-import/99/common/SUNWdbus-libs
src/util/distro-import/99/common/SUNWdialog
src/util/distro-import/99/common/SUNWdistro-const
src/util/distro-import/99/common/SUNWfppd
src/util/distro-import/99/common/SUNWgnome-commander
src/util/distro-import/99/common/SUNWgnome-freedb-libs
src/util/distro-import/99/common/SUNWgnome-libs
src/util/distro-import/99/common/SUNWgnome-themes-hires
src/util/distro-import/99/common/SUNWgqview
src/util/distro-import/99/common/SUNWgroff
src/util/distro-import/99/common/SUNWgtkspell
src/util/distro-import/99/common/SUNWlibffi
src/util/distro-import/99/common/SUNWlibgoffice
src/util/distro-import/99/common/SUNWlibmikmod
src/util/distro-import/99/common/SUNWlibnet
src/util/distro-import/99/common/SUNWlibtasn1
src/util/distro-import/99/common/SUNWmeld
src/util/distro-import/99/common/SUNWnwam-manager
src/util/distro-import/99/common/SUNWo3read
src/util/distro-import/99/common/SUNWpangomm
src/util/distro-import/99/common/SUNWphp524
src/util/distro-import/99/common/SUNWphp524-mysql
src/util/distro-import/99/common/SUNWphp524-pgsql
src/util/distro-import/99/common/SUNWphp524core
src/util/distro-import/99/common/SUNWphp524doc
src/util/distro-import/99/common/SUNWphp524man
src/util/distro-import/99/common/SUNWpython-notify
src/util/distro-import/99/common/SUNWtransmission
src/util/distro-import/99/common/SUNWtsclient
src/util/distro-import/99/common/SUNWxchat
src/util/distro-import/99/common/SUNWxdg-sound-theme
src/util/distro-import/99/common/SUNWxsane
src/util/distro-import/99/common/SUNWxwfsw
src/util/distro-import/99/common/loc/SUNWttf-indic-fonts-core
src/util/distro-import/99/i386/SUNWavant
src/util/distro-import/importer.py
--- a/src/util/distro-import/00/common/SUNW1394h	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNW1394h	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNW1394h
+consolidation "osnet"
 classification "Development/System"
 import SUNW1394h
 end package
--- a/src/util/distro-import/00/common/SUNWDTraceToolkit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWDTraceToolkit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWDTraceToolkit
+consolidation "install"
 classification "Development/System"
 import SUNWDTraceToolkit
 end package
--- a/src/util/distro-import/00/common/SUNWPython-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWPython-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWPython-extra
+consolidation "gnome"
 classification "Development/Python"
 import SUNWPython-extra
 end package
--- a/src/util/distro-import/00/common/SUNWTiff	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWTiff	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWTiff
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWTiff
 import SUNWTiff-devel
--- a/src/util/distro-import/00/common/SUNWa2ps	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWa2ps	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWa2ps
+consolidation "sfw"
 classification "System/Printing"
 import SUNWa2psu
 import SUNWa2psr
--- a/src/util/distro-import/00/common/SUNWacc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWacc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWacc
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWaccu
 import SUNWaccr
--- a/src/util/distro-import/00/common/SUNWaclg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWaclg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaclg
+consolidation "sic_team"
 classification "Web Services/Application and Web Servers"
 import SUNWaclg
 end package
--- a/src/util/distro-import/00/common/SUNWadmap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWadmap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWadmap
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWadmap
 end package
--- a/src/util/distro-import/00/common/SUNWadmlib-sysid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWadmlib-sysid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWadmlib-sysid
+consolidation "install"
 classification "System/Libraries"
 import SUNWadmlib-sysid
 end package
--- a/src/util/distro-import/00/common/SUNWadmr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWadmr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWadmr
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWadmr
 end package
--- a/src/util/distro-import/00/common/SUNWapct	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWapct	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapct
+consolidation "osnet"
 classification "System/Software Management"
 import SUNWapct
 end package
--- a/src/util/distro-import/00/common/SUNWarbel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWarbel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWarbel
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWarbel
 end package
--- a/src/util/distro-import/00/common/SUNWarc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWarc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWarc
+consolidation "osnet"
 classification "Development/C"
 import SUNWarc
 import SUNWarcr
--- a/src/util/distro-import/00/common/SUNWatfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWatfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWatfs
+consolidation "osnet"
 classification "System/File System"
 import SUNWatfsu
 import SUNWatfsr
--- a/src/util/distro-import/00/common/SUNWauda	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWauda	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWauda
+consolidation "osnet"
 classification "System/Media"
 import SUNWauda
 end package
--- a/src/util/distro-import/00/common/SUNWaudf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWaudf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudf
+consolidation "osnet"
 classification "System/Media"
 import SUNWaudf
 end package
--- a/src/util/distro-import/00/common/SUNWaudit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWaudit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudit
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWaudit
 end package
--- a/src/util/distro-import/00/common/SUNWautoef	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWautoef	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWautoef
+consolidation "l10n"
 classification "System/Text Tools"
 import SUNWautoef
 end package
--- a/src/util/distro-import/00/common/SUNWbart	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbart	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbart
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWbart
 end package
--- a/src/util/distro-import/00/common/SUNWbcc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbcc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbcc
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWbcc
 version 0.16.17
--- a/src/util/distro-import/00/common/SUNWbip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbip
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWbip
 import SUNWbipr
--- a/src/util/distro-import/00/common/SUNWbison	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbison	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbison
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWbison
 version 2.3
--- a/src/util/distro-import/00/common/SUNWbnu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbnu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbnu
+consolidation "osnet"
 classification "System/Services"
 import SUNWbnuu
 import SUNWbnur
--- a/src/util/distro-import/00/common/SUNWbrltty	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbrltty	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbrltty
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWbrltty
 import SUNWbrltty-devel
--- a/src/util/distro-import/00/common/SUNWbs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbs
+consolidation "osnet"
 classification "System/Core"
 import SUNWbsu
 import SUNWbsr
--- a/src/util/distro-import/00/common/SUNWbtool	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWbtool	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbtool
+consolidation "osnet"
 classification "System/Core"
 import SUNWbtool
 depend SUNWcpp
--- a/src/util/distro-import/00/common/SUNWcacaodtrace	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcacaodtrace	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcacaodtrace
+consolidation "cacao"
 classification "Development/System"
 import SUNWcacaodtrace
 end package
--- a/src/util/distro-import/00/common/SUNWcdrw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcdrw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcdrw
+consolidation "osnet"
 classification "System/Media"
 import SUNWcdrw
 end package
--- a/src/util/distro-import/00/common/SUNWcea	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcea	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcea
+consolidation "nspg"
 classification "Drivers/Networking"
 import SUNWcea
 end package
--- a/src/util/distro-import/00/common/SUNWcfpl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcfpl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcfpl
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWcfpl
 import SUNWcfplr
--- a/src/util/distro-import/00/common/SUNWcnetr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcnetr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcnetr
+consolidation "osnet"
 classification "System/Core"
 import SUNWcnetr
 end package
--- a/src/util/distro-import/00/common/SUNWcns	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcns	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcns
+consolidation "osnet"
 classification "System/Services"
 import SUNWcnsu
 import SUNWcnsr
--- a/src/util/distro-import/00/common/SUNWcpcu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcpcu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcpcu
+consolidation "osnet"
 classification "System/Core"
 import SUNWcpcu
 end package
--- a/src/util/distro-import/00/common/SUNWcpp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcpp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcpp
+consolidation "sunpro"
 classification "Development/C"
 import SUNWcpp
 end package
--- a/src/util/distro-import/00/common/SUNWcstl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWcstl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcstl
+consolidation "osnet"
 classification "Development/System"
 import SUNWcstl
 end package
--- a/src/util/distro-import/00/common/SUNWctpls	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWctpls	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWctpls
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWctpls
 end package
--- a/src/util/distro-import/00/common/SUNWdbus	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdbus	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdbus
+consolidation "gnome"
 classification "System/Services"
 import SUNWdbus
 import SUNWdbus-root
--- a/src/util/distro-import/00/common/SUNWdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdhcm
+consolidation "osnet"
 classification "System/Services"
 import SUNWdhcm
 depend SUNWj6rt
--- a/src/util/distro-import/00/common/SUNWdhcs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdhcs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdhcs
+consolidation "osnet"
 classification "System/Services"
 import SUNWdhcsu
 import SUNWdhcsr
--- a/src/util/distro-import/00/common/SUNWdhcsb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdhcsb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdhcsb
+consolidation "osnet"
 classification "System/Services"
 import SUNWdhcsb
 end package
--- a/src/util/distro-import/00/common/SUNWdmgt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdmgt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdmgt
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWdmgtu
 import SUNWdmgtr
--- a/src/util/distro-import/00/common/SUNWdpl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdpl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdpl
+consolidation "osnet"
 classification "Development/System"
 import SUNWdpl
 end package
--- a/src/util/distro-import/00/common/SUNWdtrc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdtrc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdtrc
+consolidation "osnet"
 classification "Development/System"
 import SUNWdtrc
 end package
--- a/src/util/distro-import/00/common/SUNWdvdrw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWdvdrw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdvdrw
+consolidation "sfw"
 classification "System/Media"
 import SUNWdvdrw
 version 5.21.4.10.8
--- a/src/util/distro-import/00/common/SUNWesu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWesu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWesu
+consolidation "osnet"
 classification "System/Core"
 import SUNWesu
 end package
--- a/src/util/distro-import/00/common/SUNWevolution	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWevolution	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWevolution
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWevolution
 import SUNWevolution-devel
--- a/src/util/distro-import/00/common/SUNWevolution-data-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWevolution-data-server	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWevolution-data-server
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWevolution-data-server
 import SUNWevolution-data-server-devel
--- a/src/util/distro-import/00/common/SUNWevolution-exchange	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWevolution-exchange	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWevolution-exchange
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWevolution-exchange
 import SUNWevolution-exchange-root
--- a/src/util/distro-import/00/common/SUNWevolution-jescs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWevolution-jescs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWevolution-jescs
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWevolution-jescs
 end package
--- a/src/util/distro-import/00/common/SUNWevolution-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWevolution-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWevolution-libs
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWevolution-libs
 import SUNWevolution-libs-devel
--- a/src/util/distro-import/00/common/SUNWevolution-webcal	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWevolution-webcal	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWevolution-webcal
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWevolution-webcal
 import SUNWevolution-webcal-root
--- a/src/util/distro-import/00/common/SUNWfchba	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWfchba	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfchba
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWfchba
 import SUNWfchbar
--- a/src/util/distro-import/00/common/SUNWfcmdb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWfcmdb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcmdb
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWfcmdb
 end package
--- a/src/util/distro-import/00/common/SUNWffilters	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWffilters	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWffilters
+consolidation "sfw"
 classification "System/Printing"
 import SUNWffiltersu
 import SUNWffiltersr
--- a/src/util/distro-import/00/common/SUNWflac	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWflac	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWflac
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWflac
 import SUNWflac-devel
--- a/src/util/distro-import/00/common/SUNWfsexam	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWfsexam	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfsexam
+consolidation "gnome_l10n"
 classification "Applications/System Utilities"
 import SUNWfsexam
 import SUNWfsexam-root
--- a/src/util/distro-import/00/common/SUNWfss	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWfss	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfss
+consolidation "osnet"
 classification "System/Core"
 import SUNWfss
 end package
--- a/src/util/distro-import/00/common/SUNWfwdcu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWfwdcu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfwdcu
+consolidation "osnet"
 classification "System/Media"
 import SUNWfwdcu
 end package
--- a/src/util/distro-import/00/common/SUNWfwflash	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWfwflash	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfwflash
+consolidation "osnet"
 classification "System/Core"
 import SUNWfwflash
 end package
--- a/src/util/distro-import/00/common/SUNWgcmn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgcmn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgcmn
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgcmn
 end package
--- a/src/util/distro-import/00/common/SUNWgetting-started-guide	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgetting-started-guide	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-guide
+consolidation "gnome"
 classification "Desktop (GNOME)/Documentation"
 import SUNWgetting-started-guide
 end package
--- a/src/util/distro-import/00/common/SUNWgksu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgksu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgksu
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgksu
 import SUNWgksu-devel
--- a/src/util/distro-import/00/common/SUNWgmake	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgmake	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgmake
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgmake
 version 3.81
--- a/src/util/distro-import/00/common/SUNWgnome-a11y-dasher	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-a11y-dasher	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-dasher
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-dasher
 import SUNWgnome-a11y-dasher-root
--- a/src/util/distro-import/00/common/SUNWgnome-a11y-gok	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-a11y-gok	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-gok
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-gok
 import SUNWgnome-a11y-gok-root
--- a/src/util/distro-import/00/common/SUNWgnome-a11y-reader	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-a11y-reader	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-reader
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-reader
 depend SUNWgnome-a11y-libs-python24
--- a/src/util/distro-import/00/common/SUNWgnome-a11y-speech	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-a11y-speech	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-speech
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-speech
 import SUNWgnome-a11y-speech-devel
--- a/src/util/distro-import/00/common/SUNWgnome-applets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-applets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-applets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-applets
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-archive-mgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-archive-mgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-archive-mgr
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-archive-mgr
 import SUNWgnome-archive-mgr-root
--- a/src/util/distro-import/00/common/SUNWgnome-audio	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-audio	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-audio
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWgnome-audio
 import SUNWgnome-audio-devel
--- a/src/util/distro-import/00/common/SUNWgnome-base-libs-java	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-base-libs-java	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-base-libs-java
+consolidation "gnome"
 classification "Development/Java"
 import SUNWgnome-base-libs-java
 import SUNWgnome-base-libs-java-devel
--- a/src/util/distro-import/00/common/SUNWgnome-calculator	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-calculator	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-calculator
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-calculator
 import SUNWgnome-calculator-root
--- a/src/util/distro-import/00/common/SUNWgnome-cd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-cd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-cd
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWgnome-cd
 import SUNWgnome-cd-root
--- a/src/util/distro-import/00/common/SUNWgnome-cd-burner	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-cd-burner	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-cd-burner
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-cd-burner
 import SUNWgnome-cd-burner-devel
--- a/src/util/distro-import/00/common/SUNWgnome-common-devel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-common-devel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-common-devel
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-common-devel
 depend_path /usr/bin/openjade
--- a/src/util/distro-import/00/common/SUNWgnome-component	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-component	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-component
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-component
 import SUNWgnome-component-devel
--- a/src/util/distro-import/00/common/SUNWgnome-config	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-config	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-config
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-config
 import SUNWgnome-config-devel
--- a/src/util/distro-import/00/common/SUNWgnome-config-editor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-config-editor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-config-editor
+consolidation "gnome"
 classification "Applications/Configuration and Preferences"
 import SUNWgnome-config-editor
 import SUNWgnome-config-editor-root
--- a/src/util/distro-import/00/common/SUNWgnome-config-java	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-config-java	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-config-java
+consolidation "gnome"
 classification "Development/Java"
 import SUNWgnome-config-java
 import SUNWgnome-config-java-devel
--- a/src/util/distro-import/00/common/SUNWgnome-desklets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-desklets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-desklets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-desklets
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-desklets-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-desklets-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-desklets-extra
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-desklets-extra
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-desktop-prefs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-desktop-prefs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-desktop-prefs
+consolidation "gnome"
 classification "Applications/Configuration and Preferences"
 import SUNWgnome-desktop-prefs
 import SUNWgnome-desktop-prefs-devel
--- a/src/util/distro-import/00/common/SUNWgnome-devhelp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-devhelp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-devhelp
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-devhelp
 import SUNWgnome-devhelp-devel
--- a/src/util/distro-import/00/common/SUNWgnome-dialog	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-dialog	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-dialog
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-dialog
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-dictionary	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-dictionary	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-dictionary
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-dictionary
 import SUNWgnome-dictionary-root
--- a/src/util/distro-import/00/common/SUNWgnome-disk-analyzer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-disk-analyzer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-disk-analyzer
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-disk-analyzer
 import SUNWgnome-disk-analyzer-root
--- a/src/util/distro-import/00/common/SUNWgnome-fun-applets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-fun-applets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-fun-applets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-fun-applets
 import SUNWgnome-fun-applets-root
--- a/src/util/distro-import/00/common/SUNWgnome-gtksourceview	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-gtksourceview	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-gtksourceview
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-gtksourceview
 import SUNWgnome-gtksourceview-devel
--- a/src/util/distro-import/00/common/SUNWgnome-gui-test	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-gui-test	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-gui-test
+consolidation "gnome"
 classification "Development/X11"
 import SUNWgnome-gui-test
 depend SUNWgnome-python-libs
--- a/src/util/distro-import/00/common/SUNWgnome-hex-editor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-hex-editor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-hex-editor
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-hex-editor
 import SUNWgnome-hex-editor-devel
--- a/src/util/distro-import/00/common/SUNWgnome-im-client	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-im-client	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-im-client
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWgnome-im-client
 import SUNWgnome-im-client-devel
--- a/src/util/distro-import/00/common/SUNWgnome-img-editor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-img-editor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor
 import SUNWgnome-img-editor-devel
--- a/src/util/distro-import/00/common/SUNWgnome-img-organizer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-img-organizer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-organizer
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-organizer
 import SUNWgnome-img-organizer-root
--- a/src/util/distro-import/00/common/SUNWgnome-intranet-applets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-intranet-applets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-intranet-applets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-intranet-applets
 import SUNWgnome-intranet-applets-root
--- a/src/util/distro-import/00/common/SUNWgnome-log-viewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-log-viewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-log-viewer
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-log-viewer
 import SUNWgnome-log-viewer-devel
--- a/src/util/distro-import/00/common/SUNWgnome-media	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-media	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-media
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWgnome-media
 import SUNWgnome-media-devel
--- a/src/util/distro-import/00/common/SUNWgnome-media-apps	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-media-apps	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-media-apps
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWgnome-media-apps
 import SUNWgnome-media-apps-devel
--- a/src/util/distro-import/00/common/SUNWgnome-meeting	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-meeting	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-meeting
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWgnome-meeting
 import SUNWgnome-meeting-root
--- a/src/util/distro-import/00/common/SUNWgnome-menu-editor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-menu-editor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-menu-editor
+consolidation "gnome"
 classification "Applications/Configuration and Preferences"
 import SUNWgnome-menu-editor
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-mm-applets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-mm-applets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-mm-applets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-mm-applets
 import SUNWgnome-mm-applets-root
--- a/src/util/distro-import/00/common/SUNWgnome-panel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-panel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-panel
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-panel
 import SUNWgnome-panel-devel
--- a/src/util/distro-import/00/common/SUNWgnome-pdf-viewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-pdf-viewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-pdf-viewer
+consolidation "gnome"
 classification "Applications/Office"
 import SUNWgnome-pdf-viewer
 import SUNWgnome-pdf-viewer-devel
--- a/src/util/distro-import/00/common/SUNWgnome-pilot	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-pilot	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-pilot
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-pilot
 import SUNWgnome-pilot-devel
--- a/src/util/distro-import/00/common/SUNWgnome-print	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-print	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-print
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-print
 import SUNWgnome-print-devel
--- a/src/util/distro-import/00/common/SUNWgnome-ps-viewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-ps-viewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-ps-viewer
+consolidation "gnome"
 classification "Applications/Office"
 import SUNWgnome-ps-viewer
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-python-desktop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-python-desktop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-python-desktop
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgnome-python-desktop
 import SUNWgnome-python-desktop-devel
--- a/src/util/distro-import/00/common/SUNWgnome-python-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-python-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-python-libs
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgnome-python-libs
 import SUNWgnome-python-libs-devel
--- a/src/util/distro-import/00/common/SUNWgnome-remote-desktop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-remote-desktop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-remote-desktop
+consolidation "gnome"
 classification "System/X11"
 import SUNWgnome-remote-desktop
 import SUNWgnome-remote-desktop-root
--- a/src/util/distro-import/00/common/SUNWgnome-screenshot	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-screenshot	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-screenshot
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-screenshot
 import SUNWgnome-screenshot-root
--- a/src/util/distro-import/00/common/SUNWgnome-search-tool	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-search-tool	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-search-tool
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-search-tool
 import SUNWgnome-search-tool-root
--- a/src/util/distro-import/00/common/SUNWgnome-session	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-session	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-session
+consolidation "gnome"
 classification "Desktop (GNOME)/Sessions"
 import SUNWgnome-session
 import SUNWgnome-session-root
--- a/src/util/distro-import/00/common/SUNWgnome-sound-recorder	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-sound-recorder	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-sound-recorder
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWgnome-sound-recorder
 import SUNWgnome-sound-recorder-root
--- a/src/util/distro-import/00/common/SUNWgnome-spell	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-spell	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-spell
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-spell
 import SUNWgnome-spell-devel
--- a/src/util/distro-import/00/common/SUNWgnome-system-monitor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-system-monitor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-system-monitor
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-system-monitor
 import SUNWgnome-system-monitor-root
--- a/src/util/distro-import/00/common/SUNWgnome-system-tools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-system-tools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-system-tools
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-system-tools
 drop usr/share/applications/services.desktop
--- a/src/util/distro-import/00/common/SUNWgnome-terminal	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-terminal	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-terminal
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-terminal
 import SUNWgnome-terminal-devel
--- a/src/util/distro-import/00/common/SUNWgnome-terminal-java	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-terminal-java	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-terminal-java
+consolidation "gnome"
 classification "Development/Java"
 import SUNWgnome-terminal-java
 import SUNWgnome-terminal-java-devel
--- a/src/util/distro-import/00/common/SUNWgnome-text-editor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-text-editor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-text-editor
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgnome-text-editor
 import SUNWgnome-text-editor-devel
--- a/src/util/distro-import/00/common/SUNWgnome-themes	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-themes	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-themes
+consolidation "gnome"
 classification "Desktop (GNOME)/Theming"
 import SUNWgnome-themes
 import SUNWgnome-themes-devel
--- a/src/util/distro-import/00/common/SUNWgnome-ui-designer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-ui-designer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-ui-designer
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-ui-designer
 import SUNWgnome-ui-designer-devel
--- a/src/util/distro-import/00/common/SUNWgnome-user-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-user-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-user-docs
+consolidation "gnome"
 classification "Desktop (GNOME)/Documentation"
 import SUNWgnome-user-docs
 end package
--- a/src/util/distro-import/00/common/SUNWgnome-utility-applets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-utility-applets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-utility-applets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-utility-applets
 import SUNWgnome-utility-applets-devel
--- a/src/util/distro-import/00/common/SUNWgnome-vfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-vfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-vfs
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-vfs
 import SUNWgnome-vfs-devel
--- a/src/util/distro-import/00/common/SUNWgnome-wm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnome-wm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-wm
+consolidation "gnome"
 classification "Desktop (GNOME)/Window Managers"
 import SUNWgnome-wm
 import SUNWgnome-wm-devel
--- a/src/util/distro-import/00/common/SUNWgnu-which	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnu-which	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-which
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWgnu-which
 version 2.16
--- a/src/util/distro-import/00/common/SUNWgnutls	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgnutls	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnutls
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWgnutls
 import SUNWgnutls-devel
--- a/src/util/distro-import/00/common/SUNWgpch	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgpch	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgpch
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgpch
 version 2.5.9
--- a/src/util/distro-import/00/common/SUNWgsfot	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgsfot	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgsfot
+consolidation "sfw"
 classification "System/Fonts"
 import SUNWgsfot
 version 6.0
--- a/src/util/distro-import/00/common/SUNWgsfst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgsfst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgsfst
+consolidation "sfw"
 classification "System/Fonts"
 import SUNWgsfst
 version 6.0
--- a/src/util/distro-import/00/common/SUNWgss	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgss	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgss
+consolidation "osnet"
 classification "System/Security"
 import SUNWgss
 end package
--- a/src/util/distro-import/00/common/SUNWgssc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgssc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgssc
+consolidation "osnet"
 classification "System/Security"
 import SUNWgssc
 end package
--- a/src/util/distro-import/00/common/SUNWgssdh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgssdh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgssdh
+consolidation "osnet"
 classification "System/Security"
 import SUNWgssdh
 end package
--- a/src/util/distro-import/00/common/SUNWgssk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgssk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgssk
+consolidation "osnet"
 classification "System/Security"
 import SUNWgssk
 end package
--- a/src/util/distro-import/00/common/SUNWgtkperf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgtkperf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtkperf
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgtkperf
 end package
--- a/src/util/distro-import/00/common/SUNWgzip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWgzip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgzip
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWgzip
 version 1.3.5
--- a/src/util/distro-import/00/common/SUNWhal	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWhal	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhal
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWhal
 import SUNWhalr
--- a/src/util/distro-import/00/common/SUNWhwdata	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWhwdata	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhwdata
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWhwdata
 end package
--- a/src/util/distro-import/00/common/SUNWibsdpu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWibsdpu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibsdpu
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWibsdpu
 end package
--- a/src/util/distro-import/00/common/SUNWicu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWicu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWicu
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWicu
 end package
--- a/src/util/distro-import/00/common/SUNWicud	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWicud	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWicud
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWicud
 end package
--- a/src/util/distro-import/00/common/SUNWidnd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWidnd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWidnd
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWidnd
 end package
--- a/src/util/distro-import/00/common/SUNWidnl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWidnl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWidnl
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWidnl
 end package
--- a/src/util/distro-import/00/common/SUNWidnu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWidnu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWidnu
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWidnu
 end package
--- a/src/util/distro-import/00/common/SUNWima	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWima	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWima
+consolidation "osnet"
 classification "Applications/Plug-ins and Run-times"
 import SUNWima
 import SUNWimar
--- a/src/util/distro-import/00/common/SUNWimagick	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWimagick	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWimagick
+consolidation "sfw"
 classification "System/Multimedia Libraries"
 import SUNWimagick
 version 6.3.4.2
--- a/src/util/distro-import/00/common/SUNWipc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWipc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipc
+consolidation "osnet"
 classification "System/Core"
 import SUNWipc
 end package
--- a/src/util/distro-import/00/common/SUNWipfh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWipfh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipfh
+consolidation "osnet"
 classification "Development/System"
 import SUNWipfh
 end package
--- a/src/util/distro-import/00/common/SUNWippcore	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWippcore	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWippcore
+consolidation "osnet"
 classification "System/Printing"
 import SUNWippcore
 end package
--- a/src/util/distro-import/00/common/SUNWippl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWippl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWippl
+consolidation "osnet"
 classification "System/Printing"
 import SUNWipplu
 import SUNWipplr
--- a/src/util/distro-import/00/common/SUNWiscsitgt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWiscsitgt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiscsitgt
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWiscsitgtu
 import SUNWiscsitgtr
--- a/src/util/distro-import/00/common/SUNWislcc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWislcc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWislcc
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWislcc
 end package
--- a/src/util/distro-import/00/common/SUNWiso-codes	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWiso-codes	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiso-codes
+consolidation "gnome"
 classification "Desktop (GNOME)/Theming"
 import SUNWiso-codes
 import SUNWiso-codes-devel
--- a/src/util/distro-import/00/common/SUNWisolc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWisolc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWisolc
+consolidation "l10n"
 classification "System/Text Tools"
 import SUNWisolc
 end package
--- a/src/util/distro-import/00/common/SUNWj6cfg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWj6cfg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6cfg
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6cfg
 end package
--- a/src/util/distro-import/00/common/SUNWjdmk-base	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWjdmk-base	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjdmk-base
+consolidation "jdmk"
 classification "Development/Java"
 import SUNWjdmk-base
 end package
--- a/src/util/distro-import/00/common/SUNWjhrt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWjhrt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjhrt
+consolidation "ub_javavm"
 classification "Desktop (GNOME)/Documentation"
 import SUNWjhrt
 end package
--- a/src/util/distro-import/00/common/SUNWjpg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWjpg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjpg
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWjpg
 import SUNWjpg-devel
--- a/src/util/distro-import/00/common/SUNWjre-config-plugin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWjre-config-plugin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjre-config-plugin
+consolidation "gnome"
 classification "Applications/Plug-ins and Run-times"
 import SUNWjre-config-plugin
 end package
--- a/src/util/distro-import/00/common/SUNWjss	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWjss	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjss
+consolidation "sic_team"
 classification "System/Services"
 import SUNWjss
 end package
--- a/src/util/distro-import/00/common/SUNWkdc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWkdc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkdc
+consolidation "osnet"
 classification "System/Security"
 import SUNWkdcu
 import SUNWkdcr
--- a/src/util/distro-import/00/common/SUNWkey	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWkey	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkey
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWkey
 end package
--- a/src/util/distro-import/00/common/SUNWkrb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWkrb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkrb
+consolidation "osnet"
 classification "System/Security"
 import SUNWkrbu
 import SUNWkrbr
--- a/src/util/distro-import/00/common/SUNWlexpt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlexpt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlexpt
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlexpt
 version 2.0.1
--- a/src/util/distro-import/00/common/SUNWlibC	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibC	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibC
+consolidation "sunpro"
 classification "Development/C++"
 import SUNWlibC
 end package
--- a/src/util/distro-import/00/common/SUNWlibcroco	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibcroco	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibcroco
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibcroco
 import SUNWlibcroco-devel
--- a/src/util/distro-import/00/common/SUNWlibexif	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibexif	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibexif
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibexif
 import SUNWlibexif-devel
--- a/src/util/distro-import/00/common/SUNWlibgcrypt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibgcrypt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgcrypt
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibgcrypt
 import SUNWlibgcrypt-devel
--- a/src/util/distro-import/00/common/SUNWlibgpg-error	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibgpg-error	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgpg-error
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibgpg-error
 import SUNWlibgpg-error-devel
--- a/src/util/distro-import/00/common/SUNWlibgtop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibgtop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgtop
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibgtop
 import SUNWlibgtop-devel
--- a/src/util/distro-import/00/common/SUNWlibm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibm
+consolidation "sunpro"
 classification "System/Libraries"
 import SUNWlibm
 import SUNWlibmr
--- a/src/util/distro-import/00/common/SUNWlibms	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibms	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibms
+consolidation "sunpro"
 classification "System/Libraries"
 import SUNWlibms
 import SUNWlibmsr
--- a/src/util/distro-import/00/common/SUNWliboil	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWliboil	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWliboil
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWliboil
 import SUNWliboil-devel
--- a/src/util/distro-import/00/common/SUNWlibpopt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibpopt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibpopt
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibpopt
 import SUNWlibpopt-devel
--- a/src/util/distro-import/00/common/SUNWlibrsvg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibrsvg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibrsvg
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibrsvg
 import SUNWlibrsvg-devel
--- a/src/util/distro-import/00/common/SUNWlibsasl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibsasl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsasl
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWlibsasl
 end package
--- a/src/util/distro-import/00/common/SUNWlibsdl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibsdl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsdl
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibsdl
 import SUNWlibsdl-devel
--- a/src/util/distro-import/00/common/SUNWlibtheora	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibtheora	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibtheora
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibtheora
 import SUNWlibtheora-devel
--- a/src/util/distro-import/00/common/SUNWlibusbugen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlibusbugen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibusbugen
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibusbugen
 end package
--- a/src/util/distro-import/00/common/SUNWlldap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlldap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlldap
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWlldap
 end package
--- a/src/util/distro-import/00/common/SUNWloc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWloc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWloc
+consolidation "osnet"
 classification "System/Localizations"
 import SUNWloc
 end package
--- a/src/util/distro-import/00/common/SUNWlp-cmds	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlp-cmds	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlp-cmds
+consolidation "osnet"
 classification "System/Printing"
 import SUNWlp-cmds
 end package
--- a/src/util/distro-import/00/common/SUNWlpr-cmds	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlpr-cmds	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlpr-cmds
+consolidation "osnet"
 classification "System/Printing"
 import SUNWlpr-cmds
 end package
--- a/src/util/distro-import/00/common/SUNWluxop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWluxop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWluxop
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWluxop
 end package
--- a/src/util/distro-import/00/common/SUNWlxsl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWlxsl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlxsl
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlxsl
 import SUNWlxsl-devel
--- a/src/util/distro-import/00/common/SUNWmda	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmda	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmda
+consolidation "osnet"
 classification "System/Core"
 import SUNWmdau
 import SUNWmdar
--- a/src/util/distro-import/00/common/SUNWmdbdm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmdbdm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmdbdm
+consolidation "osnet"
 classification "Development/System"
 import SUNWmdbdm
 end package
--- a/src/util/distro-import/00/common/SUNWmddr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmddr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmddr
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWmddr
 end package
--- a/src/util/distro-import/00/common/SUNWmibii	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmibii	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmibii
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWmibii
 end package
--- a/src/util/distro-import/00/common/SUNWmlib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmlib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmlib
+consolidation "sunpro"
 classification "System/Libraries"
 import SUNWmlib
 import SUNWmlibe
--- a/src/util/distro-import/00/common/SUNWmpsvplr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmpsvplr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmpsvplr
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWmpsvplr
 end package
--- a/src/util/distro-import/00/common/SUNWmusicbrainz	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmusicbrainz	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmusicbrainz
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWmusicbrainz
 import SUNWmusicbrainz-devel
--- a/src/util/distro-import/00/common/SUNWmyspell-dictionary-en	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmyspell-dictionary-en	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-en
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-en
 end package
--- a/src/util/distro-import/00/common/SUNWmysql-base	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmysql-base	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql-base
+consolidation "sfw"
 classification "System/Databases"
 summary "MySQL Database Management System (Base)"
 add group groupname=mysql gid=70
--- a/src/util/distro-import/00/common/SUNWmysqlt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWmysqlt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysqlt
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWmysqlt
 version 4.0.24
--- a/src/util/distro-import/00/common/SUNWneon	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWneon	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWneon
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWneon
 version 0.25.5
--- a/src/util/distro-import/00/common/SUNWnis	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWnis	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnis
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWnisu
 import SUNWnisr
--- a/src/util/distro-import/00/common/SUNWogg-vorbis	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWogg-vorbis	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWogg-vorbis
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWogg-vorbis
 import SUNWogg-vorbis-devel
--- a/src/util/distro-import/00/common/SUNWopenjade	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWopenjade	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopenjade
+consolidation "gnome"
 classification "System/Text Tools"
 import SUNWopenjade
 import SUNWopenjade-devel
--- a/src/util/distro-import/00/common/SUNWopensp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWopensp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopensp
+consolidation "gnome"
 classification "System/Text Tools"
 import SUNWopensp
 import SUNWopensp-devel
--- a/src/util/distro-import/00/common/SUNWosdem	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWosdem	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWosdem
+consolidation "osnet"
 classification "System/Core"
 import SUNWosdem
 end package
--- a/src/util/distro-import/00/common/SUNWpapi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpapi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpapi
+consolidation "osnet"
 classification "System/Printing"
 import SUNWpapi
 end package
--- a/src/util/distro-import/00/common/SUNWpc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpc
+consolidation "osnet"
 classification "System/Printing"
 import SUNWpcu
 import SUNWpcr
--- a/src/util/distro-import/00/common/SUNWpcmcu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpcmcu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcmcu
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWpcmcu
 end package
--- a/src/util/distro-import/00/common/SUNWperl-authen-pam	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWperl-authen-pam	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl-authen-pam
+consolidation "gnome"
 classification "Development/Perl"
 import SUNWperl-authen-pam
 end package
--- a/src/util/distro-import/00/common/SUNWperl-xml-parser	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWperl-xml-parser	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl-xml-parser
+consolidation "gnome"
 classification "Development/Perl"
 import SUNWperl-xml-parser
 end package
--- a/src/util/distro-import/00/common/SUNWperl584core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWperl584core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl584core
+consolidation "osnet"
 classification "Development/Perl"
 import SUNWperl584core
 version 5.8.4
--- a/src/util/distro-import/00/common/SUNWperl584usr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWperl584usr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl584usr
+consolidation "osnet"
 classification "Development/Perl"
 import SUNWperl584usr
 version 5.8.4
--- a/src/util/distro-import/00/common/SUNWpiclh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpiclh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpiclh
+consolidation "osnet"
 classification "System/Core"
 import SUNWpiclh
 end package
--- a/src/util/distro-import/00/common/SUNWpilot-link	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpilot-link	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpilot-link
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWpilot-link
 import SUNWpilot-link-devel
--- a/src/util/distro-import/00/common/SUNWpng	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpng	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpng
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWpng
 import SUNWpng-devel
--- a/src/util/distro-import/00/common/SUNWpolkit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpolkit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpolkit
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWpolkit
 end package
--- a/src/util/distro-import/00/common/SUNWpoold	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpoold	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpoold
+consolidation "osnet"
 classification "System/Core"
 import SUNWpoold
 depend SUNWj6rt
--- a/src/util/distro-import/00/common/SUNWpostgr-82-jdbc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpostgr-82-jdbc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-jdbc
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-82-jdbc
 version 8.2.504
--- a/src/util/distro-import/00/common/SUNWpostgr-82-tcl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpostgr-82-tcl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-tcl
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-82-tcl
 version 1.5
--- a/src/util/distro-import/00/common/SUNWpostrun	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpostrun	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostrun
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWpostrun
 import SUNWpostrun-root
--- a/src/util/distro-import/00/common/SUNWppm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWppm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWppm
+consolidation "osnet"
 classification "System/Printing"
 import SUNWppm
 end package
--- a/src/util/distro-import/00/common/SUNWpppdt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpppdt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpppdt
+consolidation "osnet"
 classification "System/Core"
 import SUNWpppdt
 end package
--- a/src/util/distro-import/00/common/SUNWpppg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpppg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpppg
+consolidation "osnet"
 classification "Development/GNU"
 import SUNWpppg
 end package
--- a/src/util/distro-import/00/common/SUNWpppgS	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpppgS	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpppgS
+consolidation "osnet"
 classification "Development/GNU"
 import SUNWpppgS
 end package
--- a/src/util/distro-import/00/common/SUNWpr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpr
+consolidation "sic_team"
 classification "System/Libraries"
 import SUNWpr
 end package
--- a/src/util/distro-import/00/common/SUNWprd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWprd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWprd
+consolidation "sic_team"
 classification "Development/System"
 import SUNWprd
 end package
--- a/src/util/distro-import/00/common/SUNWprint-monitor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWprint-monitor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWprint-monitor
+consolidation "gnome"
 classification "System/Printing"
 import SUNWprint-monitor
 import SUNWprint-monitor-root
--- a/src/util/distro-import/00/common/SUNWps	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWps	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWps
+consolidation "osnet"
 classification "System/Printing"
 import SUNWpsu
 import SUNWpsr
--- a/src/util/distro-import/00/common/SUNWpsf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpsf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsf
+consolidation "osnet"
 classification "System/Printing"
 import SUNWpsf
 end package
--- a/src/util/distro-import/00/common/SUNWpsm-ipp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpsm-ipp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsm-ipp
+consolidation "osnet"
 classification "System/Printing"
 import SUNWpsm-ipp
 end package
--- a/src/util/distro-import/00/common/SUNWpsm-lpd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpsm-lpd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsm-lpd
+consolidation "osnet"
 classification "System/Printing"
 import SUNWpsm-lpd
 end package
--- a/src/util/distro-import/00/common/SUNWpsutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWpsutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsutils
+consolidation "sfw"
 classification "System/Printing"
 import SUNWpsutils
 end package
--- a/src/util/distro-import/00/common/SUNWqlcu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWqlcu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWqlcu
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWqlcu
 end package
--- a/src/util/distro-import/00/common/SUNWqos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWqos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWqos
+consolidation "osnet"
 classification "System/Core"
 import SUNWqos
 end package
--- a/src/util/distro-import/00/common/SUNWqosu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWqosu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWqosu
+consolidation "osnet"
 classification "System/Core"
 import SUNWqosu
 end package
--- a/src/util/distro-import/00/common/SUNWrcap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrcap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrcap
+consolidation "osnet"
 classification "System/Core"
 import SUNWrcapu
 import SUNWrcapr
--- a/src/util/distro-import/00/common/SUNWrcmdc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrcmdc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrcmdc
+consolidation "osnet"
 classification "System/Core"
 import SUNWrcmdc
 end package
--- a/src/util/distro-import/00/common/SUNWrcmds	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrcmds	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrcmds
+consolidation "osnet"
 classification "System/Core"
 import SUNWrcmds
 import SUNWrcmdr
--- a/src/util/distro-import/00/common/SUNWrmvolmgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrmvolmgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrmvolmgr
+consolidation "osnet"
 classification "System/Media"
 import SUNWrmvolmgr
 import SUNWrmvolmgrr
--- a/src/util/distro-import/00/common/SUNWrmwb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrmwb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrmwb
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWrmwbu
 import SUNWrmwbr
--- a/src/util/distro-import/00/common/SUNWroute	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWroute	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWroute
+consolidation "osnet"
 classification "System/Core"
 import SUNWroute
 import SUNWroutr
--- a/src/util/distro-import/00/common/SUNWrpm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrpm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrpm
+consolidation "sfw"
 classification "System/Packaging"
 import SUNWrpm
 end package
--- a/src/util/distro-import/00/common/SUNWrsg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrsg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrsg
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWrsg
 end package
--- a/src/util/distro-import/00/common/SUNWrsgk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrsgk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrsgk
+consolidation "osnet"
 classification "System/Core"
 import SUNWrsgk
 end package
--- a/src/util/distro-import/00/common/SUNWrsmo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWrsmo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrsmo
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWrsmo
 end package
--- a/src/util/distro-import/00/common/SUNWsacom	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsacom	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsacom
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWsacom
 end package
--- a/src/util/distro-import/00/common/SUNWsasnm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsasnm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsasnm
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWsasnm
 end package
--- a/src/util/distro-import/00/common/SUNWsbp2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsbp2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsbp2
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWsbp2
 end package
--- a/src/util/distro-import/00/common/SUNWscplp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWscplp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscplp
+consolidation "osnet"
 classification "System/Printing"
 import SUNWscplp
 end package
--- a/src/util/distro-import/00/common/SUNWserweb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWserweb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWserweb
+consolidation "sfw"
 classification "System/Services"
 import SUNWserweb
 end package
--- a/src/util/distro-import/00/common/SUNWslp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWslp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWslp
+consolidation "osnet"
 classification "System/Services"
 import SUNWslpu
 import SUNWslpr
--- a/src/util/distro-import/00/common/SUNWsmapi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsmapi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsmapi
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWsmapi
 end package
--- a/src/util/distro-import/00/common/SUNWsmedia	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsmedia	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsmedia
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWsmedia
 import SUNWsmediar
--- a/src/util/distro-import/00/common/SUNWspeex	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWspeex	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWspeex
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWspeex
 import SUNWspeex-devel
--- a/src/util/distro-import/00/common/SUNWspnego	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWspnego	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWspnego
+consolidation "osnet"
 classification "System/Security"
 import SUNWspnego
 end package
--- a/src/util/distro-import/00/common/SUNWssh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWssh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWssh
+consolidation "osnet"
 classification "System/Security"
 import SUNWsshu
 import SUNWsshr
--- a/src/util/distro-import/00/common/SUNWsshcu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsshcu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsshcu
+consolidation "osnet"
 classification "System/Security"
 import SUNWsshcu
 end package
--- a/src/util/distro-import/00/common/SUNWsvn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsvn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsvn
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWsvn
 version 1.4.3
--- a/src/util/distro-import/00/common/SUNWsvn-java	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsvn-java	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsvn-java
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWsvn-java
 version 1.4.3
--- a/src/util/distro-import/00/common/SUNWsvn-perl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsvn-perl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsvn-perl
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWsvn-perl
 version 1.4.3
--- a/src/util/distro-import/00/common/SUNWsvn-python	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWsvn-python	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsvn-python
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWsvn-python
 version 1.4.3
--- a/src/util/distro-import/00/common/SUNWtcpdS	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtcpdS	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtcpdS
+consolidation "osnet"
 classification "System/Core"
 import SUNWtcpdS
 version 7.6
--- a/src/util/distro-import/00/common/SUNWtecla	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtecla	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtecla
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWtecla
 version 1.6.0
--- a/src/util/distro-import/00/common/SUNWter	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWter	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWter
+consolidation "osnet"
 classification "System/Core"
 import SUNWter
 end package
--- a/src/util/distro-import/00/common/SUNWtftp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtftp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtftp
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWtftp
 import SUNWtftpr
--- a/src/util/distro-import/00/common/SUNWthunderbird	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWthunderbird	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbird
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWthunderbird
 end package
--- a/src/util/distro-import/00/common/SUNWthunderbird-calendar	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWthunderbird-calendar	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbird-calendar
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWthunderbird-calendar
 end package
--- a/src/util/distro-import/00/common/SUNWtls	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtls	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtls
+consolidation "sic_team"
 classification "System/Security"
 import SUNWtls
 end package
--- a/src/util/distro-import/00/common/SUNWtlsd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtlsd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtlsd
+consolidation "sic_team"
 classification "System/Security"
 import SUNWtlsd
 end package
--- a/src/util/distro-import/00/common/SUNWtlsu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtlsu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtlsu
+consolidation "sic_team"
 classification "System/Security"
 import SUNWtlsu
 add link path=usr/bin/addbuiltin target=../sfw/bin/addbuiltin
--- a/src/util/distro-import/00/common/SUNWtnetc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtnetc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtnetc
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWtnetc
 end package
--- a/src/util/distro-import/00/common/SUNWtnetd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtnetd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtnetd
+consolidation "osnet"
 classification "System/Services"
 import SUNWtnetd
 import SUNWtnetr
--- a/src/util/distro-import/00/common/SUNWtnfd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtnfd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtnfd
+consolidation "osnet"
 classification "Development/System"
 import SUNWtnfd
 end package
--- a/src/util/distro-import/00/common/SUNWtoo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWtoo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtoo
+consolidation "osnet"
 classification "Development/System"
 import SUNWtoo
 end package
--- a/src/util/distro-import/00/common/SUNWucbt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWucbt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWucbt
+consolidation "osnet"
 classification "Development/System"
 import SUNWucbt
 end package
--- a/src/util/distro-import/00/common/SUNWudapl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWudapl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWudapl
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWudaplu
 import SUNWudaplr
--- a/src/util/distro-import/00/common/SUNWudf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWudf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWudf
+consolidation "osnet"
 classification "System/Media"
 import SUNWudf
 import SUNWudfr
--- a/src/util/distro-import/00/common/SUNWugenu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWugenu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWugenu
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWugenu
 end package
--- a/src/util/distro-import/00/common/SUNWuiu8	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWuiu8	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuiu8
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWuiu8
 end package
--- a/src/util/distro-import/00/common/SUNWuium	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWuium	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuium
+consolidation "l10n"
 classification "System/Text Tools"
 import SUNWuium
 end package
--- a/src/util/distro-import/00/common/SUNWukspfw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWukspfw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWukspfw
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWukspfw
 end package
--- a/src/util/distro-import/00/common/SUNWusbccid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWusbccid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWusbccid
+consolidation "sfw"
 classification "System/Hardware"
 import SUNWusbccid
 end package
--- a/src/util/distro-import/00/common/SUNWusbs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWusbs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWusbs
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWusbs
 end package
--- a/src/util/distro-import/00/common/SUNWusbu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWusbu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWusbu
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWusbu
 end package
--- a/src/util/distro-import/00/common/SUNWvts	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWvts	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvts
+consolidation "SunVTS"
 classification "System/Hardware"
 import SUNWvts
 import SUNWvtsr
--- a/src/util/distro-import/00/common/SUNWvtsmn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWvtsmn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvtsmn
+consolidation "SunVTS"
 classification "System/Hardware"
 import SUNWvtsmn
 end package
--- a/src/util/distro-import/00/common/SUNWvtss	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWvtss	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvtss
+consolidation "SunVTS"
 classification "System/Hardware"
 import SUNWvtss
 end package
--- a/src/util/distro-import/00/common/SUNWvtsts	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWvtsts	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvtsts
+consolidation "SunVTS"
 classification "System/Hardware"
 import SUNWvtsts
 end package
--- a/src/util/distro-import/00/common/SUNWwbsup	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWwbsup	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwbsup
+consolidation "osnet"
 classification "System/Core"
 import SUNWwbsup
 end package
--- a/src/util/distro-import/00/common/SUNWwlan	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWwlan	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwlan
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWwlanu
 import SUNWwlanr
--- a/src/util/distro-import/00/common/SUNWwpa	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWwpa	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwpa
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWwpau
 import SUNWwpar
--- a/src/util/distro-import/00/common/SUNWxcu4	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxcu4	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxcu4
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWxcu4
 end package
--- a/src/util/distro-import/00/common/SUNWxcu6	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxcu6	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxcu6
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWxcu6
 end package
--- a/src/util/distro-import/00/common/SUNWxcursor-themes	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxcursor-themes	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxcursor-themes
+consolidation "X"
 classification "System/X11"
 import SUNWxcursor-themes
 version 1.0.1
--- a/src/util/distro-import/00/common/SUNWxorg-client-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxorg-client-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-client-docs
+consolidation "X"
 classification "Development/X11"
 import SUNWxorg-client-docs
 end package
--- a/src/util/distro-import/00/common/SUNWxorg-client-programs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxorg-client-programs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-client-programs
+consolidation "X"
 classification "System/X11"
 import SUNWxorg-client-programs
 end package
--- a/src/util/distro-import/00/common/SUNWxorg-clientlibs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxorg-clientlibs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-clientlibs
+consolidation "X"
 classification "Development/X11"
 import SUNWxorg-clientlibs
 end package
--- a/src/util/distro-import/00/common/SUNWxorg-compatlinks	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxorg-compatlinks	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-compatlinks
+consolidation "X"
 classification "System/X11"
 import SUNWxorg-compatlinks
 end package
--- a/src/util/distro-import/00/common/SUNWxorg-graphics-ddx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxorg-graphics-ddx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-graphics-ddx
+consolidation "X"
 classification "Drivers/Display"
 import SUNWxorg-graphics-ddx
 end package
--- a/src/util/distro-import/00/common/SUNWxscreensaver-hacks	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxscreensaver-hacks	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxscreensaver-hacks
+consolidation "gnome"
 classification "System/X11"
 import SUNWxscreensaver-hacks
 end package
--- a/src/util/distro-import/00/common/SUNWxwfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxwfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwfs
+consolidation "X"
 classification "System/X11"
 import SUNWxwfs exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/00/common/SUNWxwmod	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWxwmod	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwmod
+consolidation "X"
 classification "System/X11"
 import SUNWxwmod
 end package
--- a/src/util/distro-import/00/common/SUNWyp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWyp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWyp
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWypu
 import SUNWypr
--- a/src/util/distro-import/00/common/SUNWzip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/SUNWzip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzip
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWzip
 version 2.32
--- a/src/util/distro-import/00/common/loc/SUNWcdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWcdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWcdhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWcos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWcos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWcos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWcxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWcxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWcxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWddhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWddhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWddhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWddhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWdeos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWdeos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdeos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWdeos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWdexwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWdexwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdexwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWdexwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWedhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWedhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWedhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWedhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWesos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWesos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWesos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWesos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWesxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWesxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWesxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWesxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWfdhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-de-DE	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-de-DE	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-de-DE
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-de-DE
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-es-ES	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-es-ES	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-es-ES
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-es-ES
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-extra
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-extra
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-fr-FR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-fr-FR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-fr-FR
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-fr-FR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-it-IT	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-it-IT	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-it-IT
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-it-IT
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ja-JP	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ja-JP	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-ja-JP
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-ja-JP
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ko-KR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ko-KR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-ko-KR
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-ko-KR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-pl-PL	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-pl-PL	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-pl-PL
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-pl-PL
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-pt-BR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-pt-BR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-pt-BR
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-pt-BR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ru-RU	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-ru-RU	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-ru-RU
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-ru-RU
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-sv-SE	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-sv-SE	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-sv-SE
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-sv-SE
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-zh-CN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-zh-CN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-zh-CN
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-zh-CN
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-zh-TW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfirefoxl10n-zh-TW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefoxl10n-zh-TW
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWfirefoxl10n-zh-TW
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfros	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfros	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfros
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWfros
 end package
--- a/src/util/distro-import/00/common/loc/SUNWfrxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWfrxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfrxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWfrxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-de
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-de
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-es
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-es
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-fr
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-fr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-it
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-it
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-ja
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-ja
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-ko
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-ko
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-ptBR
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-ptBR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-sv
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-sv
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-zhCN
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-zhCN
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhHK	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhHK	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-zhHK
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-zhHK
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhTW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10ndocument-zhTW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-zhTW
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-zhTW
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-cs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-cs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-cs
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-cs
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-de
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-de
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-es
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-es
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-fr
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-fr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-hu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-hu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-hu
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-hu
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-it
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-it
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-ja
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-ja
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-ko
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-ko
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-pl
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-pl
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-ptBR
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-ptBR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-ru
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-ru
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-sv
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-sv
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-zhCN
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-zhCN
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhHK	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhHK	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-zhHK
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-zhHK
 end package
--- a/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhTW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWgnome-l10nmessages-zhTW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-zhTW
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-zhTW
 end package
--- a/src/util/distro-import/00/common/loc/SUNWhdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWhdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWhdhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWhkxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWhkxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhkxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWhkxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWhos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWhos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWhos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWhxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWhxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWhxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWidhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWidhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWidhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWidhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWitos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWitos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWitos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWitos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWitxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWitxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWitxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWitxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWjdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWjdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWjdhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWjdoc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWjdoc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjdoc
+consolidation "l10n"
 classification "System/Text Tools"
 import SUNWjdoc
 end package
--- a/src/util/distro-import/00/common/loc/SUNWjos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWjos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWjos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWjxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWjxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWjxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWkdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWkdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWkdhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWkos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWkos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWkos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWkxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWkxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWkxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-cs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-cs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-cs
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-cs
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-de
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-de
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-es
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-es
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-extra
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-extra
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-fr
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-fr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-hu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-hu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-hu
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-hu
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-it
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-it
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-pl
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-pl
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-ptBR
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-ptBR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-ru
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-ru
 end package
--- a/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWmyspell-dictionary-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-sv
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-sv
 end package
--- a/src/util/distro-import/00/common/loc/SUNWplxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWplxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWplxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWplxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWptxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWptxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWptxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWptxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWruxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWruxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWruxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWruxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWsdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWsdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWsdhcm
 end package
--- a/src/util/distro-import/00/common/loc/SUNWstardict	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWstardict	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWstardict
+consolidation "gnome_l10n"
 classification "Applications/Accessories"
 import SUNWstardict
 import SUNWstardict-root
--- a/src/util/distro-import/00/common/loc/SUNWsvos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWsvos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsvos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWsvos
 end package
--- a/src/util/distro-import/00/common/loc/SUNWsvxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWsvxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsvxwsvr
+consolidation "l10n"
 classification "System/X11"
 import SUNWsvxwsvr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-de
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-de
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-es
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-es
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-fr
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-fr
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-it
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-it
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-ja
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-ja
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-ko
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-ko
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-ptBR
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-ptBR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-ru
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-ru
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-sv
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-sv
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-zhCN
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-zhCN
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhHK	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhHK	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-zhHK
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-zhHK
 end package
--- a/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhTW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWtgnome-l10n-ui-zhTW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-l10n-ui-zhTW
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-l10n-ui-zhTW
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-de-DE	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-de-DE	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-de-DE
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-de-DE
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-es-ES	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-es-ES	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-es-ES
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-es-ES
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-extra
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-extra
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-fr-FR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-fr-FR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-fr-FR
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-fr-FR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-it-IT	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-it-IT	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-it-IT
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-it-IT
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ja-JP	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ja-JP	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-ja-JP
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-ja-JP
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ko-KR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ko-KR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-ko-KR
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-ko-KR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-pl-PL	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-pl-PL	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-pl-PL
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-pl-PL
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-pt-BR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-pt-BR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-pt-BR
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-pt-BR
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ru-RU	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-ru-RU	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-ru-RU
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-ru-RU
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-sv-SE	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-sv-SE	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-sv-SE
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-sv-SE
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-zh-CN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-zh-CN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-zh-CN
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-zh-CN
 end package
--- a/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-zh-TW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/common/loc/SUNWthunderbirdl10n-zh-TW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWthunderbirdl10n-zh-TW
+consolidation "gnome_l10n"
 classification "Applications/Internet"
 import SUNWthunderbirdl10n-zh-TW
 end package
--- a/src/util/distro-import/00/i386/SUNWagph	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/i386/SUNWagph	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWagph
+consolidation "osnet"
 classification "Development/System"
 import SUNWagph
 end package
--- a/src/util/distro-import/00/sparc/SUNWbcp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWbcp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbcp
+consolidation "osnet"
 classification "System/Core"
 import SUNWbcp
 end package
--- a/src/util/distro-import/00/sparc/SUNWcg6h	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWcg6h	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcg6h
+consolidation "osnet"
 classification "Drivers/Display"
 import SUNWcg6h
 end package
--- a/src/util/distro-import/00/sparc/SUNWdcs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWdcs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdcs
+consolidation "osnet"
 classification "System/Core"
 import SUNWdcsr
 import SUNWdcsu
--- a/src/util/distro-import/00/sparc/SUNWdrcr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWdrcr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdrcr
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWdrcr.u
 end package
--- a/src/util/distro-import/00/sparc/SUNWfbc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWfbc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfbc
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWfbc
 end package
--- a/src/util/distro-import/00/sparc/SUNWfruid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWfruid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfruid
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWfruid
 end package
--- a/src/util/distro-import/00/sparc/SUNWfruip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWfruip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfruip
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWfruip.u
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/00/sparc/SUNWhmdu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWhmdu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhmdu
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWhmdu
 end package
--- a/src/util/distro-import/00/sparc/SUNWkfbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWkfbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkfbcf
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWkfbcf
 end package
--- a/src/util/distro-import/00/sparc/SUNWkfbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWkfbw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkfbw
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWkfbw exclude \
 	usr/openwin \
--- a/src/util/distro-import/00/sparc/SUNWluxopr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWluxopr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWluxopr
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWluxopr
 end package
--- a/src/util/distro-import/00/sparc/SUNWpstl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWpstl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpstl
+consolidation "osnet"
 classification "Development/System"
 import SUNWpstl.u
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/00/sparc/SUNWsfdr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/00/sparc/SUNWsfdr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsfdr
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWsfdr.u
 import SUNWsfdrr.u
--- a/src/util/distro-import/100a/common/SUNWapr13doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWapr13doc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapr13doc
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapr13doc
 version 1.3
--- a/src/util/distro-import/100a/common/SUNWapu13doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWapu13doc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapu13doc
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapu13doc
 version 1.3
--- a/src/util/distro-import/100a/common/SUNWcheese	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWcheese	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcheese
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWcheese
 import SUNWcheese-root
--- a/src/util/distro-import/100a/common/SUNWddu-l10n	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWddu-l10n	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWddu-l10n
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWddu-l10n
 end package
--- a/src/util/distro-import/100a/common/SUNWespeak	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWespeak	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWespeak
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWespeak
 import SUNWespeak-devel
--- a/src/util/distro-import/100a/common/SUNWgnome-a11y-speech-espeak	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnome-a11y-speech-espeak	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-speech-espeak
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-speech-espeak
 end package
--- a/src/util/distro-import/100a/common/SUNWgnome-nettool	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnome-nettool	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-nettool
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWgnome-nettool
 end package
--- a/src/util/distro-import/100a/common/SUNWgnome-time-slider	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnome-time-slider	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-time-slider
+consolidation "gnome"
 classification "Applications/Configuration and Preferences"
 import SUNWgnome-time-slider
 import SUNWgnome-time-slider-root
--- a/src/util/distro-import/100a/common/SUNWgnu-emacs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnu-emacs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-emacs
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWgnu-emacs
 version 22.1
--- a/src/util/distro-import/100a/common/SUNWgnu-emacs-el	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnu-emacs-el	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-emacs-el
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWgnu-emacs-el
 version 22.1
--- a/src/util/distro-import/100a/common/SUNWgnu-emacs-gtk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnu-emacs-gtk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-emacs-gtk
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWgnu-emacs-gtk
 version 22.1
--- a/src/util/distro-import/100a/common/SUNWgnu-emacs-nox	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnu-emacs-nox	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-emacs-nox
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWgnu-emacs-nox
 version 22.1
--- a/src/util/distro-import/100a/common/SUNWgnu-emacs-x	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgnu-emacs-x	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-emacs-x
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWgnu-emacs-x
 version 22.1
--- a/src/util/distro-import/100a/common/SUNWgobby	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgobby	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgobby
+consolidation "gnome"
 classification "System/Text Tools"
 import SUNWgobby
 end package
--- a/src/util/distro-import/100a/common/SUNWgscr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWgscr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWgscr
+consolidation "sfw"
 version 8.15.1
 depend SUNWghostscript
 end package
--- a/src/util/distro-import/100a/common/SUNWipkg-um	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWipkg-um	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipkg-um
+consolidation "ips"
 classification "System/Packaging"
 import SUNWipkg-um
 end package
--- a/src/util/distro-import/100a/common/SUNWirssi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWirssi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWirssi
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWirssi
 end package
--- a/src/util/distro-import/100a/common/SUNWjruby	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWjruby	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjruby
+consolidation "sfw"
 classification "Development/Ruby"
 import SUNWjruby
 version 1.1.3
--- a/src/util/distro-import/100a/common/SUNWlibxmlpp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWlibxmlpp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibxmlpp
+consolidation "gnome"
 classification "Development/C++"
 import SUNWlibxmlpp
 import SUNWlibxmlpp-devel
--- a/src/util/distro-import/100a/common/SUNWnet6	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWnet6	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnet6
+consolidation "gnome"
 classification "Development/System"
 import SUNWnet6
 import SUNWnet6-devel
--- a/src/util/distro-import/100a/common/SUNWobby	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWobby	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWobby
+consolidation "gnome"
 classification "Development/System"
 import SUNWobby
 import SUNWobby-devel
--- a/src/util/distro-import/100a/common/SUNWopenproj	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWopenproj	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopenproj
+consolidation "gnome"
 classification "Applications/Office"
 import SUNWopenproj
 end package
--- a/src/util/distro-import/100a/common/SUNWplanner	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWplanner	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWplanner
+consolidation "gnome"
 classification "Applications/Office"
 import SUNWplanner
 import SUNWplanner-devel
--- a/src/util/distro-import/100a/common/SUNWpowertop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWpowertop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpowertop
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWpowertop
 end package
--- a/src/util/distro-import/100a/common/SUNWprivoxy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWprivoxy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWprivoxy
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWprivoxyr
 import SUNWprivoxyu
--- a/src/util/distro-import/100a/common/SUNWscreen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWscreen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscreen
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWscreen
 import SUNWscreenrc
--- a/src/util/distro-import/100a/common/SUNWslocate	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWslocate	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWslocate
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWslocate
 import SUNWslocate-root
--- a/src/util/distro-import/100a/common/SUNWswig	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWswig	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWswig
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWswig
 version 1.3.35
--- a/src/util/distro-import/100a/common/SUNWterminator	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWterminator	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWterminator
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWterminator
 depend SUNWgnome-python-libs
--- a/src/util/distro-import/100a/common/SUNWtop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWtop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtop
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWtop
 version 3.8
--- a/src/util/distro-import/100a/common/SUNWzfs-auto-snapshot	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/SUNWzfs-auto-snapshot	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzfs-auto-snapshot
+consolidation "gnome"
 classification "System/File System"
 import SUNWzfs-auto-snapshot
 add user username=zfssnap password=NP uid=51 group=daemon \
--- a/src/util/distro-import/100a/common/loc/SUNWttf-hanyang-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/loc/SUNWttf-hanyang-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-hanyang-ko
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-hanyang-ko exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/100a/common/loc/SUNWttf-hanyang-ko-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/common/loc/SUNWttf-hanyang-ko-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-hanyang-ko-core
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-hanyang-ko-core exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/100a/i386/SUNWvdisk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/100a/i386/SUNWvdisk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvdisk
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWvdisk
 end package
--- a/src/util/distro-import/101/common/FSWxorg-fonts	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package FSWxorg-fonts
+consolidation "X"
 depend FSWxorg-fonts-core
 depend FSWxorg-fonts-cyrillic
 depend FSWxorg-fonts-daewoo
--- a/src/util/distro-import/101/common/FSWxorg-fonts-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-core
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-core
 add link path=etc/X11/fontpath.d/100dpi:pri=90 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-cyrillic	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-cyrillic	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-cyrillic
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-cyrillic
 add link path=etc/X11/fontpath.d/cyrillic:pri=75 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-daewoo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-daewoo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-daewoo
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-daewoo
 add link path=etc/X11/fontpath.d/75dpi:pri=75 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-ethiopic	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-ethiopic	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-ethiopic
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-ethiopic
 add link path=etc/X11/fontpath.d/ethiopic:pri=60 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-10	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-10	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-10
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-10
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-10:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-13	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-13	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-13
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-13
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-13:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-14	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-14	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-14
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-14
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-14:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-16	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-16	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-16
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-16
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-16:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-2
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-2
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-2:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-3	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-3	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-3
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-3
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-3:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-4	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-4	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-4
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-4
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-4:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-9	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-iso8859-9	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-iso8859-9
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-iso8859-9
 add link path=etc/X11/fontpath.d/100dpi-ISO8859-9:pri=91 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-jiskan	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-jiskan	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-jiskan
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-jiskan
 add link path=etc/X11/fontpath.d/jiskan:pri=84 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-syriac	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-syriac	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-syriac
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-syriac
 add link path=etc/X11/fontpath.d/syriac:pri=61 \
--- a/src/util/distro-import/101/common/FSWxorg-fonts-vera	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/FSWxorg-fonts-vera	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package FSWxorg-fonts-vera
+consolidation "X"
 classification "System/Fonts"
 import FSWxorg-fonts-vera
 add link path=etc/X11/fontpath.d/vera:pri=42 \
--- a/src/util/distro-import/101/common/SUNWgawk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/SUNWgawk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgawk
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWgawk
 version 3.1.5
--- a/src/util/distro-import/101/common/SUNWncurses	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/SUNWncurses	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWncurses
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWncurses
 import SUNWncurses-devel
--- a/src/util/distro-import/101/common/SUNWswt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/SUNWswt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWswt
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWswt
 end package
--- a/src/util/distro-import/101/common/SUNWxwacx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/SUNWxwacx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwacx
+consolidation "X"
 classification "System/X11"
 import SUNWxwacx exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/101/common/SUNWxwpmn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101/common/SUNWxwpmn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwpmn
+consolidation "X"
 classification "Development/X11"
 import SUNWxwpmn
 end package
--- a/src/util/distro-import/101a/common/OSOLvpanels-mysql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/OSOLvpanels-mysql	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels-mysql
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 import OSOLvpin-mysql
 depend OSOLvpanels
--- a/src/util/distro-import/101a/common/OSOLvpanels-sysid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/OSOLvpanels-sysid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels-sysid
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 import OSOLvpin-sysid
 depend OSOLvpanels
--- a/src/util/distro-import/101a/common/SUNWgccruntime	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/SUNWgccruntime	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgccruntime
+consolidation "sfw"
 classification "Development/C"
 import SUNWgccruntime exclude \
 	usr/sfw/lib/$(ARCH64)/libfrtbegin.a \
--- a/src/util/distro-import/101a/common/SUNWgnome-camera	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/SUNWgnome-camera	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-camera
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-camera exclude \
 	usr/lib/gimp/2.0/plug-ins \
--- a/src/util/distro-import/101a/common/SUNWgnome-camera-img-editor-plugin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/SUNWgnome-camera-img-editor-plugin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-camera-img-editor-plugin
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 summary "GNOME digital camera tool plugin for Gimp image editor"
 from SUNWgnome-camera import
--- a/src/util/distro-import/101a/common/SUNWjavadb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/SUNWjavadb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjavadb
+consolidation "dbtg"
 classification "Development/Databases"
 import SUNWjavadb-client
 import SUNWjavadb-common
--- a/src/util/distro-import/101a/common/SUNWpmdbdpg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/SUNWpmdbdpg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpmdbdpg
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWpmdbdpg
 version 1.49
--- a/src/util/distro-import/101a/common/SUNWpython-lxml	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/101a/common/SUNWpython-lxml	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-lxml
+consolidation "install"
 classification "Development/Python"
 import SUNWpython-lxml
 version 2.1.2
--- a/src/util/distro-import/102/common/SUNWbonnieplus	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/102/common/SUNWbonnieplus	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbonnieplus
+consolidation "sfw"
 classification "Development/System"
 import SUNWbonnieplus
 version 1.3.3
--- a/src/util/distro-import/102/common/SUNWgit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/102/common/SUNWgit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgit
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWgit
 $(i386_ONLY)chattr usr/perl5/vendor_perl/5.8.4/i86pc-solaris-64int/Error.pm \
--- a/src/util/distro-import/102/common/SUNWopenldap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/102/common/SUNWopenldap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopenldap
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWopenldapr
 drop var/run/openldap
--- a/src/util/distro-import/103/common/SUNWdoxygen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/103/common/SUNWdoxygen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdoxygen
+consolidation "sfw"
 classification "Development/Distribution Tools"
 import SUNWdoxygen
 version 1.5.7.1
--- a/src/util/distro-import/103/common/SUNWfping	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/103/common/SUNWfping	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfping
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWfping
 import SUNWfpingr
--- a/src/util/distro-import/103/common/SUNWhexedit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/103/common/SUNWhexedit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhexedit
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWhexedit
 version 1.2.12
--- a/src/util/distro-import/103/common/SUNWmpathadm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/103/common/SUNWmpathadm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmpathadm
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWmpathadm
 end package
--- a/src/util/distro-import/103/i386/SUNWgrubS	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/103/i386/SUNWgrubS	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgrubS
+consolidation "osnet"
 classification "System/Core"
 import SUNWgrubS
 version 0.97
--- a/src/util/distro-import/104/common/SUNWcimserver	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWcimserver	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcimserver
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWcimserverr
 import SUNWcimserveru
--- a/src/util/distro-import/104/common/SUNWcmake	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWcmake	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcmake
+consolidation "sfw"
 classification "Development/Distribution Tools"
 import SUNWcmake
 version 2.6.2
--- a/src/util/distro-import/104/common/SUNWfoomatic-db	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWfoomatic-db	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfoomatic-db
+consolidation "sfw"
 classification "System/Printing"
 import SUNWfoomatic-db
 version 0.20080903
--- a/src/util/distro-import/104/common/SUNWfoomatic-db-engine	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWfoomatic-db-engine	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfoomatic-db-engine
+consolidation "sfw"
 classification "System/Printing"
 import SUNWfoomatic-db-enginer
 import SUNWfoomatic-db-engineu
--- a/src/util/distro-import/104/common/SUNWgrails	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWgrails	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgrails
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWgrails
 version 1.0.3
--- a/src/util/distro-import/104/common/SUNWquilt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWquilt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWquilt
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWquiltr
 import SUNWquiltu
--- a/src/util/distro-import/104/common/SUNWwebalizer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/104/common/SUNWwebalizer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwebalizer
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWwebalizer
 import SUNWwebalizerr
--- a/src/util/distro-import/105/common/SUNWant	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWant	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWant
+consolidation "sfw"
 classification "Development/Distribution Tools"
 import SUNWant
 depend SUNWj6dev
--- a/src/util/distro-import/105/common/SUNWcar	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWcar	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcar
+consolidation "osnet"
 classification "System/Core"
 $(i386_ONLY)import SUNWcar.i
 $(i386_ONLY)import SUNWcarx.i
--- a/src/util/distro-import/105/common/SUNWgnome-sys-suspend	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWgnome-sys-suspend	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWgnome-sys-suspend was EOFed in snv_105.
 #
 package SUNWgnome-sys-suspend
+consolidation "gnome"
 end package
--- a/src/util/distro-import/105/common/SUNWkvm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWkvm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkvm
+consolidation "osnet"
 classification "System/Core"
 $(i386_ONLY)import SUNWkvm.i
 $(sparc_ONLY)import SUNWkvm.u
--- a/src/util/distro-import/105/common/SUNWlablgtk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWlablgtk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlablgtk
+consolidation "sfw"
 classification "Development/GNOME and GTK+"
 import SUNWlablgtk
 version 2.10.1
--- a/src/util/distro-import/105/common/SUNWm17n	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWm17n	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWm17n
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWm17n-db
 import SUNWm17n-db-devel
--- a/src/util/distro-import/105/common/SUNWmdb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWmdb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmdb
+consolidation "osnet"
 classification "Development/System"
 import SUNWmdb
 import SUNWmdbr
--- a/src/util/distro-import/105/common/SUNWmrxvt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWmrxvt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmrxvt
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWmrxvt
 version 0.5.4
--- a/src/util/distro-import/105/common/SUNWocaml	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWocaml	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWocaml
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWocaml
 version 3.10.2
--- a/src/util/distro-import/105/common/SUNWpicl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpicl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpicl
+consolidation "osnet"
 classification "System/Core"
 import SUNWpiclu
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/105/common/SUNWpl5m	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpl5m	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpl5m was EOFed in snv_105.
 #
 package SUNWpl5m
+consolidation "man"
 version 5.6.1
 end package
--- a/src/util/distro-import/105/common/SUNWpl5p	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpl5p	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpl5p was EOFed in snv_105.
 #
 package SUNWpl5p
+consolidation "osnet"
 version 5.6.1
 end package
--- a/src/util/distro-import/105/common/SUNWpl5u	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpl5u	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpl5u was EOFed in snv_105.
 #
 package SUNWpl5u
+consolidation "osnet"
 version 5.6.1
 end package
--- a/src/util/distro-import/105/common/SUNWpl5v	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpl5v	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpl5v was EOFed in snv_105.
 #
 package SUNWpl5v
+consolidation "osnet"
 version 5.6.1
 end package
--- a/src/util/distro-import/105/common/SUNWpython-cherrypy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpython-cherrypy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-cherrypy
+consolidation "ips"
 classification "Development/Python"
 import SUNWpython-cherrypy
 version 3.1.1
--- a/src/util/distro-import/105/common/SUNWpython-mako	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWpython-mako	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-mako
+consolidation "ips"
 classification "Development/Python"
 import SUNWpython-mako
 version 0.2.2
--- a/src/util/distro-import/105/common/SUNWrdiff-backup	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWrdiff-backup	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrdiff-backup
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWrdiff-backup
 version 1.2.1
--- a/src/util/distro-import/105/common/SUNWscim-m17n	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWscim-m17n	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-m17n
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-m17n
 end package
--- a/src/util/distro-import/105/common/SUNWslim-utils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWslim-utils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWslim-utils
+consolidation "install"
 import SUNWslim-utils
 add user username=jack uid=65432 group=staff gcos-field="Default User" home-dir=/jack login-shell=/usr/bin/bash password=9Nd/cwBcNWFZg
 end package
--- a/src/util/distro-import/105/common/SUNWunison	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWunison	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWunison
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWunison
 version 2.27.57
--- a/src/util/distro-import/105/common/SUNWvncviewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWvncviewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvncviewer
+consolidation "X"
 classification "Applications/Internet"
 import SUNWvncviewer
 version 4.1.3
--- a/src/util/distro-import/105/common/SUNWxwice	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/common/SUNWxwice	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwice
+consolidation "X"
 classification "System/X11"
 import SUNWxwice exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/105/i386/SUNWcakrx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/i386/SUNWcakrx	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWcakrx
+consolidation "osnet"
 depend SUNWcakr
 end package
--- a/src/util/distro-import/105/i386/SUNWcarx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/105/i386/SUNWcarx	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWcarx
+consolidation "osnet"
 depend SUNWcar
 end package
--- a/src/util/distro-import/106/common/SUNWcacaort	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWcacaort	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcacaort
+consolidation "cacao"
 classification "Web Services/Application and Web Servers"
 import SUNWcacaort
 add dir group=sys mode=0755 owner=root path=etc
--- a/src/util/distro-import/106/common/SUNWdia	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWdia	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdia
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWdia
 end package
--- a/src/util/distro-import/106/common/SUNWdiveintopython	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWdiveintopython	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdiveintopython
+consolidation "gnome"
 classification "Development/Python"
 import SUNWdiveintopython
 end package
--- a/src/util/distro-import/106/common/SUNWfirefox-bookmark	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWfirefox-bookmark	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefox-bookmark
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWfirefox-bookmark
 end package
--- a/src/util/distro-import/106/common/SUNWgnome-a11y-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWgnome-a11y-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-libs
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-libs
 import SUNWgnome-a11y-libs-devel
--- a/src/util/distro-import/106/common/SUNWgnome-keyring-manager	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWgnome-keyring-manager	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWgnome-keyring-manager was EOFed in snv_106.
 #
 package SUNWgnome-keyring-manager
+consolidation "gnome"
 end package
--- a/src/util/distro-import/106/common/SUNWgtk-vnc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWgtk-vnc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtk-vnc
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgtk-vnc
 import SUNWgtk-vnc-devel
--- a/src/util/distro-import/106/common/SUNWhamster	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWhamster	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhamster
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWhamster
 import SUNWhamster-root
--- a/src/util/distro-import/106/common/SUNWinstall	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWinstall	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWinstall
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWinstall
 depend SUNWbeadm
--- a/src/util/distro-import/106/common/SUNWinstall-test	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWinstall-test	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWinstall-test
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWinstall-test
 end package
--- a/src/util/distro-import/106/common/SUNWipmi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWipmi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipmi
+consolidation "sfw"
 classification "System/Hardware"
 import SUNWipmi
 import SUNWipmir
--- a/src/util/distro-import/106/common/SUNWjunit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWjunit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjunit
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjunit
 version 4.5
--- a/src/util/distro-import/106/common/SUNWlibpigment	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWlibpigment	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibpigment
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibpigment
 import SUNWlibpigment-devel
--- a/src/util/distro-import/106/common/SUNWlibpigment-python24	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWlibpigment-python24	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibpigment-python24
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibpigment-python24
 end package
--- a/src/util/distro-import/106/common/SUNWlibpigment-python25	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWlibpigment-python25	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibpigment-python25
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibpigment-python25
 end package
--- a/src/util/distro-import/106/common/SUNWlynx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWlynx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlynx
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWlynx
 import SUNWlynx-root
--- a/src/util/distro-import/106/common/SUNWnmap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWnmap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnmap
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWnmap
 version 4.75
--- a/src/util/distro-import/106/common/SUNWpcre	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWpcre	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcre
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWpcre
 version 7.8
--- a/src/util/distro-import/106/common/SUNWpython-pyopenssl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWpython-pyopenssl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-pyopenssl
+consolidation "sfw"
 classification "Development/Python"
 import SUNWpython-pyopenssl
 version 0.8
--- a/src/util/distro-import/106/common/SUNWpython-twisted-web2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWpython-twisted-web2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-twisted-web2
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-twisted-web2
 end package
--- a/src/util/distro-import/106/common/SUNWpython25-twisted	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWpython25-twisted	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython25-twisted
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython25-twisted
 end package
--- a/src/util/distro-import/106/common/SUNWpython25-twisted-web2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWpython25-twisted-web2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython25-twisted-web2
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython25-twisted-web2
 end package
--- a/src/util/distro-import/106/common/SUNWseahorse	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWseahorse	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWseahorse
+consolidation "gnome"
 classification "System/Security"
 import SUNWseahorse
 import SUNWseahorse-devel
--- a/src/util/distro-import/106/common/SUNWvscankr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWvscankr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWvscankr
+consolidation "osnet"
 depend SUNWvscan
 end package
--- a/src/util/distro-import/106/common/SUNWxvnc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/SUNWxvnc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxvnc
+consolidation "X"
 classification "System/X11"
 import SUNWxvnc
 version 4.1.3
--- a/src/util/distro-import/106/common/loc/SUNWlang-ja-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/loc/SUNWlang-ja-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ja-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ja-extra
 depend SUNWiconv-extra
--- a/src/util/distro-import/106/common/loc/SUNWlang-ko-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/loc/SUNWlang-ko-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ko-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ko-extra
 depend SUNWiconv-extra
--- a/src/util/distro-import/106/common/loc/SUNWlang-zhCN-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/loc/SUNWlang-zhCN-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhCN-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhCN-extra
 depend SUNWiconv-extra
--- a/src/util/distro-import/106/common/loc/SUNWlang-zhHK-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/loc/SUNWlang-zhHK-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhHK-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhHK-extra exclude usr/openwin
 chattr_glob * edit path usr/openwin/lib usr/X11/share/X11
--- a/src/util/distro-import/106/common/loc/SUNWlang-zhTW-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/common/loc/SUNWlang-zhTW-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhTW-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhTW-extra
 depend SUNWiconv-extra
--- a/src/util/distro-import/106/sparc/SUNWastfbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/106/sparc/SUNWastfbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWastfbcf
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWastfbcf
 end package
--- a/src/util/distro-import/107/common/SUNWbabl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWbabl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbabl
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWbabl
 import SUNWbabl-devel
--- a/src/util/distro-import/107/common/SUNWcodeina	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWcodeina	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcodeina
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWcodeina
 import SUNWcodeina-root
--- a/src/util/distro-import/107/common/SUNWcups-manager	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWcups-manager	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcups-manager
+consolidation "gnome"
 classification "System/Administration and Configuration"
 import SUNWcups-manager
 import SUNWcups-manager-root
--- a/src/util/distro-import/107/common/SUNWfftw2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWfftw2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfftw2
+consolidation "sfw"
 classification "Development/High Performance Computing"
 import SUNWfftw2
 version 2.1.5
--- a/src/util/distro-import/107/common/SUNWfftw3	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWfftw3	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfftw3
+consolidation "sfw"
 classification "Development/High Performance Computing"
 import SUNWfftw3
 version 3.1.2
--- a/src/util/distro-import/107/common/SUNWgegl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWgegl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgegl
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWgegl
 import SUNWgegl-devel
--- a/src/util/distro-import/107/common/SUNWgftp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWgftp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgftp
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgftp
 end package
--- a/src/util/distro-import/107/common/SUNWgkrellm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWgkrellm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgkrellm
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgkrellm
 import SUNWgkrellm-devel
--- a/src/util/distro-import/107/common/SUNWgnome-a11y-mousetweaks	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWgnome-a11y-mousetweaks	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-mousetweaks
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-mousetweaks
 import SUNWgnome-a11y-mousetweaks-root
--- a/src/util/distro-import/107/common/SUNWgnome-media-center	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWgnome-media-center	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-media-center
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWgnome-media-center
 depend SUNWdbus-bindings
--- a/src/util/distro-import/107/common/SUNWlibical	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWlibical	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibical
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibical
 import SUNWlibical-devel
--- a/src/util/distro-import/107/common/SUNWlibsndfile	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWlibsndfile	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsndfile
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibsndfile
 version 1.0.17
--- a/src/util/distro-import/107/common/SUNWpython24-simplejson	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWpython24-simplejson	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython24-simplejson
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython24-simplejson
 end package
--- a/src/util/distro-import/107/common/SUNWpython25-simplejson	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWpython25-simplejson	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython25-simplejson
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython25-simplejson
 end package
--- a/src/util/distro-import/107/common/SUNWpyyaml24	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWpyyaml24	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpyyaml24
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpyyaml24
 end package
--- a/src/util/distro-import/107/common/SUNWpyyaml25	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWpyyaml25	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpyyaml25
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpyyaml25
 end package
--- a/src/util/distro-import/107/common/SUNWsongbird	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWsongbird	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsongbird
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWsongbird
 end package
--- a/src/util/distro-import/107/common/SUNWxorg-doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/SUNWxorg-doc	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWxorg-doc
+consolidation "X"
 depend SUNWxorg-graphics-ddx
 depend SUNWxorg-server
 end package
--- a/src/util/distro-import/107/common/loc/SUNWgnome-l10nmessages-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/loc/SUNWgnome-l10nmessages-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-extra
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-extra
 end package
--- a/src/util/distro-import/107/common/loc/SUNWpostgr-l10n-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/loc/SUNWpostgr-l10n-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWpostgr-l10n-ja was EOFed in snv_107.
 #
 package SUNWpostgr-l10n-ja
+consolidation "l10n"
 end package
--- a/src/util/distro-import/107/common/loc/SUNWttf-unfonts-ko-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/loc/SUNWttf-unfonts-ko-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-unfonts-ko-core
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-unfonts-ko-core exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/107/common/loc/SUNWttf-unfonts-ko-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/loc/SUNWttf-unfonts-ko-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-unfonts-ko-extra
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-unfonts-ko-extra exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/107/common/loc/SUNWttf-wqy-zenhei	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/common/loc/SUNWttf-wqy-zenhei	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-wqy-zenhei
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-wqy-zenhei exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/107/i386/SUNWclutter	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/i386/SUNWclutter	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWclutter
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWclutter
 import SUNWclutter-devel
--- a/src/util/distro-import/107/i386/SUNWclutter-gst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/i386/SUNWclutter-gst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWclutter-gst
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWclutter-gst
 import SUNWclutter-gst-devel
--- a/src/util/distro-import/107/i386/SUNWclutter-gtk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/i386/SUNWclutter-gtk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWclutter-gtk
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWclutter-gtk
 import SUNWclutter-gtk-devel
--- a/src/util/distro-import/107/sparc/SUNWefbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWefbw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWefbw
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWefbw
 depend SUNWefb
--- a/src/util/distro-import/107/sparc/SUNWnfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWnfb	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWnfb
+consolidation "smcc"
 depend SUNWefb
 end package
--- a/src/util/distro-import/107/sparc/SUNWnfbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWnfbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWnfbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/107/sparc/SUNWnfbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWnfbw	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWnfbw
+consolidation "smcc"
 depend SUNWefbw
 end package
--- a/src/util/distro-import/107/sparc/SUNWpfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWpfb	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWpfb
+consolidation "smcc"
 depend SUNWefb
 end package
--- a/src/util/distro-import/107/sparc/SUNWpfbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWpfbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWpfbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/107/sparc/SUNWpfbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/107/sparc/SUNWpfbw	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWpfbw
+consolidation "smcc"
 depend SUNWefbw
 end package
--- a/src/util/distro-import/108/common/SUNWgnu-findutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/108/common/SUNWgnu-findutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-findutils
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnu-findutils
 end package
--- a/src/util/distro-import/108/common/SUNWgvim	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/108/common/SUNWgvim	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgvim
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWgvim
 version 7.2.84
--- a/src/util/distro-import/108/common/SUNWipkg-gui	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/108/common/SUNWipkg-gui	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipkg-gui
+consolidation "ips"
 classification "System/Packaging"
 import SUNWipkg-gui
 import SUNWipkg-gui-data
--- a/src/util/distro-import/108/common/SUNWlibvisual	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/108/common/SUNWlibvisual	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibvisual
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibvisual
 import SUNWlibvisual-devel
--- a/src/util/distro-import/109/common/SUNWPython26-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWPython26-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWPython26-extra
+consolidation "gnome"
 classification "Development/Python"
 import SUNWPython26-extra
 end package
--- a/src/util/distro-import/109/common/SUNWgnome-python26-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWgnome-python26-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-python26-libs
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgnome-python26-libs
 import SUNWgnome-python26-libs-devel
--- a/src/util/distro-import/109/common/SUNWkonkretcmpi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWkonkretcmpi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkonkretcmpi
+consolidation "sfw"
 classification "Development/C"
 import SUNWkonkretcmpi
 version 0.8.7
--- a/src/util/distro-import/109/common/SUNWonbld	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWonbld	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWonbld
+consolidation "osnet"
 classification "Development/Distribution Tools"
 import SUNWonbld
 end package
--- a/src/util/distro-import/109/common/SUNWpython26-setuptools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWpython26-setuptools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-setuptools
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-setuptools
 depend SUNWPython26
--- a/src/util/distro-import/109/common/SUNWruby18	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWruby18	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWruby18
+consolidation "sfw"
 classification "Development/Ruby"
 import SUNWruby18u
 import SUNWruby18r
--- a/src/util/distro-import/109/common/SUNWsg3utils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWsg3utils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsg3utils
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWsg3utilsr
 import SUNWsg3utilsu
--- a/src/util/distro-import/109/common/SUNWsimplewbem	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWsimplewbem	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsimplewbem
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWsimplewbem
 version 1.2.4
--- a/src/util/distro-import/109/common/SUNWtree	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWtree	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtree
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWtree
 version 1.5.2.1
--- a/src/util/distro-import/109/common/SUNWzsh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/SUNWzsh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzsh
+consolidation "sfw"
 classification "System/Shells"
 import SUNWzsh
 version 4.3.9
--- a/src/util/distro-import/109/common/loc/SUNWman-l10n-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/loc/SUNWman-l10n-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWman-l10n-ja
+consolidation "l10n"
 classification "System/Text Tools"
 import SUNWman-l10n-ja
 depend SUNWjdoc
--- a/src/util/distro-import/109/common/loc/SUNWpostgr-82-l10n-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/common/loc/SUNWpostgr-82-l10n-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-l10n-ja
+consolidation "l10n"
 classification "System/Databases"
 import SUNWpostgr-82-l10n-ja
 version 8.2.4
--- a/src/util/distro-import/109/sparc/SUNWefbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/109/sparc/SUNWefbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWefbcf
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWefbcf
 end package
--- a/src/util/distro-import/110/common/SUNWSblimCimClient	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWSblimCimClient	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWSblimCimClient
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWSblimCimClient
 version 1.3.7
--- a/src/util/distro-import/110/common/SUNWauto-install	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWauto-install	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWauto-install
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWauto-install
 depend SUNWauto-install-common
--- a/src/util/distro-import/110/common/SUNWauto-install-common	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWauto-install-common	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWauto-install-common
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWauto-install-common
 end package
--- a/src/util/distro-import/110/common/SUNWcfcl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWcfcl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcfcl
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWcfcl
 import SUNWcfclr
--- a/src/util/distro-import/110/common/SUNWdoc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWdoc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdoc
+consolidation "osnet"
 classification "System/Text Tools"
 import SUNWdoc
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/110/common/SUNWdtbas	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWdtbas	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdtbas
+consolidation "cde"
 classification "System/X11"
 summary "CDE application basic runtime environment"
 # Import only non-EOF compatibility libraries
--- a/src/util/distro-import/110/common/SUNWimac	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWimac	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWimac
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWimac
 import SUNWimacr
--- a/src/util/distro-import/110/common/SUNWinstalladm-tools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWinstalladm-tools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWinstalladm-tools
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWinstalladm-tools
 depend SUNWapch22
--- a/src/util/distro-import/110/common/SUNWlibmcrypt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWlibmcrypt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibmcrypt
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibmcrypt
 version 2.5.8
--- a/src/util/distro-import/110/common/SUNWlighttpd14	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWlighttpd14	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlighttpd14
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWlighttpd14r
 import SUNWlighttpd14u
--- a/src/util/distro-import/110/common/SUNWlua	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWlua	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlua
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWlua
 version 5.1.4
--- a/src/util/distro-import/110/common/SUNWmpapi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWmpapi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmpapi
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWmpapi
 import SUNWmpapir
--- a/src/util/distro-import/110/common/SUNWpostgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpostgr	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpostgr was EOFed in snv_110.
 #
 package SUNWpostgr
+consolidation "sfw"
 version 8.1.11
 end package
--- a/src/util/distro-import/110/common/SUNWpostgr-contrib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpostgr-contrib	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpostgr-contrib was EOFed in snv_110.
 #
 package SUNWpostgr-contrib
+consolidation "sfw"
 version 8.1.11
 end package
--- a/src/util/distro-import/110/common/SUNWpostgr-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpostgr-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpostgr-docs was EOFed in snv_110.
 #
 package SUNWpostgr-docs
+consolidation "sfw"
 version 8.1.11
 end package
--- a/src/util/distro-import/110/common/SUNWpostgr-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpostgr-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpostgr-libs was EOFed in snv_110.
 #
 package SUNWpostgr-libs
+consolidation "sfw"
 version 8.1.11
 end package
--- a/src/util/distro-import/110/common/SUNWpostgr-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpostgr-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpostgr-pl was EOFed in snv_110.
 #
 package SUNWpostgr-pl
+consolidation "sfw"
 version 8.1.11
 end package
--- a/src/util/distro-import/110/common/SUNWpostgr-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpostgr-server	Thu Nov 05 11:54:51 2009 -0800
@@ -6,5 +6,6 @@
 # SUNWpostgr-server was EOFed in snv_110.
 #
 package SUNWpostgr-server
+consolidation "sfw"
 version 8.1.11
 end package
--- a/src/util/distro-import/110/common/SUNWpython-ply	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpython-ply	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-ply
+consolidation "ips"
 classification "Development/Python"
 import SUNWpython-ply
 version 3.1
--- a/src/util/distro-import/110/common/SUNWpython24-ctypes	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWpython24-ctypes	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython24-ctypes
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython24-ctypes
 end package
--- a/src/util/distro-import/110/common/SUNWsblimwbemcli	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWsblimwbemcli	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsblimwbemcli
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWsblimwbemcli
 version 1.6.0
--- a/src/util/distro-import/110/common/SUNWsprot	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWsprot	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsprot
+consolidation "sunpro"
 classification "System/Core"
 import SUNWsprot
 end package
--- a/src/util/distro-import/110/common/SUNWsshd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/SUNWsshd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsshd
+consolidation "osnet"
 classification "System/Security"
 import SUNWsshdu
 import SUNWsshdr
--- a/src/util/distro-import/110/common/loc/SUNWlang-ar	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ar	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ar
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ar
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-be	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-be	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-be
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-be
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-bg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-bg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-bg
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-bg
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ca	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ca	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ca
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ca
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-cs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-cs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-cs
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-cs
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-da	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-da	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-da
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-da
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-deDE	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-deDE	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-deDE
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-deDE
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-el	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-el	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-el
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-el
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-enUS	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-enUS	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-enUS
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-enUS
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-esES	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-esES	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-esES
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-esES
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-et	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-et	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-et
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-et
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-fi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-fi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-fi
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-fi
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-frFR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-frFR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-frFR
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-frFR
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-he	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-he	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-he
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-he
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-hi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-hi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-hi
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-hi
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-hr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-hr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-hr
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-hr
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-hu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-hu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-hu
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-hu
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-id	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-id	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-id
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-id
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-is	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-is	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-is
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-is
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-it
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-it
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ja
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ja
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ka	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ka	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ka
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ka
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-kk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-kk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-kk
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-kk
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ko
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ko
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-lt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-lt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-lt
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-lt
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-lv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-lv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-lv
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-lv
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-mk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-mk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-mk
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-mk
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ms	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ms	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ms
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ms
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-mt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-mt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-mt
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-mt
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-nb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-nb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-nb
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-nb
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-nl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-nl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-nl
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-nl
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-nn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-nn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-nn
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-nn
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-pl
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-pl
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-pt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-pt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-pt
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-pt
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ptBR
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ptBR
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ro	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ro	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ro
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ro
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ru
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ru
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-sh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-sh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sh
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sh
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-sk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-sk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sk
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sk
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-sl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-sl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sl
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sl
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-sq	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-sq	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sq
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sq
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-sr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-sr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sr
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sr
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sv
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sv
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-th	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-th	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-th
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-th
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-tr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-tr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-tr
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-tr
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-uk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-uk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-uk
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-uk
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-vi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-vi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-vi
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-vi
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhCN
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhCN
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-zhHK	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-zhHK	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhHK
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhHK
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWlang-zhTW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWlang-zhTW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhTW
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhTW
 depend SUNWlang-common
--- a/src/util/distro-import/110/common/loc/SUNWpostgr-83-l10n-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWpostgr-83-l10n-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-l10n-ja
+consolidation "l10n"
 classification "System/Databases"
 import SUNWpostgr-83-l10n-ja
 version 8.3.6
--- a/src/util/distro-import/110/common/loc/SUNWttf-google-droid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/common/loc/SUNWttf-google-droid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-google-droid
+consolidation "X"
 classification "System/Fonts"
 import SUNWttf-google-droid
 end package
--- a/src/util/distro-import/110/sparc/SUNWafb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWafb	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWafb
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWafbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWafbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWafbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWafbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWafbw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWafbw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWffb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWffb	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWffb
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWffbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWffbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWffbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWffbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWffbw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWffbw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWgfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWgfb	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWgfb
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWgfbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWgfbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWgfbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWgfbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWgfbw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWgfbw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWifb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWifb	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWifb
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWifbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWifbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWifbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWifbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWifbw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWifbw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWjfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWjfb	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWjfb
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWjfbcf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWjfbcf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWjfbcf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWjfbw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWjfbw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWjfbw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWm64	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWm64	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWm64
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWm64cf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWm64cf	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWm64cf
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWm64w	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWm64w	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWm64w
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWzulu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWzulu	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWzulu
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWzuluc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWzuluc	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWzuluc
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/SUNWzuluw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/SUNWzuluw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package SUNWzuluw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/TSIpgx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/TSIpgx	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package TSIpgx
+consolidation "smcc"
 end package
--- a/src/util/distro-import/110/sparc/TSIpgxw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/110/sparc/TSIpgxw	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the empty version is installed.
 #
 package TSIpgxw
+consolidation "smcc"
 end package
--- a/src/util/distro-import/111/common/SUNWgnu-nano	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWgnu-nano	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-nano
+consolidation "sfw"
 classification "System/Text Tools"
 import SUNWgnu-nano
 version 2.0.9
--- a/src/util/distro-import/111/common/SUNWm17n-contrib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWm17n-contrib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWm17n-contrib
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWm17n-contrib
 depend SUNWm17n
--- a/src/util/distro-import/111/common/SUNWmysql51	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWmysql51	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql51
+consolidation "sfw"
 classification "System/Databases"
 import SUNWmysql51r
 import SUNWmysql51u
--- a/src/util/distro-import/111/common/SUNWmysql51lib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWmysql51lib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql51lib
+consolidation "sfw"
 classification "System/Databases"
 import SUNWmysql51lib
 version 5.1.30
--- a/src/util/distro-import/111/common/SUNWopenwsman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWopenwsman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopenwsman
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWopenwsmanr
 import SUNWopenwsmanu
--- a/src/util/distro-import/111/common/SUNWsquid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWsquid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsquid
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWsquidu
 import SUNWsquidr
--- a/src/util/distro-import/111/common/SUNWvim	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111/common/SUNWvim	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvim
+consolidation "sfw"
 classification "System/Text Tools"
 import SUNWvim
 version 7.2.141
--- a/src/util/distro-import/111a/common/OSOLvpanels	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/OSOLvpanels	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 import OSOLvpin
 depend SUNWcacaort
--- a/src/util/distro-import/111a/common/OSOLvpanels-apache	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/OSOLvpanels-apache	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels-apache
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 import OSOLvpin-apache
 depend OSOLvpanels
--- a/src/util/distro-import/111a/common/SUNWapch22m-security	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/SUNWapch22m-security	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22m-security
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22m-security
 import SUNWapch22r-security
--- a/src/util/distro-import/111a/common/SUNWgnu-idn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/SUNWgnu-idn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-idn
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWgnu-idn
 version 1.9
--- a/src/util/distro-import/111a/common/SUNWmysql51test	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/SUNWmysql51test	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql51test
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWmysql51test
 chattr usr/mysql/5.1/mysql-test/std_data/corrupt_t1.P.p1.MYI \
--- a/src/util/distro-import/111a/common/SUNWsmbfskr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/SUNWsmbfskr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWsmbfskr
+consolidation "osnet"
 depend SUNWsmbfs
 end package
--- a/src/util/distro-import/111a/common/SUNWswmt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/SUNWswmt	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWswmt
+consolidation "install"
 depend SUNWpkgcmds
 end package
--- a/src/util/distro-import/111a/common/SUNWtsg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/SUNWtsg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtsg
+consolidation "osnet"
 classification "System/Trusted"
 import SUNWtsg
 drop etc/zones/SUNWtsoldef.xml
--- a/src/util/distro-import/111a/common/loc/SUNWgetting-started-l10n-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/111a/common/loc/SUNWgetting-started-l10n-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-extra
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-extra
 end package
--- a/src/util/distro-import/116/common/SUNWImperius	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWImperius	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWImperius
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWImperius
 depend SUNWSblimCimClient
--- a/src/util/distro-import/116/common/SUNWactivation	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWactivation	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWactivation
+consolidation "sfw"
 classification "Development/Java"
 import SUNWactivation
 version 1.1.1
--- a/src/util/distro-import/116/common/SUNWaget	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWaget	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaget
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWaget
 version 0.4.1
--- a/src/util/distro-import/116/common/SUNWantlr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWantlr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWantlr
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWantlr
 depend SUNWstringtemplate
--- a/src/util/distro-import/116/common/SUNWantlr2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWantlr2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWantlr2
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWantlr2
 version 2.7.7
--- a/src/util/distro-import/116/common/SUNWaudh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWaudh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudh
+consolidation "osnet"
 classification "System/Media"
 import SUNWaudh
 end package
--- a/src/util/distro-import/116/common/SUNWavahi-bridge-dsd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWavahi-bridge-dsd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWavahi-bridge-dsd
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWavahi-bridge-dsd
 import SUNWavahi-bridge-dsd-devel
--- a/src/util/distro-import/116/common/SUNWawstats	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWawstats	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWawstats
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWawstats
 version 6.9
--- a/src/util/distro-import/116/common/SUNWbinutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWbinutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbinutils
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWbinutils
 version 2.19
--- a/src/util/distro-import/116/common/SUNWbwm-ng	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWbwm-ng	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbwm-ng
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWbwm-ng
 version 0.6
--- a/src/util/distro-import/116/common/SUNWcairo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWcairo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcairo
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWcairo
 import SUNWcairo-devel
--- a/src/util/distro-import/116/common/SUNWcglib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWcglib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcglib
+consolidation "sfw"
 classification "Development/Java"
 import SUNWcglib
 depend SUNWjarjar
--- a/src/util/distro-import/116/common/SUNWclisp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWclisp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWclisp
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWclisp
 version 2.47
--- a/src/util/distro-import/116/common/SUNWconflict	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWconflict	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWconflict
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWconflict
 version 0.2004.9.1
--- a/src/util/distro-import/116/common/SUNWconvmv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWconvmv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWconvmv
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWconvmv
 version 1.14
--- a/src/util/distro-import/116/common/SUNWdbus-bindings	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdbus-bindings	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWdbus-bindings was EOFed in snv_115.
 #
 package SUNWdbus-bindings
+consolidation "gnome"
 depend SUNWdbus-glib
 depend SUNWdbus-python24
 end package
--- a/src/util/distro-import/116/common/SUNWdbus-glib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdbus-glib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdbus-glib
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWdbus-glib
 import SUNWdbus-glib-devel
--- a/src/util/distro-import/116/common/SUNWdbus-python24	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdbus-python24	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdbus-python24
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWdbus-python24
 import SUNWdbus-python24-devel
--- a/src/util/distro-import/116/common/SUNWdbus-python26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdbus-python26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdbus-python26
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWdbus-python26
 import SUNWdbus-python26-devel
--- a/src/util/distro-import/116/common/SUNWdesktop-cache	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdesktop-cache	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-cache
+consolidation "gnome"
 classification "System/Services"
 import SUNWdesktop-cache
 import SUNWdesktop-cache-root
--- a/src/util/distro-import/116/common/SUNWdesktop-startup	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdesktop-startup	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-startup
+consolidation "gnome"
 classification "Desktop (GNOME)/Scripts"
 import SUNWdesktop-startup
 import SUNWdesktop-startup-root
--- a/src/util/distro-import/116/common/SUNWdom4j	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdom4j	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdom4j
+consolidation "sfw"
 classification "Development/Java"
 import SUNWdom4j
 depend SUNWjaxen-core
--- a/src/util/distro-import/116/common/SUNWdrools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdrools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdrools
+consolidation "sfw"
 classification "Development/Java"
 import SUNWdrools
 depend SUNWantlr
--- a/src/util/distro-import/116/common/SUNWdwdiff	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWdwdiff	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdwdiff
+consolidation "sfw"
 classification "System/Text Tools"
 import SUNWdwdiff
 version 1.5.2
--- a/src/util/distro-import/116/common/SUNWelinks	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWelinks	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWelinks
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWelinks
 version 0.11.6
--- a/src/util/distro-import/116/common/SUNWepydoc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWepydoc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWepydoc
+consolidation "sfw"
 classification "Development/Distribution Tools"
 import SUNWepydoc
 version 3.0.1
--- a/src/util/distro-import/116/common/SUNWfcgi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWfcgi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcgi
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWfcgi
 version 2.4.0
--- a/src/util/distro-import/116/common/SUNWfcgi-doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWfcgi-doc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcgi-doc
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWfcgi-doc
 version 2.4.0
--- a/src/util/distro-import/116/common/SUNWfcoeu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWfcoeu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcoeu
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfcoeu
 end package
--- a/src/util/distro-import/116/common/SUNWglib2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWglib2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWglib2
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWglib2
 import SUNWglib2-devel
--- a/src/util/distro-import/116/common/SUNWgm4	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgm4	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgm4
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgm4
 version 1.4.12
--- a/src/util/distro-import/116/common/SUNWgnome-a11y-libs-python24	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-a11y-libs-python24	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-libs-python24
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-libs-python24
 depend SUNWgnome-a11y-libs
--- a/src/util/distro-import/116/common/SUNWgnome-a11y-libs-python26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-a11y-libs-python26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-libs-python26
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-libs-python26
 depend SUNWgnome-a11y-libs
--- a/src/util/distro-import/116/common/SUNWgnome-base-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-base-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-base-libs
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-base-libs
 import SUNWgnome-base-libs-devel
--- a/src/util/distro-import/116/common/SUNWgnome-display-mgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-display-mgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-display-mgr
+consolidation "gnome"
 classification "Desktop (GNOME)/Sessions"
 import SUNWgnome-display-mgr
 import SUNWgnome-display-mgr-root
--- a/src/util/distro-import/116/common/SUNWgnome-dtstart	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-dtstart	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWgnome-dtstart
+consolidation "gnome"
 depend SUNWdesktop-startup
 end package
--- a/src/util/distro-import/116/common/SUNWgnome-media-player	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-media-player	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-media-player
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWgnome-media-player
 import SUNWgnome-media-player-root
--- a/src/util/distro-import/116/common/SUNWgnome-python-extras	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-python-extras	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-python-extras
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgnome-python-extras
 import SUNWgnome-python-extras-devel
--- a/src/util/distro-import/116/common/SUNWgnome-python26-extras	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnome-python26-extras	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-python26-extras
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgnome-python26-extras
 import SUNWgnome-python26-extras-devel
--- a/src/util/distro-import/116/common/SUNWgnu-dbm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnu-dbm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-dbm
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWgnu-dbm
 version 1.8.3
--- a/src/util/distro-import/116/common/SUNWgnu-readline	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgnu-readline	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-readline
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWgnu-readline
 version 5.2
--- a/src/util/distro-import/116/common/SUNWgocr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgocr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgocr
+consolidation "sfw"
 classification "Applications/Graphics and Imaging"
 import SUNWgocr
 version 0.46
--- a/src/util/distro-import/116/common/SUNWgrub	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgrub	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgrub
+consolidation "osnet"
 classification "System/Core"
 $(i386_ONLY)import SUNWgrub
 import SUNWgrubr
--- a/src/util/distro-import/116/common/SUNWgst-python	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgst-python	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgst-python
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgst-python
 import SUNWgst-python-devel
--- a/src/util/distro-import/116/common/SUNWgst-python26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgst-python26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgst-python26
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgst-python26
 import SUNWgst-python26-devel
--- a/src/util/distro-import/116/common/SUNWgtar	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgtar	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtar
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgtar
 version 1.22
--- a/src/util/distro-import/116/common/SUNWgtk-doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgtk-doc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtk-doc
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgtk-doc
 end package
--- a/src/util/distro-import/116/common/SUNWgtk-vnc-python26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgtk-vnc-python26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtk-vnc-python26
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgtk-vnc-python26
 end package
--- a/src/util/distro-import/116/common/SUNWgtk2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWgtk2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtk2
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgtk2
 import SUNWgtk2-devel
--- a/src/util/distro-import/116/common/SUNWhal-cups-utils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWhal-cups-utils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhal-cups-utils
+consolidation "sfw"
 classification "System/Printing"
 import SUNWhal-cups-utils
 import SUNWhal-cups-utilsr
--- a/src/util/distro-import/116/common/SUNWhttping	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWhttping	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhttping
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWhttping
 version 1.3.0
--- a/src/util/distro-import/116/common/SUNWibdma	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWibdma	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibdma
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWibdmar
 end package
--- a/src/util/distro-import/116/common/SUNWiftop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWiftop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiftop
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWiftop
 version 0.17
--- a/src/util/distro-import/116/common/SUNWio-tools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWio-tools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWio-tools
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWio-tools
 end package
--- a/src/util/distro-import/116/common/SUNWiperf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWiperf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiperf
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWiperf
 version 2.0.4
--- a/src/util/distro-import/116/common/SUNWjanino	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjanino	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjanino
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjanino
 version 2.5.10
--- a/src/util/distro-import/116/common/SUNWjarjar	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjarjar	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjarjar
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjarjar
 depend SUNWobjectasm
--- a/src/util/distro-import/116/common/SUNWjavamail	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjavamail	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjavamail
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjavamail
 version 1.4.1
--- a/src/util/distro-import/116/common/SUNWjaxb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjaxb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjaxb
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjaxb
 depend SUNWactivation
--- a/src/util/distro-import/116/common/SUNWjaxen-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjaxen-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjaxen-core
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjaxen-core
 version 1.1.1
--- a/src/util/distro-import/116/common/SUNWjdom	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjdom	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjdom
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjdom
 depend SUNWjaxen-core
--- a/src/util/distro-import/116/common/SUNWjdtcore	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjdtcore	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjdtcore
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjdtcore
 version 3.2.2
--- a/src/util/distro-import/116/common/SUNWjettison	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjettison	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjettison
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjettison
 version 1.0
--- a/src/util/distro-import/116/common/SUNWjodatime	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjodatime	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjodatime
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjodatime
 version 1.5.1
--- a/src/util/distro-import/116/common/SUNWjxl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWjxl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjxl
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjxl
 depend SUNWlog4j
--- a/src/util/distro-import/116/common/SUNWlibart	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibart	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibart
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibart
 import SUNWlibart-devel
--- a/src/util/distro-import/116/common/SUNWlibatk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibatk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibatk
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibatk
 import SUNWlibatk-devel
--- a/src/util/distro-import/116/common/SUNWlibcanberra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibcanberra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibcanberra
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibcanberra
 import SUNWlibcanberra-devel
--- a/src/util/distro-import/116/common/SUNWlibconfuse	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibconfuse	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibconfuse
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibconfuse
 version 2.6
--- a/src/util/distro-import/116/common/SUNWlibglade	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibglade	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibglade
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibglade
 import SUNWlibglade-devel
--- a/src/util/distro-import/116/common/SUNWlibgnomecanvas	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibgnomecanvas	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgnomecanvas
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibgnomecanvas
 import SUNWlibgnomecanvas-devel
--- a/src/util/distro-import/116/common/SUNWlibproxy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibproxy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibproxy
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibproxy
 import SUNWlibproxy-devel
--- a/src/util/distro-import/116/common/SUNWlibsigsegv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibsigsegv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsigsegv
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibsigsegv
 version 2.6
--- a/src/util/distro-import/116/common/SUNWlibunique	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibunique	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibunique
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibunique
 import SUNWlibunique-devel
--- a/src/util/distro-import/116/common/SUNWlibusb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlibusb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibusb
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibusb
 end package
--- a/src/util/distro-import/116/common/SUNWlog4j	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWlog4j	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlog4j
+consolidation "sfw"
 classification "Development/Java"
 import SUNWlog4j
 version 1.2.15
--- a/src/util/distro-import/116/common/SUNWmrtg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWmrtg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmrtg
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWmrtg
 version 2.16.2
--- a/src/util/distro-import/116/common/SUNWmvel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWmvel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmvel
+consolidation "sfw"
 classification "Development/Java"
 import SUNWmvel
 version 1.2.22
--- a/src/util/distro-import/116/common/SUNWmysql-python	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWmysql-python	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql-python
+consolidation "gnome"
 classification "Development/Databases"
 import SUNWmysql-python
 depend SUNWPython
--- a/src/util/distro-import/116/common/SUNWntp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWntp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWntp
+consolidation "sfw"
 classification "System/Services"
 import SUNWntpu
 import SUNWntpr
--- a/src/util/distro-import/116/common/SUNWobjectasm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWobjectasm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWobjectasm
+consolidation "sfw"
 classification "Development/Java"
 import SUNWobjectasm
 version 3.1
--- a/src/util/distro-import/116/common/SUNWpango	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpango	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpango
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWpango
 import SUNWpango-devel
--- a/src/util/distro-import/116/common/SUNWpatchutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpatchutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpatchutils
+consolidation "sfw"
 classification "System/Text Tools"
 import SUNWpatchutils
 depend_path /usr/bin/gdiff
--- a/src/util/distro-import/116/common/SUNWpciaccess	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpciaccess	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpciaccess
+consolidation "X"
 classification "System/Hardware"
 import SUNWpciaccess
 depend_path /usr/share/hwdata/pci.ids
--- a/src/util/distro-import/116/common/SUNWpen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpen
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWpen
 import SUNWpenr
--- a/src/util/distro-import/116/common/SUNWperl-pmtools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWperl-pmtools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl-pmtools
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWperl-pmtools
 version 1.10
--- a/src/util/distro-import/116/common/SUNWpixman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpixman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpixman
+consolidation "X"
 classification "System/Libraries"
 import SUNWpixman
 version 0.14.0
--- a/src/util/distro-import/116/common/SUNWpowerman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpowerman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpowerman
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWpowermanr
 import SUNWpowermanu
--- a/src/util/distro-import/116/common/SUNWpull-parser	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpull-parser	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpull-parser
+consolidation "sfw"
 classification "Development/Java"
 import SUNWpull-parser
 version 2.1.10
--- a/src/util/distro-import/116/common/SUNWpwgen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpwgen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpwgen
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWpwgen
 version 2.6
--- a/src/util/distro-import/116/common/SUNWpython26-cssutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-cssutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-cssutils
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-cssutils
 end package
--- a/src/util/distro-import/116/common/SUNWpython26-imaging	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-imaging	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-imaging
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-imaging
 end package
--- a/src/util/distro-import/116/common/SUNWpython26-notify	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-notify	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-notify
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-notify
 import SUNWpython26-notify-devel
--- a/src/util/distro-import/116/common/SUNWpython26-pyopenssl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-pyopenssl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-pyopenssl
+consolidation "sfw"
 classification "Development/Python"
 import SUNWpython26-pyopenssl
 version 0.8
--- a/src/util/distro-import/116/common/SUNWpython26-simplejson	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-simplejson	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-simplejson
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-simplejson
 end package
--- a/src/util/distro-import/116/common/SUNWpython26-twisted	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-twisted	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-twisted
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-twisted
 depend SUNWPython26
--- a/src/util/distro-import/116/common/SUNWpython26-twisted-web2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-twisted-web2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-twisted-web2
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-twisted-web2
 end package
--- a/src/util/distro-import/116/common/SUNWpython26-xdg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-xdg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-xdg
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-xdg
 end package
--- a/src/util/distro-import/116/common/SUNWpython26-zope-interface	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpython26-zope-interface	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-zope-interface
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython26-zope-interface
 end package
--- a/src/util/distro-import/116/common/SUNWpyyaml26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWpyyaml26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpyyaml26
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpyyaml26
 end package
--- a/src/util/distro-import/116/common/SUNWrelaxngDatatype	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWrelaxngDatatype	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrelaxngDatatype
+consolidation "sfw"
 classification "Development/Java"
 import SUNWrelaxngDatatype
 version 1.0
--- a/src/util/distro-import/116/common/SUNWrmodu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWrmodu	Thu Nov 05 11:54:51 2009 -0800
@@ -7,5 +7,6 @@
 # SUNWrmodu (sparc) was EOFed in snv_113.
 #
 package SUNWrmodu
+consolidation "osnet"
 $(i386_ONLY)depend SUNWrmod
 end package
--- a/src/util/distro-import/116/common/SUNWsaaj	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWsaaj	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsaaj
+consolidation "sfw"
 classification "Development/Java"
 import SUNWsaaj
 depend SUNWactivation
--- a/src/util/distro-import/116/common/SUNWslrn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWslrn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWslrn
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWslrn
 version 0.9.9.1
--- a/src/util/distro-import/116/common/SUNWstringtemplate	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWstringtemplate	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWstringtemplate
+consolidation "sfw"
 classification "Development/Java"
 import SUNWstringtemplate
 depend SUNWantlr2
--- a/src/util/distro-import/116/common/SUNWsudo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWsudo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsudo
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWsudor
 import SUNWsudou
--- a/src/util/distro-import/116/common/SUNWtor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWtor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtor
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWtor
 import SUNWtor-root
--- a/src/util/distro-import/116/common/SUNWtotem-pl-parser	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWtotem-pl-parser	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtotem-pl-parser
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWtotem-pl-parser
 import SUNWtotem-pl-parser-devel
--- a/src/util/distro-import/116/common/SUNWunixodbc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWunixodbc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWunixodbc
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWunixodbc
 import SUNWunixodbcr
--- a/src/util/distro-import/116/common/SUNWunrar	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWunrar	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWunrar
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWunrar
 version 3.8.5
--- a/src/util/distro-import/116/common/SUNWuwb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWuwb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuwb
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWuwb
 end package
--- a/src/util/distro-import/116/common/SUNWwiseman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWwiseman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwiseman
+consolidation "sfw"
 classification "Development/Java"
 import SUNWwisemanr
 import SUNWwisemanu
--- a/src/util/distro-import/116/common/SUNWxom	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxom	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxom
+consolidation "sfw"
 classification "Development/Java"
 import SUNWxom
 depend SUNWjaxen-core
--- a/src/util/distro-import/116/common/SUNWxorg-cfg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxorg-cfg	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWxorg-cfg was EOFed in snv_116.
 #
 package SUNWxorg-cfg
+consolidation "X"
 end package
--- a/src/util/distro-import/116/common/SUNWxorg-devel-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxorg-devel-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWxorg-devel-docs was EOFed in snv_116.
 #
 package SUNWxorg-devel-docs
+consolidation "X"
 depend SUNWxwpmn
 #
 # the following link was removed in snv_116 but due to bug 2369, we
--- a/src/util/distro-import/116/common/SUNWxorg-xkb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxorg-xkb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-xkb
+consolidation "l10n"
 classification "System/X11"
 import SUNWxorg-xkb
 end package
--- a/src/util/distro-import/116/common/SUNWxpp3min	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxpp3min	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxpp3min
+consolidation "sfw"
 classification "Development/Java"
 import SUNWxpp3min
 version 1.1.4.3
--- a/src/util/distro-import/116/common/SUNWxsdlib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxsdlib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxsdlib
+consolidation "sfw"
 classification "Development/Java"
 import SUNWxsdlib
 version 0.2009.4.15
--- a/src/util/distro-import/116/common/SUNWxstream	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxstream	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxstream
+consolidation "sfw"
 classification "Development/Java"
 import SUNWxstream
 depend SUNWcglib
--- a/src/util/distro-import/116/common/SUNWxwdem	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/SUNWxwdem	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwdem
+consolidation "X"
 classification "System/X11"
 import SUNWxwdem exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/116/common/loc/SUNWmyspell-dictionary-noinst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/common/loc/SUNWmyspell-dictionary-noinst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyspell-dictionary-noinst
+consolidation "gnome_l10n"
 classification "System/Localizations"
 import SUNWmyspell-dictionary-noinst
 end package
--- a/src/util/distro-import/116/i386/NVDAcg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/NVDAcg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package NVDAcg
+consolidation "X"
 classification "Applications/Graphics and Imaging"
 import NVDAcg
 version 2.2
--- a/src/util/distro-import/116/i386/SUNWbrasero	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWbrasero	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWbrasero was EOFed in snv_115.
 #
 package SUNWbrasero
+consolidation "gnome"
 end package
--- a/src/util/distro-import/116/i386/SUNWdrivel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWdrivel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdrivel
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWdrivel
 import SUNWdrivel-root
--- a/src/util/distro-import/116/i386/SUNWlibpigment-python26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWlibpigment-python26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibpigment-python26
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWlibpigment-python26
 end package
--- a/src/util/distro-import/116/i386/SUNWntfsprogs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWntfsprogs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWntfsprogs
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWntfsprogs
 version 2.0.0
--- a/src/util/distro-import/116/i386/SUNWparted	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWparted	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWparted
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWparted
 depend SUNWntfsprogs
--- a/src/util/distro-import/116/i386/SUNWrmod	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWrmod	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrmod
+consolidation "osnet"
 classification "System/Core"
 import SUNWrmodr
 chattr boot/solaris/bootenv.rc original_name=SUNWrmodr:boot/solaris/bootenv.rc
--- a/src/util/distro-import/116/i386/SUNWrmodr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/116/i386/SUNWrmodr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWrmodr
+consolidation "osnet"
 depend SUNWrmod
 end package
--- a/src/util/distro-import/117/common/SUNWaconf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/117/common/SUNWaconf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaconf
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWaconf
 depend SUNWgm4
--- a/src/util/distro-import/117/common/SUNWareca	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/117/common/SUNWareca	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWareca
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWareca
 version 7.1
--- a/src/util/distro-import/117/common/SUNWconman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/117/common/SUNWconman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWconman
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWconmanr
 import SUNWconmanu
--- a/src/util/distro-import/117/common/SUNWperl-net-ssleay	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/117/common/SUNWperl-net-ssleay	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl-net-ssleay
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWperl-net-ssleay
 version 1.35
--- a/src/util/distro-import/118/common/SUNWcedu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWcedu	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWcedu
+consolidation "nspg"
 depend SUNWced
 end package
--- a/src/util/distro-import/118/common/SUNWdosbox	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWdosbox	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdosbox
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWdosbox
 version 0.73
--- a/src/util/distro-import/118/common/SUNWejabberd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWejabberd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWejabberd
+consolidation "sfw"
 classification "Web Services/Communications"
 import SUNWejabberdr
 import SUNWejabberdu
--- a/src/util/distro-import/118/common/SUNWiozone	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWiozone	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiozone
+consolidation "sfw"
 classification "Development/System"
 import SUNWiozone
 version 3.323
--- a/src/util/distro-import/118/common/SUNWlibxmlrpc-c	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWlibxmlrpc-c	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibxmlrpc-c
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibxmlrpc-c
 version 1.6.32
--- a/src/util/distro-import/118/common/SUNWlogilab-astng	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWlogilab-astng	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlogilab-astng
+consolidation "sfw"
 classification "Development/Python"
 import SUNWlogilab-astng
 depend SUNWlogilab-common
--- a/src/util/distro-import/118/common/SUNWlogilab-common	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWlogilab-common	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlogilab-common
+consolidation "sfw"
 classification "Development/Python"
 import SUNWlogilab-common
 depend SUNWgnome-python26-libs
--- a/src/util/distro-import/118/common/SUNWmfrun	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWmfrun	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmfrun
+consolidation "cde"
 classification "System/X11"
 import SUNWmfrun
 import SUNWmfdev
--- a/src/util/distro-import/118/common/SUNWopenssl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWopenssl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopenssl
+consolidation "sfw"
 classification "System/Security"
 import SUNWopenssl-commands
 import SUNWopenssl-include
--- a/src/util/distro-import/118/common/SUNWpconsole	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWpconsole	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpconsole
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWpconsole
 import SUNWpconsoler
--- a/src/util/distro-import/118/common/SUNWshmux	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWshmux	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWshmux
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWshmux
 version 1.0.2
--- a/src/util/distro-import/118/common/SUNWsnort	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWsnort	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsnort
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWsnortr
 import SUNWsnortu
--- a/src/util/distro-import/118/common/SUNWtcat	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWtcat	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtcat
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWtcatu
 import SUNWtcatr
--- a/src/util/distro-import/118/common/SUNWtltk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWtltk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtltk
+consolidation "cde"
 classification "System/Libraries"
 import SUNWtltk exclude usr/openwin/share/include
 import SUNWtltkd
--- a/src/util/distro-import/118/common/SUNWxwplr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/118/common/SUNWxwplr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwplr
+consolidation "X"
 classification "System/X11"
 import SUNWxwplr exclude \
 	var/svc/manifest/application/x11/xfs.xml \
--- a/src/util/distro-import/119/common/SUNWaalib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWaalib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaalib
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWaalib
 version 1.4.5
--- a/src/util/distro-import/119/common/SUNWautogen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWautogen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWautogen
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWautogen
 version 5.9
--- a/src/util/distro-import/119/common/SUNWbeanshell	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWbeanshell	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbeanshell
+consolidation "sfw"
 classification "Development/Java"
 import SUNWbeanshell
 version 2.0
--- a/src/util/distro-import/119/common/SUNWbvi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWbvi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbvi
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWbvi
 version 1.3.2
--- a/src/util/distro-import/119/common/SUNWcommons-collections	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWcommons-collections	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcommons-collections
+consolidation "sfw"
 classification "Development/Java"
 import SUNWcommons-collections
 depend SUNWjunit
--- a/src/util/distro-import/119/common/SUNWfcprt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWfcprt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcprt
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWfcprt
 import SUNWfcprtr
--- a/src/util/distro-import/119/common/SUNWguile	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWguile	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWguile
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWguile
 version 1.8.4
--- a/src/util/distro-import/119/common/SUNWlibosip2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWlibosip2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibosip2
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibosip2
 version 3.3.0
--- a/src/util/distro-import/119/common/SUNWnfsc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWnfsc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnfsc
+consolidation "osnet"
 classification "System/File System"
 import SUNWnfscu
 import SUNWnfscr
--- a/src/util/distro-import/119/common/SUNWnfsckr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWnfsckr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWnfsckr
+consolidation "osnet"
 depend SUNWnfsc
 end package
--- a/src/util/distro-import/119/common/SUNWnfss	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWnfss	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnfss
+consolidation "osnet"
 classification "System/File System"
 import SUNWnfssu
 import SUNWnfssr
--- a/src/util/distro-import/119/common/SUNWnfsskr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWnfsskr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWnfsskr
+consolidation "osnet"
 depend SUNWnfss
 end package
--- a/src/util/distro-import/119/common/SUNWpipe-viewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWpipe-viewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpipe-viewer
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWpipe-viewer
 version 1.1.4
--- a/src/util/distro-import/119/common/SUNWpylint	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWpylint	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpylint
+consolidation "sfw"
 classification "Development/Python"
 import SUNWpylint
 depend SUNWlogilab-astng
--- a/src/util/distro-import/119/common/SUNWsmbskr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWsmbskr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWsmbskr
+consolidation "osnet"
 depend SUNWsmbs
 end package
--- a/src/util/distro-import/119/common/SUNWzfskr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/119/common/SUNWzfskr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWzfskr
+consolidation "osnet"
 depend SUNWzfs
 end package
--- a/src/util/distro-import/120/common/OSOLvpanels-sharemgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/OSOLvpanels-sharemgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels-sharemgr
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 import OSOLvpin-sharemgr
 depend OSOLvpanels
--- a/src/util/distro-import/120/common/SUNWjedit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWjedit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjedit
+consolidation "sfw"
 classification "Development/Editors"
 import SUNWjedit
 version 4.3
--- a/src/util/distro-import/120/common/SUNWlibtorrent	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWlibtorrent	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibtorrent
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibtorrent
 version 0.12.2
--- a/src/util/distro-import/120/common/SUNWlibyaz	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWlibyaz	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibyaz
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWlibyaz
 version 3.0.46
--- a/src/util/distro-import/120/common/SUNWncft	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWncft	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWncft
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWncft
 version 3.2.2
--- a/src/util/distro-import/120/common/SUNWnet-snmp-addons	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWnet-snmp-addons	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnet-snmp-addons
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWnet-snmp-addons
 version 5.4.1
--- a/src/util/distro-import/120/common/SUNWnet-snmp-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWnet-snmp-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnet-snmp-core
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWnet-snmp-core
 import SUNWnet-snmp-mgr
--- a/src/util/distro-import/120/common/SUNWnet-snmp-doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWnet-snmp-doc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnet-snmp-doc
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWnet-snmp-doc
 version 5.4.1
--- a/src/util/distro-import/120/common/SUNWnet-snmp-utils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWnet-snmp-utils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnet-snmp-utils
+consolidation "sfw"
 classification "System/Enterprise Management"
 import SUNWnet-snmp-utils
 version 5.4.1
--- a/src/util/distro-import/120/common/SUNWpdsh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWpdsh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpdsh
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWpdsh
 version 2.18
--- a/src/util/distro-import/120/common/SUNWpywbem	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWpywbem	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpywbem
+consolidation "sfw"
 classification "Development/Python"
 import SUNWpywbem
 version 0.7.0
--- a/src/util/distro-import/120/common/SUNWrtorrent	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWrtorrent	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrtorrent
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWrtorrent
 version 0.8.2
--- a/src/util/distro-import/120/common/SUNWsfwdemo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWsfwdemo	Thu Nov 05 11:54:51 2009 -0800
@@ -7,5 +7,6 @@
 # SUNWsfwdemo was EOFed in snv_120.
 #
 package SUNWsfwdemo
+consolidation "sfw"
 depend SUNWnet-snmp-doc
 end package
--- a/src/util/distro-import/120/common/SUNWsmagt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWsmagt	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWsmagt was EOFed in snv_120.
 #
 package SUNWsmagt
+consolidation "sfw"
 depend SUNWnet-snmp-addons
 depend SUNWnet-snmp-core
 version 5.0.9
--- a/src/util/distro-import/120/common/SUNWsmcmd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWsmcmd	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWsmcmd was EOFed in snv_120.
 #
 package SUNWsmcmd
+consolidation "sfw"
 depend SUNWnet-snmp-utils
 version 5.0.9
 end package
--- a/src/util/distro-import/120/common/SUNWsmdoc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWsmdoc	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWsmdoc was EOFed in snv_120.
 #
 package SUNWsmdoc
+consolidation "sfw"
 depend SUNWnet-snmp-doc
 version 5.0.9
 end package
--- a/src/util/distro-import/120/common/SUNWsmmgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWsmmgr	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWsmmgr was EOFed in snv_120.
 #
 package SUNWsmmgr
+consolidation "sfw"
 depend SUNWnet-snmp-core
 version 5.0.9
 #
--- a/src/util/distro-import/120/common/SUNWts	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWts	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWts
+consolidation "osnet"
 classification "System/Trusted"
 import SUNWtsu
 drop usr/sbin/txzonemgr
--- a/src/util/distro-import/120/common/SUNWxprint-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWxprint-server	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWxprint-server was EOFed in snv_120.
 #
 package SUNWxprint-server
+consolidation "X"
 end package
--- a/src/util/distro-import/120/common/SUNWxwpft	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWxwpft	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWxwpft was EOFed in snv_120.
 #
 package SUNWxwpft
+consolidation "X"
 end package
--- a/src/util/distro-import/120/common/SUNWxwrtl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWxwrtl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwrtl
+consolidation "X"
 classification "System/X11"
 import SUNWxwrtl exclude usr/openwin
 chattr_glob * edit target openwin X11
--- a/src/util/distro-import/120/common/SUNWxwslb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/SUNWxwslb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwslb
+consolidation "X"
 classification "Development/X11"
 import SUNWxwslb exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/120/common/loc/SUNWttf-gentium	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/loc/SUNWttf-gentium	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-gentium
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-gentium
 end package
--- a/src/util/distro-import/120/common/loc/SUNWttf-kacst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/loc/SUNWttf-kacst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-kacst
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-kacst
 end package
--- a/src/util/distro-import/120/common/loc/SUNWttf-unifont	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/common/loc/SUNWttf-unifont	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-unifont
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-unifont
 end package
--- a/src/util/distro-import/120/i386/SUNWxorg-mesa	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/120/i386/SUNWxorg-mesa	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-mesa
+consolidation "X"
 classification "System/X11"
 import SUNWxorg-mesa exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/121/common/SUNWbind	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWbind	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbind
+consolidation "sfw"
 classification "System/Services"
 import SUNWbind
 import SUNWbindr
--- a/src/util/distro-import/121/common/SUNWbindc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWbindc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbindc
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWbindc
 version 9.6.1.1
--- a/src/util/distro-import/121/common/SUNWipkg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWipkg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipkg
+consolidation "ips"
 classification "System/Packaging"
 import SUNWipkg
 depend [email protected]
--- a/src/util/distro-import/121/common/SUNWpython-pycurl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWpython-pycurl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-pycurl
+consolidation "ips"
 classification "Development/Python"
 import SUNWpython-pycurl
 version 7.19.0.1
--- a/src/util/distro-import/121/common/SUNWxwinc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWxwinc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwinc
+consolidation "X"
 classification "Development/X11"
 import SUNWxwinc exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/121/common/SUNWxwxft	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/common/SUNWxwxft	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwxft
+consolidation "X"
 classification "System/X11"
 import SUNWxwxft exclude usr/openwin
 version 2.1.13
--- a/src/util/distro-import/121/i386/SUNWxvm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/i386/SUNWxvm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxvm
+consolidation "osnet"
 classification "System/Virtualization"
 import SUNWxvmh
 import SUNWxvmhvm
--- a/src/util/distro-import/121/i386/SUNWxvmdom	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/i386/SUNWxvmdom	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxvmdom
+consolidation "osnet"
 classification "System/Virtualization"
 import SUNWxvmdomu
 import SUNWxvmdomr exclude var var/log var/log/xen
--- a/src/util/distro-import/121/i386/SUNWxvmipa	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/121/i386/SUNWxvmipa	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxvmipa
+consolidation "osnet"
 classification "System/Virtualization"
 import SUNWxvmipar
 import SUNWxvmipau
--- a/src/util/distro-import/122/common/SUNWapu13	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWapu13	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapu13
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapu13dev
 import SUNWapu13lib
--- a/src/util/distro-import/122/common/SUNWapu13-ldap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWapu13-ldap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapu13-ldap
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapu13-ldap
 version 1.3.9
--- a/src/util/distro-import/122/common/SUNWapu13dbd-mysql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWapu13dbd-mysql	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapu13dbd-mysql
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapu13dbd-mysql
 version 1.3.9
--- a/src/util/distro-import/122/common/SUNWapu13dbd-pgsql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWapu13dbd-pgsql	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapu13dbd-pgsql
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapu13dbd-pgsql
 version 1.3.9
--- a/src/util/distro-import/122/common/SUNWapu13dbd-sqlite	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWapu13dbd-sqlite	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapu13dbd-sqlite
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapu13dbd-sqlite
 version 1.3.9
--- a/src/util/distro-import/122/common/SUNWcsl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWcsl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcsl
+consolidation "osnet"
 classification "System/Core"
 import SUNWcsl
 import SUNWcslr
--- a/src/util/distro-import/122/common/SUNWdfbh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWdfbh	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWdfbh was EOFed in snv_122.
 #
 package SUNWdfbh
+consolidation "osnet"
 end package
--- a/src/util/distro-import/122/common/SUNWfreeipmi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWfreeipmi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfreeipmi
+consolidation "sfw"
 classification "System/Hardware"
 import SUNWfreeipmir
 import SUNWfreeipmiu
--- a/src/util/distro-import/122/common/SUNWgnu-coreutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWgnu-coreutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-coreutils
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWgnu-coreutils
 version 7.4
--- a/src/util/distro-import/122/common/SUNWlftp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWlftp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlftp
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWlftpr
 import SUNWlftpu
--- a/src/util/distro-import/122/common/SUNWperl510core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWperl510core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl510core
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWperl510core
 version 5.10.0
--- a/src/util/distro-import/122/common/SUNWperl510usr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWperl510usr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl510usr
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWperl510usr
 version 5.10.0
--- a/src/util/distro-import/122/common/SUNWrss-glx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWrss-glx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrss-glx
+consolidation "gnome"
 classification "System/X11"
 import SUNWrss-glx
 depend_path /usr/X11/lib/xscreensaver/bin/xscreensaver-gl-helper
--- a/src/util/distro-import/122/common/SUNWscp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWscp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscp
+consolidation "osnet"
 classification "System/Core"
 import SUNWscpu exclude usr/ucb/ex usr/ucb/vi usr/ucb/view
 import SUNWscpr
--- a/src/util/distro-import/122/common/SUNWxwsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWxwsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -5,5 +5,6 @@
 # on the package with the new name.
 #
 package SUNWxwsvr
+consolidation "X"
 depend SUNWxscreensaver
 end package
--- a/src/util/distro-import/122/common/SUNWzoneint	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/SUNWzoneint	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzoneint
+consolidation "osnet"
 classification "Development/System"
 import SUNWzoneint
 end package
--- a/src/util/distro-import/122/common/osnet-dev	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/common/osnet-dev	Thu Nov 05 11:54:51 2009 -0800
@@ -13,8 +13,10 @@
 depend SUNWgcc
 depend SUNWgnome-base-libs
 depend SUNWgnome-vfs
+depend SUNWgnome-xml
 depend SUNWgnu-gettext
 depend SUNWhea
+depend SUNWiscsitgt
 depend SUNWj6dev
 depend SUNWjsnmp
 depend SUNWlibm
--- a/src/util/distro-import/122/i386/SUNWdfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/i386/SUNWdfb	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWdfb was EOFed in snv_122.
 #
 package SUNWdfb
+consolidation "osnet"
 end package
--- a/src/util/distro-import/122/sparc/SUNWust	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/122/sparc/SUNWust	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWust
+consolidation "osnet"
 classification "System/Core"
 import SUNWust1.v
 import SUNWust2.v
--- a/src/util/distro-import/123/common/SUNWPython	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWPython	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWPython
+consolidation "gnome"
 classification "Development/Python"
 import SUNWPython
 import SUNWPython-devel
--- a/src/util/distro-import/123/common/SUNWcurl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWcurl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcurl
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWcurl
 version 7.19.5
--- a/src/util/distro-import/123/common/SUNWflexlex	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWflexlex	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWflexlex
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWflexlex
 version 2.5.35
--- a/src/util/distro-import/123/common/SUNWflexruntime	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWflexruntime	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWflexruntime
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWflexruntime
 version 2.5.35
--- a/src/util/distro-import/123/common/SUNWgsed	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWgsed	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgsed
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWgsed
 version 4.2.1
--- a/src/util/distro-import/123/common/SUNWless	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWless	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWless
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWless
 version 436
--- a/src/util/distro-import/123/common/SUNWlibstdcxx4	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWlibstdcxx4	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibstdcxx4
+consolidation "sfw"
 classification "Development/C++"
 import SUNWlibstdcxx4
 version 4.2.1
--- a/src/util/distro-import/123/common/SUNWmercurial	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWmercurial	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmercurial
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWmercurial
 version 1.3.1
--- a/src/util/distro-import/123/common/SUNWsound-exchange	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWsound-exchange	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsound-exchange
+consolidation "sfw"
 classification "Applications/Sound and Video"
 import SUNWsound-exchange
 version 14.3.0
--- a/src/util/distro-import/123/common/SUNWsqlite3	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWsqlite3	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsqlite3
+consolidation "sfw"
 classification "System/Databases"
 import SUNWsqlite3
 version 3.6.17
--- a/src/util/distro-import/123/common/SUNWsqlite3docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWsqlite3docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsqlite3docs
+consolidation "sfw"
 classification "System/Databases"
 import SUNWsqlite3docs
 version 3.6.17
--- a/src/util/distro-import/123/common/SUNWsqlite3tcl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWsqlite3tcl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsqlite3tcl
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWsqlite3tcl
 version 3.6.17
--- a/src/util/distro-import/123/common/SUNWsysbench	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWsysbench	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsysbench
+consolidation "sfw"
 classification "Development/System"
 import SUNWsysbench
 version 0.4.12
--- a/src/util/distro-import/123/common/SUNWtcsh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/SUNWtcsh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtcsh
+consolidation "sfw"
 classification "System/Shells"
 import SUNWtcsh
 version 6.17.0
--- a/src/util/distro-import/123/common/loc/SUNWlang-af	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-af	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-af
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-af
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-as	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-as	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-as
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-as
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-az	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-az	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-az
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-az
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-bn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-bn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-bn
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-bn
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-gu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-gu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-gu
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-gu
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-kn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-kn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-kn
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-kn
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-ky	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-ky	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ky
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ky
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-ml	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-ml	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ml
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ml
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-mr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-mr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-mr
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-mr
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-or	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-or	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-or
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-or
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWlang-pa	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWlang-pa	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-pa
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-pa
 depend SUNWlang-common
--- a/src/util/distro-import/123/common/loc/SUNWttf-mgopen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/common/loc/SUNWttf-mgopen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-mgopen
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-mgopen
 end package
--- a/src/util/distro-import/123/i386/SUNWvirt-manager	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/123/i386/SUNWvirt-manager	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvirt-manager
+consolidation "gnome"
 classification "System/Virtualization"
 import SUNWvirt-manager
 import SUNWvirt-manager-root
--- a/src/util/distro-import/124/common/SUNWGlib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWGlib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWGlib
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWGlib
 version 1.2.10
--- a/src/util/distro-import/124/common/SUNWGtk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWGtk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWGtk
+consolidation "sfw"
 classification "Applications/Graphics and Imaging"
 import SUNWGtku
 import SUNWGtkr
--- a/src/util/distro-import/124/common/SUNWbeadm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWbeadm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbeadm
+consolidation "install"
 classification "System/Core"
 import SUNWbeadm
 add file exec_attr.SUNWbeadm path=etc/security/exec_attr mode=0644 \
--- a/src/util/distro-import/124/common/SUNWcmdassist	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWcmdassist	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcmdassist
+consolidation "l10n"
 classification "Desktop (GNOME)/Documentation"
 import SUNWcmdassist
 end package
--- a/src/util/distro-import/124/common/SUNWcompiz	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWcompiz	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcompiz
+consolidation "gnome"
 classification "Desktop (GNOME)/Window Managers"
 import SUNWcompiz
 $(i386_ONLY)import SUNWcompiz-devel
--- a/src/util/distro-import/124/common/SUNWdesktop-search-firefox	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWdesktop-search-firefox	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWdesktop-search-firefox was EOFed in snv_124.
 #
 package SUNWdesktop-search-firefox
+consolidation "gnome"
 end package
--- a/src/util/distro-import/124/common/SUNWdesktop-search-thunderbird	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWdesktop-search-thunderbird	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWdesktop-search-thunderbird was EOFed in snv_124.
 #
 package SUNWdesktop-search-thunderbird
+consolidation "gnome"
 end package
--- a/src/util/distro-import/124/common/SUNWfirefox-apoc-adapter	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWfirefox-apoc-adapter	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWfirefox-apoc-adapter was EOFed in snv_124.
 #
 package SUNWfirefox-apoc-adapter
+consolidation "gnome"
 end package
--- a/src/util/distro-import/124/common/SUNWfreetype2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWfreetype2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfreetype2
+consolidation "X"
 classification "System/Libraries"
 import SUNWfreetype2
 version 2.3.9
--- a/src/util/distro-import/124/common/SUNWgcc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgcc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgcc
+consolidation "sfw"
 classification "Development/C"
 import SUNWgcc
 from SUNWgccruntime import
--- a/src/util/distro-import/124/common/SUNWghostscript	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWghostscript	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWghostscript
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWghostscriptr
 import SUNWghostscriptu
--- a/src/util/distro-import/124/common/SUNWgir-repository	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgir-repository	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgir-repository
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgir-repository
 end package
--- a/src/util/distro-import/124/common/SUNWgnome-a11y-speech-freetts	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgnome-a11y-speech-freetts	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWgnome-a11y-speech-freetts was EOFed in snv_124.
 #
 package SUNWgnome-a11y-speech-freetts
+consolidation "gnome"
 end package
--- a/src/util/distro-import/124/common/SUNWgnome-python26-desktop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgnome-python26-desktop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-python26-desktop
+consolidation "gnome"
 classification "Development/Python"
 import SUNWgnome-python26-desktop
 import SUNWgnome-python26-desktop-devel
--- a/src/util/distro-import/124/common/SUNWgnonlin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgnonlin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnonlin
+consolidation "gnome"
 classification "System/Multimedia Libraries"
 import SUNWgnonlin
 import SUNWgnonlin-devel
--- a/src/util/distro-import/124/common/SUNWgobject-introspection	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgobject-introspection	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgobject-introspection
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgobject-introspection
 import SUNWgobject-introspection-devel
--- a/src/util/distro-import/124/common/SUNWgui-install	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWgui-install	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgui-install
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWgui-install
 add file exec_attr.SUNWgui-install path=etc/security/exec_attr mode=0644 \
--- a/src/util/distro-import/124/common/SUNWj6dev	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6dev	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6dev
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6dev
 drop usr/jdk/instances/jdk1.6.0/LICENSE
--- a/src/util/distro-import/124/common/SUNWj6dmo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6dmo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6dmo
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6dmo
 add license DLJ/LICENSE license=SUNWj6dmo.DLJ
--- a/src/util/distro-import/124/common/SUNWj6dmx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6dmx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6dmx
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6dmx
 add license DLJ/LICENSE license=SUNWj6dmx.DLJ
--- a/src/util/distro-import/124/common/SUNWj6dvx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6dvx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6dvx
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6dvx
 add license DLJ/LICENSE license=SUNWj6dvx.DLJ
--- a/src/util/distro-import/124/common/SUNWj6man	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6man	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6man
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6man
 add license DLJ/LICENSE license=SUNWj6man.DLJ
--- a/src/util/distro-import/124/common/SUNWj6rt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6rt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6rt
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6rt
 drop usr/jdk/instances/jdk1.6.0/jre/LICENSE
--- a/src/util/distro-import/124/common/SUNWj6rtx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWj6rtx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6rtx
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6rtx
 drop usr/jdk/instances/jdk1.6.0/jre/lib/$(ARCH64)/motif21/libmawt.so
--- a/src/util/distro-import/124/common/SUNWjokosher	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWjokosher	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjokosher
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWjokosher
 depend SUNWdbus-python26
--- a/src/util/distro-import/124/common/SUNWjrexx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWjrexx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWjrexx
+consolidation "sfw"
 classification "Development/Java"
 import SUNWjrexx
 version 1.1.1
--- a/src/util/distro-import/124/common/SUNWmysql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWmysql	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql
+consolidation "sfw"
 classification "System/Databases"
 import SUNWmysqlu
 import SUNWmysqlr
--- a/src/util/distro-import/124/common/SUNWperl584man	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWperl584man	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWperl584man
+consolidation "man"
 classification "Development/Perl"
 import SUNWperl584man
 add license Artistic license=SUNWperl584man.Artistic
--- a/src/util/distro-import/124/common/SUNWpgadmin3	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWpgadmin3	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpgadmin3
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpgadmin3
 version 1.10.0
--- a/src/util/distro-import/124/common/SUNWqdox	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWqdox	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWqdox
+consolidation "sfw"
 classification "Development/Java"
 import SUNWqdox
 version 1.9
--- a/src/util/distro-import/124/common/SUNWquagga	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWquagga	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWquagga
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWquaggau
 import SUNWquaggar
--- a/src/util/distro-import/124/common/SUNWraptor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWraptor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWraptor
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWraptor
 import SUNWraptor-devel
--- a/src/util/distro-import/124/common/SUNWser	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWser	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWser
+consolidation "sfw"
 classification "System/Services"
 import SUNWseru
 import SUNWserr
--- a/src/util/distro-import/124/common/SUNWsfdoc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWsfdoc	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWsfdoc was EOFed in snv_124.
 #
 package SUNWsfdoc
+consolidation "sfw"
 end package
--- a/src/util/distro-import/124/common/SUNWsfinf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWsfinf	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWsfinf was EOFed in snv_124.
 #
 package SUNWsfinf
+consolidation "sfw"
 end package
--- a/src/util/distro-import/124/common/SUNWsfman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWsfman	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWsfman was EOFed in snv_124.
 #
 package SUNWsfman
+consolidation "sfw"
 end package
--- a/src/util/distro-import/124/common/SUNWsfwhea	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWsfwhea	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWsfwhea was EOFed in snv_124.
 #
 package SUNWsfwhea
+consolidation "sfw"
 end package
--- a/src/util/distro-import/124/common/SUNWtack	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWtack	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtack
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWtack
 end package
--- a/src/util/distro-import/124/common/SUNWtrove	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWtrove	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtrove
+consolidation "sfw"
 classification "Development/Java"
 import SUNWtrove
 version 2.0.4
--- a/src/util/distro-import/124/common/SUNWtss	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWtss	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtss
+consolidation "sfw"
 classification "System/Security"
 import SUNWtss
 import SUNWtss-root
--- a/src/util/distro-import/124/common/SUNWvinagre	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWvinagre	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvinagre
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWvinagre
 import SUNWvinagre-devel
--- a/src/util/distro-import/124/common/SUNWwebmin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWwebmin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwebmin
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWwebminu
 import SUNWwebminr
--- a/src/util/distro-import/124/common/SUNWxscreensaver	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWxscreensaver	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxscreensaver
+consolidation "gnome"
 classification "System/X11"
 import SUNWxscreensaver
 import SUNWgnome-screensaver-root
--- a/src/util/distro-import/124/common/SUNWxscreensaver-hacks-gl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/SUNWxscreensaver-hacks-gl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxscreensaver-hacks-gl
+consolidation "gnome"
 classification "System/X11"
 import SUNWxscreensaver-hacks-gl
 #
--- a/src/util/distro-import/124/common/loc/SUNWj6jmp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/common/loc/SUNWj6jmp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWj6jmp
+consolidation "ub_javavm"
 classification "Development/Java"
 import SUNWj6jmp
 depend SUNWj6man
--- a/src/util/distro-import/124/i386/SUNWclutter-cairo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/i386/SUNWclutter-cairo	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWclutter-cairo was EOFed in snv_124.
 #
 package SUNWclutter-cairo
+consolidation "gnome"
 end package
--- a/src/util/distro-import/124/i386/SUNWmoovida	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/i386/SUNWmoovida	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmoovida
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWmoovida
 depend SUNWPython26-extra
--- a/src/util/distro-import/124/i386/SUNWmoovida-plugins	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/i386/SUNWmoovida-plugins	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmoovida-plugins
+consolidation "gnome"
 classification "Applications/Sound and Video"
 import SUNWmoovida-plugins
 end package
--- a/src/util/distro-import/124/sparc/SUNWpdu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/124/sparc/SUNWpdu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpdu
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWpdu
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/125/common/SUNW1394	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNW1394	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNW1394
+consolidation "osnet"
 classification "System/Hardware"
 import SUNW1394
 
--- a/src/util/distro-import/125/common/SUNWaac	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWaac	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaac
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWaac
 
--- a/src/util/distro-import/125/common/SUNWafe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWafe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWafe
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWafe
 
--- a/src/util/distro-import/125/common/SUNWapch22m-jk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWapch22m-jk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22m-jk
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22m-jk
 import SUNWapch22r-jk
--- a/src/util/distro-import/125/common/SUNWaudd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWaudd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudd
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudd
 
--- a/src/util/distro-import/125/common/SUNWaudiols	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWaudiols	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudiols
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudiols
 
--- a/src/util/distro-import/125/common/SUNWaudiop16x	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWaudiop16x	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudiop16x
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudiop16x
 
--- a/src/util/distro-import/125/common/SUNWav1394	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWav1394	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWav1394
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWav1394
 
--- a/src/util/distro-import/125/common/SUNWbridge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWbridge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbridge
+consolidation "osnet"
 classification "System/Core"
 import SUNWbridger
 import SUNWbridgeu
--- a/src/util/distro-import/125/common/SUNWced	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWced	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWced
+consolidation "nspg"
 classification "Drivers/Networking"
 import SUNWced
 $(i386_ONLY)import SUNWcedu
--- a/src/util/distro-import/125/common/SUNWchxge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWchxge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWchxge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWchxge
 
--- a/src/util/distro-import/125/common/SUNWcpc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWcpc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcpc
+consolidation "osnet"
 classification "System/Core"
 $(i386_ONLY)import SUNWcpc.i
 $(sparc_ONLY)import SUNWcpc.u
--- a/src/util/distro-import/125/common/SUNWcpr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWcpr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcpr
+consolidation "osnet"
 classification "System/Hardware"
 $(i386_ONLY)import SUNWcpr.i
 $(sparc_ONLY)import SUNWcpr.u
--- a/src/util/distro-import/125/common/SUNWcs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWcs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcs
+consolidation "osnet"
 classification "System/Core"
 import SUNWcsu exclude usr/openwin
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/125/common/SUNWcsd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWcsd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcsd
+consolidation "osnet"
 classification "System/Core"
 import SUNWcsd
 #
--- a/src/util/distro-import/125/common/SUNWdcaf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWdcaf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdcaf
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWdcaf
 import SUNWdcar
--- a/src/util/distro-import/125/common/SUNWdmfe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWdmfe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdmfe
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWdmfe
 
--- a/src/util/distro-import/125/common/SUNWdtrp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWdtrp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdtrp
+consolidation "osnet"
 classification "Development/System"
 import SUNWdtrp
 
--- a/src/util/distro-import/125/common/SUNWemlxs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWemlxs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWemlxs
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWemlxs
 import SUNWemlxu
--- a/src/util/distro-import/125/common/SUNWfcip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfcip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcip
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWfcip
 
--- a/src/util/distro-import/125/common/SUNWfcoe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfcoe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcoe
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfcoe
 
--- a/src/util/distro-import/125/common/SUNWfcoei	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfcoei	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcoei
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfcoei
 
--- a/src/util/distro-import/125/common/SUNWfcoet	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfcoet	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcoet
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfcoet
 
--- a/src/util/distro-import/125/common/SUNWfcp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfcp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcp
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfcp
 
--- a/src/util/distro-import/125/common/SUNWfcsm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfcsm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfcsm
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfcsm
 
--- a/src/util/distro-import/125/common/SUNWfctl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfctl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfctl
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWfctl
 
--- a/src/util/distro-import/125/common/SUNWfmd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfmd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfmd
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWfmd
 import SUNWfmdr
--- a/src/util/distro-import/125/common/SUNWftdu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWftdu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWftdu
+consolidation "osnet"
 classification "Development/System"
 import SUNWftduu
 import SUNWftdur
--- a/src/util/distro-import/125/common/SUNWfwdc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWfwdc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfwdc
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWfwdc
 
--- a/src/util/distro-import/125/common/SUNWggrp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWggrp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWggrp
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWggrp
 version 2.5.4
--- a/src/util/distro-import/125/common/SUNWgnu-diffutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWgnu-diffutils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-diffutils
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWgnu-diffutils
 version 2.8.7
--- a/src/util/distro-import/125/common/SUNWhermon	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWhermon	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhermon
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWhermon
 
--- a/src/util/distro-import/125/common/SUNWhmd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWhmd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhmd
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWhmd
 
--- a/src/util/distro-import/125/common/SUNWhxge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWhxge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhxge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWhxge
 
--- a/src/util/distro-import/125/common/SUNWib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWib
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWib
 
--- a/src/util/distro-import/125/common/SUNWibsdp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibsdp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibsdp
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWibsdp
 
--- a/src/util/distro-import/125/common/SUNWibsdpib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibsdpib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibsdpib
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWibsdpib
 
--- a/src/util/distro-import/125/common/SUNWibus	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus
 import SUNWibus-devel
--- a/src/util/distro-import/125/common/SUNWibus-anthy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-anthy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-anthy
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-anthy
 depend SUNWibus
--- a/src/util/distro-import/125/common/SUNWibus-chewing	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-chewing	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-chewing
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-chewing
 import SUNWibus-chewing-root
--- a/src/util/distro-import/125/common/SUNWibus-hangul	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-hangul	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-hangul
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-hangul
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-m17n	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-m17n	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-m17n
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-m17n
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-pinyin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-pinyin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-pinyin
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-pinyin
 depend SUNWibus
--- a/src/util/distro-import/125/common/SUNWibus-table	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table
 depend SUNWibus
--- a/src/util/distro-import/125/common/SUNWibus-table-data-array30	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-array30	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-array30
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-array30
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-cangjie	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-cangjie	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-cangjie
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-cangjie
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-erbi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-erbi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-erbi
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-erbi
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-quick	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-quick	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-quick
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-quick
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-translit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-translit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-translit
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-translit
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-wubi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-wubi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-wubi
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-wubi
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-xinhua	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-xinhua	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-xinhua
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-xinhua
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-yong	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-yong	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-yong
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-yong
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWibus-table-data-zhengma	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWibus-table-data-zhengma	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWibus-table-data-zhengma
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWibus-table-data-zhengma
 version 1.1.0
--- a/src/util/distro-import/125/common/SUNWidzebra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWidzebra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWidzebra
+consolidation "sfw"
 classification "System/Text Tools"
 import SUNWidzebra
 version 2.0.40
--- a/src/util/distro-import/125/common/SUNWigb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWigb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWigb
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWigb
 
--- a/src/util/distro-import/125/common/SUNWii	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWii	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWii
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWiiu
 import SUNWiir
--- a/src/util/distro-import/125/common/SUNWiiimf-ja-anthy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-ja-anthy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-ja-anthy
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-ja-anthy
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-ko-hangul	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-ko-hangul	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-ko-hangul
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-ko-hangul
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-th-thaile	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-th-thaile	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-th-thaile
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-th-thaile
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhCN-cle-core
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhCN-cle-core
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-open	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-open	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhCN-cle-open
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhCN-cle-open
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-sunpinyin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhCN-cle-sunpinyin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhCN-cle-sunpinyin
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhCN-cle-sunpinyin
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhHK-hkle-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhHK-hkle-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhHK-hkle-core
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhHK-hkle-core
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhHK-hkle-open	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhHK-hkle-open	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhHK-hkle-open
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhHK-hkle-open
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-chewing	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-chewing	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhTW-twle-chewing
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhTW-twle-chewing
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhTW-twle-core
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhTW-twle-core
 end package
--- a/src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-open	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiiimf-zhTW-twle-open	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf-zhTW-twle-open
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf-zhTW-twle-open
 end package
--- a/src/util/distro-import/125/common/SUNWintgige	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWintgige	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWintgige
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWintgige
 
--- a/src/util/distro-import/125/common/SUNWipf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWipf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipf
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWipfu
 import SUNWipfr
--- a/src/util/distro-import/125/common/SUNWipoib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWipoib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipoib
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWipoib
 
--- a/src/util/distro-import/125/common/SUNWiscsi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiscsi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiscsi
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWiscsiu
 import SUNWiscsir
--- a/src/util/distro-import/125/common/SUNWiscsidm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiscsidm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiscsidm
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWiscsidmr
 import SUNWiscsidmu
--- a/src/util/distro-import/125/common/SUNWiscsit	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWiscsit	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiscsit
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWiscsitr
 import SUNWiscsitu
--- a/src/util/distro-import/125/common/SUNWixgb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWixgb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWixgb
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWixgb
 
--- a/src/util/distro-import/125/common/SUNWixgbe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWixgbe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWixgbe
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWixgbe
 
--- a/src/util/distro-import/125/common/SUNWlatencytop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWlatencytop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlatencytop
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWlatencytop
 end package
--- a/src/util/distro-import/125/common/SUNWldtp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWldtp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWldtp
+consolidation "ips"
 classification "Development/Distribution Tools"
 import SUNWldtp
 version 1.7.1
--- a/src/util/distro-import/125/common/SUNWllc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWllc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWllc
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWllc
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/125/common/SUNWmd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWmd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmd
+consolidation "osnet"
 classification "System/Core"
 import SUNWmdu
 import SUNWmdr
--- a/src/util/distro-import/125/common/SUNWmms	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWmms	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmms
+consolidation "osnet"
 classification "System/Media"
 import SUNWmmsr
 import SUNWmmsu
--- a/src/util/distro-import/125/common/SUNWmptsas	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWmptsas	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmptsas
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWmptsas
 
--- a/src/util/distro-import/125/common/SUNWmrsas	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWmrsas	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmrsas
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWmrsas
 
--- a/src/util/distro-import/125/common/SUNWmxfe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWmxfe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmxfe
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWmxfe
 
--- a/src/util/distro-import/125/common/SUNWmyri10ge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWmyri10ge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmyri10ge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWmyri10ge
 
--- a/src/util/distro-import/125/common/SUNWnca	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWnca	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnca
+consolidation "osnet"
 classification "System/Core"
 import SUNWncau
 import SUNWncar
--- a/src/util/distro-import/125/common/SUNWnxge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWnxge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnxge
+consolidation "osnet"
 classification "Drivers/Networking"
 $(i386_ONLY)import SUNWnxge
 $(sparc_ONLY)import SUNWnxge.u
--- a/src/util/distro-import/125/common/SUNWpacket	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpacket	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpacket
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWpacketu exclude usr
 import SUNWpacketh
--- a/src/util/distro-import/125/common/SUNWpcan	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpcan	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcan
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWpcan
 
--- a/src/util/distro-import/125/common/SUNWpcelx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpcelx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcelx
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWpcelx
 
--- a/src/util/distro-import/125/common/SUNWpcmci	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpcmci	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcmci
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWpcmci
 
--- a/src/util/distro-import/125/common/SUNWpcmem	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpcmem	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcmem
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWpcmem
 
--- a/src/util/distro-import/125/common/SUNWpcser	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpcser	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcser
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWpcser
 
--- a/src/util/distro-import/125/common/SUNWpcwl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpcwl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpcwl
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWpcwl
 
--- a/src/util/distro-import/125/common/SUNWpd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpd
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWpd
 
--- a/src/util/distro-import/125/common/SUNWpkgcmds	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpkgcmds	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpkgcmds
+consolidation "osnet"
 classification "System/Packaging"
 import SUNWpkgcmdsu
 import SUNWpkgcmdsr
--- a/src/util/distro-import/125/common/SUNWpm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpm
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWpmu
 import SUNWpmr
--- a/src/util/distro-import/125/common/SUNWpool	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpool	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpool
+consolidation "osnet"
 classification "System/Core"
 import SUNWpool
 import SUNWpoolr
--- a/src/util/distro-import/125/common/SUNWpostgr-82-client	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-client	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-client
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-82-client
 version 8.2.14
--- a/src/util/distro-import/125/common/SUNWpostgr-82-contrib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-contrib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-contrib
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-82-contrib
 version 8.2.14
--- a/src/util/distro-import/125/common/SUNWpostgr-82-devel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-devel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-devel
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-82-devel
 version 8.2.14
--- a/src/util/distro-import/125/common/SUNWpostgr-82-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-docs
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-82-docs
 version 8.2.14
--- a/src/util/distro-import/125/common/SUNWpostgr-82-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-libs
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-82-libs
 version 8.2.14
--- a/src/util/distro-import/125/common/SUNWpostgr-82-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-pl
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-82-pl
 version 8.2.14
--- a/src/util/distro-import/125/common/SUNWpostgr-82-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-82-server	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-82-server
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-82-server
 import SUNWpostgr-82-server-data-root
--- a/src/util/distro-import/125/common/SUNWpostgr-83-client	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-client	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-client
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-83-client
 version 8.3.8
--- a/src/util/distro-import/125/common/SUNWpostgr-83-contrib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-contrib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-contrib
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-83-contrib
 version 8.3.8
--- a/src/util/distro-import/125/common/SUNWpostgr-83-devel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-devel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-devel
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-83-devel
 version 8.3.8
--- a/src/util/distro-import/125/common/SUNWpostgr-83-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-docs
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-83-docs
 version 8.3.8
--- a/src/util/distro-import/125/common/SUNWpostgr-83-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-libs
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-83-libs
 version 8.3.8
--- a/src/util/distro-import/125/common/SUNWpostgr-83-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-pl
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-83-pl
 version 8.3.8
--- a/src/util/distro-import/125/common/SUNWpostgr-83-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpostgr-83-server	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-server
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-83-server
 import SUNWpostgr-83-server-data-root
--- a/src/util/distro-import/125/common/SUNWpppd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpppd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpppd
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWpppd
 import SUNWpppdu
--- a/src/util/distro-import/125/common/SUNWpsdpr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWpsdpr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsdpr
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWpsdpr
 
--- a/src/util/distro-import/125/common/SUNWqlc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWqlc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWqlc
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWqlc
 
--- a/src/util/distro-import/125/common/SUNWrdc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWrdc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrdc
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWrdcu
 import SUNWrdcr
--- a/src/util/distro-import/125/common/SUNWrds	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWrds	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrds
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWrds
 
--- a/src/util/distro-import/125/common/SUNWrge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWrge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWrge
 
--- a/src/util/distro-import/125/common/SUNWrpcib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWrpcib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrpcib
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWrpcib
 
--- a/src/util/distro-import/125/common/SUNWrsm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWrsm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrsm
+consolidation "osnet"
 classification "System/Core"
 import SUNWrsm
 
--- a/src/util/distro-import/125/common/SUNWrsync	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWrsync	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrsync
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWrsync
 version 3.0.6
--- a/src/util/distro-import/125/common/SUNWscm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWscm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscm
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWscmu
 import SUNWscmr
--- a/src/util/distro-import/125/common/SUNWscsa1394	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWscsa1394	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscsa1394
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWscsa1394
 
--- a/src/util/distro-import/125/common/SUNWsdcard	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsdcard	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsdcard
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWsdcard
 
--- a/src/util/distro-import/125/common/SUNWsfe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsfe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsfe
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWsfe
 
--- a/src/util/distro-import/125/common/SUNWsmbfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsmbfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsmbfs
+consolidation "osnet"
 classification "System/File System"
 import SUNWsmbfsu
 import SUNWsmbfsr
--- a/src/util/distro-import/125/common/SUNWsmbs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsmbs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsmbs
+consolidation "osnet"
 classification "System/File System"
 import SUNWsmbsu
 import SUNWsmbsr
--- a/src/util/distro-import/125/common/SUNWsmpd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsmpd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsmpd
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWsmpd
 
--- a/src/util/distro-import/125/common/SUNWspsv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWspsv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWspsv
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWspsvu
 import SUNWspsvr
--- a/src/util/distro-import/125/common/SUNWsrpt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsrpt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsrpt
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWsrptr
 import SUNWsrptu
--- a/src/util/distro-import/125/common/SUNWsynergy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWsynergy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsynergy
+consolidation "X"
 classification "System/X11"
 import SUNWsynergy
 version 1.3.1
--- a/src/util/distro-import/125/common/SUNWtavor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWtavor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtavor
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWtavor
 
--- a/src/util/distro-import/125/common/SUNWtnfc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWtnfc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtnfc
+consolidation "osnet"
 classification "Development/System"
 import SUNWtnfc
 
--- a/src/util/distro-import/125/common/SUNWtpm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWtpm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtpm
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWtpm
 
--- a/src/util/distro-import/125/common/SUNWuacm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWuacm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuacm
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWuacm
 
--- a/src/util/distro-import/125/common/SUNWudaplt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWudaplt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWudaplt
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWudapltu
 import SUNWudapltr
--- a/src/util/distro-import/125/common/SUNWuedg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWuedg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuedg
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWuedg
 
--- a/src/util/distro-import/125/common/SUNWuftdi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWuftdi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuftdi
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWuftdi
 
--- a/src/util/distro-import/125/common/SUNWugen	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWugen	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWugen
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWugen
 
--- a/src/util/distro-import/125/common/SUNWuksp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWuksp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuksp
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWuksp
 
--- a/src/util/distro-import/125/common/SUNWuprl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWuprl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuprl
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWuprl
 
--- a/src/util/distro-import/125/common/SUNWusb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWusb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWusb
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWusb
 
--- a/src/util/distro-import/125/common/SUNWusbvc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWusbvc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWusbvc
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWusbvc
 
--- a/src/util/distro-import/125/common/SUNWvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvr
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWvr
 
--- a/src/util/distro-import/125/common/SUNWvscan	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWvscan	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvscan
+consolidation "osnet"
 classification "System/Services"
 import SUNWvscankr
 import SUNWvscanu
--- a/src/util/distro-import/125/common/SUNWwxwidgets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWwxwidgets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwxwidgets
+consolidation "sfw"
 classification "Desktop (GNOME)/Libraries"
 import SUNWwxwidgets
 import SUNWwxwidgets-devel
--- a/src/util/distro-import/125/common/SUNWxdm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWxdm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxdm
+consolidation "X"
 classification "System/X11"
 import SUNWxdm exclude usr/openwin
 import SUNWxdm-root
--- a/src/util/distro-import/125/common/SUNWxge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWxge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWxge
 
--- a/src/util/distro-import/125/common/SUNWxwdv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWxwdv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwdv
+consolidation "osnet"
 classification "System/X11"
 import SUNWxwdv
 
--- a/src/util/distro-import/125/common/SUNWxwopt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWxwopt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwopt
+consolidation "X"
 classification "System/X11"
 import SUNWxwopt exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/125/common/SUNWxwplt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWxwplt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwplt
+consolidation "X"
 classification "System/X11"
 import SUNWxwplt exclude usr/openwin
 # X libraries not yet included
--- a/src/util/distro-import/125/common/SUNWyge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWyge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWyge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWyge
 
--- a/src/util/distro-import/125/common/SUNWzfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWzfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzfs
+consolidation "osnet"
 classification "System/File System"
 import SUNWzfsu
 import SUNWzfsr
--- a/src/util/distro-import/125/common/SUNWzone	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/SUNWzone	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzone
+consolidation "osnet"
 classification "System/Core"
 import SUNWzoneu
 import SUNWzoner
--- a/src/util/distro-import/125/common/loc/SUNWlang-hy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWlang-hy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-hy
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-hy
 depend SUNWlang-common
--- a/src/util/distro-import/125/common/loc/SUNWlang-ks	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWlang-ks	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ks
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ks
 depend SUNWlang-common
--- a/src/util/distro-import/125/common/loc/SUNWlang-ku	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWlang-ku	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ku
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ku
 depend SUNWlang-common
--- a/src/util/distro-import/125/common/loc/SUNWlang-sa	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWlang-sa	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sa
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sa
 depend SUNWlang-common
--- a/src/util/distro-import/125/common/loc/SUNWlang-zhSG	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWlang-zhSG	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-zhSG
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-zhSG
 depend SUNWlang-common
--- a/src/util/distro-import/125/common/loc/SUNWttf-bpg-georgian	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWttf-bpg-georgian	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-bpg-georgian
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-bpg-georgian
 end package
--- a/src/util/distro-import/125/common/loc/SUNWttf-sil	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/common/loc/SUNWttf-sil	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-sil
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-sil
 end package
--- a/src/util/distro-import/125/i386/BRCMbnx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/BRCMbnx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package BRCMbnx
+consolidation "osnet"
 classification "Drivers/Networking"
 import BRCMbnx
 
--- a/src/util/distro-import/125/i386/NVDAgraphics	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/NVDAgraphics	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package NVDAgraphics
+consolidation "X"
 classification "Drivers/Display"
 import NVDAgraphics
 import NVDAgraphicsr
--- a/src/util/distro-import/125/i386/SUNWGParted	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWGParted	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWGParted
+consolidation "gnome"
 classification "System/Administration and Configuration"
 import SUNWGParted
 end package
--- a/src/util/distro-import/125/i386/SUNWad810	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWad810	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWad810
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWad810
 add set name=info.keyword value=audioi810
--- a/src/util/distro-import/125/i386/SUNWadixp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWadixp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWadixp
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWadixp
 
--- a/src/util/distro-import/125/i386/SUNWadpu320	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWadpu320	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWadpu320
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWadpu320
 
--- a/src/util/distro-import/125/i386/SUNWagp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWagp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWagp
+consolidation "osnet"
 classification "Drivers/Display"
 import SUNWagp
 
--- a/src/util/distro-import/125/i386/SUNWahci	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWahci	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWahci
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWahci
 
--- a/src/util/distro-import/125/i386/SUNWamd8111s	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWamd8111s	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWamd8111s
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWamd8111s
 
--- a/src/util/distro-import/125/i386/SUNWamr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWamr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWamr
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWamr
 
--- a/src/util/distro-import/125/i386/SUNWamt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWamt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWamt
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWamt
 import SUNWamt-lms
--- a/src/util/distro-import/125/i386/SUNWarcmsr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWarcmsr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWarcmsr
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWarcmsr
 
--- a/src/util/distro-import/125/i386/SUNWarn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWarn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWarn
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWarn
 
--- a/src/util/distro-import/125/i386/SUNWatge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWatge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWatge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWatge
 
--- a/src/util/distro-import/125/i386/SUNWatheros	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWatheros	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWatheros
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWatheros
 
--- a/src/util/distro-import/125/i386/SUNWatigfx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWatigfx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWatigfx
+consolidation "osnet"
 classification "Drivers/Display"
 import SUNWatigfx
 
--- a/src/util/distro-import/125/i386/SUNWatu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWatu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWatu
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWatu
 
--- a/src/util/distro-import/125/i386/SUNWaudiocmi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWaudiocmi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudiocmi
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudiocmi
 
--- a/src/util/distro-import/125/i386/SUNWaudiohd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWaudiohd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudiohd
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudiohd
 
--- a/src/util/distro-import/125/i386/SUNWaudiosolo	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWaudiosolo	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudiosolo
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudiosolo
 
--- a/src/util/distro-import/125/i386/SUNWaudiovia97	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWaudiovia97	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWaudiovia97
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWaudiovia97
 
--- a/src/util/distro-import/125/i386/SUNWbcmsata	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWbcmsata	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbcmsata
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWbcmsata
 
--- a/src/util/distro-import/125/i386/SUNWbfe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWbfe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbfe
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWbfe
 
--- a/src/util/distro-import/125/i386/SUNWdcopy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWdcopy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdcopy
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWdcopy
 
--- a/src/util/distro-import/125/i386/SUNWdrmr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWdrmr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdrmr
+consolidation "osnet"
 classification "Drivers/Display"
 import SUNWdrmr
 
--- a/src/util/distro-import/125/i386/SUNWfipe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWfipe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfipe
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWfipe
 
--- a/src/util/distro-import/125/i386/SUNWipw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWipw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipw
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWipw
 
--- a/src/util/distro-import/125/i386/SUNWiwh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWiwh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiwh
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWiwh
 
--- a/src/util/distro-import/125/i386/SUNWiwi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWiwi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiwi
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWiwi
 
--- a/src/util/distro-import/125/i386/SUNWiwk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWiwk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiwk
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWiwk
 
--- a/src/util/distro-import/125/i386/SUNWlsimega	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWlsimega	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlsimega
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWlsimega
 
--- a/src/util/distro-import/125/i386/SUNWlx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWlx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlx
+consolidation "osnet"
 classification "Applications/System Utilities"
 import SUNWlxu
 import SUNWlxr
--- a/src/util/distro-import/125/i386/SUNWmegasas	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWmegasas	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmegasas
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWmegasas
 
--- a/src/util/distro-import/125/i386/SUNWmv88sx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWmv88sx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmv88sx
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWmv88sx
 
--- a/src/util/distro-import/125/i386/SUNWnge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWnge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWnge
 
--- a/src/util/distro-import/125/i386/SUNWntxn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWntxn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWntxn
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWntxn
 
--- a/src/util/distro-import/125/i386/SUNWnvsata	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWnvsata	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnvsata
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWnvsata
 
--- a/src/util/distro-import/125/i386/SUNWos86r	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWos86r	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWos86r
+consolidation "osnet"
 classification "System/Core"
 import SUNWos86r
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/125/i386/SUNWpsdcr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWpsdcr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsdcr
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWpsdcr
 # Preserve the sysinit modules to facilitate a smooth hostid transition.
--- a/src/util/distro-import/125/i386/SUNWpsdir	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWpsdir	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsdir
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWpsdir
 
--- a/src/util/distro-import/125/i386/SUNWralink	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWralink	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWralink
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWralink
 
--- a/src/util/distro-import/125/i386/SUNWrtls	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWrtls	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrtls
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWrtls
 
--- a/src/util/distro-import/125/i386/SUNWrtw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWrtw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrtw
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWrtw
 
--- a/src/util/distro-import/125/i386/SUNWrum	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWrum	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrum
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWrum
 
--- a/src/util/distro-import/125/i386/SUNWrwd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWrwd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrwd
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWrwd
 
--- a/src/util/distro-import/125/i386/SUNWrwn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWrwn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrwn
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWrwn
 
--- a/src/util/distro-import/125/i386/SUNWsi3124	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWsi3124	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsi3124
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWsi3124
 
--- a/src/util/distro-import/125/i386/SUNWuath	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWuath	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWuath
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWuath
 
--- a/src/util/distro-import/125/i386/SUNWural	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWural	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWural
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWural
 
--- a/src/util/distro-import/125/i386/SUNWurtw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWurtw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWurtw
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWurtw
 
--- a/src/util/distro-import/125/i386/SUNWvia823x	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWvia823x	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvia823x
+consolidation "osnet"
 classification "Drivers/Media"
 import SUNWvia823x
 
--- a/src/util/distro-import/125/i386/SUNWwpi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWwpi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwpi
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWwpi
 
--- a/src/util/distro-import/125/i386/SUNWxdt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWxdt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxdt
+consolidation "osnet"
 classification "Development/System"
 import SUNWxdt
 
--- a/src/util/distro-import/125/i386/SUNWxsvc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWxsvc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxsvc
+consolidation "osnet"
 classification "System/X11"
 import SUNWxsvc
 
--- a/src/util/distro-import/125/i386/SUNWxvmpv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWxvmpv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxvmpv
+consolidation "osnet"
 classification "System/Virtualization"
 import SUNWxvmpv
 
--- a/src/util/distro-import/125/i386/SUNWzyd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/i386/SUNWzyd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzyd
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWzyd
 
--- a/src/util/distro-import/125/sparc/SUNWastfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWastfb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWastfb
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWastfb
 
--- a/src/util/distro-import/125/sparc/SUNWcg6	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWcg6	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcg6
+consolidation "osnet"
 classification "Drivers/Display"
 import SUNWcg6.u
 
--- a/src/util/distro-import/125/sparc/SUNWcti2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWcti2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcti2
+consolidation "osnet"
 classification "System/Core"
 import SUNWcti2.u
 
--- a/src/util/distro-import/125/sparc/SUNWcvc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWcvc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcvc
+consolidation "osnet"
 classification "System/Core"
 import SUNWcvc.u
 import SUNWcvcr.u
--- a/src/util/distro-import/125/sparc/SUNWdrr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWdrr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdrr
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWdrr.u
 
--- a/src/util/distro-import/125/sparc/SUNWdscp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWdscp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdscp
+consolidation "osnet"
 classification "System/Core"
 import SUNWdscpr.u
 import SUNWdscpu.u
--- a/src/util/distro-import/125/sparc/SUNWefb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWefb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWefb
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWefb
 
--- a/src/util/distro-import/125/sparc/SUNWefc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWefc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWefc
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWefc.u
 import SUNWefck
--- a/src/util/distro-import/125/sparc/SUNWerid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWerid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWerid
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWerid
 
--- a/src/util/distro-import/125/sparc/SUNWged	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWged	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWged
+consolidation "nspg"
 classification "Drivers/Networking"
 import SUNWged
 
--- a/src/util/distro-import/125/sparc/SUNWidn	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWidn	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWidn
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWidn.u
 
--- a/src/util/distro-import/125/sparc/SUNWiopc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWiopc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiopc
+consolidation "osnet"
 classification "System/Core"
 import SUNWiopc.u
 import SUNWiopc.v
--- a/src/util/distro-import/125/sparc/SUNWkfb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWkfb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWkfb
+consolidation "smcc"
 classification "Drivers/Display"
 import SUNWkfb
 import SUNWkfbr
--- a/src/util/distro-import/125/sparc/SUNWldom	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWldom	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWldom
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWldomr.v
 import SUNWldomu.v
--- a/src/util/distro-import/125/sparc/SUNWluxd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWluxd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWluxd
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWluxd.u
 
--- a/src/util/distro-import/125/sparc/SUNWluxl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWluxl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWluxl
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWluxl
 
--- a/src/util/distro-import/125/sparc/SUNWn2cp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWn2cp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWn2cp
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWn2cp.v
 
--- a/src/util/distro-import/125/sparc/SUNWniumx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWniumx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWniumx
+consolidation "osnet"
 classification "System/Core"
 import SUNWniumx.v
 
--- a/src/util/distro-import/125/sparc/SUNWqfed	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWqfed	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWqfed
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWqfed
 
--- a/src/util/distro-import/125/sparc/SUNWsckm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWsckm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsckm
+consolidation "osnet"
 classification "System/Enterprise Management"
 import SUNWsckm.u
 import SUNWsckmr
--- a/src/util/distro-import/125/sparc/SUNWssad	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWssad	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWssad
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWssad
 
--- a/src/util/distro-import/125/sparc/SUNWstc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWstc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWstc
+consolidation "osnet"
 classification "System/Core"
 import SUNWstc.u
 
--- a/src/util/distro-import/125/sparc/SUNWus	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/125/sparc/SUNWus	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWus
+consolidation "osnet"
 classification "System/Core"
 import SUNWus.u
 
--- a/src/util/distro-import/126/common/OSOLvpanels-firewall	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/OSOLvpanels-firewall	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels-firewall
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 import OSOLvpin-firewall
 depend OSOLvpanels
--- a/src/util/distro-import/126/common/SUNWPython26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWPython26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWPython26
+consolidation "gnome"
 classification "Development/Python"
 import SUNWPython26
 import SUNWPython26-devel
--- a/src/util/distro-import/126/common/SUNWapch22m-php52	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWapch22m-php52	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22m-php52
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22m-php52
 import SUNWapch22r-php52
--- a/src/util/distro-import/126/common/SUNWbash	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWbash	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbash
+consolidation "sfw"
 classification "System/Shells"
 import SUNWbash
 import SUNWbashr
--- a/src/util/distro-import/126/common/SUNWcakr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWcakr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcakr
+consolidation "osnet"
 classification "System/Core"
 $(i386_ONLY)import SUNWcakr.i
 $(i386_ONLY)import SUNWcakrx.i
--- a/src/util/distro-import/126/common/SUNWcups	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWcups	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcups
+consolidation "sfw"
 classification "System/Printing"
 import SUNWcupsu
 drop usr/lib/$(ARCH64)/libcups.so
--- a/src/util/distro-import/126/common/SUNWcups-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWcups-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcups-libs
+consolidation "sfw"
 classification "System/Printing"
 summary "CUPS (Runtime Libraries)"
 from SUNWcupsu import
--- a/src/util/distro-import/126/common/SUNWfakeroot	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWfakeroot	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfakeroot
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWfakeroot
 version 1.11
--- a/src/util/distro-import/126/common/SUNWgdb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWgdb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgdb
+consolidation "sfw"
 classification "Development/System"
 import SUNWgdb
 version 6.8
--- a/src/util/distro-import/126/common/SUNWgnu-mp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWgnu-mp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-mp
+consolidation "sfw"
 classification "Development/High Performance Computing"
 import SUNWgnu-mp
 version 4.3.1
--- a/src/util/distro-import/126/common/SUNWgnu-mpfr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWgnu-mpfr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-mpfr
+consolidation "sfw"
 classification "Development/High Performance Computing"
 import SUNWgnu-mpfr
 version 2.4.1
--- a/src/util/distro-import/126/common/SUNWgtk2-print-cups	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWgtk2-print-cups	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtk2-print-cups
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgtk2-print-cups
 end package
--- a/src/util/distro-import/126/common/SUNWgtk2-print-papi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWgtk2-print-papi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtk2-print-papi
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgtk2-print-papi
 end package
--- a/src/util/distro-import/126/common/SUNWhea	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWhea	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhea
+consolidation "osnet"
 classification "System/Core"
 import SUNWhea
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/126/common/SUNWhpijs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWhpijs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWhpijs
+consolidation "sfw"
 classification "System/Printing"
 import SUNWhpijs
 version 3.9.8
--- a/src/util/distro-import/126/common/SUNWman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWman
+consolidation "man"
 classification "System/Text Tools"
 import SUNWman
 # Replace BSD vi with vim
--- a/src/util/distro-import/126/common/SUNWmysql-python26	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWmysql-python26	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql-python26
+consolidation "gnome"
 classification "Development/Databases"
 import SUNWmysql-python26
 depend SUNWmysql51
--- a/src/util/distro-import/126/common/SUNWphp52	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWphp52	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWphp52
+consolidation "sfw"
 classification "Development/PHP"
 import SUNWphp52r
 import SUNWphp52u
--- a/src/util/distro-import/126/common/SUNWphp52-mysql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWphp52-mysql	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWphp52-mysql
+consolidation "sfw"
 classification "Development/PHP"
 import SUNWphp52r-mysql
 import SUNWphp52u-mysql
--- a/src/util/distro-import/126/common/SUNWphp52-pear	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWphp52-pear	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWphp52-pear
+consolidation "sfw"
 classification "Development/PHP"
 import SUNWphp52r-pear
 import SUNWphp52u-pear
--- a/src/util/distro-import/126/common/SUNWphp52-pgsql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWphp52-pgsql	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWphp52-pgsql
+consolidation "sfw"
 classification "Development/PHP"
 import SUNWphp52r-pgsql
 import SUNWphp52u-pgsql
--- a/src/util/distro-import/126/common/SUNWphp52d	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWphp52d	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWphp52d
+consolidation "sfw"
 classification "Development/PHP"
 import SUNWphp52d
 version 5.2.11
--- a/src/util/distro-import/126/common/SUNWpmcs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWpmcs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpmcs
+consolidation "osnet"
 classification "Drivers/Storage"
 import SUNWpmcsr
 import SUNWpmcsu
--- a/src/util/distro-import/126/common/SUNWpycups	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWpycups	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpycups
+consolidation "sfw"
 classification "System/Printing"
 import SUNWpycups
 version 1.9.46
--- a/src/util/distro-import/126/common/SUNWsra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWsra	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWsra was EOFed in snv_126.
 #
 package SUNWsra
+consolidation "osnet"
 end package
--- a/src/util/distro-import/126/common/SUNWstmf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWstmf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWstmf
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWstmf
 import SUNWstmfu
--- a/src/util/distro-import/126/common/SUNWwget	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWwget	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwget
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWwgetu
 import SUNWwgetr
--- a/src/util/distro-import/126/common/SUNWwireshark	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWwireshark	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwireshark
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWwireshark
 import SUNWwiresharkr
--- a/src/util/distro-import/126/common/SUNWxwman	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/SUNWxwman	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwman
+consolidation "X"
 classification "System/X11"
 import SUNWxwman exclude usr/openwin
 # Not yet confirmed redistributable
--- a/src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-cs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-cs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-cs
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-cs
 end package
--- a/src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-hu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-hu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-hu
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-hu
 end package
--- a/src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/common/loc/SUNWgnome-l10ndocument-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-pl
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-pl
 end package
--- a/src/util/distro-import/126/i386/OSOLvpanels-hypervisor	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/i386/OSOLvpanels-hypervisor	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package OSOLvpanels-hypervisor
+consolidation "vpanels"
 classification "Applications/Configuration and Preferences"
 classification "System/Virtualization"
 import OSOLvpin-hypervisor
--- a/src/util/distro-import/126/i386/SUNWmwl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/126/i386/SUNWmwl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmwl
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWmwl
 
--- a/src/util/distro-import/127/common/SUNWapch22	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWapch22	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22u
 import SUNWapch22r
--- a/src/util/distro-import/127/common/SUNWapch22d	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWapch22d	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22d
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22d
 version 2.2.14
--- a/src/util/distro-import/127/common/SUNWapch22m-sed	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWapch22m-sed	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22m-sed
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22m-sed
 import SUNWapch22r-sed
--- a/src/util/distro-import/127/common/SUNWapr13	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWapr13	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapr13
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapr13dev
 import SUNWapr13lib
--- a/src/util/distro-import/127/common/SUNWbge	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWbge	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbge
+consolidation "osnet"
 classification "Drivers/Networking"
 import SUNWbge
 
--- a/src/util/distro-import/127/common/SUNWckr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWckr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWckr
+consolidation "osnet"
 classification "System/Core"
 import SUNWckr
 # BEGIN NON-REDISTRIBUTABLE
--- a/src/util/distro-import/127/common/SUNWfontconfig	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWfontconfig	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfontconfig
+consolidation "X"
 classification "System/Libraries"
 import SUNWfontconfig
 import SUNWfontconfig-root
--- a/src/util/distro-import/127/common/SUNWfontconfig-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWfontconfig-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfontconfig-docs
+consolidation "X"
 classification "Development/X11"
 import SUNWfontconfig-docs
 version 2.7.3
--- a/src/util/distro-import/127/common/SUNWgimpprint	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWgimpprint	Thu Nov 05 11:54:51 2009 -0800
@@ -7,6 +7,7 @@
 # SUNWgimpprint was EOFed in snv_127.
 #
 package SUNWgimpprint
+consolidation "sfw"
 depend SUNWgutenprint
 version 4.2.6
 end package
--- a/src/util/distro-import/127/common/SUNWgutenprint	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWgutenprint	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgutenprint
+consolidation "sfw"
 classification "System/Printing"
 import SUNWgutenprint
 version 5.2.4
--- a/src/util/distro-import/127/common/SUNWlibsmbclient	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWlibsmbclient	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsmbclient
+consolidation "sfw"
 classification "System/Libraries"
 summary "A library that permits applications to manipulate CIFS/SMB network resources"
 add dir path=usr/sfw mode=0755 owner=root group=bin
--- a/src/util/distro-import/127/common/SUNWmemcached	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWmemcached	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmemcached
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWmemcached
 import SUNWmemcachedr
--- a/src/util/distro-import/127/common/SUNWmkcd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWmkcd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmkcd
+consolidation "sfw"
 classification "System/Hardware"
 import SUNWmkcd
 import SUNWmkcdr
--- a/src/util/distro-import/127/common/SUNWmutt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWmutt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmutt
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWmutt
 import SUNWmuttr
--- a/src/util/distro-import/127/common/SUNWmysql5	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWmysql5	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql5
+consolidation "sfw"
 classification "System/Databases"
 import SUNWmysql5u
 import SUNWmysql5r
--- a/src/util/distro-import/127/common/SUNWmysql5test	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWmysql5test	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql5test
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWmysql5test
 depend SUNWmysql5
--- a/src/util/distro-import/127/common/SUNWpostgr-84-client	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-client	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-client
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-84-client
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-84-contrib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-contrib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-contrib
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-84-contrib
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-84-devel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-devel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-devel
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-84-devel
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-84-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-docs
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-84-docs
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-84-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-libs
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-84-libs
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-84-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-pl
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-84-pl
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-84-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-server	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-server
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-84-server
 import SUNWpostgr-84-server-data-root
--- a/src/util/distro-import/127/common/SUNWpostgr-84-tests	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-84-tests	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-84-tests
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-84-tests
 version 8.4.1
--- a/src/util/distro-import/127/common/SUNWpostgr-common	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-common	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-common
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-common
 import SUNWpostgr-common-root
--- a/src/util/distro-import/127/common/SUNWpostgr-libpqxx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-libpqxx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-libpqxx
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-libpqxx
 version 3.0.2
--- a/src/util/distro-import/127/common/SUNWpostgr-tcl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpostgr-tcl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-tcl
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-tcl
 version 1.7
--- a/src/util/distro-import/127/common/SUNWpython24-cssutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpython24-cssutils	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWpython24-cssutils was EOFed in snv_127.
 #
 package SUNWpython24-cssutils
+consolidation "gnome"
 end package
--- a/src/util/distro-import/127/common/SUNWpython25-cssutils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpython25-cssutils	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWpython25-cssutils was EOFed in snv_127.
 #
 package SUNWpython25-cssutils
+consolidation "gnome"
 end package
--- a/src/util/distro-import/127/common/SUNWpython26-lxml	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWpython26-lxml	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython26-lxml
+consolidation "install"
 classification "Development/Python"
 import SUNWpython26-lxml
 version 2.1.2
--- a/src/util/distro-import/127/common/SUNWs10brand	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWs10brand	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWs10brand
+consolidation "osnet"
 classification "System/Virtualization"
 import SUNWs10brandr
 import SUNWs10brandu
--- a/src/util/distro-import/127/common/SUNWses	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWses	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWses
+consolidation "osnet"
 classification "Drivers/Ports"
 import SUNWses
 
--- a/src/util/distro-import/127/common/SUNWsmba	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWsmba	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsmba
+consolidation "sfw"
 classification "System/File System"
 import SUNWsmbau exclude \
 	usr/sfw/include/libsmbclient.h \
--- a/src/util/distro-import/127/common/SUNWxorg-server	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/common/SUNWxorg-server	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-server
+consolidation "X"
 classification "System/X11"
 import SUNWxorg-server
 depend_path /usr/share/X11/xkb/rules/base
--- a/src/util/distro-import/127/i386/SUNWacpidump	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/i386/SUNWacpidump	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWacpidump
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWacpidump
 version 0.2007.11.16
--- a/src/util/distro-import/127/sparc/SUNWwbsd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/127/sparc/SUNWwbsd	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWwbsd was EOFed in snv_127.
 #
 package SUNWwbsd
+consolidation "osnet"
 end package
--- a/src/util/distro-import/71/common/SUNWcacaowsvr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/71/common/SUNWcacaowsvr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcacaowsvr
+consolidation "cacao"
 classification "Web Services/Application and Web Servers"
 import SUNWcacaowsvr
 depend SUNWaclg
--- a/src/util/distro-import/71/common/SUNWgd2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/71/common/SUNWgd2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgd2
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWgd2
 version 2.0.34
--- a/src/util/distro-import/71/common/SUNWgnu-automake-110	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/71/common/SUNWgnu-automake-110	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-automake-110
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgnu-automake-110
 depend SUNWgm4
--- a/src/util/distro-import/71/common/SUNWgnu-automake-19	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/71/common/SUNWgnu-automake-19	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-automake-19
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgnu-automake-19
 depend SUNWgm4
--- a/src/util/distro-import/71/common/SUNWtidy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/71/common/SUNWtidy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtidy
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWtidy
 version 1.0.0
--- a/src/util/distro-import/72/common/SUNWastdev	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/72/common/SUNWastdev	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWastdev
+consolidation "osnet"
 classification "System/Software Management"
 import SUNWastdev
 end package
--- a/src/util/distro-import/72/common/SUNWdsd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/72/common/SUNWdsd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdsd
+consolidation "osnet"
 classification "System/Services"
 import SUNWdsdr
 import SUNWdsdu
--- a/src/util/distro-import/72/common/SUNWxorg-tsol-module	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/72/common/SUNWxorg-tsol-module	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-tsol-module
+consolidation "X"
 classification "System/Trusted"
 import SUNWxorg-tsol-module
 end package
--- a/src/util/distro-import/75a/common/SUNWIPython	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWIPython	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWIPython
+consolidation "gnome"
 classification "Development/Python"
 import SUNWIPython
 end package
--- a/src/util/distro-import/75a/common/SUNWgnome-crash-report	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWgnome-crash-report	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-crash-report
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-crash-report
 import SUNWgnome-crash-report-root
--- a/src/util/distro-import/75a/common/SUNWgnome-devel-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWgnome-devel-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-devel-docs
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-devel-docs
 end package
--- a/src/util/distro-import/75a/common/SUNWgnome-img-viewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWgnome-img-viewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-viewer
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-viewer
 import SUNWgnome-img-viewer-devel
--- a/src/util/distro-import/75a/common/SUNWlibdaemon	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWlibdaemon	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibdaemon
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibdaemon
 import SUNWlibdaemon-devel
--- a/src/util/distro-import/75a/common/SUNWtgnome-tsol-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWtgnome-tsol-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-tsol-libs
+consolidation "gnome"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-tsol-libs
 import SUNWtgnome-tsol-libs-devel
--- a/src/util/distro-import/75a/common/SUNWtgnome-tsoljdsdevmgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWtgnome-tsoljdsdevmgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-tsoljdsdevmgr
+consolidation "gnome"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-tsoljdsdevmgr
 end package
--- a/src/util/distro-import/75a/common/SUNWtgnome-tsoljdslabel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWtgnome-tsoljdslabel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-tsoljdslabel
+consolidation "gnome"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-tsoljdslabel
 end package
--- a/src/util/distro-import/75a/common/SUNWtgnome-tsoljdsselmgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWtgnome-tsoljdsselmgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-tsoljdsselmgr
+consolidation "gnome"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-tsoljdsselmgr
 end package
--- a/src/util/distro-import/75a/common/SUNWtgnome-tstripe	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWtgnome-tstripe	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-tstripe
+consolidation "gnome"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-tstripe
 end package
--- a/src/util/distro-import/75a/common/SUNWtgnome-xagent	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/common/SUNWtgnome-xagent	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtgnome-xagent
+consolidation "gnome"
 classification "Desktop (GNOME)/Trusted Extensions"
 import SUNWtgnome-xagent
 end package
--- a/src/util/distro-import/75a/i386/SUNWurlgrabber	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/i386/SUNWurlgrabber	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWurlgrabber
+consolidation "osnet"
 classification "Applications/Internet"
 import SUNWurlgrabber
 version 3.1.0
--- a/src/util/distro-import/75a/i386/SUNWvirtinst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/75a/i386/SUNWvirtinst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvirtinst
+consolidation "osnet"
 classification "System/Virtualization"
 import SUNWvirtinst
 depend SUNWlibvirt
--- a/src/util/distro-import/76/common/SUNWfilebench	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/76/common/SUNWfilebench	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfilebench
+consolidation "osnet"
 classification "Development/System"
 import SUNWfilebench
 end package
--- a/src/util/distro-import/76/common/SUNWgnome-doc-utils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/76/common/SUNWgnome-doc-utils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-doc-utils
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-doc-utils
 depend SUNWlxml
--- a/src/util/distro-import/76/common/loc/SUNWgnome-l10ndocument-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/76/common/loc/SUNWgnome-l10ndocument-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-extra
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-extra
 end package
--- a/src/util/distro-import/77/common/SUNWisns	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/77/common/SUNWisns	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWisns
+consolidation "osnet"
 classification "System/Hardware"
 import SUNWisns
 import SUNWisnsadm
--- a/src/util/distro-import/77/common/SUNWtexi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/77/common/SUNWtexi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtexi
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWtexi
 version 4.7
--- a/src/util/distro-import/78/common/SUNWlibevent	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/78/common/SUNWlibevent	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibevent
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibevent
 version 1.3.5
--- a/src/util/distro-import/78/common/SUNWlibtool	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/78/common/SUNWlibtool	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibtool
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWlibtool
 depend SUNWbash
--- a/src/util/distro-import/78/common/SUNWltdl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/78/common/SUNWltdl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWltdl
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWltdl
 version 1.5.22
--- a/src/util/distro-import/79b/common/SUNWp7zip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/79b/common/SUNWp7zip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWp7zip
+consolidation "sfw"
 classification "System/Core"
 import SUNWp7zip
 version 4.55
--- a/src/util/distro-import/79b/common/SUNWpmdbi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/79b/common/SUNWpmdbi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpmdbi
+consolidation "sfw"
 classification "Development/Perl"
 import SUNWpmdbi
 version 1.58
--- a/src/util/distro-import/80/common/SUNWndmp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/80/common/SUNWndmp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWndmp
+consolidation "osnet"
 classification "System/Services"
 import SUNWndmpu
 import SUNWndmpr
--- a/src/util/distro-import/80/common/SUNWnetcat	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/80/common/SUNWnetcat	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnetcat
+consolidation "osnet"
 classification "Applications/Internet"
 import SUNWnetcat
 end package
--- a/src/util/distro-import/80/common/SUNWservicetag	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/80/common/SUNWservicetag	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWservicetag
+consolidation "cns"
 classification "System/Services"
 import SUNWservicetagu
 import SUNWservicetagr
--- a/src/util/distro-import/80/common/SUNWstosreg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/80/common/SUNWstosreg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWstosreg
+consolidation "install"
 classification "System/Core"
 import SUNWstosreg
 end package
--- a/src/util/distro-import/81/common/SUNWexpect	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/81/common/SUNWexpect	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWexpect
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWexpect
 version 5.43
--- a/src/util/distro-import/82/common/SUNWgamin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/82/common/SUNWgamin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgamin
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWgamin
 import SUNWgamin-devel
--- a/src/util/distro-import/83/common/SUNWgnome-help-viewer	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/SUNWgnome-help-viewer	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-help-viewer
+consolidation "gnome"
 classification "Desktop (GNOME)/Documentation"
 import SUNWgnome-help-viewer
 import SUNWgnome-help-viewer-root
--- a/src/util/distro-import/83/common/SUNWgnome-img-editor-help	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/SUNWgnome-img-editor-help	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-cs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-cs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-cs
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-cs
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-de
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-de
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-es
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-es
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-extra
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-extra
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-fr
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-fr
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-it
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-it
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-ko
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-ko
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-ru
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-ru
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-sv
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-sv
 end package
--- a/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/83/common/loc/SUNWgnome-img-editor-help-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-zhCN
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-zhCN
 end package
--- a/src/util/distro-import/84/common/SUNWftp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/84/common/SUNWftp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWftp
+consolidation "osnet"
 classification "System/Core"
 import SUNWftpu
 # base package will deliver etc/ftpd/ftpusers
--- a/src/util/distro-import/85/common/SUNWapch	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWapch	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapchu
 import SUNWapchr
--- a/src/util/distro-import/85/common/SUNWapchd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWapchd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapchd
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapchd
 version 1.3.41
--- a/src/util/distro-import/85/common/SUNWcairomm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWcairomm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcairomm
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWcairomm
 import SUNWcairomm-devel
--- a/src/util/distro-import/85/common/SUNWccsm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWccsm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWccsm
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWccsm
 end package
--- a/src/util/distro-import/85/common/SUNWcompiz-fusion-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWcompiz-fusion-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcompiz-fusion-extra
+consolidation "gnome"
 classification "Applications/Plug-ins and Run-times"
 import SUNWcompiz-fusion-extra
 import SUNWcompiz-fusion-extra-root
--- a/src/util/distro-import/85/common/SUNWcompiz-fusion-main	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWcompiz-fusion-main	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcompiz-fusion-main
+consolidation "gnome"
 classification "Applications/Plug-ins and Run-times"
 import SUNWcompiz-fusion-main
 import SUNWcompiz-fusion-main-devel
--- a/src/util/distro-import/85/common/SUNWcompizconfig-gconf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWcompizconfig-gconf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcompizconfig-gconf
+consolidation "gnome"
 classification "Desktop (GNOME)/Window Managers"
 import SUNWcompizconfig-gconf
 end package
--- a/src/util/distro-import/85/common/SUNWcompizconfig-python	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWcompizconfig-python	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcompizconfig-python
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWcompizconfig-python
 import SUNWcompizconfig-python-devel
--- a/src/util/distro-import/85/common/SUNWglibmm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWglibmm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWglibmm
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWglibmm
 import SUNWglibmm-devel
--- a/src/util/distro-import/85/common/SUNWgtkmm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWgtkmm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtkmm
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgtkmm
 import SUNWgtkmm-devel
--- a/src/util/distro-import/85/common/SUNWid3lib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWid3lib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWid3lib
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWid3lib
 import SUNWid3lib-devel
--- a/src/util/distro-import/85/common/SUNWiiimf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWiiimf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiiimf
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiiimf
 import SUNWiiimf-root
--- a/src/util/distro-import/85/common/SUNWlibcompizconfig	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWlibcompizconfig	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibcompizconfig
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibcompizconfig
 import SUNWlibcompizconfig-devel
--- a/src/util/distro-import/85/common/SUNWlibgc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWlibgc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgc
+consolidation "gnome"
 classification "Development/C++"
 import SUNWlibgc
 import SUNWlibgc-devel
--- a/src/util/distro-import/85/common/SUNWlibgmime	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWlibgmime	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgmime
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibgmime
 import SUNWlibgmime-devel
--- a/src/util/distro-import/85/common/SUNWlibopenusb	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWlibopenusb	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibopenusb
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibopenusb
 version 1.0.1
--- a/src/util/distro-import/85/common/SUNWlibsexy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWlibsexy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsexy
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibsexy
 import SUNWlibsexy-devel
--- a/src/util/distro-import/85/common/SUNWpython-imaging	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWpython-imaging	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-imaging
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-imaging
 end package
--- a/src/util/distro-import/85/common/SUNWpython-setuptools	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWpython-setuptools	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-setuptools
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-setuptools
 end package
--- a/src/util/distro-import/85/common/SUNWpython-twisted	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWpython-twisted	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-twisted
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-twisted
 depend SUNWPython
--- a/src/util/distro-import/85/common/SUNWpython-xdg	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWpython-xdg	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-xdg
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-xdg
 end package
--- a/src/util/distro-import/85/common/SUNWpython-zope-interface	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWpython-zope-interface	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-zope-interface
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-zope-interface
 end package
--- a/src/util/distro-import/85/common/SUNWrdesktop	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWrdesktop	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrdesktop
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWrdesktop
 end package
--- a/src/util/distro-import/85/common/SUNWrrdtool	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWrrdtool	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWrrdtool
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWrrdtool
 end package
--- a/src/util/distro-import/85/common/SUNWsexy-python	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWsexy-python	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsexy-python
+consolidation "gnome"
 classification "Development/Python"
 import SUNWsexy-python
 end package
--- a/src/util/distro-import/85/common/SUNWsigcpp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWsigcpp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsigcpp
+consolidation "gnome"
 classification "Development/C++"
 import SUNWsigcpp
 import SUNWsigcpp-devel
--- a/src/util/distro-import/85/common/SUNWxdg-user-dirs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWxdg-user-dirs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxdg-user-dirs
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWxdg-user-dirs
 import SUNWxdg-user-dirs-root
--- a/src/util/distro-import/85/common/SUNWxdg-utils	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/SUNWxdg-utils	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxdg-utils
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWxdg-utils
 end package
--- a/src/util/distro-import/85/common/loc/SUNWcsdhcm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/loc/SUNWcsdhcm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcsdhcm
+consolidation "l10n"
 classification "System/Services"
 import SUNWcsdhcm
 end package
--- a/src/util/distro-import/85/common/loc/SUNWcsos	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/loc/SUNWcsos	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcsos
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWcsos
 end package
--- a/src/util/distro-import/85/common/loc/SUNWgnome-l10ndocument-rtl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/loc/SUNWgnome-l10ndocument-rtl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-rtl
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-rtl
 end package
--- a/src/util/distro-import/85/common/loc/SUNWgnome-l10nmessages-rtl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/85/common/loc/SUNWgnome-l10nmessages-rtl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-rtl
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-rtl
 end package
--- a/src/util/distro-import/86/common/SUNWcvs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWcvs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcvs
+consolidation "sfw"
 classification "Development/Source Code Management"
 import SUNWcvs
 version 1.12.13
--- a/src/util/distro-import/86/common/SUNWddu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWddu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWddu
+consolidation "hcts"
 classification "System/Hardware"
 import SUNWddu
 end package
--- a/src/util/distro-import/86/common/SUNWdistro-license-copyright	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWdistro-license-copyright	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdistro-license-copyright
+consolidation "solaris_re"
 classification "System/Core"
 import SUNWdistro-license
 end package
--- a/src/util/distro-import/86/common/SUNWgnome-a11y-poke	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWgnome-a11y-poke	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-a11y-poke
+consolidation "gnome"
 classification "Applications/Universal Access"
 import SUNWgnome-a11y-poke
 import SUNWgnome-a11y-poke-root
--- a/src/util/distro-import/86/common/SUNWgnome-fonts	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWgnome-fonts	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-fonts
+consolidation "gnome"
 classification "System/Fonts"
 import SUNWgnome-fonts exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/86/common/SUNWgnome-xml	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWgnome-xml	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-xml
+consolidation "gnome"
 classification "Desktop (GNOME)/Documentation"
 import SUNWgnome-xml-share
 import SUNWgnome-xml-root
--- a/src/util/distro-import/86/common/SUNWiconv-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWiconv-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiconv-extra
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiconv-extra
 end package
--- a/src/util/distro-import/86/common/SUNWiconv-unicode	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWiconv-unicode	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWiconv-unicode
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWiconv-unicode
 end package
--- a/src/util/distro-import/86/common/SUNWinstall-l10n	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWinstall-l10n	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWinstall-l10n
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWinstall-l10n
 end package
--- a/src/util/distro-import/86/common/SUNWinstall-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWinstall-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWinstall-libs
+consolidation "install"
 classification "System/Libraries"
 import SUNWinstall-libs
 end package
--- a/src/util/distro-import/86/common/SUNWlibanthy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWlibanthy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibanthy
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlibanthy
 import SUNWlibanthy-devel
--- a/src/util/distro-import/86/common/SUNWlibchewing	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWlibchewing	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibchewing
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlibchewing
 import SUNWlibchewing-devel
--- a/src/util/distro-import/86/common/SUNWlibhangul	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWlibhangul	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibhangul
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlibhangul
 import SUNWlibhangul-devel
--- a/src/util/distro-import/86/common/SUNWmp	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWmp	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmp
+consolidation "l10n"
 classification "System/Printing"
 import SUNWmp exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/86/common/SUNWsolnm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWsolnm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsolnm
+consolidation "solaris_re"
 classification "System/Core"
 import SUNWsolnm
 end package
--- a/src/util/distro-import/86/common/SUNWwsr2	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/SUNWwsr2	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWwsr2
+consolidation "install"
 classification "System/Administration and Configuration"
 import SUNWwsr2
 import SUNWproduct-registry-root
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-de
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-de
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-es
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-es
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-fr
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-fr
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-it
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-it
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-ja
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-ja
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-ko
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-ko
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-ptBR
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-ptBR
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-ru
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-ru
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-sv
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-sv
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-zhCN
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-zhCN
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhHK	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhHK	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-zhHK
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-zhHK
 end package
--- a/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhTW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWgetting-started-l10n-zhTW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgetting-started-l10n-zhTW
+consolidation "gnome"
 classification "System/Localizations"
 import SUNWgetting-started-l10n-zhTW
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-ar-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-ar-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ar-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ar-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-bg-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-bg-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-bg-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-bg-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-ca-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-ca-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ca-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ca-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-common	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-common	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-common
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-common
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-common-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-common-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-common-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-common-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-cs-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-cs-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-cs-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-cs-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-da-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-da-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-da-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-da-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-de
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-de
 depend SUNWlang-deDE
--- a/src/util/distro-import/86/common/loc/SUNWlang-de-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-de-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-de-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-de-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-el-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-el-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-el-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-el-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-en	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-en	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-en
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-en
 depend SUNWlang-enUS
--- a/src/util/distro-import/86/common/loc/SUNWlang-en-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-en-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-en-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-en-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-es
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-es
 depend SUNWlang-esES
--- a/src/util/distro-import/86/common/loc/SUNWlang-es-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-es-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-es-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-es-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-et-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-et-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-et-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-et-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-fi-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-fi-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-fi-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-fi-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-fr
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-fr
 depend SUNWlang-frFR
--- a/src/util/distro-import/86/common/loc/SUNWlang-fr-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-fr-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-fr-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-fr-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-he-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-he-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-he-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-he-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-hr-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-hr-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-hr-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-hr-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-hu-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-hu-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-hu-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-hu-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-is-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-is-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-is-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-is-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-it-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-it-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-it-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-it-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-lt-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-lt-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-lt-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-lt-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-lv-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-lv-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-lv-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-lv-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-mk-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-mk-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-mk-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-mk-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-nl-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-nl-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-nl-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-nl-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-no-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-no-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-no-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-no-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-pl-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-pl-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-pl-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-pl-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-pt-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-pt-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-pt-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-pt-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-ptBR-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-ptBR-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ptBR-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ptBR-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-ro-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-ro-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ro-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ro-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-ru-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-ru-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-ru-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-ru-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-sh-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-sh-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sh-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sh-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-sk-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-sk-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sk-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sk-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-sl-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-sl-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sl-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sl-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-sq-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-sq-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sq-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sq-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-sr-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-sr-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sr-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sr-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-sv-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-sv-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-sv-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-sv-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-th-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-th-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-th-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-th-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWlang-tr-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWlang-tr-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlang-tr-extra
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlang-tr-extra
 end package
--- a/src/util/distro-import/86/common/loc/SUNWttf-arabeyes	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWttf-arabeyes	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-arabeyes
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-arabeyes exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/86/common/loc/SUNWttf-arphic-ukai	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWttf-arphic-ukai	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-arphic-ukai
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-arphic-ukai exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/86/common/loc/SUNWttf-arphic-uming	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWttf-arphic-uming	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-arphic-uming
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-arphic-uming exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/86/common/loc/SUNWttf-ipafont	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/86/common/loc/SUNWttf-ipafont	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-ipafont
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-ipafont exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/87/common/SUNWgnu-mc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWgnu-mc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-mc
+consolidation "sfw"
 classification "Desktop (GNOME)/File Managers"
 import SUNWgnu-mc
 version 4.6.1
--- a/src/util/distro-import/87/common/SUNWlibmemcached	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWlibmemcached	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibmemcached
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibmemcached
 version 0.16
--- a/src/util/distro-import/87/common/SUNWmemcached-java	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWmemcached-java	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmemcached-java
+consolidation "sfw"
 classification "Development/Java"
 import SUNWmemcached-java
 version 2.0.1
--- a/src/util/distro-import/87/common/SUNWpostgr-83-tcl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWpostgr-83-tcl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-83-tcl
+consolidation "sfw"
 classification "Development/Databases"
 import SUNWpostgr-83-tcl
 version 1.5
--- a/src/util/distro-import/87/common/SUNWpostgr-jdbc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWpostgr-jdbc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-jdbc
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-jdbc
 version 8.3.603
--- a/src/util/distro-import/87/common/SUNWpostgr-upgrade	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWpostgr-upgrade	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpostgr-upgrade
+consolidation "sfw"
 classification "System/Databases"
 import SUNWpostgr-upgrade
 end package
--- a/src/util/distro-import/87/common/SUNWpysqlite	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWpysqlite	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpysqlite
+consolidation "gnome"
 classification "Development/Databases"
 import SUNWpysqlite
 version 2.4.1
--- a/src/util/distro-import/87/common/SUNWtcpd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/87/common/SUNWtcpd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtcpd
+consolidation "osnet"
 classification "System/Core"
 import SUNWtcpd
 version 7.6
--- a/src/util/distro-import/88/common/SUNWTcl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWTcl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWTcl
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWTcl
 version 8.4.18
--- a/src/util/distro-import/88/common/SUNWTk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWTk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWTk
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWTk
 version 8.4.18
--- a/src/util/distro-import/88/common/SUNWdiffstat	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWdiffstat	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdiffstat
+consolidation "sfw"
 classification "System/Text Tools"
 import SUNWdiffstat
 version 1.45
--- a/src/util/distro-import/88/common/SUNWlxml	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWlxml	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlxml
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlxml
 import SUNWlxml-devel
--- a/src/util/distro-import/88/common/SUNWnethack	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWnethack	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnethack
+consolidation "sfw"
 classification "Applications/Games"
 import SUNWnethack
 import SUNWnethackr
--- a/src/util/distro-import/88/common/SUNWsane-backend	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWsane-backend	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsane-backend
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWsane-backendu
 import SUNWsane-backendr
--- a/src/util/distro-import/88/common/SUNWsane-frontend	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWsane-frontend	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsane-frontend
+consolidation "sfw"
 classification "Applications/Graphics and Imaging"
 import SUNWsane-frontend
 version 1.0.14
--- a/src/util/distro-import/88/common/SUNWscsip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWscsip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscsip
+consolidation "osnet"
 classification "Applications/Plug-ins and Run-times"
 import SUNWscsip
 end package
--- a/src/util/distro-import/88/common/SUNWtvnc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWtvnc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtvnc
+consolidation "gfx"
 classification "Applications/Internet"
 import SUNWtvnc
 version 0.4
--- a/src/util/distro-import/88/common/SUNWvgl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWvgl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWvgl
+consolidation "gfx"
 classification "System/Hardware"
 import SUNWvgl
 version 2.1
--- a/src/util/distro-import/88/common/SUNWzlib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/common/SUNWzlib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWzlib
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWzlib
 import SUNWzlibr
--- a/src/util/distro-import/88/sparc/SUNWfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/88/sparc/SUNWfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfs
+consolidation "osnet"
 classification "System/Administration and Configuration"
 import SUNWfsr
 import SUNWfsu
--- a/src/util/distro-import/89/common/SUNWbzip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/SUNWbzip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbzip
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWbzip
 version 1.0.5
--- a/src/util/distro-import/89/common/SUNWgnu-gperf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/SUNWgnu-gperf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-gperf
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgnu-gperf
 version 3.0.3
--- a/src/util/distro-import/89/common/SUNWlcms	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/SUNWlcms	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlcms
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWlcms
 version 1.17
--- a/src/util/distro-import/89/common/SUNWlibmng	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/SUNWlibmng	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibmng
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibmng
 version 1.0.10
--- a/src/util/distro-import/89/common/SUNWpostgr-82-server-data-root	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/SUNWpostgr-82-server-data-root	Thu Nov 05 11:54:51 2009 -0800
@@ -4,6 +4,7 @@
 # be deleted when the newer package is installed.
 #
 package SUNWpostgr-82-server-data-root
+consolidation "sfw"
 version 8.2.6
 depend SUNWpostgr-82-server
 end package
--- a/src/util/distro-import/89/common/SUNWpostgr-server-data	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/SUNWpostgr-server-data	Thu Nov 05 11:54:51 2009 -0800
@@ -4,6 +4,7 @@
 # be deleted when the newer package is installed.
 #
 package SUNWpostgr-server-data
+consolidation "sfw"
 version 8.1.11
 depend SUNWpostgr-server
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-cs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-cs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-cs
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-cs
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-de	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-de	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-de
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-de
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-es	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-es	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-es
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-es
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-extra
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-extra
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-fr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-fr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-fr
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-fr
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-hu	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-hu	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-hu
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-hu
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-it	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-it	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-it
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-it
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ja	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ja	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-ja
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-ja
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ko	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ko	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-ko
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-ko
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-noinst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-noinst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-noinst
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-noinst
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-pl
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-pl
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ptBR	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ptBR	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-ptBR
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-ptBR
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-rtl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-rtl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-rtl
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-rtl
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ru	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-ru	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-ru
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-ru
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-sv	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-sv	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-sv
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-sv
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhCN	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhCN	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-zhCN
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-zhCN
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhHK	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhHK	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-zhHK
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-zhHK
 end package
--- a/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhTW	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWdesktop-other-l10n-zhTW	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-other-l10n-zhTW
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWdesktop-other-l10n-zhTW
 end package
--- a/src/util/distro-import/89/common/loc/SUNWgnome-l10ndocument-noinst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWgnome-l10ndocument-noinst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10ndocument-noinst
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10ndocument-noinst
 end package
--- a/src/util/distro-import/89/common/loc/SUNWgnome-l10nmessages-noinst	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/89/common/loc/SUNWgnome-l10nmessages-noinst	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-l10nmessages-noinst
+consolidation "gnome_l10n"
 classification "Desktop (GNOME)/Localizations"
 import SUNWgnome-l10nmessages-noinst
 end package
--- a/src/util/distro-import/90/common/SUNWdcraw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWdcraw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdcraw
+consolidation "gnome"
 classification "System/Media"
 import SUNWdcraw
 version 8.81
--- a/src/util/distro-import/90/common/SUNWfetchmail	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWfetchmail	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfetchmail
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWfetchmail
 version 6.3.8
--- a/src/util/distro-import/90/common/SUNWpgbouncer-pg83	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWpgbouncer-pg83	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpgbouncer-pg83
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWpgbouncer-pg83-config
 import SUNWpgbouncer-pg83-server
--- a/src/util/distro-import/90/common/SUNWprocmail	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWprocmail	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWprocmail
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWprocmail
 version 3.22
--- a/src/util/distro-import/90/common/SUNWslang	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWslang	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWslang
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWslang
 import SUNWslangr
--- a/src/util/distro-import/90/common/SUNWsndm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWsndm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsndm
+consolidation "osnet"
 classification "System/Core"
 import SUNWsndmu
 import SUNWsndmr
--- a/src/util/distro-import/90/common/SUNWtcltls	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/90/common/SUNWtcltls	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtcltls
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWtcltls
 version 1.6
--- a/src/util/distro-import/92/common/SUNWgnome-character-map	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnome-character-map	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-character-map
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-character-map
 import SUNWgnome-character-map-devel
--- a/src/util/distro-import/92/common/SUNWgnome-file-mgr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnome-file-mgr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-file-mgr
+consolidation "gnome"
 classification "Desktop (GNOME)/File Managers"
 import SUNWgnome-file-mgr
 import SUNWgnome-file-mgr-devel
--- a/src/util/distro-import/92/common/SUNWgnome-games	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnome-games	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-games
+consolidation "gnome"
 classification "Applications/Games"
 import SUNWgnome-games
 import SUNWgnome-games-devel
--- a/src/util/distro-import/92/common/SUNWgnome-gvfs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnome-gvfs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-gvfs
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWgnome-gvfs
 depend_path /usr/bin/less
--- a/src/util/distro-import/92/common/SUNWgnome-internet-applets	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnome-internet-applets	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-internet-applets
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWgnome-internet-applets
 end package
--- a/src/util/distro-import/92/common/SUNWgnome-power-manager	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnome-power-manager	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-power-manager
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWgnome-power-manager
 import SUNWgnome-power-manager-root
--- a/src/util/distro-import/92/common/SUNWgnu-gettext	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWgnu-gettext	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnu-gettext
+consolidation "sfw"
 classification "Development/GNU"
 import SUNWgnu-gettext
 version 0.16.1
--- a/src/util/distro-import/92/common/SUNWlibsoup	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWlibsoup	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibsoup
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibsoup
 import SUNWlibsoup-devel
--- a/src/util/distro-import/92/common/SUNWlinks	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWlinks	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlinks
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWlinks
 version 1.0
--- a/src/util/distro-import/92/common/SUNWmysql5jdbc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWmysql5jdbc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmysql5jdbc
+consolidation "sfw"
 classification "System/Databases"
 import SUNWmysql5jdbc
 version 5.1.5
--- a/src/util/distro-import/92/common/SUNWsolaris-devel-docs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWsolaris-devel-docs	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWsolaris-devel-docs was EOFed in snv_92.
 #
 package SUNWsolaris-devel-docs
+consolidation "gnome"
 end package
--- a/src/util/distro-import/92/common/SUNWxdg-user-dirs-gtk	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/SUNWxdg-user-dirs-gtk	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxdg-user-dirs-gtk
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWxdg-user-dirs-gtk
 import SUNWxdg-user-dirs-gtk-root
--- a/src/util/distro-import/92/common/loc/SUNWgnome-img-editor-help-pl	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/common/loc/SUNWgnome-img-editor-help-pl	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-img-editor-help-pl
+consolidation "gnome_l10n"
 classification "Applications/Graphics and Imaging"
 import SUNWgnome-img-editor-help-pl
 end package
--- a/src/util/distro-import/92/i386/SUNWlibvirt	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/92/i386/SUNWlibvirt	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibvirt
+consolidation "osnet"
 classification "System/Libraries"
 import SUNWlibvirt
 import SUNWlibvirtr
--- a/src/util/distro-import/93/common/SUNWlibpcap	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/93/common/SUNWlibpcap	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibpcap
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibpcap
 version 0.9.8
--- a/src/util/distro-import/93/common/SUNWslib	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/93/common/SUNWslib	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWslib
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWslib
 version 3.1.1
--- a/src/util/distro-import/93/i386/SUNWpsh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/93/i386/SUNWpsh	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpsh
+consolidation "osnet"
 classification "Drivers/Other Peripherals"
 import SUNWpsh
 end package
--- a/src/util/distro-import/94/common/SUNWerlang	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/SUNWerlang	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWerlang
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWerlang
 version 12.1.1
--- a/src/util/distro-import/94/common/SUNWerlang-doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/SUNWerlang-doc	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWerlang-doc
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWerlang-doc
 version 12.1.1
--- a/src/util/distro-import/94/common/SUNWircii	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/SUNWircii	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWircii
+consolidation "sfw"
 classification "Applications/Internet"
 import SUNWircii
 version 0.2006.7.25
--- a/src/util/distro-import/94/common/SUNWlibrsync	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/SUNWlibrsync	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibrsync
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibrsync
 version 0.9.7
--- a/src/util/distro-import/94/common/SUNWpampkcs11	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/SUNWpampkcs11	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpampkcs11
+consolidation "sfw"
 classification "System/Security"
 import SUNWpampkcs11-docs
 import SUNWpampkcs11r
--- a/src/util/distro-import/94/common/SUNWxorg-headers	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/SUNWxorg-headers	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxorg-headers
+consolidation "X"
 classification "Development/X11"
 import SUNWxorg-headers
 depend SUNWhea
--- a/src/util/distro-import/94/common/loc/SUNWttf-thai-scalable	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/94/common/loc/SUNWttf-thai-scalable	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-thai-scalable
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-thai-scalable exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/95/common/SUNWfirefox	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWfirefox	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfirefox
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWfirefox
 import SUNWfirefox-devel
--- a/src/util/distro-import/95/common/SUNWicdc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWicdc	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the newer package is installed.
 #
 package SUNWicdc
+consolidation "install"
 end package
--- a/src/util/distro-import/95/common/SUNWilmbase	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWilmbase	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWilmbase
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWilmbase
 version 1.0.1
--- a/src/util/distro-import/95/common/SUNWlogrotate	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWlogrotate	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlogrotate
+consolidation "sfw"
 classification "System/Administration and Configuration"
 import SUNWlogrotater
 import SUNWlogrotateu
--- a/src/util/distro-import/95/common/SUNWopenexr	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWopenexr	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopenexr
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWopenexr
 version 1.6.1
--- a/src/util/distro-import/95/common/SUNWsnack	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWsnack	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWsnack
+consolidation "sfw"
 classification "Development/Other Languages"
 import SUNWsnack
 version 2.2.10
--- a/src/util/distro-import/95/common/SUNWstunnel	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWstunnel	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWstunnel
+consolidation "sfw"
 classification "System/Security"
 import SUNWstunnelr
 import SUNWstunnelu
--- a/src/util/distro-import/95/common/SUNWunzip	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/95/common/SUNWunzip	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWunzip
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWunzip
 version 5.53.7
--- a/src/util/distro-import/96/common/SUNWipkg-gui-l10n	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWipkg-gui-l10n	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the newer package is installed.
 #
 package SUNWipkg-gui-l10n
+consolidation "ips"
 end package
--- a/src/util/distro-import/96/common/SUNWlibdatrie	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWlibdatrie	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibdatrie
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlibdatrie
 import SUNWlibdatrie-devel
--- a/src/util/distro-import/96/common/SUNWlibgsf	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWlibgsf	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgsf
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWlibgsf
 import SUNWlibgsf-devel
--- a/src/util/distro-import/96/common/SUNWlibthai	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWlibthai	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibthai
+consolidation "l10n"
 classification "System/Localizations"
 import SUNWlibthai
 import SUNWlibthai-devel
--- a/src/util/distro-import/96/common/SUNWscim	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim
 import SUNWscim-bridge
--- a/src/util/distro-import/96/common/SUNWscim-anthy	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-anthy	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-anthy
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-anthy
 version 1.2.4
--- a/src/util/distro-import/96/common/SUNWscim-chewing	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-chewing	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-chewing
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-chewing
 version 0.3.1
--- a/src/util/distro-import/96/common/SUNWscim-hangul	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-hangul	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-hangul
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-hangul
 version 0.3.2
--- a/src/util/distro-import/96/common/SUNWscim-pinyin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-pinyin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-pinyin
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-pinyin
 version 0.5.91
--- a/src/util/distro-import/96/common/SUNWscim-sunpinyin	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-sunpinyin	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-sunpinyin
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-sunpinyin
 version 1.0
--- a/src/util/distro-import/96/common/SUNWscim-tables	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-tables	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-tables
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-tables
 version 0.5.7
--- a/src/util/distro-import/96/common/SUNWscim-tables-chinese	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-tables-chinese	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-tables-chinese
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-tables-chinese
 version 0.5.7
--- a/src/util/distro-import/96/common/SUNWscim-tables-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-tables-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-tables-extra
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-tables-extra
 version 0.5.7
--- a/src/util/distro-import/96/common/SUNWscim-tables-india	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-tables-india	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-tables-india
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-tables-india
 version 0.5.7
--- a/src/util/distro-import/96/common/SUNWscim-tables-japanese	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-tables-japanese	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-tables-japanese
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-tables-japanese
 version 0.5.7
--- a/src/util/distro-import/96/common/SUNWscim-tables-korean	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-tables-korean	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-tables-korean
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-tables-korean
 version 0.5.7
--- a/src/util/distro-import/96/common/SUNWscim-thai	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWscim-thai	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWscim-thai
+consolidation "l10n"
 classification "System/Internationalization"
 import SUNWscim-thai
 version 0.1.0
--- a/src/util/distro-import/96/common/SUNWw3m	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/96/common/SUNWw3m	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWw3m
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWw3m
 end package
--- a/src/util/distro-import/97/common/SUNWapch22m-dtrace	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/97/common/SUNWapch22m-dtrace	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22m-dtrace
+consolidation "sfw"
 classification "Development/System"
 import SUNWapch22m-dtrace
 import SUNWapch22r-dtrace
--- a/src/util/distro-import/97/common/SUNWapch22m-fcgid	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/97/common/SUNWapch22m-fcgid	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWapch22m-fcgid
+consolidation "sfw"
 classification "Web Services/Application and Web Servers"
 import SUNWapch22m-fcgid
 import SUNWapch22r-fcgid
--- a/src/util/distro-import/97/common/SUNWopensolaris-welcome	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/97/common/SUNWopensolaris-welcome	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWopensolaris-welcome
+consolidation "gnome"
 classification "System/Text Tools"
 import SUNWopensolaris-welcome
 end package
--- a/src/util/distro-import/97/common/SUNWsrh	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/97/common/SUNWsrh	Thu Nov 05 11:54:51 2009 -0800
@@ -4,4 +4,5 @@
 # be deleted when the newer package is installed.
 #
 package SUNWsrh
+consolidation "osnet"
 end package
--- a/src/util/distro-import/98/common/SUNWdesktop-search	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/98/common/SUNWdesktop-search	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdesktop-search
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWdesktop-search
 import SUNWdesktop-search-devel
--- a/src/util/distro-import/98/common/SUNWipkg-brand	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/98/common/SUNWipkg-brand	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWipkg-brand
+consolidation "ips"
 classification "System/Packaging"
 import SUNWipkg-brand
 depend SUNWesu
--- a/src/util/distro-import/98/common/SUNWmtx	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/98/common/SUNWmtx	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmtx
+consolidation "sfw"
 classification "System/Media"
 import SUNWmtx
 version 1.3.11
--- a/src/util/distro-import/98/common/loc/SUNWlang-mt-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/98/common/loc/SUNWlang-mt-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWlang-mt-extra was EOFed in snv_98.
 #
 package SUNWlang-mt-extra
+consolidation "l10n"
 end package
--- a/src/util/distro-import/98/common/loc/SUNWlang-nb-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/98/common/loc/SUNWlang-nb-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWlang-nb-extra was EOFed in snv_98.
 #
 package SUNWlang-nb-extra
+consolidation "l10n"
 end package
--- a/src/util/distro-import/98/common/loc/SUNWlang-nn-extra	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/98/common/loc/SUNWlang-nn-extra	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWlang-nn-extra was EOFed in snv_98.
 #
 package SUNWlang-nn-extra
+consolidation "l10n"
 end package
--- a/src/util/distro-import/99/common/SUNWPython25	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWPython25	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWPython25
+consolidation "gnome"
 classification "Development/Python"
 import SUNWPython25
 import SUNWPython25-devel
--- a/src/util/distro-import/99/common/SUNWapch22m-php5	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWapch22m-php5	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWapch22m-php5
+consolidation "sfw"
 version 2.2.6
 depend SUNWapch22m-php52
 end package
--- a/src/util/distro-import/99/common/SUNWbluefish	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWbluefish	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWbluefish
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWbluefish
 end package
--- a/src/util/distro-import/99/common/SUNWcontact-lookup-applet	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWcontact-lookup-applet	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWcontact-lookup-applet
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWcontact-lookup-applet
 end package
--- a/src/util/distro-import/99/common/SUNWdbus-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWdbus-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdbus-libs
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWdbus-libs
 import SUNWdbus-devel
--- a/src/util/distro-import/99/common/SUNWdialog	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWdialog	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdialog
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWdialog
 end package
--- a/src/util/distro-import/99/common/SUNWdistro-const	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWdistro-const	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWdistro-const
+consolidation "install"
 classification "System/Core"
 import SUNWdistro-const
 depend SUNWinstall
--- a/src/util/distro-import/99/common/SUNWfppd	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWfppd	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWfppd
+consolidation "sfw"
 classification "System/Printing"
 import SUNWfppd
 version 0.2008.8.18
--- a/src/util/distro-import/99/common/SUNWgnome-commander	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgnome-commander	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-commander
+consolidation "gnome"
 classification "Desktop (GNOME)/File Managers"
 import SUNWgnome-commander
 end package
--- a/src/util/distro-import/99/common/SUNWgnome-freedb-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgnome-freedb-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -6,4 +6,5 @@
 # SUNWgnome-freedb-libs was EOFed in snv_99.
 #
 package SUNWgnome-freedb-libs
+consolidation "gnome"
 end package
--- a/src/util/distro-import/99/common/SUNWgnome-libs	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgnome-libs	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-libs
+consolidation "gnome"
 classification "Development/GNOME and GTK+"
 import SUNWgnome-libs-devel
 import SUNWgnome-libs
--- a/src/util/distro-import/99/common/SUNWgnome-themes-hires	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgnome-themes-hires	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgnome-themes-hires
+consolidation "gnome"
 classification "Desktop (GNOME)/Theming"
 import SUNWgnome-themes-hires
 end package
--- a/src/util/distro-import/99/common/SUNWgqview	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgqview	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgqview
+consolidation "gnome"
 classification "Applications/Graphics and Imaging"
 import SUNWgqview
 end package
--- a/src/util/distro-import/99/common/SUNWgroff	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgroff	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgroff
+consolidation "gnome"
 classification "System/Text Tools"
 import SUNWgroff
 end package
--- a/src/util/distro-import/99/common/SUNWgtkspell	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWgtkspell	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWgtkspell
+consolidation "gnome"
 classification "Applications/Accessories"
 import SUNWgtkspell
 import SUNWgtkspell-devel
--- a/src/util/distro-import/99/common/SUNWlibffi	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWlibffi	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibffi
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibffi
 import SUNWlibffi-devel
--- a/src/util/distro-import/99/common/SUNWlibgoffice	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWlibgoffice	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibgoffice
+consolidation "gnome"
 classification "Development/System"
 import SUNWlibgoffice
 import SUNWlibgoffice-devel
--- a/src/util/distro-import/99/common/SUNWlibmikmod	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWlibmikmod	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibmikmod
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibmikmod
 import SUNWlibmikmod-devel
--- a/src/util/distro-import/99/common/SUNWlibnet	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWlibnet	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibnet
+consolidation "sfw"
 classification "System/Libraries"
 import SUNWlibnet
 version 1.1.2.1
--- a/src/util/distro-import/99/common/SUNWlibtasn1	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWlibtasn1	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWlibtasn1
+consolidation "gnome"
 classification "System/Libraries"
 import SUNWlibtasn1
 import SUNWlibtasn1-devel
--- a/src/util/distro-import/99/common/SUNWmeld	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWmeld	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWmeld
+consolidation "sfw"
 classification "Applications/System Utilities"
 import SUNWmeld
 version 1.1.5.1
--- a/src/util/distro-import/99/common/SUNWnwam-manager	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWnwam-manager	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWnwam-manager
+consolidation "gnome"
 classification "System/Administration and Configuration"
 import SUNWnwam-manager
 import SUNWnwam-manager-root
--- a/src/util/distro-import/99/common/SUNWo3read	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWo3read	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWo3read
+consolidation "gnome"
 classification "Applications/Office"
 import SUNWo3read
 end package
--- a/src/util/distro-import/99/common/SUNWpangomm	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWpangomm	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpangomm
+consolidation "gnome"
 classification "Desktop (GNOME)/Libraries"
 import SUNWpangomm
 import SUNWpangomm-devel
--- a/src/util/distro-import/99/common/SUNWphp524	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWphp524	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWphp524
+consolidation "sfw"
 version 5.2.4
 depend SUNWphp52
 end package
--- a/src/util/distro-import/99/common/SUNWphp524-mysql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWphp524-mysql	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWphp524-mysql
+consolidation "sfw"
 version 5.2.4
 depend SUNWphp52-mysql
 end package
--- a/src/util/distro-import/99/common/SUNWphp524-pgsql	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWphp524-pgsql	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWphp524-pgsql
+consolidation "sfw"
 version 5.2.4
 depend SUNWphp52-pgsql
 end package
--- a/src/util/distro-import/99/common/SUNWphp524core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWphp524core	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWphp524core
+consolidation "sfw"
 version 5.2.4
 depend SUNWphp52
 end package
--- a/src/util/distro-import/99/common/SUNWphp524doc	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWphp524doc	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWphp524doc
+consolidation "sfw"
 version 5.2.4
 depend SUNWphp52d
 end package
--- a/src/util/distro-import/99/common/SUNWphp524man	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWphp524man	Thu Nov 05 11:54:51 2009 -0800
@@ -5,6 +5,7 @@
 # on the package with the new name.
 #
 package SUNWphp524man
+consolidation "sfw"
 version 5.2.4
 depend SUNWphp52
 end package
--- a/src/util/distro-import/99/common/SUNWpython-notify	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWpython-notify	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWpython-notify
+consolidation "gnome"
 classification "Development/Python"
 import SUNWpython-notify
 import SUNWpython-notify-devel
--- a/src/util/distro-import/99/common/SUNWtransmission	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWtransmission	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtransmission
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWtransmission
 end package
--- a/src/util/distro-import/99/common/SUNWtsclient	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWtsclient	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWtsclient
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWtsclient
 end package
--- a/src/util/distro-import/99/common/SUNWxchat	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWxchat	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxchat
+consolidation "gnome"
 classification "Applications/Internet"
 import SUNWxchat
 import SUNWxchat-root
--- a/src/util/distro-import/99/common/SUNWxdg-sound-theme	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWxdg-sound-theme	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxdg-sound-theme
+consolidation "gnome"
 classification "Desktop (GNOME)/Theming"
 import SUNWxdg-sound-theme
 end package
--- a/src/util/distro-import/99/common/SUNWxsane	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWxsane	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxsane
+consolidation "gnome"
 classification "Applications/System Utilities"
 import SUNWxsane
 end package
--- a/src/util/distro-import/99/common/SUNWxwfsw	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/SUNWxwfsw	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWxwfsw
+consolidation "X"
 classification "System/X11"
 import SUNWxwfsw exclude usr/openwin
 # Obsolete - replaced by /usr/openwin -> X11 symlink
--- a/src/util/distro-import/99/common/loc/SUNWttf-indic-fonts-core	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/common/loc/SUNWttf-indic-fonts-core	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWttf-indic-fonts-core
+consolidation "l10n"
 classification "System/Fonts"
 import SUNWttf-indic-fonts-core exclude usr/openwin
 chattr_glob * edit path usr/openwin usr/X11
--- a/src/util/distro-import/99/i386/SUNWavant	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/99/i386/SUNWavant	Thu Nov 05 11:54:51 2009 -0800
@@ -1,4 +1,5 @@
 package SUNWavant
+consolidation "gnome"
 classification "Applications/Panels and Applets"
 import SUNWavant
 import SUNWavant-devel
--- a/src/util/distro-import/importer.py	Thu Nov 05 12:39:57 2009 -0800
+++ b/src/util/distro-import/importer.py	Thu Nov 05 11:54:51 2009 -0800
@@ -57,6 +57,7 @@
 
 basename_dict = {}   # basenames to action lists
 branch_dict = {}     # 
+cons_dict = {}       # consolidation incorporation dictionaries
 create_repo = False  #
 curpkg = None        # which IPS package we're currently importing
 def_branch = ""      # default branch
@@ -98,6 +99,7 @@
                 self.desc = ""
                 self.summary = ""
                 self.version = ""
+                self.consolidation = ""
                 self.imppkg = None
                 self.actions = []
 
@@ -1116,6 +1118,21 @@
                 elif token == "description":
                         curpkg.desc = lexer.get_token()
 
+                elif token == "consolidation":
+			# Add to consolidation incorporation and
+			# include the org.opensolaris.consolidation
+			# package property.
+                        curpkg.consolidation = lexer.get_token()
+                        if not curpkg.consolidation in cons_dict:
+                                cons_dict[curpkg.consolidation] = []
+                        cons_dict[curpkg.consolidation].append(curpkg.name)
+
+                        action = actions.fromstr("set " \
+                            "name=org.opensolaris.consolidation value=%s" %
+                            curpkg.consolidation)
+                        action.attrs["importer.source"] = token
+                        curpkg.actions.append(action)
+
                 elif token == "summary":
                         curpkg.summary = lexer.get_token()
 
@@ -1332,6 +1349,26 @@
 
         print "Third pass: dependency id, resolution and publication", datetime.now()
 
+        # Generate consolidation incorporations
+        for cons in cons_dict.keys():
+                curpkg = start_package("consolidation/%s/%s-incorporation" %
+                        (cons, cons))
+                curpkg.summary = "%s consolidation incorporation" % cons
+                curpkg.desc = "This incorporation constrains packages " \
+                        "from the %s consolidation." % cons
+
+                for depend in cons_dict[cons]:
+                        action = actions.fromstr(
+                            "depend fmri=%s type=incorporate" % depend)
+                        action.attrs["importer.source"] = "depend"
+                        curpkg.actions.append(action)
+                action = actions.fromstr("set " \
+                    "name=org.opensolaris.consolidation value=%s" % cons)
+                action.attrs["importer.source"] = "add"
+                curpkg.actions.append(action)
+                end_package(curpkg)
+                curpkg = None
+
         if just_these_pkgs:
                 newpkgs = set(pkgdict[name]
                               for name in pkgdict.keys()