--- a/components/gawk/gawk.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gawk/gawk.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,16 +21,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/gawk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<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.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=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=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://directory.fsf.org/project/gawk/"
+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=http://directory.fsf.org/project/gawk/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/594
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license gawk.license license="GPLv2"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -125,11 +128,10 @@
 file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo
 file path=usr/share/man/man1/gawk.1
 file path=usr/share/man/man1/igawk.1
-link path=usr/share/man/man1/pgawk.1 target=gawk.1
+legacy pkg=SUNWgawk desc="gawk - GNU awk 3.1.5" \
+    name="gawk - GNU implementation of awk"
+license gawk.license license=GPLv2
 link path=usr/gnu/bin/awk target=../../bin/gawk
 link path=usr/gnu/share/man/man1/awk.1 \
     target=../../../../share/man/man1/gawk.1
-
-legacy  pkg=SUNWgawk \
-	name="gawk - GNU implementation of awk" \
-	desc="gawk - GNU awk 3.1.5"
+link path=usr/share/man/man1/pgawk.1 target=gawk.1