diff -r 1cc872b933c9 -r 24181f5eb463 components/libnet/libnet.p5m
--- a/components/libnet/libnet.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/libnet/libnet.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,42 +18,32 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/demo/libnet/(.+[.-].+)$ -> set action.hash $(MACH32)/sample/%<\1> >
-<transform dir file link hardlink path=usr/demo -> default facet.devel true> 
-
-set name=pkg.fmri value=pkg:/system/library/libnet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="libnet - a library for portable network packet construction"
-set name=com.oracle.info.description value="the libnet network packet construction library"
+<transform dir file link hardlink path=usr/demo -> default facet.devel true>
+set name=pkg.fmri \
+    value=pkg:/system/library/libnet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="libnet - a library for portable network packet construction"
+set name=com.oracle.info.description \
+    value="the libnet network packet construction library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2011/399
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2011/399
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license libnet.license license='BSD'
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH64)
-dir path=usr/demo
-dir path=usr/demo/libnet
-dir path=usr/demo/libnet/win32
-dir path=usr/include
-dir path=usr/include/libnet
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
-
+dir  path=usr
+dir  path=usr/bin
+dir  path=usr/bin/$(MACH64)
+file $(MACH64)/libnet-config path=usr/bin/$(MACH64)/libnet-config
 file $(MACH32)/libnet-config path=usr/bin/libnet-config
-file $(MACH64)/libnet-config path=usr/bin/$(MACH64)/libnet-config
+dir  path=usr/demo
+dir  path=usr/demo/libnet
 file path=usr/demo/libnet/arp.c
 file path=usr/demo/libnet/bgp4_hdr.c
 file path=usr/demo/libnet/bgp4_notification.c
@@ -68,13 +58,13 @@
 file path=usr/demo/libnet/get_addr.c
 file path=usr/demo/libnet/gre.c
 file path=usr/demo/libnet/hsrp.c
+file path=usr/demo/libnet/icmp6_echoreq.c
+file path=usr/demo/libnet/icmp6_unreach.c
 file path=usr/demo/libnet/icmp_echo_cq.c
 file path=usr/demo/libnet/icmp_redirect.c
 file path=usr/demo/libnet/icmp_timeexceed.c
 file path=usr/demo/libnet/icmp_timestamp.c
 file path=usr/demo/libnet/icmp_unreach.c
-file path=usr/demo/libnet/icmp6_echoreq.c
-file path=usr/demo/libnet/icmp6_unreach.c
 file path=usr/demo/libnet/ieee.c
 file path=usr/demo/libnet/ip_link.c
 file path=usr/demo/libnet/ip_raw.c
@@ -90,18 +80,21 @@
 file path=usr/demo/libnet/smurf.c
 file path=usr/demo/libnet/stp.c
 file path=usr/demo/libnet/synflood.c
+file path=usr/demo/libnet/synflood6.c
 file path=usr/demo/libnet/synflood6_frag.c
-file path=usr/demo/libnet/synflood6.c
 file path=usr/demo/libnet/tcp1.c
 file path=usr/demo/libnet/tcp2.c
+file path=usr/demo/libnet/test_ipv4.c
 file path=usr/demo/libnet/test_ipv4_options.c
-file path=usr/demo/libnet/test_ipv4.c
 file path=usr/demo/libnet/test_ipv6_icmpv4.c
 file path=usr/demo/libnet/tftp.c
 file path=usr/demo/libnet/tring_tcp1.c
 file path=usr/demo/libnet/tring_tcp2.c
 file path=usr/demo/libnet/udp1.c
 file path=usr/demo/libnet/udp2.c
+dir  path=usr/demo/libnet/win32
+dir  path=usr/include
+dir  path=usr/include/libnet
 file path=usr/include/libnet.h
 file path=usr/include/libnet/libnet-asn1.h
 file path=usr/include/libnet/libnet-functions.h
@@ -109,12 +102,18 @@
 file path=usr/include/libnet/libnet-macros.h
 file path=usr/include/libnet/libnet-structures.h
 file path=usr/include/libnet/libnet-types.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libnet.so target=libnet.so.1.6.0
+link path=usr/lib/$(MACH64)/libnet.so.1 target=libnet.so.1.6.0
 file usr/lib/$(MACH64)/libnet.so path=usr/lib/$(MACH64)/libnet.so.1.6.0
+link path=usr/lib/libnet.so target=libnet.so.1.6.0
+link path=usr/lib/libnet.so.1 target=libnet.so.1.6.0
 file usr/lib/libnet.so path=usr/lib/libnet.so.1.6.0
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man3
 file libnet-functions.h.3 path=usr/share/man/man3/libnet-functions.h.3
 file libnet-macros.h.3 path=usr/share/man/man3/libnet-macros.h.3
 file libnet.h.3 path=usr/share/man/man3/libnet.h.3
-link path=usr/lib/$(MACH64)/libnet.so target=libnet.so.1.6.0 
-link path=usr/lib/$(MACH64)/libnet.so.1 target=libnet.so.1.6.0 
-link path=usr/lib/libnet.so target=libnet.so.1.6.0
-link path=usr/lib/libnet.so.1 target=libnet.so.1.6.0
+license libnet.license license=BSD