Module Name:    src
Committed By:   mrg
Date:           Sat Oct  8 20:03:04 UTC 2016

Modified Files:
        src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
        src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile

Log Message:
don't undefine XFree86LOADER twice.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2	Wed Jun 29 19:36:35 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile	Sat Oct  8 20:03:04 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -45,7 +45,6 @@ CPPFLAGS.InitInput.c=	${X11FLAGS.EXTENSI
 			-UGLXEXT
 CPPFLAGS.miinitext.c=	${X11FLAGS.EXTENSION} \
 			-DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
-			-UXFree86LOADER \
 			-UGLXEXT
 CPPFLAGS.dpmsstubs.c=	${X11FLAGS.EXTENSION} \
 			-UGLXEXT

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15	Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Sat Oct  8 20:03:04 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2016/10/08 20:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -44,7 +44,6 @@ CPPFLAGS+=	-UDDXTIME
 CPPFLAGS.InitInput.c=	${X11FLAGS.EXTENSION} \
 			-UGLXEXT
 CPPFLAGS.miinitext.c=	${X11FLAGS.EXTENSION} \
-			-UXFree86LOADER \
 			-UGLXEXT
 CPPFLAGS.dpmsstubs.c=	${X11FLAGS.EXTENSION} \
 			-UGLXEXT

Reply via email to