--- a/components/open-fabrics/open-fabrics.p5m	Fri Sep 07 12:05:40 2012 -0700
+++ b/components/open-fabrics/open-fabrics.p5m	Tue Sep 11 00:00:29 2012 -0700
@@ -112,17 +112,17 @@
 file path=usr/bin/ucmatose
 file path=usr/bin/udaddy
 file path=usr/include/infiniband/arch.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/driver.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/kern-abi.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/mad.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/mad_osd.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/ofa_solaris.h variant.opensolaris.zone=global
+file path=usr/include/infiniband/driver.h
+file path=usr/include/infiniband/kern-abi.h
+file path=usr/include/infiniband/mad.h
+file path=usr/include/infiniband/mad_osd.h
+file path=usr/include/infiniband/ofa_solaris.h
 file path=usr/include/infiniband/sa.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/umad.h variant.opensolaris.zone=global
-file path=usr/include/infiniband/verbs.h variant.opensolaris.zone=global
+file path=usr/include/infiniband/umad.h
+file path=usr/include/infiniband/verbs.h
 file path=usr/include/rdma/rdma_cma.h variant.opensolaris.zone=global
 file path=usr/include/rdma/rdma_verbs.h variant.opensolaris.zone=global
-file path=usr/lib/$(MACH64)/libibmad.so.5.1.2 variant.opensolaris.zone=global
+file path=usr/lib/$(MACH64)/libibmad.so.5.1.2
 file path=usr/lib/$(MACH64)/libibumad.so.3.0.2
 file path=usr/lib/$(MACH64)/libibverbs.so.1.0.0
 file path=usr/lib/$(MACH64)/libmlx4-rdmav2.so
@@ -174,7 +174,7 @@
 file path=usr/lib/ibdm1.5.7/pkgIndex.tcl variant.opensolaris.zone=global
 file path=usr/lib/ibis1.5.7/libibis.so.1.5.7 variant.opensolaris.zone=global
 file path=usr/lib/ibis1.5.7/pkgIndex.tcl variant.opensolaris.zone=global
-file path=usr/lib/libibmad.so.5.1.2 variant.opensolaris.zone=global
+file path=usr/lib/libibmad.so.5.1.2
 file path=usr/lib/libibnetdisc.so.5.0.1 variant.opensolaris.zone=global
 file path=usr/lib/libibumad.so.3.0.2
 file path=usr/lib/libibverbs.so.1.0.0
@@ -376,8 +376,8 @@
 file path=usr/share/man/man4/libsdp.conf.4 variant.opensolaris.zone=global
 file path=usr/share/man/man7/rdma_cm.7 variant.opensolaris.zone=global
 file path=usr/share/man/man7/verbs.7 variant.opensolaris.zone=global
-link path=usr/lib/$(MACH64)/libibmad.so.5 target=libibmad.so.5.1.2 variant.opensolaris.zone=global
-link path=usr/lib/$(MACH64)/libibmad.so target=libibmad.so.5.1.2 variant.opensolaris.zone=global
+link path=usr/lib/$(MACH64)/libibmad.so.5 target=libibmad.so.5.1.2
+link path=usr/lib/$(MACH64)/libibmad.so target=libibmad.so.5.1.2
 link path=usr/lib/$(MACH64)/libibumad.so.3 target=libibumad.so.3.0.2
 link path=usr/lib/$(MACH64)/libibumad.so target=libibumad.so.3.0.2
 link path=usr/lib/$(MACH64)/libibverbs.so target=libibverbs.so.1.0.0 variant.opensolaris.zone=global
@@ -389,8 +389,8 @@
 link path=usr/lib/$(MACH64)/libosmvendor.so.3 target=libosmvendor.so.3.0.5 variant.opensolaris.zone=global
 link path=usr/lib/$(MACH64)/librdmacm.so target=librdmacm.so.1.0.0 variant.opensolaris.zone=global
 link path=usr/lib/$(MACH64)/librdmacm.so.1 target=librdmacm.so.1.0.0
-link path=usr/lib/libibmad.so.5 target=libibmad.so.5.1.2 variant.opensolaris.zone=global
-link path=usr/lib/libibmad.so target=libibmad.so.5.1.2 variant.opensolaris.zone=global
+link path=usr/lib/libibmad.so.5 target=libibmad.so.5.1.2
+link path=usr/lib/libibmad.so target=libibmad.so.5.1.2
 link path=usr/lib/libibnetdisc.so.5 target=libibnetdisc.so.5.0.1 variant.opensolaris.zone=global
 link path=usr/lib/libibumad.so.3 target=libibumad.so.3.0.2
 link path=usr/lib/libibumad.so target=libibumad.so.3.0.2