diff -r 3ed3d241c1c6 -r b1282e88c680 usr/src/cmd/tomcat/Solaris/build.properties.sed
--- a/usr/src/cmd/tomcat/Solaris/build.properties.sed	Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/cmd/tomcat/Solaris/build.properties.sed	Tue Jan 31 18:34:04 2012 +0000
@@ -34,9 +34,9 @@
 /^base-xerces/s/=.*/=file:\/\/${base.path}\/..\//
 
 # remove directory path so that only file name will remain
-/\${base-commons\.loc}/s/\/.*\//\//g
-/\${base-logging\.loc}/s/\/.*\//\//g
-/\${base-struts\.loc}/s/\/.*\//\//g
-/\${base-sf\.loc}/s/\/.*\//\//g
-/\${base-tomcat\.loc}/s/\/.*\//\//g
-/\${base-xerces\.loc}/s/\/.*\//\//g
+/\${base-commons\.loc\.[12]}/s/\/.*\//\//g
+/\${base-logging\.loc}\.[12]/s/\/.*\//\//g
+/\${base-struts\.loc\.[12]}/s/\/.*\//\//g
+/\${base-sf\.loc\.[12]}/s/\/.*\//\//g
+/\${base-tomcat\.loc\.[12]}/s/\/.*\//\//g
+/\${base-xerces\.loc\.[12]}/s/\/.*\//\//g