--- a/components/ircii/ircii.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/ircii/ircii.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,53 +18,41 @@
 #
 # 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/chat/ircii@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Internet Relay Chat Client"
+set name=pkg.description \
+    value="A terminal-based IRC client that runs under most unix platforms."
 set name=pkg.human-version value=$(COMPONENT_VERSION)
-set name=pkg.description value="A terminal-based IRC client that runs under most unix platforms."
-set name=pkg.summary value="Internet Relay Chat Client"
-set name=com.oracle.info.description value="the ircii Internet Relay Chat Client"
+set name=com.oracle.info.description \
+    value="the ircii Internet Relay Chat Client"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     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=org.opensolaris.arc-caseid \
-    value=LSARC/2008/373
+set name=org.opensolaris.arc-caseid value=LSARC/2008/373
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/irc
-dir path=usr/share/irc/help
-dir path=usr/share/irc/help/alias
-dir path=usr/share/irc/help/bind
-dir path=usr/share/irc/help/ctcp
-dir path=usr/share/irc/help/dcc
-dir path=usr/share/irc/help/ircii
-dir path=usr/share/irc/help/load
-dir path=usr/share/irc/help/note
-dir path=usr/share/irc/help/on
-dir path=usr/share/irc/help/set
-dir path=usr/share/irc/help/window
-dir path=usr/share/irc/script
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/irc
 file path=usr/bin/ircflush
 file path=usr/bin/ircio
 file path=usr/bin/wserv
+dir  path=usr/share
+dir  path=usr/share/irc
+dir  path=usr/share/irc/help
 file path=usr/share/irc/help/!
 file path=usr/share/irc/help/.date
 file path=usr/share/irc/help/:
 file path=usr/share/irc/help/@
 file path=usr/share/irc/help/abort
 file path=usr/share/irc/help/admin
+dir  path=usr/share/irc/help/alias
 file path=usr/share/irc/help/alias/alias
 file path=usr/share/irc/help/alias/functions
 file path=usr/share/irc/help/alias/quote
@@ -74,6 +62,7 @@
 file path=usr/share/irc/help/away
 file path=usr/share/irc/help/basics
 file path=usr/share/irc/help/beep
+dir  path=usr/share/irc/help/bind
 file path=usr/share/irc/help/bind/backspace
 file path=usr/share/irc/help/bind/backward_character
 file path=usr/share/irc/help/bind/backward_history
@@ -136,6 +125,7 @@
 file path=usr/share/irc/help/commands
 file path=usr/share/irc/help/comment
 file path=usr/share/irc/help/connect
+dir  path=usr/share/irc/help/ctcp
 file path=usr/share/irc/help/ctcp/action
 file path=usr/share/irc/help/ctcp/clientinfo
 file path=usr/share/irc/help/ctcp/ctcp
@@ -147,6 +137,7 @@
 file path=usr/share/irc/help/ctcp/utc
 file path=usr/share/irc/help/ctcp/version
 file path=usr/share/irc/help/date
+dir  path=usr/share/irc/help/dcc
 file path=usr/share/irc/help/dcc/chat
 file path=usr/share/irc/help/dcc/close
 file path=usr/share/irc/help/dcc/dcc
@@ -181,6 +172,7 @@
 file path=usr/share/irc/help/input
 file path=usr/share/irc/help/intro
 file path=usr/share/irc/help/invite
+dir  path=usr/share/irc/help/ircii
 file path=usr/share/irc/help/ircii/copyright
 file path=usr/share/irc/help/ison
 file path=usr/share/irc/help/join
@@ -190,6 +182,7 @@
 file path=usr/share/irc/help/leave
 file path=usr/share/irc/help/links
 file path=usr/share/irc/help/list
+dir  path=usr/share/irc/help/load
 file path=usr/share/irc/help/load/2.9script
 file path=usr/share/irc/help/load/action
 file path=usr/share/irc/help/load/alias
@@ -266,6 +259,7 @@
 file path=usr/share/irc/help/news
 file path=usr/share/irc/help/newuser
 file path=usr/share/irc/help/nick
+dir  path=usr/share/irc/help/note
 file path=usr/share/irc/help/note/antiwall
 file path=usr/share/irc/help/note/count
 file path=usr/share/irc/help/note/deny
@@ -289,6 +283,7 @@
 file path=usr/share/irc/help/note/wallops
 file path=usr/share/irc/help/notice
 file path=usr/share/irc/help/notify
+dir  path=usr/share/irc/help/on
 file path=usr/share/irc/help/on/action
 file path=usr/share/irc/help/on/channel_nick
 file path=usr/share/irc/help/on/channel_signoff
@@ -372,6 +367,7 @@
 file path=usr/share/irc/help/sendline
 file path=usr/share/irc/help/server
 file path=usr/share/irc/help/servlist
+dir  path=usr/share/irc/help/set
 file path=usr/share/irc/help/set/always_split_biggest
 file path=usr/share/irc/help/set/auto_unmark_away
 file path=usr/share/irc/help/set/auto_whowas
@@ -518,6 +514,7 @@
 file path=usr/share/irc/help/who
 file path=usr/share/irc/help/whois
 file path=usr/share/irc/help/whowas
+dir  path=usr/share/irc/help/window
 file path=usr/share/irc/help/window/add
 file path=usr/share/irc/help/window/addgroup
 file path=usr/share/irc/help/window/back
@@ -567,6 +564,7 @@
 file path=usr/share/irc/help/window/window
 file path=usr/share/irc/help/xecho
 file path=usr/share/irc/help/xtype
+dir  path=usr/share/irc/script
 file path=usr/share/irc/script/2.8script
 file path=usr/share/irc/script/2.9script
 file path=usr/share/irc/script/action
@@ -648,6 +646,8 @@
 file path=usr/share/irc/script/wallopstat
 file path=usr/share/irc/script/whowas
 file path=usr/share/irc/script/window
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+link path=usr/share/man/man1/irc.1 target=ircII.1
 file path=usr/share/man/man1/ircII.1
 license ircii.license license=BSD
-link path=usr/share/man/man1/irc.1 target=ircII.1