components/apr/apr-13.p5m
branchs11-update
changeset 3734 24181f5eb463
parent 3668 614657dc60eb
--- a/components/apr/apr-13.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/apr/apr-13.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,51 +18,45 @@
 #
 # 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 link hardlink path=usr/apr/1.3/.* -> \
     default facet.devel all>
-
 set name=pkg.fmri \
     value=pkg:/library/apr-13@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="Apache Portable Runtime (APR) 1.3 Shared Libraries"
+set name=pkg.summary value="Apache Portable Runtime (APR) 1.3 Shared Libraries"
 set name=pkg.description \
     value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
-set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.3 Shared Libraries"
+set name=com.oracle.info.description \
+    value="the Apache Portable Runtime (APR) 1.3 Shared Libraries"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+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=LSARC/2008/541
+set name=org.opensolaris.arc-caseid value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/apr
-dir path=usr/apr/1.3
-dir path=usr/apr/1.3/bin/$(MACH64)
-dir path=usr/apr/1.3/build
-dir path=usr/apr/1.3/build/$(MACH64)
-dir path=usr/apr/1.3/include
-dir path=usr/apr/1.3/lib
-dir path=usr/apr/1.3/lib/$(MACH64)
-dir path=usr/apr/1.3/lib/pkgconfig
-dir path=usr/bin
-dir path=usr/bin/$(MACH64)
+dir  path=usr
+dir  path=usr/apr
+dir  path=usr/apr/1.3
+dir  path=usr/apr/1.3/bin/$(MACH64)
 file path=usr/apr/1.3/bin/$(MACH64)/apr-1-config
+link path=usr/apr/1.3/bin/64 target=$(MACH64)
 file path=usr/apr/1.3/bin/apr-1-config
+dir  path=usr/apr/1.3/build
+dir  path=usr/apr/1.3/build/$(MACH64)
 file path=usr/apr/1.3/build/$(MACH64)/apr_rules.mk
 file path=usr/apr/1.3/build/$(MACH64)/libtool mode=0555
 file path=usr/apr/1.3/build/$(MACH64)/make_exports.awk
 file path=usr/apr/1.3/build/$(MACH64)/make_var_export.awk
 file path=usr/apr/1.3/build/$(MACH64)/mkdir.sh mode=0555
+link path=usr/apr/1.3/build/64 target=$(MACH64)
 file path=usr/apr/1.3/build/apr_rules.mk
 file path=usr/apr/1.3/build/libtool mode=0555
 file path=usr/apr/1.3/build/make_exports.awk
 file path=usr/apr/1.3/build/make_var_export.awk
 file path=usr/apr/1.3/build/mkdir.sh mode=0555
+dir  path=usr/apr/1.3/include
 file path=usr/apr/1.3/include/apr.h
 file path=usr/apr/1.3/include/apr_allocator.h
 file path=usr/apr/1.3/include/apr_atomic.h
@@ -99,28 +93,30 @@
 file path=usr/apr/1.3/include/apr_user.h
 file path=usr/apr/1.3/include/apr_version.h
 file path=usr/apr/1.3/include/apr_want.h
+dir  path=usr/apr/1.3/lib
+dir  path=usr/apr/1.3/lib/$(MACH64)
 file path=usr/apr/1.3/lib/$(MACH64)/apr.exp
 file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.a
+link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.3.9 \
+    facet.devel=false
+link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.3.9 \
+    facet.devel=false
 file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0.3.9 facet.devel=false
 file path=usr/apr/1.3/lib/$(MACH64)/pkgconfig/apr-1.pc
+link path=usr/apr/1.3/lib/64 target=$(MACH64)
 file path=usr/apr/1.3/lib/apr.exp
 file path=usr/apr/1.3/lib/libapr-1.a
+link path=usr/apr/1.3/lib/libapr-1.so target=libapr-1.so.0.3.9 facet.devel=false
+link path=usr/apr/1.3/lib/libapr-1.so.0 target=libapr-1.so.0.3.9 \
+    facet.devel=false
 file path=usr/apr/1.3/lib/libapr-1.so.0.3.9 facet.devel=false
+dir  path=usr/apr/1.3/lib/pkgconfig
 file path=usr/apr/1.3/lib/pkgconfig/apr-1.pc
-link path=usr/apr/1.3/bin/64 target=$(MACH64)
-link path=usr/apr/1.3/build/64 target=$(MACH64)
-link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.3.9 \
-     facet.devel=false
-link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.3.9 \
-     facet.devel=false
-link path=usr/apr/1.3/lib/64 target=$(MACH64)
-link path=usr/apr/1.3/lib/libapr-1.so target=libapr-1.so.0.3.9 \
-     facet.devel=false
-link path=usr/apr/1.3/lib/libapr-1.so.0 target=libapr-1.so.0.3.9 \
-     facet.devel=false
-link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.3/bin/$(MACH64)/apr-1-config \
-     mediator=apr-1-config mediator-version=1.3
+dir  path=usr/bin
+dir  path=usr/bin/$(MACH64)
+link path=usr/bin/$(MACH64)/apr-1-config \
+    target=../../apr/1.3/bin/$(MACH64)/apr-1-config mediator=apr-1-config \
+    mediator-version=1.3
 link path=usr/bin/apr-1-config target=../apr/1.3/bin/apr-1-config \
-     mediator=apr-1-config mediator-version=1.3
-
+    mediator=apr-1-config mediator-version=1.3
 license apr.license license="Apache v2.0"