--- a/components/pcre/pcre.p5m	Tue Jun 23 14:24:18 2015 -0700
+++ b/components/pcre/pcre.p5m	Fri Jul 10 08:56:04 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, 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>
@@ -27,7 +27,7 @@
 set name=pkg.summary value="Perl-Compatible Regular Expressions"
 set name=pkg.description value="The PCRE library is a set of functions that implement regular expression pattern matching using almost the same syntax and semantics as Perl"
 set name=com.oracle.info.description value="the PCRE library"
-set name=com.oracle.info.tpno value=9271
+set name=com.oracle.info.tpno value=23018
 set name=info.classification value="org.opensolaris.category.2008:Development/C"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -35,26 +35,9 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2012/081
 
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH64)
-dir path=usr/include
-dir path=usr/include/pcre
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/pcre
-dir path=usr/share/doc/pcre/html
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
-
+file path=usr/bin/$(MACH64)/pcre-config
 file path=usr/bin/$(MACH64)/pcregrep
 file path=usr/bin/$(MACH64)/pcretest
-file path=usr/bin/$(MACH64)/pcre-config
 file path=usr/bin/pcre-config
 file path=usr/bin/pcregrep
 file path=usr/bin/pcretest
@@ -66,24 +49,40 @@
 file path=usr/include/pcre/pcrecpparg.h
 file path=usr/include/pcre/pcreposix.h
 file ucp.h path=usr/include/pcre/ucp.h
+link path=usr/lib/$(MACH64)/libpcre.so target=libpcre.so.0.0.0
+link path=usr/lib/$(MACH64)/libpcre.so.0 target=libpcre.so.0.0.0
 file path=usr/lib/$(MACH64)/libpcre.so.0.0.0
+link path=usr/lib/$(MACH64)/libpcrecpp.so target=libpcrecpp.so.0.0.0
+link path=usr/lib/$(MACH64)/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
 file path=usr/lib/$(MACH64)/libpcrecpp.so.0.0.0
+link path=usr/lib/$(MACH64)/libpcreposix.so target=libpcreposix.so.0.0.0
+link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.0
 file path=usr/lib/$(MACH64)/libpcreposix.so.0.0.0
 file path=usr/lib/$(MACH64)/llib-lpcre.ln
 file path=usr/lib/$(MACH64)/pkgconfig/libpcre.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libpcrecpp.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libpcreposix.pc
+link path=usr/lib/libpcre.so target=libpcre.so.0.0.0
+link path=usr/lib/libpcre.so.0 target=libpcre.so.0.0.0
 file path=usr/lib/libpcre.so.0.0.0
+link path=usr/lib/libpcrecpp.so target=libpcrecpp.so.0.0.0
+link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
 file path=usr/lib/libpcrecpp.so.0.0.0
+link path=usr/lib/libpcreposix.so target=libpcreposix.so.0.0.0
+link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.0
 file path=usr/lib/libpcreposix.so.0.0.0
 file llib-lpcre path=usr/lib/llib-lpcre
 file path=usr/lib/llib-lpcre.ln
 file path=usr/lib/pkgconfig/libpcre.pc
 file path=usr/lib/pkgconfig/libpcrecpp.pc
 file path=usr/lib/pkgconfig/libpcreposix.pc
+file path=usr/share/doc/pcre/html/NON-AUTOTOOLS-BUILD.txt
+file path=usr/share/doc/pcre/html/README.txt
 file path=usr/share/doc/pcre/html/index.html
 file path=usr/share/doc/pcre/html/pcre-config.html
 file path=usr/share/doc/pcre/html/pcre.html
+file path=usr/share/doc/pcre/html/pcre16.html
+file path=usr/share/doc/pcre/html/pcre32.html
 file path=usr/share/doc/pcre/html/pcre_assign_jit_stack.html
 file path=usr/share/doc/pcre/html/pcre_compile.html
 file path=usr/share/doc/pcre/html/pcre_compile2.html
@@ -101,12 +100,15 @@
 file path=usr/share/doc/pcre/html/pcre_get_stringtable_entries.html
 file path=usr/share/doc/pcre/html/pcre_get_substring.html
 file path=usr/share/doc/pcre/html/pcre_get_substring_list.html
-file path=usr/share/doc/pcre/html/pcre_info.html
+file path=usr/share/doc/pcre/html/pcre_jit_exec.html
 file path=usr/share/doc/pcre/html/pcre_jit_stack_alloc.html
 file path=usr/share/doc/pcre/html/pcre_jit_stack_free.html
 file path=usr/share/doc/pcre/html/pcre_maketables.html
+file path=usr/share/doc/pcre/html/pcre_pattern_to_host_byte_order.html
 file path=usr/share/doc/pcre/html/pcre_refcount.html
 file path=usr/share/doc/pcre/html/pcre_study.html
+file path=usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html
+file path=usr/share/doc/pcre/html/pcre_utf32_to_host_byte_order.html
 file path=usr/share/doc/pcre/html/pcre_version.html
 file path=usr/share/doc/pcre/html/pcreapi.html
 file path=usr/share/doc/pcre/html/pcrebuild.html
@@ -131,6 +133,86 @@
 file path=usr/share/man/man1/pcregrep.1
 file path=usr/share/man/man1/pcretest.1
 file path=usr/share/man/man3/pcre.3
+file path=usr/share/man/man3/pcre16.3
+link path=usr/share/man/man3/pcre16_assign_jit_stack.3 \
+    target=pcre_assign_jit_stack.3
+link path=usr/share/man/man3/pcre16_compile.3 target=pcre_compile.3
+link path=usr/share/man/man3/pcre16_compile2.3 target=pcre_compile2.3
+link path=usr/share/man/man3/pcre16_config.3 target=pcre_config.3
+link path=usr/share/man/man3/pcre16_copy_named_substring.3 \
+    target=pcre_copy_named_substring.3
+link path=usr/share/man/man3/pcre16_copy_substring.3 \
+    target=pcre_copy_substring.3
+link path=usr/share/man/man3/pcre16_dfa_exec.3 target=pcre_dfa_exec.3
+link path=usr/share/man/man3/pcre16_exec.3 target=pcre_exec.3
+link path=usr/share/man/man3/pcre16_free_study.3 target=pcre_free_study.3
+link path=usr/share/man/man3/pcre16_free_substring.3 \
+    target=pcre_free_substring.3
+link path=usr/share/man/man3/pcre16_free_substring_list.3 \
+    target=pcre_free_substring_list.3
+link path=usr/share/man/man3/pcre16_fullinfo.3 target=pcre_fullinfo.3
+link path=usr/share/man/man3/pcre16_get_named_substring.3 \
+    target=pcre_get_named_substring.3
+link path=usr/share/man/man3/pcre16_get_stringnumber.3 \
+    target=pcre_get_stringnumber.3
+link path=usr/share/man/man3/pcre16_get_stringtable_entries.3 \
+    target=pcre_get_stringtable_entries.3
+link path=usr/share/man/man3/pcre16_get_substring.3 target=pcre_get_substring.3
+link path=usr/share/man/man3/pcre16_get_substring_list.3 \
+    target=pcre_get_substring_list.3
+link path=usr/share/man/man3/pcre16_jit_exec.3 target=pcre_jit_exec.3
+link path=usr/share/man/man3/pcre16_jit_stack_alloc.3 \
+    target=pcre_jit_stack_alloc.3
+link path=usr/share/man/man3/pcre16_jit_stack_free.3 \
+    target=pcre_jit_stack_free.3
+link path=usr/share/man/man3/pcre16_maketables.3 target=pcre_maketables.3
+link path=usr/share/man/man3/pcre16_pattern_to_host_byte_order.3 \
+    target=pcre_pattern_to_host_byte_order.3
+link path=usr/share/man/man3/pcre16_refcount.3 target=pcre_refcount.3
+link path=usr/share/man/man3/pcre16_study.3 target=pcre_study.3
+link path=usr/share/man/man3/pcre16_utf16_to_host_byte_order.3 \
+    target=pcre_utf16_to_host_byte_order.3
+link path=usr/share/man/man3/pcre16_version.3 target=pcre_version.3
+file path=usr/share/man/man3/pcre32.3
+link path=usr/share/man/man3/pcre32_assign_jit_stack.3 \
+    target=pcre_assign_jit_stack.3
+link path=usr/share/man/man3/pcre32_compile.3 target=pcre_compile.3
+link path=usr/share/man/man3/pcre32_compile2.3 target=pcre_compile2.3
+link path=usr/share/man/man3/pcre32_config.3 target=pcre_config.3
+link path=usr/share/man/man3/pcre32_copy_named_substring.3 \
+    target=pcre_copy_named_substring.3
+link path=usr/share/man/man3/pcre32_copy_substring.3 \
+    target=pcre_copy_substring.3
+link path=usr/share/man/man3/pcre32_dfa_exec.3 target=pcre_dfa_exec.3
+link path=usr/share/man/man3/pcre32_exec.3 target=pcre_exec.3
+link path=usr/share/man/man3/pcre32_free_study.3 target=pcre_free_study.3
+link path=usr/share/man/man3/pcre32_free_substring.3 \
+    target=pcre_free_substring.3
+link path=usr/share/man/man3/pcre32_free_substring_list.3 \
+    target=pcre_free_substring_list.3
+link path=usr/share/man/man3/pcre32_fullinfo.3 target=pcre_fullinfo.3
+link path=usr/share/man/man3/pcre32_get_named_substring.3 \
+    target=pcre_get_named_substring.3
+link path=usr/share/man/man3/pcre32_get_stringnumber.3 \
+    target=pcre_get_stringnumber.3
+link path=usr/share/man/man3/pcre32_get_stringtable_entries.3 \
+    target=pcre_get_stringtable_entries.3
+link path=usr/share/man/man3/pcre32_get_substring.3 target=pcre_get_substring.3
+link path=usr/share/man/man3/pcre32_get_substring_list.3 \
+    target=pcre_get_substring_list.3
+link path=usr/share/man/man3/pcre32_jit_exec.3 target=pcre_jit_exec.3
+link path=usr/share/man/man3/pcre32_jit_stack_alloc.3 \
+    target=pcre_jit_stack_alloc.3
+link path=usr/share/man/man3/pcre32_jit_stack_free.3 \
+    target=pcre_jit_stack_free.3
+link path=usr/share/man/man3/pcre32_maketables.3 target=pcre_maketables.3
+link path=usr/share/man/man3/pcre32_pattern_to_host_byte_order.3 \
+    target=pcre_pattern_to_host_byte_order.3
+link path=usr/share/man/man3/pcre32_refcount.3 target=pcre_refcount.3
+link path=usr/share/man/man3/pcre32_study.3 target=pcre_study.3
+link path=usr/share/man/man3/pcre32_utf32_to_host_byte_order.3 \
+    target=pcre_utf32_to_host_byte_order.3
+link path=usr/share/man/man3/pcre32_version.3 target=pcre_version.3
 file path=usr/share/man/man3/pcre_assign_jit_stack.3
 file path=usr/share/man/man3/pcre_compile.3
 file path=usr/share/man/man3/pcre_compile2.3
@@ -148,18 +230,22 @@
 file path=usr/share/man/man3/pcre_get_stringtable_entries.3
 file path=usr/share/man/man3/pcre_get_substring.3
 file path=usr/share/man/man3/pcre_get_substring_list.3
-file path=usr/share/man/man3/pcre_info.3
+file path=usr/share/man/man3/pcre_jit_exec.3
 file path=usr/share/man/man3/pcre_jit_stack_alloc.3
 file path=usr/share/man/man3/pcre_jit_stack_free.3
 file path=usr/share/man/man3/pcre_maketables.3
+file path=usr/share/man/man3/pcre_pattern_to_host_byte_order.3
 file path=usr/share/man/man3/pcre_refcount.3
 file path=usr/share/man/man3/pcre_study.3
+file path=usr/share/man/man3/pcre_utf16_to_host_byte_order.3
+file path=usr/share/man/man3/pcre_utf32_to_host_byte_order.3
 file path=usr/share/man/man3/pcre_version.3
 file path=usr/share/man/man3/pcreapi.3
 file path=usr/share/man/man3/pcrebuild.3
 file path=usr/share/man/man3/pcrecallout.3
 file path=usr/share/man/man3/pcrecompat.3
 file path=usr/share/man/man3/pcrecpp.3
+file path=usr/share/man/man3/pcredemo.3
 file path=usr/share/man/man3/pcrejit.3
 file path=usr/share/man/man3/pcrelimits.3
 file path=usr/share/man/man3/pcrematching.3
@@ -172,18 +258,4 @@
 file path=usr/share/man/man3/pcrestack.3
 file path=usr/share/man/man3/pcresyntax.3
 file path=usr/share/man/man3/pcreunicode.3
-
-link path=usr/lib/$(MACH64)/libpcre.so target=libpcre.so.0.0.0
-link path=usr/lib/$(MACH64)/libpcre.so.0 target=libpcre.so.0.0.0
-link path=usr/lib/$(MACH64)/libpcrecpp.so target=libpcrecpp.so.0.0.0
-link path=usr/lib/$(MACH64)/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
-link path=usr/lib/$(MACH64)/libpcreposix.so target=libpcreposix.so.0.0.0
-link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.0
-link path=usr/lib/libpcre.so target=libpcre.so.0.0.0
-link path=usr/lib/libpcre.so.0 target=libpcre.so.0.0.0
-link path=usr/lib/libpcrecpp.so target=libpcrecpp.so.0.0.0
-link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
-link path=usr/lib/libpcreposix.so target=libpcreposix.so.0.0.0
-link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.0
-
 license pcre.license license="BSD"