--- a/components/open-fabrics/open-fabrics.p5m	Fri Apr 05 15:35:37 2013 -0700
+++ b/components/open-fabrics/open-fabrics.p5m	Tue Apr 09 10:37:15 2013 -0700
@@ -46,39 +46,14 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=variant.opensolaris.zone value=global value=nonglobal
 
+# This package name has known conflicts with other packages in the WOS
+set pkg.linted.pkglint.manifest004=true
+
+
 legacy pkg=SUNWofusr \
     name="Oracle Solaris OpenFabrics userland libraries and applications" \
     desc="Oracle Solaris OpenFabrics userland libraries and applications"
 
-dir path=etc
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH64)
-dir path=usr/include
-dir path=usr/include/infiniband
-dir path=usr/include/rdma
-dir path=usr/lib
-dir path=usr/lib/amd64
-dir path=usr/lib/ibdiagnet1.5.7 
-dir path=usr/lib/ibdm1.5.7 
-dir path=usr/lib/ibdm1.5.7/ibnl 
-dir path=usr/lib/ibis1.5.7 
-dir path=usr/lib/secure
-dir path=usr/lib/secure/$(MACH64)
-dir path=usr/lib/$(MACH64)
-dir path=usr/sbin
-dir path=usr/sbin/$(MACH64)
-dir path=usr/share
-dir path=usr/share/libibverbs.d
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man1m 
-dir path=usr/share/man/man3 
-dir path=usr/share/man/man3lib 
-dir path=usr/share/man/man4 
-dir path=usr/share/man/man7 
-dir path=usr/perl5/site_perl/5.12/i86pc-solaris-64int variant.arch=i386 
-dir path=usr/perl5/site_perl/5.12/sun4-solaris-64int variant.arch=sparc 
 file path=usr/perl5/site_perl/5.12/i86pc-solaris-64int/IBswcountlimits.pm variant.arch=i386 group=root mode=0444 
 file path=usr/perl5/site_perl/5.12/sun4-solaris-64int/IBswcountlimits.pm variant.arch=sparc group=root mode=0444 
 file path=etc/libsdp.conf mode=0644 preserve=renameold