--- a/components/groff/groff.p5m	Fri Apr 05 15:35:37 2013 -0700
+++ b/components/groff/groff.p5m	Tue Apr 09 10:37:15 2013 -0700
@@ -35,13 +35,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/425
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/X11
-dir  path=usr/X11/lib
-dir  path=usr/X11/lib/X11
-dir  path=usr/X11/lib/X11/app-defaults
 file path=usr/X11/lib/X11/app-defaults/GXditview
-dir  path=usr/bin
 file path=usr/bin/addftinfo
 file path=usr/bin/afmtodit
 file path=usr/bin/eqn2graph
@@ -65,16 +59,10 @@
 file path=usr/bin/pre-grohtml
 file path=usr/bin/tfmtodit
 file path=usr/bin/xtotroff
-dir  path=usr/gnu
-dir  path=usr/gnu/bin
 file usr/bin/ggrn path=usr/gnu/bin/grn
 file usr/bin/gindxbib path=usr/gnu/bin/indxbib
 file usr/bin/grefer path=usr/gnu/bin/refer
-dir  path=usr/lib
-dir  path=usr/lib/groff
-dir  path=usr/lib/groff/groffer
 file path=usr/lib/groff/groffer/groffer2.sh
-dir  path=usr/lib/groff/site-tmac
 file path=usr/lib/groff/site-tmac/an.tmac
 file path=usr/lib/groff/site-tmac/ansun.tmac
 file path=usr/lib/groff/site-tmac/bib.tmac
@@ -82,16 +70,10 @@
 file path=usr/lib/groff/site-tmac/s.tmac
 file path=usr/lib/groff/site-tmac/v.tmac
 file path=usr/lib/groff/site-tmac/vgrind.tmac
-dir  path=usr/share
-dir  path=usr/share/doc
-dir  path=usr/share/doc/groff
-dir  path=usr/share/doc/groff/1.19.2
-dir  path=usr/share/doc/groff/1.19.2/examples
 file path=usr/share/doc/groff/1.19.2/examples/grnexmpl.g
 file path=usr/share/doc/groff/1.19.2/examples/grnexmpl.me
 file path=usr/share/doc/groff/1.19.2/examples/grnexmpl.ps
 file path=usr/share/doc/groff/1.19.2/examples/groff.css facet.doc.html=true
-dir  path=usr/share/doc/groff/1.19.2/examples/mom
 file path=usr/share/doc/groff/1.19.2/examples/mom/README.txt
 file path=usr/share/doc/groff/1.19.2/examples/mom/elvis_syntax
 file path=usr/share/doc/groff/1.19.2/examples/mom/elvis_syntax.new
@@ -104,8 +86,6 @@
 file path=usr/share/doc/groff/1.19.2/examples/mom/typesetting.ps
 file path=usr/share/doc/groff/1.19.2/examples/webpage.ms
 file path=usr/share/doc/groff/1.19.2/examples/webpage.ps
-dir  path=usr/share/doc/groff/1.19.2/html facet.doc.html=true
-dir  path=usr/share/doc/groff/1.19.2/html/mom facet.doc.html=true
 file path=usr/share/doc/groff/1.19.2/html/mom/appendices.html \
     facet.doc.html=true
 file path=usr/share/doc/groff/1.19.2/html/mom/color.html facet.doc.html=true
@@ -137,15 +117,9 @@
 file path=usr/share/doc/groff/1.19.2/meintro.ps
 file path=usr/share/doc/groff/1.19.2/meref.me
 file path=usr/share/doc/groff/1.19.2/meref.ps
-dir  path=usr/share/doc/groff/1.19.2/pdf
 file path=usr/share/doc/groff/1.19.2/pdf/pdfmark.pdf facet.doc.html=true
 file path=usr/share/doc/groff/1.19.2/pic.ms
 file path=usr/share/doc/groff/1.19.2/pic.ps
-dir  path=usr/share/groff
-dir  path=usr/share/groff/1.19.2
-dir  path=usr/share/groff/1.19.2/font
-dir  path=usr/share/groff/1.19.2/font/devX100
-dir  path=usr/share/groff/1.19.2/font/devX100-12
 file path=usr/share/groff/1.19.2/font/devX100-12/CB
 file path=usr/share/groff/1.19.2/font/devX100-12/CBI
 file path=usr/share/groff/1.19.2/font/devX100-12/CI
@@ -182,8 +156,6 @@
 file path=usr/share/groff/1.19.2/font/devX100/TBI
 file path=usr/share/groff/1.19.2/font/devX100/TI
 file path=usr/share/groff/1.19.2/font/devX100/TR
-dir  path=usr/share/groff/1.19.2/font/devX75
-dir  path=usr/share/groff/1.19.2/font/devX75-12
 file path=usr/share/groff/1.19.2/font/devX75-12/CB
 file path=usr/share/groff/1.19.2/font/devX75-12/CBI
 file path=usr/share/groff/1.19.2/font/devX75-12/CI
@@ -220,7 +192,6 @@
 file path=usr/share/groff/1.19.2/font/devX75/TBI
 file path=usr/share/groff/1.19.2/font/devX75/TI
 file path=usr/share/groff/1.19.2/font/devX75/TR
-dir  path=usr/share/groff/1.19.2/font/devdvi
 file path=usr/share/groff/1.19.2/font/devdvi/CW
 file path=usr/share/groff/1.19.2/font/devdvi/CWEC
 file path=usr/share/groff/1.19.2/font/devdvi/CWI
@@ -258,7 +229,6 @@
 file path=usr/share/groff/1.19.2/font/devdvi/TR
 file path=usr/share/groff/1.19.2/font/devdvi/TREC
 file path=usr/share/groff/1.19.2/font/devdvi/TRTC
-dir  path=usr/share/groff/1.19.2/font/devdvi/generate
 file path=usr/share/groff/1.19.2/font/devdvi/generate/CompileFonts
 file path=usr/share/groff/1.19.2/font/devdvi/generate/Makefile
 file path=usr/share/groff/1.19.2/font/devdvi/generate/ec.map
@@ -273,7 +243,6 @@
 file path=usr/share/groff/1.19.2/font/devdvi/generate/texsy.map
 file path=usr/share/groff/1.19.2/font/devdvi/generate/textex.map
 file path=usr/share/groff/1.19.2/font/devdvi/generate/textt.map
-dir  path=usr/share/groff/1.19.2/font/devhtml
 file path=usr/share/groff/1.19.2/font/devhtml/B
 file path=usr/share/groff/1.19.2/font/devhtml/BI
 file path=usr/share/groff/1.19.2/font/devhtml/CB
@@ -284,7 +253,6 @@
 file path=usr/share/groff/1.19.2/font/devhtml/I
 file path=usr/share/groff/1.19.2/font/devhtml/R
 file path=usr/share/groff/1.19.2/font/devhtml/S
-dir  path=usr/share/groff/1.19.2/font/devlbp
 file path=usr/share/groff/1.19.2/font/devlbp/CB
 file path=usr/share/groff/1.19.2/font/devlbp/CI
 file path=usr/share/groff/1.19.2/font/devlbp/CR
@@ -304,7 +272,6 @@
 file path=usr/share/groff/1.19.2/font/devlbp/TBI
 file path=usr/share/groff/1.19.2/font/devlbp/TI
 file path=usr/share/groff/1.19.2/font/devlbp/TR
-dir  path=usr/share/groff/1.19.2/font/devlj4
 file path=usr/share/groff/1.19.2/font/devlj4/AB
 file path=usr/share/groff/1.19.2/font/devlj4/ABI
 file path=usr/share/groff/1.19.2/font/devlj4/AI
@@ -352,14 +319,12 @@
 file path=usr/share/groff/1.19.2/font/devlj4/UI
 file path=usr/share/groff/1.19.2/font/devlj4/UR
 file path=usr/share/groff/1.19.2/font/devlj4/WINGDINGS
-dir  path=usr/share/groff/1.19.2/font/devlj4/generate
 file path=usr/share/groff/1.19.2/font/devlj4/generate/Makefile
 file path=usr/share/groff/1.19.2/font/devlj4/generate/special.awk
 file path=usr/share/groff/1.19.2/font/devlj4/generate/special.map
 file path=usr/share/groff/1.19.2/font/devlj4/generate/symbol.map
 file path=usr/share/groff/1.19.2/font/devlj4/generate/text.map
 file path=usr/share/groff/1.19.2/font/devlj4/generate/wingdings.map
-dir  path=usr/share/groff/1.19.2/tmac
 file path=usr/share/groff/1.19.2/tmac/X.tmac
 file path=usr/share/groff/1.19.2/tmac/Xps.tmac
 file path=usr/share/groff/1.19.2/tmac/a4.tmac
@@ -372,7 +337,6 @@
 file path=usr/share/groff/1.19.2/tmac/lbp.tmac
 file path=usr/share/groff/1.19.2/tmac/lj4.tmac
 file path=usr/share/groff/1.19.2/tmac/me.tmac
-dir  path=usr/share/groff/1.19.2/tmac/mm
 file path=usr/share/groff/1.19.2/tmac/mm/0.MT
 file path=usr/share/groff/1.19.2/tmac/mm/4.MT
 file path=usr/share/groff/1.19.2/tmac/mm/5.MT
@@ -386,7 +350,6 @@
 file path=usr/share/groff/1.19.2/tmac/pdfmark.tmac
 file path=usr/share/groff/1.19.2/tmac/spdf.tmac
 file path=usr/share/groff/1.19.2/tmac/trace.tmac
-dir  path=usr/share/info
 file path=usr/share/info/groff \
     restart_fmri=svc:/application/texinfo-update:default
 file path=usr/share/info/groff-1 \
@@ -395,8 +358,6 @@
     restart_fmri=svc:/application/texinfo-update:default
 file path=usr/share/info/groff-3 \
     restart_fmri=svc:/application/texinfo-update:default
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
 file path=usr/share/man/man1/addftinfo.1
 file path=usr/share/man/man1/afmtodit.1
 file path=usr/share/man/man1/eqn2graph.1
@@ -419,11 +380,9 @@
 file path=usr/share/man/man1/pic2graph.1
 file path=usr/share/man/man1/tfmtodit.1
 file path=usr/share/man/man1/xtotroff.1
-dir  path=usr/share/man/man4
 file usr/share/man/man5/groff_font.5 path=usr/share/man/man4/groff_font.4
 file usr/share/man/man5/groff_tmac.5 path=usr/share/man/man4/groff_tmac.4
 file usr/share/man/man5/lj4_font.5 path=usr/share/man/man4/lj4_font.4
-dir  path=usr/share/man/man5
 file usr/share/man/man7/ditroff.7 path=usr/share/man/man5/ditroff.5
 file usr/share/man/man7/ditroff.7 path=usr/share/man/man5/groff.5
 file usr/share/man/man7/groff_char.7 path=usr/share/man/man5/groff_char.5