--- a/.hgignore	Tue Apr 22 16:09:02 2008 -0700
+++ b/.hgignore	Wed Apr 23 22:53:54 2008 -0700
@@ -24,4 +24,5 @@
 ^src/util/distro-import/proto/
 ^src/util/distro-import/redist_cluster$
 ^src/util/distro-import/slim_cluster$
+^src/util/distro-import/86/entire.incorporation
 ^webrev

--- a/src/util/distro-import/Makefile	Tue Apr 22 16:09:02 2008 -0700
+++ b/src/util/distro-import/Makefile	Wed Apr 23 22:53:54 2008 -0700
@@ -132,6 +132,9 @@
 	Studio.import		\
 	Webstackui.import
 
+UNBUNDLED_CLUSTERS=		\
+	Clusters.import
+
 BUILDS= 75a\
 	79b\
 	86
@@ -318,19 +321,29 @@
 entire: $(BUILDID)/entire.incorporation
 	PKG_REPO=$(REPO) ./import_manifest_file [email protected],5.11-0.$(BUILDID) $(BUILDID)/entire.incorporation
 
-$(UNBUNDLED_TARGETS:%=$(BUILDS)/%):
+$(UNBUNDLED_TARGETS:%=$(BUILDS)/%) $(UNBUNDLED_CLUSTERS:%=$(BUILDS)/%):
 	$(MAKE) BUILDID=$(@D) $(@F)
 
 $(UNBUNDLED_TARGETS): unbundleds/$$(@:%.import=%)
 	rm -f redist_cluster; ln -s $(BUILDID)/redist_cluster redist_cluster
 	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) `./package_names.py unbundleds/$(@:%.import=%)`  unbundleds/$(@:%.import=%) redist_cluster
 
+$(UNBUNDLED_CLUSTERS): unbundleds/$$(@:%.import=%)
+	rm -f redist_cluster; ln -s $(BUILDID)/redist_cluster redist_cluster
+	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) `./package_names.py unbundleds/$(@:%.import=%)`  unbundleds/$(@:%.import=%) $(UNBUNDLED_TARGETS:%.import=unbundleds/%) redist_cluster
+
+%/all_unbundleds:
+	$(MAKE) BUILDID=$(@D) $(@F)
+
+all_unbundleds:	$(UNBUNDLED_TARGETS:%=$(BUILDID)/%)
+	$(MAKE) $(BUILDID)/$(UNBUNDLED_CLUSTERS)
+
 
 %/SUNWipkg:
 	$(MAKE) BUILDID=$(@D) $(@F)
 
 SUNWipkg:
-	PKG_REPO=$(REPO) ./publish_ips pkg:/[email protected],5.11-0.`echo $(BUILDID) | tr '[a-z]' ' '`
+	PKG_REPO=$(REPO) ./publish_ips pkg:/[email protected],5.11-0.`echo $(BUILDID) | tr '[a-z]' ' '` ../../../packages/i386/SUNWipkg
 
 clean:
 	rm -f $(OBJS)

--- a/src/util/distro-import/publish_ips	Tue Apr 22 16:09:02 2008 -0700
+++ b/src/util/distro-import/publish_ips	Wed Apr 23 22:53:54 2008 -0700
@@ -26,7 +26,6 @@
 #
 export PATH=../../../proto/root_`uname -p`/usr/bin:$PATH
 export PYTHONPATH=../../../proto/root_`uname -p`/usr/lib/python2.4/vendor-packages
-export PACKAGEPATH=../../../packages/i386
 eval `pkgsend open $1`
-pkgsend import $PACKAGEPATH/SUNWipkg
+pkgsend import $2
 pkgsend close

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/unbundleds/Clusters	Wed Apr 23 22:53:54 2008 -0700
@@ -0,0 +1,134 @@
+package java-dev
+description "Java Development cluster"
+depend SUNWant
+depend SUNWcvs
+depend SUNWfirefox
+depend SUNWj6cfg
+depend SUNWj6dev
+depend SUNWj6dmo
+depend SUNWj6dmx
+depend SUNWj6dvx
+depend SUNWj6man
+depend SUNWj6rt
+depend SUNWj6rtx
+depend SUNWmercurial
+depend SUNWmysql-base
+depend SUNWmysql5
+depend SUNWsvn
+depend SUNWsvn-java
+depend glassfishv2
+depend netbeans
+depend sunstudio
+end package
+
+package ss-dev
+description "Sun Studio Development cluster"
+depend SUNWaconf 
+depend SUNWbison
+depend SUNWbtool
+depend SUNWcvs
+depend SUNWflexlex
+depend SUNWgmake
+depend SUNWgnu-automake-110
+depend SUNWgnu-automake-19
+depend SUNWj6cfg
+depend SUNWj6dev
+depend SUNWj6dmo
+depend SUNWj6dmx
+depend SUNWj6dvx
+depend SUNWj6man
+depend SUNWj6rt
+depend SUNWj6rtx
+depend SUNWlibtool
+depend SUNWmercurial
+depend SUNWsprot
+depend SUNWsvn
+depend sunstudio
+end package
+
+package gcc-dev
+description "GNU Tools Development cluster"
+depend SUNWaconf
+depend SUNWbison
+depend SUNWcvs
+depend SUNWflexlex
+depend SUNWgcc
+depend SUNWgdb
+depend SUNWgmake
+depend SUNWgnu-automake-110
+depend SUNWgnu-automake-19
+depend SUNWlibtool
+depend SUNWmercurial
+depend SUNWsprot
+depend SUNWsvn
+end package
+
+package hpc-dev
+description "HPC Application Development cluster"
+depend SUNWcvs
+depend SUNWgmake
+depend SUNWj6cfg
+depend SUNWj6dev
+depend SUNWj6dmo
+depend SUNWj6dmx
+depend SUNWj6dvx
+depend SUNWj6man
+depend SUNWj6rt
+depend SUNWj6rtx
+depend SUNWmercurial
+depend SUNWsprot
+depend SUNWsvn
+depend clustertools
+depend sunstudio
+end package
+
+package amp-dev
+description "AMP Development cluster"
+depend SUNWPython
+depend SUNWapch22
+depend SUNWapch22d
+depend SUNWapch22m-dtrace
+depend SUNWapch22m-fcgid
+depend SUNWapch22m-jk
+depend SUNWapch22m-php5
+depend SUNWapch22m-security
+depend SUNWcvs
+depend SUNWcvs
+depend SUNWmemcached
+depend SUNWmercurial
+depend SUNWmercurial
+depend SUNWmysql-base
+depend SUNWmysql5
+depend SUNWphp524
+depend SUNWphp524-mysql
+depend SUNWphp524-pgsql
+depend SUNWphp524doc
+depend SUNWphp524man
+depend SUNWpython-twisted
+depend SUNWsquid
+depend SUNWsvn
+depend SUNWsvn
+depend SUNWtcat
+depend netbeans
+depend webstackui
+end package
+
+package ruby-dev
+description "Ruby Development cluster"
+depend SUNWcvs
+depend SUNWfirefox
+depend SUNWj6cfg
+depend SUNWj6dev
+depend SUNWj6dmo
+depend SUNWj6dmx
+depend SUNWj6dvx
+depend SUNWj6man
+depend SUNWj6rt
+depend SUNWj6rtx
+depend SUNWmemcached
+depend SUNWmercurial
+depend SUNWruby18
+depend SUNWsquid
+depend SUNWsvn
+depend netbeans
+end package

--- a/src/util/distro-import/unbundleds/Studio	Tue Apr 22 16:09:02 2008 -0700
+++ b/src/util/distro-import/unbundleds/Studio	Wed Apr 23 22:53:54 2008 -0700
@@ -80,6 +80,7 @@
 #import SPROtdemo
 import SPROudchk
 import SPROutool
+chattr_glob * edit path SUNWspro SunStudioExpress
 # manually added dependencies
 depend SUNWj6cfg
 depend SUNWj6dev