--- a/pkg/manifests/x11-server-xserver-common.p5m	Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xserver-common.p5m	Fri Sep 09 20:42:44 2011 -0700
@@ -27,20 +27,23 @@
 
 set name=pkg.fmri \
     value=pkg:/x11/server/xserver-common@__version:xserver-common__
+set name=pkg.summary value="X server common files"
 set name=pkg.description \
     value="Files shared by all X server variants based on the X.Org Foundation implementation.  Includes the x11-server SMF service for Solaris."
-set name=pkg.summary value="X server common files"
-dir path=lib/svc/manifest/application/x11
-dir path=usr/X11/bin
-dir path=usr/demo/Xserver
-dir path=usr/demo/Xserver/mdb
-dir path=usr/lib/xorg
-dir path=usr/share/doc/Xserver
 file path=etc/security/auth_attr.d/xserver-common group=sys
 file path=etc/security/prof_attr.d/xserver-common group=sys
+dir  path=lib/svc/manifest/application/x11
 file path=lib/svc/manifest/application/x11/x11-server.xml
 file path=lib/svc/method/x11-server
+dir  path=usr/X11/bin
+link path=usr/X11/bin/X target=../../bin/X
+link path=usr/X11/bin/Xserver target=../../bin/Xserver
+$(i386_ONLY)link path=usr/X11/bin/amd64 target=../../bin/amd64
+link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
+link path=usr/bin/X target=Xserver
 file path=usr/bin/Xserver
+dir  path=usr/demo/Xserver
+dir  path=usr/demo/Xserver/mdb
 file path=usr/demo/Xserver/mdb/README
 file path=usr/demo/Xserver/mdb/list_Xserver_clients mode=0555
 file path=usr/demo/Xserver/mdb/list_Xserver_devicegrab_client mode=0555
@@ -48,17 +51,14 @@
 file path=usr/lib/help/auths/locale/C/X11States.html
 file path=usr/lib/help/profiles/locale/C/RtDesktopConfiguration.html
 file path=usr/lib/mdb/proc/$(ARCH64)/Xserver.so
+dir  path=usr/lib/xorg
 file path=usr/lib/xorg/TrustedExtensionsPolicy
 file path=usr/lib/xorg/protocol.txt
+dir  path=usr/share/doc/Xserver
 file path=usr/share/doc/Xserver/Xserver-DTrace.html
 file path=usr/share/doc/Xserver/Xserver-DTrace.txt
 file path=usr/share/doc/Xserver/Xserver-DTrace.xml
 file path=usr/share/man/man1/Xnest.1
 file path=usr/share/man/man1/Xserver.1
-link path=usr/X11/bin/X target=../../bin/X
-link path=usr/X11/bin/Xserver target=../../bin/Xserver
-$(i386_ONLY)link path=usr/X11/bin/amd64 target=../../bin/amd64
-link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
-link path=usr/bin/X target=Xserver
 # Xserver script runs /usr/bin/readlink (from GNU coreutils)
-depend fmri=pkg:/file/gnu-coreutils type=require
+depend type=require fmri=pkg:/file/gnu-coreutils