--- a/components/gawk/gawk.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gawk/gawk.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,27 +18,27 @@
 #
 # 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 volatile>
-set name=pkg.fmri \
-    value=pkg:/text/gawk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/text/gawk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU awk"
 set name=pkg.description \
     value="The awk utility interprets a special-purpose programming language that makes it possible to handle many data-reformatting jobs with just a few lines of code."
-set name=pkg.summary value="GNU awk"
 set name=com.oracle.info.description value="GNU awk"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 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/594
+set name=org.opensolaris.arc-caseid value=PSARC/2008/594
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file usr/bin/gawk path=usr/gnu/bin/awk
+link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true
 file path=usr/bin/igawk
 file path=usr/bin/pgawk
+file usr/bin/gawk path=usr/gnu/bin/awk
+file usr/share/man/man1/gawk.1 path=usr/gnu/share/man/man1/awk.1
 file path=usr/lib/awk/grcat mode=0555
 file path=usr/lib/awk/pwcat mode=0555
 file path=usr/share/awk/assert.awk
@@ -82,11 +82,8 @@
 file path=usr/share/locale/tr/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/gawk.mo
-file usr/share/man/man1/gawk.1 path=usr/gnu/share/man/man1/awk.1
+link path=usr/share/man/man1/gawk.1 target=../../../gnu/share/man/man1/awk.1 \
+    facet.compat.gnulinks=all
 file path=usr/share/man/man1/igawk.1
+link path=usr/share/man/man1/pgawk.1 target=../../../gnu/share/man/man1/awk.1
 license gawk.license license="GPLv3, FDLv1.3"
-link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true
-link path=usr/share/man/man1/gawk.1 \
-    target=../../../gnu/share/man/man1/awk.1 facet.compat.gnulinks=all
-link path=usr/share/man/man1/pgawk.1 \
-    target=../../../gnu/share/man/man1/awk.1