--- a/components/libpcap/libpcap.p5m	Fri Jan 17 12:16:54 2014 -0800
+++ b/components/libpcap/libpcap.p5m	Fri Jan 17 12:16:54 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 # The libpcap man pages should go in section 3pcap instead of
@@ -27,28 +27,19 @@
 set name=pkg.fmri \
     value=pkg:/system/library/libpcap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Packet capture library"
+set name=pkg.description \
+    value="The library provides a portable framework for low-level network monitoring and user-level packet capture. Applications include network statistics collection, security monitoring, network debugging, etc."
 set name=com.oracle.info.description value="the libpcap package capture library"
+set name=com.oracle.info.tpno value=15968
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/288
+set name=org.opensolaris.arc-caseid value=PSARC/2008/288
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3pcap
-dir path=usr/share/man/man4
-dir path=usr/share/man/man5
-#
+file path=usr/bin/$(MACH64)/pcap-config
 file path=usr/bin/pcap-config
-file path=usr/bin/$(MACH64)/pcap-config
 file path=usr/include/pcap-bpf.h
 file path=usr/include/pcap-namedb.h
 file path=usr/include/pcap.h
@@ -60,8 +51,12 @@
 file path=usr/include/pcap/sll.h
 file path=usr/include/pcap/usb.h
 file path=usr/include/pcap/vlan.h
-file path=usr/lib/$(MACH64)/libpcap.so.1.1.1
-file path=usr/lib/libpcap.so.1.1.1
+link path=usr/lib/$(MACH64)/libpcap.so target=libpcap.so.1
+link path=usr/lib/$(MACH64)/libpcap.so.1 target=libpcap.so.1.5.1
+file path=usr/lib/$(MACH64)/libpcap.so.1.5.1
+link path=usr/lib/libpcap.so target=libpcap.so.1
+link path=usr/lib/libpcap.so.1 target=libpcap.so.1.5.1
+file path=usr/lib/libpcap.so.1.5.1
 file path=usr/share/man/man1/pcap-config.1
 file path=usr/share/man/man3pcap/pcap.3pcap
 file path=usr/share/man/man3pcap/pcap_activate.3pcap
@@ -72,40 +67,70 @@
 file path=usr/share/man/man3pcap/pcap_create.3pcap
 file path=usr/share/man/man3pcap/pcap_datalink.3pcap
 file path=usr/share/man/man3pcap/pcap_datalink_name_to_val.3pcap
+link path=usr/share/man/man3pcap/pcap_datalink_val_to_description.3pcap \
+    target=pcap_datalink_val_to_name.3pcap
 file path=usr/share/man/man3pcap/pcap_datalink_val_to_name.3pcap
+link path=usr/share/man/man3pcap/pcap_dispatch.3pcap target=pcap_loop.3pcap
 file path=usr/share/man/man3pcap/pcap_dump.3pcap
 file path=usr/share/man/man3pcap/pcap_dump_close.3pcap
 file path=usr/share/man/man3pcap/pcap_dump_file.3pcap
 file path=usr/share/man/man3pcap/pcap_dump_flush.3pcap
+link path=usr/share/man/man3pcap/pcap_dump_fopen.3pcap \
+    target=pcap_dump_open.3pcap
 file path=usr/share/man/man3pcap/pcap_dump_ftell.3pcap
 file path=usr/share/man/man3pcap/pcap_dump_open.3pcap
 file path=usr/share/man/man3pcap/pcap_file.3pcap
 file path=usr/share/man/man3pcap/pcap_fileno.3pcap
 file path=usr/share/man/man3pcap/pcap_findalldevs.3pcap
-file path=usr/share/man/man3pcap/pcap_fopen_offline.3pcap
-file path=usr/share/man/man3pcap/pcap_free_datalinks.3pcap
-file path=usr/share/man/man3pcap/pcap_freealldevs.3pcap
+link path=usr/share/man/man3pcap/pcap_fopen_offline.3pcap \
+    target=pcap_open_offline.3pcap
+link \
+    path=usr/share/man/man3pcap/pcap_fopen_offline_with_tstamp_precision.3pcap \
+    target=pcap_open_offline.3pcap
+link path=usr/share/man/man3pcap/pcap_free_datalinks.3pcap \
+    target=pcap_list_datalinks.3pcap
+link path=usr/share/man/man3pcap/pcap_free_tstamp_types.3pcap \
+    target=pcap_list_tstamp_types.3pcap
+link path=usr/share/man/man3pcap/pcap_freealldevs.3pcap \
+    target=pcap_findalldevs.3pcap
 file path=usr/share/man/man3pcap/pcap_freecode.3pcap
 file path=usr/share/man/man3pcap/pcap_get_selectable_fd.3pcap
+file path=usr/share/man/man3pcap/pcap_get_tstamp_precision.3pcap
+file path=usr/share/man/man3pcap/pcap_geterr.3pcap
+link path=usr/share/man/man3pcap/pcap_getnonblock.3pcap \
+    target=pcap_setnonblock.3pcap
 file path=usr/share/man/man3pcap/pcap_inject.3pcap
 file path=usr/share/man/man3pcap/pcap_is_swapped.3pcap
 file path=usr/share/man/man3pcap/pcap_lib_version.3pcap
 file path=usr/share/man/man3pcap/pcap_list_datalinks.3pcap
+file path=usr/share/man/man3pcap/pcap_list_tstamp_types.3pcap
 file path=usr/share/man/man3pcap/pcap_lookupdev.3pcap
 file path=usr/share/man/man3pcap/pcap_lookupnet.3pcap
 file path=usr/share/man/man3pcap/pcap_loop.3pcap
 file path=usr/share/man/man3pcap/pcap_major_version.3pcap
-file path=usr/share/man/man3pcap/pcap_next.3pcap
+link path=usr/share/man/man3pcap/pcap_minor_version.3pcap \
+    target=pcap_major_version.3pcap
+link path=usr/share/man/man3pcap/pcap_next.3pcap target=pcap_next_ex.3pcap
+file path=usr/share/man/man3pcap/pcap_next_ex.3pcap
 file path=usr/share/man/man3pcap/pcap_offline_filter.3pcap
 file path=usr/share/man/man3pcap/pcap_open_dead.3pcap
+link path=usr/share/man/man3pcap/pcap_open_dead_with_tstamp_precision.3pcap \
+    target=pcap_open_dead.3pcap
 file path=usr/share/man/man3pcap/pcap_open_live.3pcap
-file path=usr/share/man/man3pcap/pcap_perror.3pcap
+file path=usr/share/man/man3pcap/pcap_open_offline.3pcap
+link path=usr/share/man/man3pcap/pcap_open_offline_with_tstamp_precision.3pcap \
+    target=pcap_open_offline.3pcap
+link path=usr/share/man/man3pcap/pcap_perror.3pcap target=pcap_geterr.3pcap
+link path=usr/share/man/man3pcap/pcap_sendpacket.3pcap target=pcap_inject.3pcap
 file path=usr/share/man/man3pcap/pcap_set_buffer_size.3pcap
 file path=usr/share/man/man3pcap/pcap_set_datalink.3pcap
+file path=usr/share/man/man3pcap/pcap_set_immediate_mode.3pcap
 file path=usr/share/man/man3pcap/pcap_set_promisc.3pcap
 file path=usr/share/man/man3pcap/pcap_set_rfmon.3pcap
 file path=usr/share/man/man3pcap/pcap_set_snaplen.3pcap
 file path=usr/share/man/man3pcap/pcap_set_timeout.3pcap
+file path=usr/share/man/man3pcap/pcap_set_tstamp_precision.3pcap
+file path=usr/share/man/man3pcap/pcap_set_tstamp_type.3pcap
 file path=usr/share/man/man3pcap/pcap_setdirection.3pcap
 file path=usr/share/man/man3pcap/pcap_setfilter.3pcap
 file path=usr/share/man/man3pcap/pcap_setnonblock.3pcap
@@ -113,29 +138,11 @@
 file path=usr/share/man/man3pcap/pcap_stats.3pcap
 file path=usr/share/man/man3pcap/pcap_statustostr.3pcap
 file path=usr/share/man/man3pcap/pcap_strerror.3pcap
+file path=usr/share/man/man3pcap/pcap_tstamp_type_name_to_val.3pcap
+file path=usr/share/man/man3pcap/pcap_tstamp_type_val_to_name.3pcap
 file path=usr/share/man/man4/pcap-savefile.4
 file path=usr/share/man/man5/pcap-filter.5
 file path=usr/share/man/man5/pcap-linktype.5
+file path=usr/share/man/man5/pcap-tstamp.5
+#
 license license.pcap license=BSD
-link path=usr/lib/$(MACH64)/libpcap.so target=./libpcap.so.1.1.1
-link path=usr/lib/$(MACH64)/libpcap.so.1 target=./libpcap.so.1.1.1
-link path=usr/lib/libpcap.so target=./libpcap.so.1.1.1
-link path=usr/lib/libpcap.so.1 target=./libpcap.so.1.1.1
-link path=usr/share/man/man3pcap/pcap_datalink_val_to_description.3pcap \
-    target=./pcap_datalink_val_to_name.3pcap
-link path=usr/share/man/man3pcap/pcap_dispatch.3pcap \
-    target=./pcap_loop.3pcap
-link path=usr/share/man/man3pcap/pcap_dump_fopen.3pcap \
-    target=./pcap_dump_open.3pcap
-link path=usr/share/man/man3pcap/pcap_geterr.3pcap \
-    target=./pcap_perror.3pcap
-link path=usr/share/man/man3pcap/pcap_getnonblock.3pcap \
-    target=./pcap_setnonblock.3pcap
-link path=usr/share/man/man3pcap/pcap_minor_version.3pcap \
-    target=./pcap_major_version.3pcap
-link path=usr/share/man/man3pcap/pcap_next_ex.3pcap \
-    target=./pcap_next.3pcap
-link path=usr/share/man/man3pcap/pcap_open_offline.3pcap \
-    target=./pcap_fopen_offline.3pcap
-link path=usr/share/man/man3pcap/pcap_sendpacket.3pcap \
-    target=./pcap_inject.3pcap