--- a/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Fri Apr 05 15:35:37 2013 -0700
+++ b/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Tue Apr 09 10:37:15 2013 -0700
@@ -36,34 +36,18 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=etc/openssl/certs group=sys
 # Basic directories, links, and a configuration file.
-dir path=etc
-dir path=etc/openssl group=sys
 file path=etc/openssl/openssl.cnf group=sys mode=0644 original_name=SUNWopenssl:etc/sfw/openssl/openssl.cnf preserve=true
-dir path=etc/openssl/certs group=sys
 dir path=etc/openssl/private group=sys mode=0700
-dir path=etc/sfw
 link path=etc/sfw/openssl target=../openssl
-dir path=lib
-dir path=lib/$(MACH64)
-dir path=lib/openssl
-dir path=lib/openssl/engines
 link path=lib/openssl/engines/64 target=$(MACH64)
-dir path=lib/openssl/engines/$(MACH64)
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
 # Commands.
-dir path=usr
-dir path=usr/bin
 file $(MACH64)/apps/openssl path=usr/bin/openssl
 file etc/openssl/misc/CA.pl path=usr/bin/CA.pl
-dir path=usr/sfw
-dir path=usr/sfw/bin
 link path=usr/sfw/bin/openssl target=../../bin/openssl
-dir path=usr/bin/$(MACH32)
 file $(MACH32)/apps/openssl path=usr/bin/$(MACH32)/openssl
-dir path=usr/bin/$(MACH64)
-dir path=usr/sfw/bin/$(MACH64)
 link path=usr/bin/$(MACH64)/openssl target=../openssl
 link path=usr/sfw/bin/$(MACH64)/openssl target=../../../bin/openssl
 # 32 bit libraries, lint libraries, and engines.
@@ -97,10 +81,6 @@
 link path=usr/lib/$(MACH64)/libssl.so target=../../../lib/$(MACH64)/libssl.so
 link path=usr/lib/$(MACH64)/libssl.so.1.0.0 target=../../../lib/$(MACH64)/libssl.so.1.0.0
 # Header and pkg files.
-dir path=usr/include
-dir path=usr/include/openssl
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/$(MACH64)/pkgconfig
 file $(MACH32)/openssl.pc path=usr/lib/pkgconfig/openssl.pc
 file $(MACH64)/openssl.pc path=usr/lib/$(MACH64)/pkgconfig/openssl.pc
 file path=usr/include/openssl/aes.h
@@ -174,21 +154,11 @@
 file path=usr/include/openssl/x509_vfy.h
 file path=usr/include/openssl/x509v3.h
 # Wanboot static standalone openssl binaries
-dir path=/lib
-dir path=/lib/openssl
-dir path=/lib/openssl/wanboot
-dir path=/lib/openssl/wanboot/$(MACH64)
 file path=/lib/openssl/wanboot/$(MACH64)/wanboot-openssl.o \
     variant.arch=sparc \
     pkg.depend.bypass-generate=.* \
     pkg.linted.userland.action001=true
 # Manual pages.
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1openssl
-dir path=usr/share/man/man3openssl
-dir path=usr/share/man/man5openssl
-dir path=usr/share/man/man7openssl
 file path=usr/share/man/man1openssl/CA.pl.1openssl
 file path=usr/share/man/man1openssl/asn1parse.1openssl
 file path=usr/share/man/man1openssl/ca.1openssl