--- a/components/mpfr/mpfr.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/mpfr/mpfr.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,32 +18,38 @@
 #
 # 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/mpfr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/mpfr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU MPFR"
-set name=pkg.description value="The GNU Multiple Precision with IEEE Rounding Floating-Point Library"
+set name=pkg.description \
+    value="The GNU Multiple Precision with IEEE Rounding Floating-Point Library"
 set name=com.oracle.info.description value="GNU MPFR"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/High Performance Computing"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2008/655
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/655
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 #
 file path=usr/include/mpfr/mpf2mpfr.h
 file path=usr/include/mpfr/mpfr.h
+link path=usr/lib/$(MACH64)/libmpfr.so target=libmpfr.so.1.2.2
+link path=usr/lib/$(MACH64)/libmpfr.so.1 target=libmpfr.so.1.2.2
+file path=usr/lib/$(MACH64)/libmpfr.so.1.2.2
+file path=usr/lib/$(MACH64)/llib-lmpfr.ln
+file path=usr/lib/$(MACH64)/pkgconfig/libmpfr.pc
+link path=usr/lib/libmpfr.so target=libmpfr.so.1.2.2
+#
+link path=usr/lib/libmpfr.so.1 target=libmpfr.so.1.2.2
 file path=usr/lib/libmpfr.so.1.2.2
-file path=usr/lib/$(MACH64)/libmpfr.so.1.2.2
 file path=usr/lib/llib-lmpfr
 file path=usr/lib/llib-lmpfr.ln
-file path=usr/lib/$(MACH64)/llib-lmpfr.ln
 file path=usr/lib/pkgconfig/libmpfr.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libmpfr.pc
 file path=usr/share/doc/mpfr/examples/ReadMe
 file path=usr/share/doc/mpfr/examples/divworst.c
 file path=usr/share/doc/mpfr/examples/rndo-add.c
@@ -52,9 +58,4 @@
 file path=usr/share/info/mpfr.info
 file path=usr/share/man/man3/libmpfr.3
 #
-link path=usr/lib/libmpfr.so.1 target=libmpfr.so.1.2.2
-link path=usr/lib/libmpfr.so target=libmpfr.so.1.2.2
-link path=usr/lib/$(MACH64)/libmpfr.so.1 target=libmpfr.so.1.2.2
-link path=usr/lib/$(MACH64)/libmpfr.so target=libmpfr.so.1.2.2
-#
 license mpfr.license license="LGPLv2.1, FDLv1.2"