--- a/components/m4/m4.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/m4/m4.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,49 +20,43 @@
 #
 
 #
-# 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 committed>
 set name=pkg.fmri \
     value=pkg:/developer/macro/gnu-m4@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU m4"
 set name=pkg.description \
     value="GNU M4 is an implementation of the traditional Unix macro processor"
-set name=pkg.summary value="GNU m4"
 set name=com.oracle.info.description value="GNU m4"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/GNU
+set name=info.classification value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/388
+set name=org.opensolaris.arc-caseid value=PSARC/2008/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
+link path=usr/bin/gm4 target=../gnu/bin/m4 facet.compat.gnulinks=true
+dir  path=usr/gnu
+dir  path=usr/gnu/bin
 file path=usr/gnu/bin/m4
+dir  path=usr/gnu/share
+dir  path=usr/gnu/share/man
+dir  path=usr/gnu/share/man/man1
 file path=usr/gnu/share/man/man1/m4.1
+dir  path=usr/sfw
+dir  path=usr/sfw/bin
+link path=usr/sfw/bin/gm4 target=../../gnu/bin/m4
+dir  path=usr/share
+dir  path=usr/share/info
 file path=usr/share/info/m4.info
 file path=usr/share/info/m4.info-1
 file path=usr/share/info/m4.info-2
-legacy pkg=SUNWgm4 \
-    desc="GNU m4 - A macro processor (gm4)" \
-    name="GNU m4"
-
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+link path=usr/share/man/man1/gm4.1 target=../../../gnu/share/man/man1/m4.1 \
+    facet.compat.gnulinks=all
+legacy pkg=SUNWgm4 desc="GNU m4 - A macro processor (gm4)" name="GNU m4"
 license m4.license license="GPLv3, FDLv1.2"
-link path=usr/bin/gm4 \
-    target=../gnu/bin/m4 facet.compat.gnulinks=true
-link path=usr/sfw/bin/gm4 target=../../gnu/bin/m4
-link path=usr/share/man/man1/gm4.1 \
-    target=../../../gnu/share/man/man1/m4.1 facet.compat.gnulinks=all