--- a/components/hwdata/hwdata.p5m	Thu Mar 14 08:40:47 2013 -0700
+++ b/components/hwdata/hwdata.p5m	Thu Mar 14 11:55:18 2013 -0700
@@ -42,11 +42,11 @@
 dir path=usr/share/hwdata group=sys
 file pci.ids path=usr/share/hwdata/pci.ids
 file usb.ids path=usr/share/hwdata/usb.ids
-license pci.ids.license license=BSD \
+license pci.ids.license license="BSD (pci.ids)" \
     com.oracle.info.description="the pci.ids list of PCI device & vendor IDs" \
     com.oracle.info.name=pci.ids com.oracle.info.tpno=7530 \
     com.oracle.info.version=$(COMPONENT_VERSION_pci.ids)
-license usb.ids.license license=BSD \
+license usb.ids.license license="BSD (usb.ids)" \
     com.oracle.info.description="the usb.ids list of USB device & vendor IDs" \
     com.oracle.info.name=usb.ids com.oracle.info.tpno=7831 \
     com.oracle.info.version=$(COMPONENT_VERSION_usb.ids)

--- a/components/open-fabrics/open-fabrics.p5m	Thu Mar 14 08:40:47 2013 -0700
+++ b/components/open-fabrics/open-fabrics.p5m	Thu Mar 14 11:55:18 2013 -0700
@@ -444,62 +444,62 @@
     com.oracle.info.name=open-fabrics \
     com.oracle.info.version=1.5.3
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (ibutils)' \
     com.oracle.info.description="the OpenFabrics User Level InfiniBand Management Utilities" \
     com.oracle.info.name=ibutils \
     com.oracle.info.version=1.5.7
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (infiniband-diags)' \
     com.oracle.info.description="the OpenFabrics Diagnostic Tools" \
     com.oracle.info.name=infiniband-diags \
     com.oracle.info.version=1.5.8
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (libibmad)' \
     com.oracle.info.description="the OpenFabrics InfiniBand MAD library" \
     com.oracle.info.name=libibmad \
     com.oracle.info.version=1.3.7
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (libibumad)' \
     com.oracle.info.description="the OpenFabrics user MAD interface library" \
     com.oracle.info.name=libibumad \
     com.oracle.info.version=1.3.7
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (libibverbs)' \
     com.oracle.info.description="the OpenFabrics RDMA verbs library" \
     com.oracle.info.name=libibverbs \
     com.oracle.info.version=1.1.4
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (libmlx4)' \
     com.oracle.info.description="the OpenFabrics Mellanox ConnectX driver" \
     com.oracle.info.name=libmlx4 \
     com.oracle.info.version=1.0.1
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (librdmacm)' \
     com.oracle.info.description="the OpenFabrics RDMA cm library" \
     com.oracle.info.name=librdmacm \
     com.oracle.info.version=1.0.14.1
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (libsdp)' \
     com.oracle.info.description="the OpenFabrics InfiniBand SDP library" \
     com.oracle.info.name=libsdp \
     com.oracle.info.version=1.1.108
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (opensm)' \
     com.oracle.info.description="the OpenFabrics InfiniBand Subnet Manager and Administrator" \
     com.oracle.info.name=opensm \
     com.oracle.info.version=3.3.9
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (perftest)' \
     com.oracle.info.description="the OpenFabrics performance tests" \
     com.oracle.info.name=perftest \
     com.oracle.info.version=1.3.0
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (qperf)' \
     com.oracle.info.description="the OpenFabrics RDMA and IP performance tests" \
     com.oracle.info.name=qperf \
     com.oracle.info.version=0.4.6
 
-license open-fabrics.license license='open-fabrics' \
+license open-fabrics.license license='open-fabrics (rds-tools)' \
     com.oracle.info.description="the OpenFabrics RDS support tools" \
     com.oracle.info.name=rds-tools \
     com.oracle.info.version=2.0.4

--- a/components/proftpd/proftpd.p5m	Thu Mar 14 08:40:47 2013 -0700
+++ b/components/proftpd/proftpd.p5m	Thu Mar 14 11:55:18 2013 -0700
@@ -200,12 +200,12 @@
     name="FTP Server, (Usr)" \
     desc="FTP Server and Utilities"
 
-license proftpd.license license=GPLv2 \
+license proftpd.license license="GPLv2 (mod_gss)" \
     com.oracle.info.description="the ProFPTD GSS Engine" \
     com.oracle.info.name=mod_gss \
     com.oracle.info.tpno=4477 \
     com.oracle.info.version=1.3.3
-license proftpd.license license=GPLv2 \
+license proftpd.license license="GPLv2 (proftpd)" \
     com.oracle.info.description="the ProFTPD server and utilities" \
     com.oracle.info.name=proftpd \
     com.oracle.info.tpno=6824 \

--- a/components/samba/samba30/libsmbclient.p5m	Thu Mar 14 08:40:47 2013 -0700
+++ b/components/samba/samba30/libsmbclient.p5m	Thu Mar 14 11:55:18 2013 -0700
@@ -41,12 +41,12 @@
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-license mozldap.license license="LGPLv2.1 GPLv2" \
+license mozldap.license license="LGPLv2.1 GPLv2 (libsmbclient)" \
     com.oracle.info.description="the libsmbclient libraries" \
     com.oracle.info.name=libsmbclient \
     com.oracle.info.version=3.5.8
 
-license mozldap.license license="LGPLv2.1 GPLv2" \
+license mozldap.license license="LGPLv2.1 GPLv2 (mozldap)" \
     com.oracle.info.description="mozldap, the Mozilla LDAP SDK" \
     com.oracle.info.name=mozldap \
     com.oracle.info.version=6.0.7