--- a/components/libassuan/libassuan.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/libassuan/libassuan.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,34 +18,36 @@
 #
 # 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/security/libassuan@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/security/libassuan@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG IPC implementation library"
-set name=pkg.description value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
-set name=com.oracle.info.description value="the GnuPG IPC implementation library"
+set name=pkg.description \
+    value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
+set name=com.oracle.info.description \
+    value="the GnuPG IPC implementation library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/397
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 #
 file path=usr/bin/libassuan-config
 file path=usr/include/assuan.h
+link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.1.0
+link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.1.0
+file path=usr/lib/$(MACH64)/libassuan.so.0.1.0
+link path=usr/lib/libassuan.so target=libassuan.so.0.1.0
+#
+link path=usr/lib/libassuan.so.0 target=libassuan.so.0.1.0
 file path=usr/lib/libassuan.so.0.1.0
-file path=usr/lib/$(MACH64)/libassuan.so.0.1.0
 file path=usr/share/aclocal/libassuan.m4
 file path=usr/share/info/assuan.info
 #
-link path=usr/lib/libassuan.so.0 target=libassuan.so.0.1.0
-link path=usr/lib/libassuan.so target=libassuan.so.0.1.0
-link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.1.0
-link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.1.0
-#
 license libassuan.license license="GPLv3, LGPLv2"
 depend type=optional fmri=crypto/[email protected]