[src/netbsd-3]: src/x11/Xserver/Xserver/Xsun Pull up revision 1.8 (requested ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/215d0ebc8655
branches:  netbsd-3
changeset: 576060:215d0ebc8655
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jun 09 07:49:02 2005 +0000

description:
Pull up revision 1.8 (requested by martin in ticket #383):
Do not create a X symlink for Xsun on sparc64 - this overwrites the
symlink we already created for XFree86.

diffstat:

 x11/Xserver/Xserver/Xsun/Makefile |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 1cf2ebeef82f -r 215d0ebc8655 x11/Xserver/Xserver/Xsun/Makefile
--- a/x11/Xserver/Xserver/Xsun/Makefile Thu Jun 09 07:44:56 2005 +0000
+++ b/x11/Xserver/Xserver/Xsun/Makefile Thu Jun 09 07:49:02 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2004/03/17 00:18:57 kleink Exp $
+#      $NetBSD: Makefile,v 1.7.8.1 2005/06/09 07:49:02 snj Exp $
 
 .include <bsd.own.mk>
 
@@ -39,7 +39,10 @@
        ${DPADD.render} ${LIBXFONT} ${LDADD.dix/xpstubs} ${LIBFREETYPE} \
        ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
 
+.if ${MACHINE} != "sparc64"
+# sparc64 uses XFree86 as default X link
 SYMLINKS=      ${X11BINDIR}/Xsun ${X11BINDIR}/X
+.endif
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>