--- a/pkg/manifests/x11-xclipboard.p5m	Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xclipboard.p5m	Fri Sep 09 20:42:44 2011 -0700
@@ -20,16 +20,15 @@
 # DEALINGS IN THE SOFTWARE.
 #
 set name=pkg.fmri value=pkg:/x11/xclipboard@__version:xclipboard__
+set name=pkg.summary value="xclipboard & xcutsel tools for clipboard management"
 set name=pkg.description \
     value="xclipboard is used to collect and display text selections that are sent to the CLIPBOARD by other clients.  It is typically used to save CLIPBOARD selections for later use.  It stores each CLIPBOARD selection as a separate string, each of which can be selected.  The xcutsel program is used to copy the current selection into a cut buffer and to make a selection that contains the current contents of the cut buffer.  It acts as a bridge between applications that don't support selections and those that do."
-set name=pkg.summary \
-    value="xclipboard & xcutsel tools for clipboard management"
+link path=usr/X11/bin/xclipboard target=../../bin/xclipboard
+link path=usr/X11/bin/xcutsel target=../../bin/xcutsel
 file path=usr/bin/xclipboard
 file path=usr/bin/xcutsel
 file path=usr/share/X11/app-defaults/XClipboard
 file path=usr/share/man/man1/xclipboard.1
 file path=usr/share/man/man1/xcutsel.1
-link path=usr/X11/bin/xclipboard target=../../bin/xclipboard
-link path=usr/X11/bin/xcutsel target=../../bin/xcutsel
 # XClipboard app-defaults specifies helvetica & courier fonts
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core