--- a/open-src/xserver/xserver-common/Xserver	Fri Jul 15 16:42:26 2011 -0700
+++ b/open-src/xserver/xserver-common/Xserver	Mon Jul 18 13:01:21 2011 -0700
@@ -125,7 +125,6 @@
 if [[ -f ${XSERVER} ]] ; then
     # Canonicalize path, so that we don't break people who specified path
     # via the /usr/X -> openwin or X11 link
-    builtin -f libcmd.so.1 readlink && \
     XSERVER=$(readlink -f ${XSERVER})
 else
     # Automatically select replacements for removed X servers

--- a/pkg/manifests/x11-server-xserver-common.p5m	Fri Jul 15 16:42:26 2011 -0700
+++ b/pkg/manifests/x11-server-xserver-common.p5m	Mon Jul 18 13:01:21 2011 -0700
@@ -73,3 +73,5 @@
 link path=usr/X11/bin/Xserver target=../../bin/Xserver
 $(i386_ONLY)link path=usr/X11/bin/amd64 target=../../bin/amd64
 link path=usr/bin/X target=Xserver
+# Xserver script runs /usr/bin/readlink (from GNU coreutils)
+depend fmri=pkg:/file/gnu-coreutils type=require