# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
# Date 1311019281 25200
# Node ID 7423a7b0645e428b68502fb9f68fc3ba20f63025
# Parent  fc95fded4809d9804fec57ab93439990a648f832
7066497 Xserver script shouldn't use readlink builtin

diff -r fc95fded4809 -r 7423a7b0645e open-src/xserver/xserver-common/Xserver
--- 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
diff -r fc95fded4809 -r 7423a7b0645e pkg/manifests/x11-server-xserver-common.p5m
--- 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