--- a/components/apr-1_5/apr-15.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/apr-1_5/apr-15.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,35 +18,34 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file link hardlink path=usr/apr/1.5/.* -> \
     default facet.devel all>
 <transform file path=usr/apr/1.5/manual/.* -> default facet.doc.html all>
-
 set name=pkg.fmri \
     value=pkg:/library/apr-15@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="Apache Portable Runtime (APR) 1.5 Shared Libraries"
+set name=pkg.summary value="Apache Portable Runtime (APR) 1.5 Shared Libraries"
 set name=pkg.description \
     value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.5"
-set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.5 Shared Libraries"
+set name=com.oracle.info.description \
+    value="the Apache Portable Runtime (APR) 1.5 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=PSARC/2014/099
+set name=org.opensolaris.arc-caseid value=PSARC/2014/099
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 file path=usr/apr/1.5/bin/$(MACH64)/apr-1-config
+link path=usr/apr/1.5/bin/64 target=$(MACH64)
 file path=usr/apr/1.5/bin/apr-1-config
 file path=usr/apr/1.5/build/$(MACH64)/apr_rules.mk
 file path=usr/apr/1.5/build/$(MACH64)/libtool mode=0555
 file path=usr/apr/1.5/build/$(MACH64)/make_exports.awk
 file path=usr/apr/1.5/build/$(MACH64)/make_var_export.awk
 file path=usr/apr/1.5/build/$(MACH64)/mkdir.sh mode=0555
+link path=usr/apr/1.5/build/64 target=$(MACH64)
 file path=usr/apr/1.5/build/apr_rules.mk
 file path=usr/apr/1.5/build/libtool mode=0555
 file path=usr/apr/1.5/build/make_exports.awk
@@ -90,8 +89,18 @@
 file path=usr/apr/1.5/include/apr_user.h
 file path=usr/apr/1.5/include/apr_version.h
 file path=usr/apr/1.5/include/apr_want.h
-file path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
+link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so \
+    target=libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
+link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0 \
+    target=libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
+file path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0.5.$(MICRO_VERSION) \
+    facet.devel=false
 file path=usr/apr/1.5/lib/$(MACH64)/pkgconfig/apr-1.pc
+link path=usr/apr/1.5/lib/64 target=$(MACH64)
+link path=usr/apr/1.5/lib/libapr-1.so target=libapr-1.so.0.5.$(MICRO_VERSION) \
+    facet.devel=false
+link path=usr/apr/1.5/lib/libapr-1.so.0 \
+    target=libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
 file path=usr/apr/1.5/lib/libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
 file path=usr/apr/1.5/lib/pkgconfig/apr-1.pc
 file path=usr/apr/1.5/manual/annotated.html
@@ -283,20 +292,10 @@
 file path=usr/apr/1.5/manual/tab_s.png
 file path=usr/apr/1.5/manual/tabs.css
 file path=usr/apr/1.5/manual/unionapr__descriptor.html
-link path=usr/apr/1.5/bin/64 target=$(MACH64)
-link path=usr/apr/1.5/build/64 target=$(MACH64)
-link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.5.$(MICRO_VERSION) \
-     facet.devel=false
-link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.5.$(MICRO_VERSION) \
-     facet.devel=false
-link path=usr/apr/1.5/lib/64 target=$(MACH64)
-link path=usr/apr/1.5/lib/libapr-1.so target=libapr-1.so.0.5.$(MICRO_VERSION) \
-     facet.devel=false
-link path=usr/apr/1.5/lib/libapr-1.so.0 target=libapr-1.so.0.5.$(MICRO_VERSION) \
-     facet.devel=false
-link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.5/bin/$(MACH64)/apr-1-config \
-     mediator=apr-1-config mediator-version=1.5 pkg.linted.pkglint.dupaction010.2=true
+link path=usr/bin/$(MACH64)/apr-1-config \
+    target=../../apr/1.5/bin/$(MACH64)/apr-1-config mediator=apr-1-config \
+    mediator-version=1.5 pkg.linted.pkglint.dupaction010.2=true
 link path=usr/bin/apr-1-config target=../apr/1.5/bin/apr-1-config \
-     mediator=apr-1-config mediator-version=1.5 pkg.linted.pkglint.dupaction010.2=true
-
+    mediator=apr-1-config mediator-version=1.5 \
+    pkg.linted.pkglint.dupaction010.2=true
 license apr.license license="Apache v2.0"