--- a/usr/src/Targetdirs	Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/Targetdirs	Fri Jul 15 23:48:44 2011 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Targetdirs	1.272	11/06/02 SMI"
+# ident	"@(#)Targetdirs	1.273	11/06/15 SMI"
 #
 
 #
@@ -65,11 +65,7 @@
 	/etc/security \
 	/etc/security/auth_attr.d \
 	/etc/security/exec_attr.d \
-	/etc/security/pam_pkcs11 \
-	/etc/security/pam_pkcs11/cacerts \
-	/etc/security/pam_pkcs11/crls \
 	/etc/security/prof_attr.d \
-	/etc/stunnel \
 	/etc/mysql	\
 	/etc/mysql/5.0	\
 	/etc/mysql/5.1	\
@@ -85,8 +81,7 @@
 	/lib/svc/manifest/network \
 	/lib/svc/manifest/network/ldap \
 	/lib/svc/manifest/network/loadbalancer \
-	/lib/svc/manifest/network/routing \
-	/lib/svc/manifest/network/ssl
+	/lib/svc/manifest/network/routing
 
 # Note: Do not add subdirs (other than logs, proxy and libexec) 
 # of /var/apache2/2.2 to the list.  The apache2 installation will 
@@ -158,7 +153,6 @@
 	/usr/include/openldap \
 	/usr/include/sane \
 	/usr/include/stdcxx4 \
-	/usr/include/tidy \
 	/usr/include/xmlrpc-c \
 	/usr/include/yaz \
 	/usr/jruby \
@@ -186,14 +180,12 @@
 	/usr/lib/openldap/bin/$(MACH64) \
 	/usr/lib/nethack \
 	/usr/lib/openusb_backend \
-	/usr/lib/pam_pkcs11 \
 	/usr/lib/pkgconfig \
 	/usr/lib/python2.6 \
 	/usr/lib/python2.6/vendor-packages \
 	/usr/lib/python2.6/vendor-packages/rdiff_backup \
 	/usr/lib/quilt \
 	/usr/lib/sane \
-	/usr/lib/security \
 	/usr/lib/tcl8.4 \
 	/usr/lib/tcl8.4/snack2.2.10 \
 	/usr/lib/tcl8.4/tls1.6 \
@@ -521,8 +513,6 @@
 	/usr/share/doc/jrexx \
 	/usr/share/doc/librsync-0.9.7 \
 	/usr/share/doc/librsync-0.9.7/html \
-	/usr/share/doc/libsndfile \
-	/usr/share/doc/libsndfile/html \
 	/usr/share/doc/libxmlrpc-c3-dev \
 	/usr/share/doc/libxmlrpc-c3-dev/examples \
 	/usr/share/doc/libxmlrpc-c3-dev/examples/conf \
@@ -533,7 +523,6 @@
 	/usr/share/doc/openldap \
 	/usr/share/doc/openldap/admin24 \
 	/usr/share/doc/openldap/images \
-	/usr/share/doc/pam_pkcs11 \
 	/usr/share/doc/pen \
 	/usr/share/doc/privoxy \
 	/usr/share/doc/privoxy/developer-manual \
@@ -552,8 +541,6 @@
 	/usr/share/doc/stdcxx4/html/stdlibref \
 	/usr/share/doc/stdcxx4/html/stdlibug \
 	/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 \
@@ -612,9 +599,6 @@
 	/usr/share/man/man7openssl \
 	/usr/share/man/man8 \
 	/usr/share/man/man8oldap \
-	/usr/share/octave \
-	/usr/share/octave/site \
-	/usr/share/octave/site/m \
 	/usr/share/pixmaps \
 	/usr/share/quilt \
 	/usr/share/quilt/compat \
@@ -675,8 +659,6 @@
 	/usr/bin/$(MACH64) \
 	/usr/lib/$(MACH64) \
 	/usr/lib/$(MACH64)/pkgconfig \
-	/usr/lib/pam_pkcs11/$(MACH64) \
-	/usr/lib/security/$(MACH64) \
 	/usr/sfw/bin/$(MACH64) \
 	/usr/apr/1.3/bin/$(MACH64) \
 	/usr/apr/1.3/build/$(MACH64) \