[src/trunk]: src/x11/Xserver + No need to undefine -UXF86VIDMODE twice

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

details:   https://anonhg.NetBSD.org/src/rev/3b8eaf069d64
branches:  trunk
changeset: 557991:3b8eaf069d64
user:      rtr <rtr%NetBSD.org@localhost>
date:      Sun Jan 25 02:19:38 2004 +0000

description:
+ No need to undefine -UXF86VIDMODE twice
+ No need to define XF86DRI since it's never defined to begin with
+ __GLX_ALIGN64 now defined globally in X11FLAGS.EXTENSION.

diffstat:

 x11/Xserver/Xext/Makefile.ext |  4 ++--
 x11/Xserver/cfb/Makefile.cfb  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 854179de87e3 -r 3b8eaf069d64 x11/Xserver/Xext/Makefile.ext
--- a/x11/Xserver/Xext/Makefile.ext     Sun Jan 25 02:15:51 2004 +0000
+++ b/x11/Xserver/Xext/Makefile.ext     Sun Jan 25 02:19:38 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ext,v 1.5 2003/12/23 04:46:26 rtr Exp $
+#      $NetBSD: Makefile.ext,v 1.6 2004/01/25 02:19:38 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,7 @@
 CPPFLAGS+=     ${X11FLAGS.EXTENSION}
 
 .if ${MACHINE} == "sparc64"
-CPPFLAGS+=     -UXF86VIDMODE -UXF86VIDMODE -UXF86DRI -D__GLX_ALIGN64
+CPPFLAGS+=     -UXF86VIDMODE
 .endif
 
 CPPFLAGS.security.c=   -DDEFAULTPOLICYFILE=\"${X11LIBDIR}/xserver/SecurityPolicy\"
diff -r 854179de87e3 -r 3b8eaf069d64 x11/Xserver/cfb/Makefile.cfb
--- a/x11/Xserver/cfb/Makefile.cfb      Sun Jan 25 02:15:51 2004 +0000
+++ b/x11/Xserver/cfb/Makefile.cfb      Sun Jan 25 02:19:38 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cfb,v 1.7 2003/12/23 04:45:08 rtr Exp $
+#      $NetBSD: Makefile.cfb,v 1.8 2004/01/25 02:21:23 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -77,7 +77,7 @@
 
 
 .if ${MACHINE} == "sparc64"
-CPPFLAGS+=     -UXF86VIDMODE -UXF86VIDMODE -UXF86DRI -D__GLX_ALIGN64
+CPPFLAGS+=     -UXF86VIDMODE
 .endif
 
 CPPFLAGS.cfb8lineCO.c= -DRROP=GXcopy