--- a/components/pcre/pcre.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/pcre/pcre.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,46 +18,33 @@
#
# 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>
-
-set name=pkg.fmri value=pkg:/library/pcre@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/pcre@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
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=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=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/C"
+set name=info.classification value=org.opensolaris.category.2008:Development/C
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/081
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-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
-
+dir path=usr
+dir path=usr/bin
+dir path=usr/bin/$(MACH64)
+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
+dir path=usr/include
+dir path=usr/include/pcre
file path=usr/include/pcre/pcre.h
file pcre_internal.h path=usr/include/pcre/pcre_internal.h
file path=usr/include/pcre/pcre_scanner.h
@@ -66,21 +53,41 @@
file path=usr/include/pcre/pcrecpparg.h
file path=usr/include/pcre/pcreposix.h
file ucp.h path=usr/include/pcre/ucp.h
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+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
+dir path=usr/lib/$(MACH64)/pkgconfig
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
+dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/libpcre.pc
file path=usr/lib/pkgconfig/libpcrecpp.pc
file path=usr/lib/pkgconfig/libpcreposix.pc
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/pcre
+dir path=usr/share/doc/pcre/html
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
@@ -127,9 +134,12 @@
file path=usr/share/doc/pcre/html/pcrestack.html
file path=usr/share/doc/pcre/html/pcretest.html
file path=usr/share/doc/pcre/html/pcreunicode.html
+dir path=usr/share/man
+dir path=usr/share/man/man1
file path=usr/share/man/man1/pcre-config.1
file path=usr/share/man/man1/pcregrep.1
file path=usr/share/man/man1/pcretest.1
+dir path=usr/share/man/man3
file path=usr/share/man/man3/pcre.3
file path=usr/share/man/man3/pcre_assign_jit_stack.3
file path=usr/share/man/man3/pcre_compile.3
@@ -172,18 +182,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"
+license pcre.license license=BSD