--- a/components/mercurial/mercurial-GENFRAG.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,33 +18,22 @@
 #
 # 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 committed>
 
 # These are not installed, but can be found in the source contrib directory.
 <transform file path=usr/demo/mercurial/(.+)$ -> set action.hash %<\1> >
- 
+
 # We also ignore all dependencies implied by the demos.
 <transform file path=usr/demo/mercurial/.+ -> set pkg.depend.bypass-generate .*>
 
 # And we don't create .pyc files for demo files.
 <transform file path=usr/demo/mercurial/.*\.py$ -> default pkg.tmp.autopyc false>
-
-license mercurial.copyright license='GPLv2+'
-
-dir path=usr
-dir path=usr/demo
-dir path=usr/demo/mercurial
-dir path=usr/demo/mercurial/git-viz
-dir path=usr/demo/mercurial/hgsh
-dir path=usr/demo/mercurial/vim
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man5
-
+dir  path=usr
+dir  path=usr/demo
+dir  path=usr/demo/mercurial
 file path=usr/demo/mercurial/bash_completion
 file path=usr/demo/mercurial/casesmash.py
 file path=usr/demo/mercurial/check-code.py mode=555
@@ -52,8 +41,10 @@
 file path=usr/demo/mercurial/debugcmdserver.py mode=555
 file path=usr/demo/mercurial/debugshell.py
 file path=usr/demo/mercurial/dumprevlog mode=555
+dir  path=usr/demo/mercurial/git-viz
 file path=usr/demo/mercurial/hg-ssh mode=555
 file path=usr/demo/mercurial/hgk mode=555
+dir  path=usr/demo/mercurial/hgsh
 file path=usr/demo/mercurial/hgsh/Makefile
 file path=usr/demo/mercurial/hgsh/hgsh.c
 file path=usr/demo/mercurial/hgweb.fcgi mode=555
@@ -74,6 +65,7 @@
 file path=usr/demo/mercurial/tcsh_completion_build.sh mode=555
 file path=usr/demo/mercurial/tmplrewrite.py mode=555
 file path=usr/demo/mercurial/undumprevlog mode=555
+dir  path=usr/demo/mercurial/vim
 file path=usr/demo/mercurial/vim/HGAnnotate.vim
 file path=usr/demo/mercurial/vim/hg-menu.vim
 file path=usr/demo/mercurial/vim/hgcommand.vim
@@ -82,7 +74,11 @@
 file path=usr/demo/mercurial/vim/patchreview.vim
 file path=usr/demo/mercurial/xml.rnc
 file path=usr/demo/mercurial/zsh_completion
-
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file hg.1 path=usr/share/man/man1/hg.1
+dir  path=usr/share/man/man5
 file hgignore.5 path=usr/share/man/man5/hgignore.5
 file hgrc.5 path=usr/share/man/man5/hgrc.5
+license mercurial.copyright license=GPLv2+