--- a/components/sed/sed.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/sed/sed.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,150 +20,148 @@
 #
 
 #
-# 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/gnu-sed@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="gsed - GNU implementation of sed, the Unix stream editor"
 set name=pkg.description \
     value="sed takes text input and performs some operation (or set of operations) on it and outputs the modified text."
-set name=pkg.summary \
-    value="gsed - GNU implementation of sed, the Unix stream editor"
 set name=com.oracle.info.description value="GNU sed"
 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/254
+set name=org.opensolaris.arc-caseid value=PSARC/2008/254
 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/share
-dir path=usr/share/info
-dir path=usr/share/locale
-dir path=usr/share/locale/af
-dir path=usr/share/locale/af/LC_MESSAGES
-dir path=usr/share/locale/ca
-dir path=usr/share/locale/ca/LC_MESSAGES
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/el
-dir path=usr/share/locale/el/LC_MESSAGES
-dir path=usr/share/locale/eo
-dir path=usr/share/locale/eo/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/et
-dir path=usr/share/locale/et/LC_MESSAGES
-dir path=usr/share/locale/eu
-dir path=usr/share/locale/eu/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/ga
-dir path=usr/share/locale/ga/LC_MESSAGES
-dir path=usr/share/locale/gl
-dir path=usr/share/locale/gl/LC_MESSAGES
-dir path=usr/share/locale/he
-dir path=usr/share/locale/he/LC_MESSAGES
-dir path=usr/share/locale/hr
-dir path=usr/share/locale/hr/LC_MESSAGES
-dir path=usr/share/locale/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
-dir path=usr/share/locale/id
-dir path=usr/share/locale/id/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/ko
-dir path=usr/share/locale/ko/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/pt
-dir path=usr/share/locale/pt/LC_MESSAGES
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/share/locale/ro
-dir path=usr/share/locale/ro/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/sk
-dir path=usr/share/locale/sk/LC_MESSAGES
-dir path=usr/share/locale/sl
-dir path=usr/share/locale/sl/LC_MESSAGES
-dir path=usr/share/locale/sr
-dir path=usr/share/locale/sr/LC_MESSAGES
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
-dir path=usr/share/locale/tr
-dir path=usr/share/locale/tr/LC_MESSAGES
-dir path=usr/share/locale/uk
-dir path=usr/share/locale/uk/LC_MESSAGES
-dir path=usr/share/locale/vi
-dir path=usr/share/locale/vi/LC_MESSAGES
-dir path=usr/share/locale/zh_CN
-dir path=usr/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
+link path=usr/bin/gsed target=../gnu/bin/sed facet.compat.gnulinks=true
+dir  path=usr/gnu
+dir  path=usr/gnu/bin
 file usr/bin/sed path=usr/gnu/bin/sed
+dir  path=usr/gnu/share
+dir  path=usr/gnu/share/man
+dir  path=usr/gnu/share/man/man1
+file usr/share/man/man1/sed.1 path=usr/gnu/share/man/man1/sed.1
+dir  path=usr/share
+dir  path=usr/share/info
 file path=usr/share/info/sed.info
+dir  path=usr/share/locale
+dir  path=usr/share/locale/af
+dir  path=usr/share/locale/af/LC_MESSAGES
 file path=usr/share/locale/af/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/ca
+dir  path=usr/share/locale/ca/LC_MESSAGES
 file path=usr/share/locale/ca/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/cs
+dir  path=usr/share/locale/cs/LC_MESSAGES
 file path=usr/share/locale/cs/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/da
+dir  path=usr/share/locale/da/LC_MESSAGES
 file path=usr/share/locale/da/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/el
+dir  path=usr/share/locale/el/LC_MESSAGES
 file path=usr/share/locale/el/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/eo
+dir  path=usr/share/locale/eo/LC_MESSAGES
 file path=usr/share/locale/eo/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file path=usr/share/locale/es/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/et
+dir  path=usr/share/locale/et/LC_MESSAGES
 file path=usr/share/locale/et/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/eu
+dir  path=usr/share/locale/eu/LC_MESSAGES
 file path=usr/share/locale/eu/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/fi
+dir  path=usr/share/locale/fi/LC_MESSAGES
 file path=usr/share/locale/fi/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/ga
+dir  path=usr/share/locale/ga/LC_MESSAGES
 file path=usr/share/locale/ga/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/gl
+dir  path=usr/share/locale/gl/LC_MESSAGES
 file path=usr/share/locale/gl/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/he
+dir  path=usr/share/locale/he/LC_MESSAGES
 file path=usr/share/locale/he/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/hr
+dir  path=usr/share/locale/hr/LC_MESSAGES
 file path=usr/share/locale/hr/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/hu
+dir  path=usr/share/locale/hu/LC_MESSAGES
 file path=usr/share/locale/hu/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/id
+dir  path=usr/share/locale/id/LC_MESSAGES
 file path=usr/share/locale/id/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
 file path=usr/share/locale/it/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/ja
+dir  path=usr/share/locale/ja/LC_MESSAGES
 file path=usr/share/locale/ja/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/ko
+dir  path=usr/share/locale/ko/LC_MESSAGES
 file path=usr/share/locale/ko/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/nl
+dir  path=usr/share/locale/nl/LC_MESSAGES
 file path=usr/share/locale/nl/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/pt
+dir  path=usr/share/locale/pt/LC_MESSAGES
 file path=usr/share/locale/pt/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/pt_BR
+dir  path=usr/share/locale/pt_BR/LC_MESSAGES
 file path=usr/share/locale/pt_BR/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/ro
+dir  path=usr/share/locale/ro/LC_MESSAGES
 file path=usr/share/locale/ro/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file path=usr/share/locale/ru/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/sk
+dir  path=usr/share/locale/sk/LC_MESSAGES
 file path=usr/share/locale/sk/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/sl
+dir  path=usr/share/locale/sl/LC_MESSAGES
 file path=usr/share/locale/sl/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/sr
+dir  path=usr/share/locale/sr/LC_MESSAGES
 file path=usr/share/locale/sr/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/sv
+dir  path=usr/share/locale/sv/LC_MESSAGES
 file path=usr/share/locale/sv/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/tr
+dir  path=usr/share/locale/tr/LC_MESSAGES
 file path=usr/share/locale/tr/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/uk
+dir  path=usr/share/locale/uk/LC_MESSAGES
 file path=usr/share/locale/uk/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/vi
+dir  path=usr/share/locale/vi/LC_MESSAGES
 file path=usr/share/locale/vi/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/zh_CN
+dir  path=usr/share/locale/zh_CN/LC_MESSAGES
 file path=usr/share/locale/zh_CN/LC_MESSAGES/sed.mo
+dir  path=usr/share/locale/zh_TW
+dir  path=usr/share/locale/zh_TW/LC_MESSAGES
 file path=usr/share/locale/zh_TW/LC_MESSAGES/sed.mo
-file usr/share/man/man1/sed.1 path=usr/gnu/share/man/man1/sed.1
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+link path=usr/share/man/man1/gsed.1 target=../../../gnu/share/man/man1/sed.1 \
+    facet.compat.gnulinks=all
 license sed.license license="GPLv3, FDLv1.3"
-link path=usr/bin/gsed \
-    target=../gnu/bin/sed facet.compat.gnulinks=true
-link path=usr/share/man/man1/gsed.1 \
-    target=../../../gnu/share/man/man1/sed.1 facet.compat.gnulinks=all