[src/netbsd-3]: src/x11/Xserver Pull up revision 1.25 (requested by jmc in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/8f4cebf90d98
branches:  netbsd-3
changeset: 575239:8f4cebf90d98
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 21:46:35 2005 +0000

description:
Pull up revision 1.25 (requested by jmc in ticket #114):
+ fix up the rest of the reachover to build XFree86 for sparc64

diffstat:

 x11/Xserver/Makefile.common |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r b6453dab698d -r 8f4cebf90d98 x11/Xserver/Makefile.common
--- a/x11/Xserver/Makefile.common       Wed Apr 06 21:46:30 2005 +0000
+++ b/x11/Xserver/Makefile.common       Wed Apr 06 21:46:35 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.20.2.4 2005/04/06 21:42:01 tron Exp $
+#      $NetBSD: Makefile.common,v 1.20.2.5 2005/04/06 21:46:35 tron Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -43,7 +43,8 @@
 
 # XFree86 servers all need XFONT as well.
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "macppc" || ${MACHINE} == "cats" || ${MACHINE} == "sgimips"
+    ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
+    ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64"
 XSERVER_NEEDS_XFONT=   yes
 XSERVER_NEEDS_MIEXT=   yes
 XSERVER_XFREE86=       yes
@@ -78,10 +79,6 @@
 XSERVER_XSUN24=                yes
 .endif
 
-.if ${MACHINE} == "sparc64"
-XSERVER_XFREE86=       yes
-.endif
-
 .if ${MACHINE} == "vax"
 XSERVER_HAS_FB=                no
 XSERVER_XVFB=          no