--- a/pkg/manifests/x11-library-libxv.p5m	Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxv.p5m	Fri Sep 09 20:42:44 2011 -0700
@@ -20,17 +20,24 @@
 # DEALINGS IN THE SOFTWARE.
 #
 set name=pkg.fmri value=pkg:/x11/library/libxv@__version:libXv__
+set name=pkg.summary value="libXv - X Video (Xv) extension client library"
 set name=pkg.description \
     value="Xlib-based client API for the X Video (Xv) extension to the X11 protocol"
-set name=pkg.summary value="libXv - X Video (Xv) extension client library"
-dir path=usr/share/man/man3xv
+link path=usr/X11/lib/$(ARCH64)/libXv.so target=../../../lib/$(ARCH64)/libXv.so
+link path=usr/X11/lib/$(ARCH64)/libXv.so.1 \
+    target=../../../lib/$(ARCH64)/libXv.so.1
+link path=usr/X11/lib/libXv.so target=../../lib/libXv.so
+link path=usr/X11/lib/libXv.so.1 target=../../lib/libXv.so.1
 file path=usr/include/X11/extensions/Xvlib.h
+link path=usr/lib/$(ARCH64)/libXv.so target=libXv.so.1
 file path=usr/lib/$(ARCH64)/libXv.so.1
 file path=usr/lib/$(ARCH64)/llib-lXv.ln
 file path=usr/lib/$(ARCH64)/pkgconfig/xv.pc
+link path=usr/lib/libXv.so target=libXv.so.1
 file path=usr/lib/libXv.so.1
 file path=usr/lib/llib-lXv.ln
 file path=usr/lib/pkgconfig/xv.pc
+dir  path=usr/share/man/man3xv
 file path=usr/share/man/man3xv/Xv.3xv
 file path=usr/share/man/man3xv/XvCreateImage.3xv
 file path=usr/share/man/man3xv/XvFreeAdaptorInfo.3xv
@@ -57,12 +64,4 @@
 file path=usr/share/man/man3xv/XvStopVideo.3xv
 file path=usr/share/man/man3xv/XvUngrabPort.3xv
 file path=usr/share/man/man3xv/XvVideoNotify.3xv
-link path=usr/X11/lib/$(ARCH64)/libXv.so \
-    target=../../../lib/$(ARCH64)/libXv.so
-link path=usr/X11/lib/$(ARCH64)/libXv.so.1 \
-    target=../../../lib/$(ARCH64)/libXv.so.1
-link path=usr/X11/lib/libXv.so target=../../lib/libXv.so
-link path=usr/X11/lib/libXv.so.1 target=../../lib/libXv.so.1
-link path=usr/lib/$(ARCH64)/libXv.so target=libXv.so.1
-link path=usr/lib/libXv.so target=libXv.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true