--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/145/common/developer:gnome:gettext	Thu Jul 29 09:43:49 2010 -0700
@@ -0,0 +1,13 @@
+package developer/gnome/gettext
+consolidation "gnome"
+classification "Development/GNOME and GTK+"
+import SUNWgnome-common-devel exclude usr/share/info/gettext.info
+depend_path /usr/bin/openjade
+depend_path /usr/bin/xsltproc
+end package
+
+package SUNWgnome-common-devel
+consolidation "gnome"
+renamed 133
+depend developer/gnome/gettext
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/145/common/file:mc	Thu Jul 29 09:43:49 2010 -0700
@@ -0,0 +1,13 @@
+package file/mc
+consolidation "sfw"
+classification "Desktop (GNOME)/File Managers"
+import SUNWgnu-mc
+version 4.7.3
+end package
+
+package SUNWgnu-mc
+consolidation "sfw"
+renamed 133
+depend file/mc
+version 4.6.1
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/145/common/runtime:dosbox	Thu Jul 29 09:43:49 2010 -0700
@@ -0,0 +1,13 @@
+package runtime/dosbox
+consolidation "sfw"
+classification "Applications/System Utilities"
+import SUNWdosbox
+version 0.74
+end package
+
+package SUNWdosbox
+consolidation "sfw"
+renamed 133
+depend runtime/dosbox
+version 0.73
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/145/common/web:java-servlet:tomcat	Thu Jul 29 09:43:49 2010 -0700
@@ -0,0 +1,31 @@
+package web/java-servlet/tomcat
+consolidation "sfw"
+classification "Web Services/Application and Web Servers"
+import SUNWtcatu
+import SUNWtcatr
+version 6.0.28
+
+chattr var/tomcat6/conf/catalina.policy \
+	original_name=SUNWtcat:var/tomcat6/conf/catalina.policy
+chattr var/tomcat6/conf/catalina.properties \
+	original_name=SUNWtcat:var/tomcat6/conf/catalina.properties
+chattr var/tomcat6/conf/context.xml \
+	original_name=SUNWtcat:var/tomcat6/conf/context.xml
+chattr var/tomcat6/conf/logging.properties \
+	original_name=SUNWtcat:var/tomcat6/conf/logging.properties
+chattr var/tomcat6/conf/server.xml \
+	original_name=SUNWtcat:var/tomcat6/conf/server.xml
+chattr var/tomcat6/conf/tomcat-users.xml \
+	original_name=SUNWtcat:var/tomcat6/conf/tomcat-users.xml
+chattr var/tomcat6/conf/web.xml \
+	original_name=SUNWtcat:var/tomcat6/conf/web.xml
+chattr var/tomcat6/webapps/ROOT/index.jsp \
+	original_name=SUNWtcat:var/tomcat6/webapps/ROOT/index.jsp
+end package
+
+package SUNWtcat
+consolidation "sfw"
+renamed 133
+depend web/java-servlet/tomcat
+version 6.0.20
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/145/common/web:java-servlet:tomcat:tomcat-examples	Thu Jul 29 09:43:49 2010 -0700
@@ -0,0 +1,16 @@
+package web/java-servlet/tomcat/tomcat-examples
+consolidation "sfw"
+classification "Web Services/Application and Web Servers"
+import SUNWtcat-examples
+version 6.0.28
+
+chattr var/tomcat6/webapps/ROOT/index.htm \
+	original_name=SUNWtcat-examples:var/tomcat6/webapps/ROOT/index.htm
+end package
+
+package SUNWtcat-examples
+consolidation "sfw"
+renamed 133
+depend web/java-servlet/tomcat/tomcat-examples
+version 6.0.20
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/145/i386/driver:graphics:nvidia	Thu Jul 29 09:43:49 2010 -0700
@@ -0,0 +1,427 @@
+package driver/graphics/nvidia
+consolidation "nvidia"
+classification "Drivers/Display"
+import NVDAgraphics
+import NVDAgraphicsr
+add link path=dev/nvidia0 \
+    target=fbs/nvidia0 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia1 \
+    target=fbs/nvidia1 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia2 \
+    target=fbs/nvidia2 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia3 \
+    target=fbs/nvidia3 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia4 \
+    target=fbs/nvidia4 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia5 \
+    target=fbs/nvidia5 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia6 \
+    target=fbs/nvidia6 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia7 \
+    target=fbs/nvidia7 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia8 \
+    target=fbs/nvidia8 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia9 \
+    target=fbs/nvidia9 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia10 \
+    target=fbs/nvidia10 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia11 \
+    target=fbs/nvidia11 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia12 \
+    target=fbs/nvidia12 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia13 \
+    target=fbs/nvidia13 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia14 \
+    target=fbs/nvidia14 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidia15 \
+    target=fbs/nvidia15 \
+    variant.opensolaris.zone=global
+add link path=dev/nvidiactl \
+    target=../devices/pseudo/nvidia@255:nvidiactl \
+    variant.opensolaris.zone=global
+
+add driver name=nvidia \
+    perms="* 0666 root root" \
+    alias="pci10de,40" \
+    alias="pci10de,41" \
+    alias="pci10de,42" \
+    alias="pci10de,43" \
+    alias="pci10de,44" \
+    alias="pci10de,45" \
+    alias="pci10de,46" \
+    alias="pci10de,47" \
+    alias="pci10de,48" \
+    alias="pci10de,4e" \
+    alias="pci10de,90" \
+    alias="pci10de,91" \
+    alias="pci10de,92" \
+    alias="pci10de,93" \
+    alias="pci10de,95" \
+    alias="pci10de,98" \
+    alias="pci10de,99" \
+    alias="pci10de,9d" \
+    alias="pci10de,c0" \
+    alias="pci10de,c1" \
+    alias="pci10de,c2" \
+    alias="pci10de,c3" \
+    alias="pci10de,c8" \
+    alias="pci10de,c9" \
+    alias="pci10de,cc" \
+    alias="pci10de,cd" \
+    alias="pci10de,ce" \
+    alias="pci10de,f1" \
+    alias="pci10de,f2" \
+    alias="pci10de,f3" \
+    alias="pci10de,f4" \
+    alias="pci10de,f5" \
+    alias="pci10de,f6" \
+    alias="pci10de,f8" \
+    alias="pci10de,f9" \
+    alias="pci10de,140" \
+    alias="pci10de,141" \
+    alias="pci10de,142" \
+    alias="pci10de,143" \
+    alias="pci10de,144" \
+    alias="pci10de,145" \
+    alias="pci10de,146" \
+    alias="pci10de,147" \
+    alias="pci10de,148" \
+    alias="pci10de,149" \
+    alias="pci10de,14a" \
+    alias="pci10de,14c" \
+    alias="pci10de,14d" \
+    alias="pci10de,14e" \
+    alias="pci10de,14f" \
+    alias="pci10de,160" \
+    alias="pci10de,161" \
+    alias="pci10de,162" \
+    alias="pci10de,163" \
+    alias="pci10de,164" \
+    alias="pci10de,165" \
+    alias="pci10de,166" \
+    alias="pci10de,167" \
+    alias="pciex10de,168" \
+    alias="pci10de,169" \
+    alias="pci10de,16a" \
+    alias="pci10de,191" \
+    alias="pci10de,193" \
+    alias="pci10de,194" \
+    alias="pci10de,197" \
+    alias="pci10de,19d" \
+    alias="pci10de,19e" \
+    alias="pci10de,1d0" \
+    alias="pci10de,1d1" \
+    alias="pci10de,1d2" \
+    alias="pci10de,1d3" \
+    alias="pci10de,1d6" \
+    alias="pci10de,1d7" \
+    alias="pci10de,1d8" \
+    alias="pciex10de,1da" \
+    alias="pci10de,1db" \
+    alias="pci10de,1dc" \
+    alias="pci10de,1dd" \
+    alias="pci10de,1de" \
+    alias="pci10de,1df" \
+    alias="pciex10de,215" \
+    alias="pciex10de,218" \
+    alias="pci10de,221" \
+    alias="pci10de,222" \
+    alias="pci10de,240" \
+    alias="pci10de,241" \
+    alias="pci10de,242" \
+    alias="pci10de,244" \
+    alias="pci10de,245" \
+    alias="pci10de,247" \
+    alias="pci10de,290" \
+    alias="pci10de,291" \
+    alias="pci10de,292" \
+    alias="pci10de,293" \
+    alias="pci10de,294" \
+    alias="pci10de,295" \
+    alias="pci10de,297" \
+    alias="pci10de,298" \
+    alias="pci10de,299" \
+    alias="pci10de,29a" \
+    alias="pci10de,29b" \
+    alias="pci10de,29c" \
+    alias="pci10de,29d" \
+    alias="pci10de,29e" \
+    alias="pci10de,29f" \
+    alias="pci10de,2e0" \
+    alias="pci10de,2e1" \
+    alias="pci10de,2e2" \
+    alias="pci10de,2e3" \
+    alias="pci10de,2e4" \
+    alias="pci10de,38b" \
+    alias="pci10de,390" \
+    alias="pci10de,391" \
+    alias="pci10de,392" \
+    alias="pci10de,393" \
+    alias="pci10de,394" \
+    alias="pci10de,395" \
+    alias="pci10de,397" \
+    alias="pci10de,398" \
+    alias="pci10de,399" \
+    alias="pci10de,39c" \
+    alias="pci10de,39e" \
+    alias="pci10de,3d0" \
+    alias="pci10de,3d1" \
+    alias="pci10de,3d2" \
+    alias="pci10de,3d5" \
+    alias="pci10de,3d6" \
+    alias="pci10de,400" \
+    alias="pci10de,401" \
+    alias="pci10de,402" \
+    alias="pci10de,403" \
+    alias="pci10de,404" \
+    alias="pci10de,405" \
+    alias="pci10de,406" \
+    alias="pci10de,407" \
+    alias="pci10de,408" \
+    alias="pci10de,409" \
+    alias="pci10de,40a" \
+    alias="pci10de,40b" \
+    alias="pci10de,40c" \
+    alias="pci10de,40d" \
+    alias="pci10de,40e" \
+    alias="pci10de,40f" \
+    alias="pci10de,410" \
+    alias="pci10de,420" \
+    alias="pci10de,421" \
+    alias="pci10de,422" \
+    alias="pci10de,423" \
+    alias="pci10de,424" \
+    alias="pci10de,425" \
+    alias="pci10de,426" \
+    alias="pci10de,427" \
+    alias="pci10de,428" \
+    alias="pci10de,429" \
+    alias="pci10de,42a" \
+    alias="pci10de,42b" \
+    alias="pci10de,42c" \
+    alias="pci10de,42d" \
+    alias="pci10de,42e" \
+    alias="pci10de,42f" \
+    alias="pci10de,531" \
+    alias="pci10de,533" \
+    alias="pci10de,53a" \
+    alias="pci10de,53b" \
+    alias="pci10de,53e" \
+    alias="pci10de,5e0" \
+    alias="pci10de,5e1" \
+    alias="pci10de,5e2" \
+    alias="pci10de,5e3" \
+    alias="pci10de,5e6" \
+    alias="pci10de,5e7" \
+    alias="pci10de,5ea" \
+    alias="pci10de,5eb" \
+    alias="pci10de,5ed" \
+    alias="pci10de,5f8" \
+    alias="pci10de,5f9" \
+    alias="pci10de,5fd" \
+    alias="pci10de,5fe" \
+    alias="pci10de,5ff" \
+    alias="pci10de,600" \
+    alias="pci10de,601" \
+    alias="pci10de,602" \
+    alias="pci10de,603" \
+    alias="pci10de,604" \
+    alias="pci10de,605" \
+    alias="pci10de,606" \
+    alias="pci10de,607" \
+    alias="pci10de,608" \
+    alias="pci10de,609" \
+    alias="pci10de,60a" \
+    alias="pci10de,60b" \
+    alias="pci10de,60c" \
+    alias="pci10de,60d" \
+    alias="pci10de,60f" \
+    alias="pci10de,610" \
+    alias="pci10de,611" \
+    alias="pci10de,612" \
+    alias="pci10de,613" \
+    alias="pci10de,614" \
+    alias="pci10de,615" \
+    alias="pci10de,617" \
+    alias="pci10de,618" \
+    alias="pci10de,619" \
+    alias="pci10de,61a" \
+    alias="pci10de,61b" \
+    alias="pci10de,61c" \
+    alias="pci10de,61d" \
+    alias="pci10de,61e" \
+    alias="pci10de,61f" \
+    alias="pci10de,622" \
+    alias="pci10de,623" \
+    alias="pci10de,625" \
+    alias="pci10de,626" \
+    alias="pci10de,627" \
+    alias="pci10de,628" \
+    alias="pci10de,62a" \
+    alias="pci10de,62b" \
+    alias="pci10de,62c" \
+    alias="pci10de,62d" \
+    alias="pci10de,62e" \
+    alias="pci10de,631" \
+    alias="pci10de,632" \
+    alias="pci10de,635" \
+    alias="pci10de,637" \
+    alias="pci10de,638" \
+    alias="pci10de,63a" \
+    alias="pci10de,640" \
+    alias="pci10de,641" \
+    alias="pci10de,643" \
+    alias="pci10de,644" \
+    alias="pci10de,645" \
+    alias="pci10de,646" \
+    alias="pci10de,647" \
+    alias="pci10de,648" \
+    alias="pci10de,649" \
+    alias="pci10de,64a" \
+    alias="pci10de,64b" \
+    alias="pci10de,64c" \
+    alias="pci10de,651" \
+    alias="pci10de,652" \
+    alias="pci10de,653" \
+    alias="pci10de,654" \
+    alias="pci10de,656" \
+    alias="pci10de,658" \
+    alias="pci10de,659" \
+    alias="pci10de,65a" \
+    alias="pci10de,65b" \
+    alias="pci10de,65c" \
+    alias="pci10de,6c0" \
+    alias="pci10de,6c4" \
+    alias="pci10de,6cd" \
+    alias="pci10de,6d1" \
+    alias="pci10de,6de" \
+    alias="pci10de,6e0" \
+    alias="pci10de,6e1" \
+    alias="pci10de,6e2" \
+    alias="pci10de,6e3" \
+    alias="pci10de,6e4" \
+    alias="pci10de,6e5" \
+    alias="pci10de,6e6" \
+    alias="pci10de,6e7" \
+    alias="pci10de,6e8" \
+    alias="pci10de,6e9" \
+    alias="pci10de,6ea" \
+    alias="pci10de,6eb" \
+    alias="pci10de,6ec" \
+    alias="pci10de,6ef" \
+    alias="pci10de,6f1" \
+    alias="pci10de,6f8" \
+    alias="pci10de,6f9" \
+    alias="pci10de,6fa" \
+    alias="pci10de,6fb" \
+    alias="pci10de,6fd" \
+    alias="pci10de,6ff" \
+    alias="pci10de,7e0" \
+    alias="pci10de,7e1" \
+    alias="pci10de,7e2" \
+    alias="pci10de,7e3" \
+    alias="pci10de,7e5" \
+    alias="pci10de,844" \
+    alias="pci10de,845" \
+    alias="pci10de,846" \
+    alias="pci10de,847" \
+    alias="pci10de,848" \
+    alias="pci10de,849" \
+    alias="pci10de,84a" \
+    alias="pci10de,84b" \
+    alias="pci10de,84c" \
+    alias="pci10de,84d" \
+    alias="pci10de,84f" \
+    alias="pci10de,860" \
+    alias="pci10de,861" \
+    alias="pci10de,862" \
+    alias="pci10de,863" \
+    alias="pci10de,864" \
+    alias="pci10de,865" \
+    alias="pci10de,866" \
+    alias="pci10de,867" \
+    alias="pci10de,868" \
+    alias="pci10de,86a" \
+    alias="pci10de,86c" \
+    alias="pci10de,86d" \
+    alias="pci10de,86e" \
+    alias="pci10de,86f" \
+    alias="pci10de,870" \
+    alias="pci10de,871" \
+    alias="pci10de,872" \
+    alias="pci10de,873" \
+    alias="pci10de,874" \
+    alias="pci10de,876" \
+    alias="pci10de,87a" \
+    alias="pci10de,87d" \
+    alias="pci10de,87e" \
+    alias="pci10de,87f" \
+    alias="pci10de,a20" \
+    alias="pci10de,a23" \
+    alias="pci10de,a28" \
+    alias="pci10de,a29" \
+    alias="pci10de,a2a" \
+    alias="pci10de,a2b" \
+    alias="pci10de,a2c" \
+    alias="pci10de,a2d" \
+    alias="pci10de,a34" \
+    alias="pci10de,a35" \
+    alias="pci10de,a3c" \
+    alias="pci10de,a60" \
+    alias="pci10de,a62" \
+    alias="pci10de,a63" \
+    alias="pci10de,a64" \
+    alias="pci10de,a65" \
+    alias="pci10de,a66" \
+    alias="pci10de,a68" \
+    alias="pci10de,a69" \
+    alias="pci10de,a6a" \
+    alias="pci10de,a6c" \
+    alias="pci10de,a6e" \
+    alias="pci10de,a6f" \
+    alias="pci10de,a70" \
+    alias="pci10de,a71" \
+    alias="pci10de,a72" \
+    alias="pci10de,a73" \
+    alias="pci10de,a74" \
+    alias="pci10de,a75" \
+    alias="pci10de,a78" \
+    alias="pci10de,a7c" \
+    alias="pci10de,ca0" \
+    alias="pci10de,ca2" \
+    alias="pci10de,ca3" \
+    alias="pci10de,ca4" \
+    alias="pci10de,ca7" \
+    alias="pci10de,ca8" \
+    alias="pci10de,ca9" \
+    alias="pci10de,caf" \
+    alias="pci10de,cb0" \
+    alias="pci10de,cb1" \
+    alias="pci10de,cbc"
+
+# Depends on ogl-select service to create links at boot
+depend_path /lib/svc/manifest/application/opengl/ogl-select.xml
+version 0.256.35
+end package
+
+package NVDAgraphics
+consolidation "nvidia"
+renamed 144
+depend driver/graphics/nvidia
+version 0.190.53
+end package

--- a/src/util/distro-import/Makefile	Wed Jul 28 08:56:45 2010 +0100
+++ b/src/util/distro-import/Makefile	Thu Jul 29 09:43:49 2010 -0700
@@ -178,6 +178,7 @@
 GLOBAL_CHATTRS_142 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_143 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_144 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS_145 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
@@ -257,6 +258,7 @@
 ELIDED_FILES_142 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_143 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_144 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_145 = $(ELIDED_FILES_BASE)
 ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
 
 #
@@ -356,6 +358,7 @@
 CACHED_FILES_142 =
 CACHED_FILES_143 =
 CACHED_FILES_144 =
+CACHED_FILES_145 =
 
 CACHED_FILES = $(CACHED_FILES_$(BUILDID))
 
@@ -483,6 +486,7 @@
 FIX_FILES_142 = $(FIX_FILES_136)
 FIX_FILES_143 = $(FIX_FILES_136)
 FIX_FILES_144 = $(FIX_FILES_136)
+FIX_FILES_145 = $(FIX_FILES_136)
 FIX_FILES = $(FIX_FILES_$(BUILDID))
 
 JDKFILES = LICENSE README.html
@@ -574,7 +578,8 @@
 	141			\
 	142			\
 	143			\
-	144
+	144			\
+	145
 
 #
 # Starting in build 80, filelist.ramdisk began moving between various
@@ -587,7 +592,7 @@
 FILELIST_RAMDISK_PKG_72		= SUNWcakr.i
 FILELIST_RAMDISK_PKG_71		= SUNWcakr.i
 
-default:	144/slim_import
+default:	145/slim_import
 
 cluster.import:	$(WOS_PKGS)/.clustertoc Makefile
 	./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
@@ -799,6 +804,7 @@
 INCLUDE_PATH_142 = 142:$(INCLUDE_PATH_141)
 INCLUDE_PATH_143 = 143:$(INCLUDE_PATH_142)
 INCLUDE_PATH_144 = 144:$(INCLUDE_PATH_143)
+INCLUDE_PATH_145 = 145:$(INCLUDE_PATH_144)
 
 import:	cluster.import $(FIX_FILES:%=$(BUILDID)/%)
 	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \