--- a/components/slrn/slrn.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/slrn/slrn.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,70 +18,31 @@
 #
 # 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 uncommitted>
 set name=pkg.fmri \
     value=pkg:/network/nntp/slrn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary \
-    value="slrn - S-Lang read news"
+set name=pkg.summary value="slrn - S-Lang read news"
 set name=pkg.description \
     value="slrn is an text-based news client, i.e. a program that accesses a newsserver to read messages from the Internet News service (also known as 'Usenet')."
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=com.oracle.info.description value="the slrn news reader"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
-    value="org.opensolaris.category.2008:Applications/Internet"
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url \
-    value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/639
-set name=org.opensolaris.consolidation \
-    value=$(CONSOLIDATION)
-
-license slrn.license license='GPLv2'
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/slrn
-dir path=usr/share/doc/slrn/slrnpull
-dir path=usr/share/locale
-dir path=usr/share/locale/be
-dir path=usr/share/locale/be/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/es
-dir path=usr/share/locale/es/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/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/ru
-dir path=usr/share/locale/ru/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/man
-dir path=usr/share/man/man1
-dir path=usr/share/slrn
-dir path=usr/share/slrn/slang
+set name=org.opensolaris.arc-caseid value=PSARC/2008/639
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/slrn
 file path=usr/bin/slrnpull
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/slrn
 file path=usr/share/doc/slrn/COPYING
 file path=usr/share/doc/slrn/COPYRIGHT
 file path=usr/share/doc/slrn/FAQ
@@ -100,6 +61,7 @@
 file path=usr/share/doc/slrn/slrn-doc.html
 file path=usr/share/doc/slrn/slrn.rc
 file path=usr/share/doc/slrn/slrnfuns.txt
+dir  path=usr/share/doc/slrn/slrnpull
 file path=usr/share/doc/slrn/slrnpull/README
 file path=usr/share/doc/slrn/slrnpull/README.offline
 file path=usr/share/doc/slrn/slrnpull/SETUP
@@ -108,21 +70,52 @@
 file path=usr/share/doc/slrn/slrnpull/slrn.rc
 file path=usr/share/doc/slrn/slrnpull/slrnpull.conf
 file path=usr/share/doc/slrn/slrnpull/slrnpull.sh
+dir  path=usr/share/locale
+dir  path=usr/share/locale/be
+dir  path=usr/share/locale/be/LC_MESSAGES
 file path=usr/share/locale/be/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/da
+dir  path=usr/share/locale/da/LC_MESSAGES
 file path=usr/share/locale/da/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file path=usr/share/locale/es/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/fi
+dir  path=usr/share/locale/fi/LC_MESSAGES
 file path=usr/share/locale/fi/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
 file path=usr/share/locale/it/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/ko
+dir  path=usr/share/locale/ko/LC_MESSAGES
 file path=usr/share/locale/ko/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/nl
+dir  path=usr/share/locale/nl/LC_MESSAGES
 file path=usr/share/locale/nl/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file path=usr/share/locale/ru/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/sv
+dir  path=usr/share/locale/sv/LC_MESSAGES
 file path=usr/share/locale/sv/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/tr
+dir  path=usr/share/locale/tr/LC_MESSAGES
 file path=usr/share/locale/tr/LC_MESSAGES/slrn.mo
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/slrn.1
 file path=usr/share/man/man1/slrnpull.1
+dir  path=usr/share/slrn
+dir  path=usr/share/slrn/slang
 file path=usr/share/slrn/slang/color.sl
 file path=usr/share/slrn/slang/gsort.sl
 file path=usr/share/slrn/slang/ispell.sl
@@ -138,3 +131,4 @@
 file path=usr/share/slrn/slang/util.sl
 file path=usr/share/slrn/slang/varset.sl
 file path=usr/share/slrn/slang/xcomment.sl
+license slrn.license license=GPLv2