--- a/components/libidn/libidn.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/libidn/libidn.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,20 +18,22 @@
 #
 # 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/libidn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/libidn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="IDN - The Internationalized Domains Library"
-set name=pkg.description value="A fully documented implementation of the Stringprep, Punycode and IDNA specifications for the purpose of encoding and decoding internationalized domain names"
-set name=com.oracle.info.description value="the libidn Internationalized Domains Library"
+set name=pkg.description \
+    value="A fully documented implementation of the Stringprep, Punycode and IDNA specifications for the purpose of encoding and decoding internationalized domain names"
+set name=com.oracle.info.description \
+    value="the libidn Internationalized Domains 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/2007/167
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2007/167
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 #
@@ -43,15 +45,18 @@
 file path=usr/include/idn/punycode.h
 file path=usr/include/idn/stringprep.h
 file path=usr/include/idn/tld.h
+link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.2
+link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.2
+file path=usr/lib/$(MACH64)/libidn.so.11.6.2
+file path=usr/lib/$(MACH64)/llib-lidn.ln
+file path=usr/lib/$(MACH64)/pkgconfig/libidn.pc
+link path=usr/lib/libidn.so target=libidn.so.11.6.2
+#
+link path=usr/lib/libidn.so.11 target=libidn.so.11.6.2
 file path=usr/lib/libidn.so.11.6.2
-file path=usr/lib/$(MACH64)/libidn.so.11.6.2
 file path=usr/lib/llib-lidn
 file path=usr/lib/llib-lidn.ln
-file path=usr/lib/$(MACH64)/llib-lidn.ln
 file path=usr/lib/pkgconfig/libidn.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libidn.pc
-file path=usr/share/doc/idn/libidn-components.pdf
-file path=usr/share/doc/idn/libidn.pdf
 file path=usr/share/doc/idn/html/libidn-components.png
 file path=usr/share/doc/idn/html/libidn.html
 file path=usr/share/doc/idn/java/about.html
@@ -78,6 +83,8 @@
 file path=usr/share/doc/idn/java/resources/gjdochtml-clean-layout.css
 file path=usr/share/doc/idn/java/resources/inherit.png
 file path=usr/share/doc/idn/java/serialized-form.html
+file path=usr/share/doc/idn/libidn-components.pdf
+file path=usr/share/doc/idn/libidn.pdf
 file path=usr/share/doc/idn/tld/ac.tld
 file path=usr/share/doc/idn/tld/at.tld
 file path=usr/share/doc/idn/tld/biz.tld
@@ -168,9 +175,4 @@
 file path=usr/share/man/man3/tld_get_z.3
 file path=usr/share/man/man3/tld_strerror.3
 #
-link path=usr/lib/libidn.so.11 target=libidn.so.11.6.2
-link path=usr/lib/libidn.so target=libidn.so.11.6.2
-link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.2
-link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.2
-#
 license libidn.license license="LGPLv2.1, GPLv3, FDLv1.3"