Split PCRE

4 files changed, 41 insertions, 26 deletions

diff --git a/pcre/pcre.p5m b/pcre/pcre.p5m
index 1deda83..50ead5f 100644
--- a/pcre/pcre.p5m
+++ b/pcre/pcre.p5m
@@ -1,16 +1,18 @@
 set name=pkg.fmri value=pkg:/library/pcre@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
+set name=info.source-url value="$(download)"
+
 license $(license-file) license="$(license)"
 
+depend fmri=pkg:/library/pcre1@$(ips-version) type=require
+depend fmri=pkg:/library/pcre1@$(ips-version) type=incorporate
+
 <transform file dir link path=.*pcre-config.* -> default facet.devel true>
 
 dir path=usr
 dir path=usr/include
 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/man
@@ -18,19 +20,15 @@ dir path=usr/share/man/man1
 dir path=usr/share/man/man3
 file $(protodir.64)/usr/bin/pcre-config path=usr/bin/$(MACH64)/pcre-config
 file path=usr/bin/pcre-config
+file path=usr/include/pcre.h
 file path=usr/include/pcre_scanner.h
 file path=usr/include/pcre_stringpiece.h
-file path=usr/include/pcre.h
 file path=usr/include/pcreposix.h
-file path=usr/lib/$(MACH64)/libpcre.so.1.0.1
-file path=usr/lib/$(MACH64)/libpcreposix.so.0.0.1
-file path=usr/lib/$(MACH64)/pkgconfig/libpcre.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libpcreposix.pc
-file path=usr/lib/libpcre.so.1.0.1
-file path=usr/lib/libpcreposix.so.0.0.1
 file path=usr/lib/pkgconfig/libpcre.pc
 file path=usr/lib/pkgconfig/libpcreposix.pc
 file path=usr/share/man/man1/pcre-config.1
+file path=usr/share/man/man3/pcre.3
+file path=usr/share/man/man3/pcre16.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
@@ -40,14 +38,14 @@ file path=usr/share/man/man3/pcre_copy_substring.3
 file path=usr/share/man/man3/pcre_dfa_exec.3
 file path=usr/share/man/man3/pcre_exec.3
 file path=usr/share/man/man3/pcre_free_study.3
-file path=usr/share/man/man3/pcre_free_substring_list.3
 file path=usr/share/man/man3/pcre_free_substring.3
+file path=usr/share/man/man3/pcre_free_substring_list.3
 file path=usr/share/man/man3/pcre_fullinfo.3
 file path=usr/share/man/man3/pcre_get_named_substring.3
 file path=usr/share/man/man3/pcre_get_stringnumber.3
 file path=usr/share/man/man3/pcre_get_stringtable_entries.3
-file path=usr/share/man/man3/pcre_get_substring_list.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_jit_stack_alloc.3
 file path=usr/share/man/man3/pcre_jit_stack_free.3
 file path=usr/share/man/man3/pcre_maketables.3
@@ -56,8 +54,6 @@ 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_version.3
-file path=usr/share/man/man3/pcre.3
-file path=usr/share/man/man3/pcre16.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
@@ -75,13 +71,9 @@ 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.1.0.1
-link path=usr/lib/$(MACH64)/libpcre.so.1 target=libpcre.so.1.0.1
 link path=usr/lib/$(MACH64)/libpcreposix.so target=libpcreposix.so.0.0.1
-link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.1
 link path=usr/lib/libpcre.so target=libpcre.so.1.0.1
-link path=usr/lib/libpcre.so.1 target=libpcre.so.1.0.1
 link path=usr/lib/libpcreposix.so target=libpcreposix.so.0.0.1
-link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.1
 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
@@ -91,14 +83,14 @@ link path=usr/share/man/man3/pcre16_copy_substring.3 target=pcre_copy_substring.
 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_list.3 target=pcre_free_substring_list.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_list.3 target=pcre_get_substring_list.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_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
diff --git a/pcre/pcre1.p5m b/pcre/pcre1.p5m
new file mode 100644
index 0000000..b76bd74
--- /dev/null
+++ b/pcre/pcre1.p5m
@@ -0,0 +1,15 @@
+set name=pkg.fmri value=pkg:/library/pcre1@$(ips-version)
+set name=pkg.summary value="$(summary), shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(MACH64)/libpcre.so.1.0.1
+file path=usr/lib/$(MACH64)/libpcreposix.so.0.0.1
+file path=usr/lib/libpcre.so.1.0.1
+file path=usr/lib/libpcreposix.so.0.0.1
+link path=usr/lib/$(MACH64)/libpcre.so.1 target=libpcre.so.1.0.1
+link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.1
+link path=usr/lib/libpcre.so.1 target=libpcre.so.1.0.1
+link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.1
diff --git a/pcre/pcrecpp.p5m b/pcre/pcrecpp.p5m
index e2eb275..f19fd77 100644
--- a/pcre/pcrecpp.p5m
+++ b/pcre/pcrecpp.p5m
@@ -1,21 +1,19 @@
-
 set name=pkg.fmri value=pkg:/library/pcrecpp@$(ips-version)
 set name=pkg.summary value="$(summary), C++ library"
 set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
+set name=info.source-url value="$(download)"
 license $(license-file) license="$(license)"
 
 depend fmri=pkg:/library/pcre@$(ips-version) type=incorporate
+depend fmri=pkg:/library/pcre@$(ips-version) type=require
+depend fmri=pkg:/library/pcrecpp0@$(ips-version) type=incorporate
+depend fmri=pkg:/library/pcrecpp0@$(ips-version) type=require
 
 file path=usr/include/pcrecpp.h
 file path=usr/include/pcrecpparg.h
-file path=usr/lib/$(MACH64)/libpcrecpp.so.0.0.0
 file path=usr/lib/$(MACH64)/pkgconfig/libpcrecpp.pc
-file path=usr/lib/libpcrecpp.so.0.0.0
 file path=usr/lib/pkgconfig/libpcrecpp.pc
 file path=usr/share/man/man3/pcrecpp.3
 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/libpcrecpp.so target=libpcrecpp.so.0.0.0
-link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
 
diff --git a/pcre/pcrecpp0.p5m b/pcre/pcrecpp0.p5m
new file mode 100644
index 0000000..2eafa53
--- /dev/null
+++ b/pcre/pcrecpp0.p5m
@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg:/library/pcrecpp0@$(ips-version)
+set name=pkg.summary value="$(summary), C++ shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(MACH64)/libpcrecpp.so.0.0.0
+file path=usr/lib/libpcrecpp.so.0.0.0
+link path=usr/lib/$(MACH64)/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
+link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0