--- a/pkg/manifests/x11-library-libxmu.p5m	Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxmu.p5m	Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,16 @@
 # DEALINGS IN THE SOFTWARE.
 #
 set name=pkg.fmri value=pkg:/x11/library/libxmu@__version:libXmu__
+set name=pkg.summary \
+    value="libXmu - miscellaneous utility functions for Xaw and Xt clients"
 set name=pkg.description \
     value="This library contains miscellaneous utilities and is not part of the Xlib standard.  It contains routines which only use public interfaces so that it may be layered on top of any proprietary implementation of Xlib or Xt."
-set name=pkg.summary \
-    value="libXmu - miscellaneous utility functions for Xaw and Xt clients"
-dir path=usr/share/doc/libXmu
-dir path=usr/share/man/man3xmu
+link path=usr/X11/lib/$(ARCH64)/libXmu.so \
+    target=../../../lib/$(ARCH64)/libXmu.so
+link path=usr/X11/lib/$(ARCH64)/libXmu.so.4 \
+    target=../../../lib/$(ARCH64)/libXmu.so.4
+link path=usr/X11/lib/libXmu.so target=../../lib/libXmu.so
+link path=usr/X11/lib/libXmu.so.4 target=../../lib/libXmu.so.4
 file path=usr/include/X11/Xmu/Atoms.h
 file path=usr/include/X11/Xmu/CloseHook.h
 file path=usr/include/X11/Xmu/Converters.h
@@ -45,22 +49,18 @@
 file path=usr/include/X11/Xmu/Xct.h
 file path=usr/include/X11/Xmu/Xmu.h
 file path=usr/include/X11/Xmu/XmuSolaris.h
+link path=usr/lib/$(ARCH64)/libXmu.so target=libXmu.so.4
 file path=usr/lib/$(ARCH64)/libXmu.so.4
 file path=usr/lib/$(ARCH64)/llib-lXmu.ln
 file path=usr/lib/$(ARCH64)/pkgconfig/xmu.pc
+link path=usr/lib/libXmu.so target=libXmu.so.4
 file path=usr/lib/libXmu.so.4
 file path=usr/lib/llib-lXmu.ln
 file path=usr/lib/pkgconfig/xmu.pc
+dir  path=usr/share/doc/libXmu
 file path=usr/share/doc/libXmu/Xmu.xml
 file path=usr/share/doc/libXmu/xlogo.svg
+dir  path=usr/share/man/man3xmu
 file path=usr/share/man/man3xmu/XSolarisCheckColormapEquivalence.3xmu
 file path=usr/share/man/man3xmu/XSolarisGetVisualGamma.3xmu
-link path=usr/X11/lib/$(ARCH64)/libXmu.so \
-    target=../../../lib/$(ARCH64)/libXmu.so
-link path=usr/X11/lib/$(ARCH64)/libXmu.so.4 \
-    target=../../../lib/$(ARCH64)/libXmu.so.4
-link path=usr/X11/lib/libXmu.so target=../../lib/libXmu.so
-link path=usr/X11/lib/libXmu.so.4 target=../../lib/libXmu.so.4
-link path=usr/lib/$(ARCH64)/libXmu.so target=libXmu.so.4
-link path=usr/lib/libXmu.so target=libXmu.so.4
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true