--- a/components/nethack/nethack.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/nethack/nethack.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,39 +18,28 @@
 #
 # 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:/games/nethack@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value="Nethack is a turn-based single-player dungeon exploration game related to Hack and Rogue.  The primary interface is a pseudo-graphical display rendered in text in a terminal, and controlled by the keyboard."
 set name=pkg.summary value="A single-player dungeon exploration game"
+set name=pkg.description \
+    value="Nethack is a turn-based single-player dungeon exploration game related to Hack and Rogue.  The primary interface is a pseudo-graphical display rendered in text in a terminal, and controlled by the keyboard."
 set name=com.oracle.info.description value="the nethack game"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Games
 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/172
+set name=org.opensolaris.arc-caseid value=PSARC/2008/172
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license nethack.copyright license=Nethack
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/nethack
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man6
-dir path=var
-dir path=var/games
-dir path=var/games/nethack mode=0775 group=games
-dir path=var/games/nethack/save mode=0775 group=games
-
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/nethack
+dir  path=usr/lib
+dir  path=usr/lib/nethack
 file path=usr/lib/nethack/Arc-fila.lev
 file path=usr/lib/nethack/Arc-filb.lev
 file path=usr/lib/nethack/Arc-goal.lev
@@ -153,7 +142,7 @@
 file path=usr/lib/nethack/minetn-5.lev
 file path=usr/lib/nethack/minetn-6.lev
 file path=usr/lib/nethack/minetn-7.lev
-file path=usr/lib/nethack/nethack mode=2555 group=games
+file path=usr/lib/nethack/nethack group=games mode=2555
 file path=usr/lib/nethack/opthelp
 file path=usr/lib/nethack/options
 file path=usr/lib/nethack/oracle.lev
@@ -183,12 +172,18 @@
 file path=usr/lib/nethack/wizard3.lev
 file path=usr/lib/nethack/wizhelp
 file path=usr/lib/nethack/x11tiles
-
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man6
 file nethack.6 path=usr/share/man/man6/nethack.6
-
-file path=var/games/nethack/logfile mode=0664 group=games \
+dir  path=var
+dir  path=var/games
+dir  path=var/games/nethack group=games mode=0775
+file path=var/games/nethack/logfile group=games mode=0664 \
     original_name=SUNWnethack:var/games/nethack/logfile preserve=true
-file path=var/games/nethack/perm mode=0664 group=games \
+file path=var/games/nethack/perm group=games mode=0664 \
     original_name=SUNWnethack:var/games/nethack/perm preserve=true
-file path=var/games/nethack/record mode=0664 group=games \
+file path=var/games/nethack/record group=games mode=0664 \
     original_name=SUNWnethack:var/games/nethack/record preserve=true
+dir  path=var/games/nethack/save group=games mode=0775
+license nethack.copyright license=Nethack