--- a/components/bison/bison.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/bison/bison.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,80 +20,33 @@
 #
 
 #
-# 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:/developer/parser/bison@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="bison - A YACC Replacement"
 set name=pkg.description \
     value="a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar"
-set name=pkg.summary value="bison - A YACC Replacement"
 set name=com.oracle.info.description value="the bison parser generator"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 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/289
+set name=org.opensolaris.arc-caseid value=PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/aclocal
-dir path=usr/share/bison
-dir path=usr/share/bison/m4sugar
-dir path=usr/share/info
-dir path=usr/share/locale
-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/et
-dir path=usr/share/locale/et/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/ga
-dir path=usr/share/locale/ga/LC_MESSAGES
-dir path=usr/share/locale/hr
-dir path=usr/share/locale/hr/LC_MESSAGES
-dir path=usr/share/locale/id
-dir path=usr/share/locale/id/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/ms
-dir path=usr/share/locale/ms/LC_MESSAGES
-dir path=usr/share/locale/nb
-dir path=usr/share/locale/nb/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/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/share/locale/ro
-dir path=usr/share/locale/ro/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/rw
-dir path=usr/share/locale/rw/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/locale/vi
-dir path=usr/share/locale/vi/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
 file path=usr/bin/bison
+dir  path=usr/sfw
+dir  path=usr/sfw/bin
+link path=usr/sfw/bin/bison target=../../bin/bison
+dir  path=usr/share
+dir  path=usr/share/aclocal
 file path=usr/share/aclocal/bison-i18n.m4
+dir  path=usr/share/bison
 file path=usr/share/bison/README
 file path=usr/share/bison/c++.m4
 file path=usr/share/bison/c.m4
@@ -101,36 +54,81 @@
 file path=usr/share/bison/glr.cc
 file path=usr/share/bison/lalr1.cc
 file path=usr/share/bison/location.cc
+dir  path=usr/share/bison/m4sugar
 file path=usr/share/bison/m4sugar/m4sugar.m4
 file path=usr/share/bison/yacc.c
+dir  path=usr/share/info
 file path=usr/share/info/bison.info
+dir  path=usr/share/locale
+dir  path=usr/share/locale/da
+dir  path=usr/share/locale/da/LC_MESSAGES
 file path=usr/share/locale/da/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file path=usr/share/locale/es/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/et
+dir  path=usr/share/locale/et/LC_MESSAGES
 file path=usr/share/locale/et/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/ga
+dir  path=usr/share/locale/ga/LC_MESSAGES
 file path=usr/share/locale/ga/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/hr
+dir  path=usr/share/locale/hr/LC_MESSAGES
 file path=usr/share/locale/hr/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/id
+dir  path=usr/share/locale/id/LC_MESSAGES
 file path=usr/share/locale/id/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
 file path=usr/share/locale/it/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/ja
+dir  path=usr/share/locale/ja/LC_MESSAGES
 file path=usr/share/locale/ja/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/ms
+dir  path=usr/share/locale/ms/LC_MESSAGES
 file path=usr/share/locale/ms/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/nb
+dir  path=usr/share/locale/nb/LC_MESSAGES
 file path=usr/share/locale/nb/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/nl
+dir  path=usr/share/locale/nl/LC_MESSAGES
 file path=usr/share/locale/nl/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/pt_BR
+dir  path=usr/share/locale/pt_BR/LC_MESSAGES
 file path=usr/share/locale/pt_BR/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/ro
+dir  path=usr/share/locale/ro/LC_MESSAGES
 file path=usr/share/locale/ro/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file path=usr/share/locale/ru/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/rw
+dir  path=usr/share/locale/rw/LC_MESSAGES
 file path=usr/share/locale/rw/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/sv
+dir  path=usr/share/locale/sv/LC_MESSAGES
 file path=usr/share/locale/sv/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/tr
+dir  path=usr/share/locale/tr/LC_MESSAGES
 file path=usr/share/locale/tr/LC_MESSAGES/bison.mo
+dir  path=usr/share/locale/vi
+dir  path=usr/share/locale/vi/LC_MESSAGES
 file path=usr/share/locale/vi/LC_MESSAGES/bison.mo
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/bison.1
-legacy pkg=SUNWbison \
-    desc="GNU bison - A YACC Replacement" \
+legacy pkg=SUNWbison desc="GNU bison - A YACC Replacement" \
     name="bison - A YACC Replacement"
 
 
 license bison.license license="GPLv2, FDLv1.2"
-link path=usr/sfw/bin/bison target=../../bin/bison
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gm4 type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gm4