--- a/components/tcsh/tcsh.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/tcsh/tcsh.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,66 +18,63 @@
 #
 # 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:/shell/tcsh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Tenex C-shell (tcsh)"
 set name=pkg.description \
     value="C shell with file name completion and command line editing"
-set name=pkg.summary value="Tenex C-shell (tcsh)"
 set name=com.oracle.info.description value="tcsh, the Tenex C-shell"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 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/2007/025
+set name=org.opensolaris.arc-caseid value=PSARC/2007/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/locale
-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/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/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/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/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/uk
-dir path=usr/share/locale/uk/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/tcsh
+dir  path=usr/share
+dir  path=usr/share/locale
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file $(MACH32)/nls/german.cat path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/el
+dir  path=usr/share/locale/el/LC_MESSAGES
 file $(MACH32)/nls/greek.cat path=usr/share/locale/el/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file $(MACH32)/nls/spanish.cat path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/et
+dir  path=usr/share/locale/et/LC_MESSAGES
 file $(MACH32)/nls/et.cat path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/fi
+dir  path=usr/share/locale/fi/LC_MESSAGES
 file $(MACH32)/nls/finnish.cat path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file $(MACH32)/nls/french.cat path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
 file $(MACH32)/nls/italian.cat path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/ja
+dir  path=usr/share/locale/ja/LC_MESSAGES
 file $(MACH32)/nls/ja.cat path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file $(MACH32)/nls/pl.cat path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file $(MACH32)/nls/russian.cat path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/locale/uk
+dir  path=usr/share/locale/uk/LC_MESSAGES
 file $(MACH32)/nls/ukrainian.cat path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file manpages/tcsh.1 path=usr/share/man/man1/tcsh.1
-legacy pkg=SUNWtcsh \
-    desc="Tenex C-shell (tcsh)" \
-    name="Tenex C-shell (tcsh)"
+legacy pkg=SUNWtcsh desc="Tenex C-shell (tcsh)" name="Tenex C-shell (tcsh)"
 license tcsh.license license=BSD