--- a/usr/src/Targetdirs	Tue Apr 06 16:00:14 2010 +0300
+++ b/usr/src/Targetdirs	Sat Apr 17 01:03:10 2010 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Targetdirs	1.249	10/02/19 SMI"
+# ident	"@(#)Targetdirs	1.251	10/04/12 SMI"
 #
 
 #
@@ -118,7 +117,6 @@
 	$($(MACH)_ROOT.BIN) \
 	/etc/sfw \
 	/etc/sfw/private \
-	/etc/sfw/mysql \
 	/etc/webmin \
 	/etc/apache \
 	/etc/apache2 \
@@ -890,8 +888,6 @@
 	/usr/share/doc/aalib \
 	/usr/share/doc/ant \
 	/usr/share/doc/antlr-2.7.7 \
-	/usr/share/doc/antlr \
-	/usr/share/doc/asm \
 	/usr/share/doc/automake \
 	/usr/share/doc/awstats \
 	/usr/share/doc/awstats/images \
@@ -903,15 +899,12 @@
 	/usr/share/doc/confuse/examples \
 	/usr/share/doc/confuse/examples/.deps \
 	/usr/share/doc/confuse/examples/.libs \
-	/usr/share/doc/cglib \
 	/usr/share/doc/clisp\
 	/usr/share/doc/clisp/doc\
 	/usr/share/doc/commons-collections \
 	/usr/share/doc/curl \
 	/usr/share/doc/curl/html \
-	/usr/share/doc/dom4j \
 	/usr/share/doc/doxygen-1.5.7.1 \
-	/usr/share/doc/drools \
 	/usr/share/doc/elinks \
 	/usr/share/doc/erlang \
 	/usr/share/doc/epydoc \
@@ -945,14 +938,6 @@
 	/usr/share/doc/iozone \
 	/usr/share/doc/idzebra-2.0 \
 	/usr/share/doc/idzebra-2.0/common \
-	/usr/share/doc/jdom \
-	/usr/share/doc/janino \
-	/usr/share/doc/jarjar \
-	/usr/share/doc/jaxen-core \
-	/usr/share/doc/jettison \
-	/usr/share/doc/jexcelapi \
-	/usr/share/doc/jdt-core \
-	/usr/share/doc/joda-time \
 	/usr/share/doc/jrexx \
 	/usr/share/doc/lcms \
 	/usr/share/doc/lcms/html \
@@ -971,10 +956,8 @@
 	/usr/share/doc/libxmlrpc-c3-dev/examples/conf/abyss_root \
 	/usr/share/doc/libxmlrpc-c3-dev/examples/conf/abyss_root/conf \
 	/usr/share/doc/libxmlrpc-c3-dev/examples/conf/abyss_root/htdocs \
-	/usr/share/doc/log4j \
 	/usr/share/doc/mpfr \
 	/usr/share/doc/mpfr/html \
-	/usr/share/doc/mvel \
 	/usr/share/doc/neon-0.29.0/html \
 	/usr/share/doc/ntp \
 	/usr/share/doc/ntp/description_files \
@@ -999,12 +982,10 @@
 	/usr/share/doc/privoxy/developer-manual \
 	/usr/share/doc/privoxy/faq \
 	/usr/share/doc/privoxy/user-manual \
-	/usr/share/doc/pullparser \
 	/usr/share/doc/pyOpenSSL \
 	/usr/share/doc/qdox \
 	/usr/share/doc/quilt-0.47 \
 	/usr/share/doc/rdiff-backup-1.2.1 \
-	/usr/share/doc/relaxngDatatype \
 	/usr/share/doc/saaj \
 	/usr/share/doc/snack-2.2.10 \
 	/usr/share/doc/snack-2.2.10/examples \
@@ -1014,17 +995,12 @@
 	/usr/share/doc/stdcxx4/html \
 	/usr/share/doc/stdcxx4/html/stdlibref \
 	/usr/share/doc/stdcxx4/html/stdlibug \
-	/usr/share/doc/stringtemplate \
 	/usr/share/doc/sysbench \
 	/usr/share/doc/tidy \
 	/usr/share/doc/tidy/html \
 	/usr/share/doc/tls-1.6 \
 	/usr/share/doc/tls-1.6/html \
 	/usr/share/doc/trove \
-	/usr/share/doc/xom \
-	/usr/share/doc/xpp3-min \
-	/usr/share/doc/xsdlib \
-	/usr/share/doc/xstream \
 	/usr/share/doc/yaz \
 	/usr/share/doc/yaz/common \
 	/usr/share/emacs \
@@ -1353,38 +1329,6 @@
 	/usr/sfw/share/serweb/html/user_interface \
 	/usr/sfw/share/serweb/html/user_interface/reg \
 	/usr/sfw/share/serweb/phplib \
-	/usr/sfw/lib/mysql \
-	/usr/sfw/mysql \
-	/usr/sfw/mysql/mysql-test \
-	/usr/sfw/mysql/mysql-test/t \
-	/usr/sfw/mysql/mysql-test/r \
-	/usr/sfw/mysql/mysql-test/include \
-	/usr/sfw/mysql/mysql-test/std_data \
-	/usr/sfw/include/mysql \
-	/usr/sfw/share/mysql \
-	/usr/sfw/share/mysql/charsets \
-	/usr/sfw/share/mysql/czech \
-	/usr/sfw/share/mysql/dutch \
-	/usr/sfw/share/mysql/danish \
-	/usr/sfw/share/mysql/english \
-	/usr/sfw/share/mysql/estonian \
-	/usr/sfw/share/mysql/french \
-	/usr/sfw/share/mysql/german \
-	/usr/sfw/share/mysql/greek \
-	/usr/sfw/share/mysql/hungarian \
-	/usr/sfw/share/mysql/italian \
-	/usr/sfw/share/mysql/japanese \
-	/usr/sfw/share/mysql/korean \
-	/usr/sfw/share/mysql/norwegian \
-	/usr/sfw/share/mysql/norwegian-ny \
-	/usr/sfw/share/mysql/polish \
-	/usr/sfw/share/mysql/portuguese \
-	/usr/sfw/share/mysql/romanian \
-	/usr/sfw/share/mysql/russian \
-	/usr/sfw/share/mysql/slovak \
-	/usr/sfw/share/mysql/spanish \
-	/usr/sfw/share/mysql/swedish \
-	/usr/sfw/share/mysql/ukrainian \
 	/usr/pgadmin3 \
 	/usr/pgadmin3/bin \
 	/usr/pgadmin3/share \