Sat Oct 8 20:03:04 2016 UTC ()
don't undefine XFree86LOADER twice.


(mrg)
diff -r1.2 -r1.3 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
diff -r1.15 -r1.16 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs diff -r1.2 -r1.3 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile 2016/06/29 19:36:35 1.2
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile 2016/10/08 20:03:04 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $ 1# $NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "../../Makefile.Xserver" 5.include "../../Makefile.Xserver"
6 6
7PROG= Xvfb 7PROG= Xvfb
8 8
9.PATH: ${X11SRCDIR.xorg-server}/hw/vfb 9.PATH: ${X11SRCDIR.xorg-server}/hw/vfb
10.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man 10.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man
11.PATH: ${X11SRCDIR.xorg-server}/Xext 11.PATH: ${X11SRCDIR.xorg-server}/Xext
12.PATH: ${X11SRCDIR.xorg-server}/Xi 12.PATH: ${X11SRCDIR.xorg-server}/Xi
13.PATH: ${X11SRCDIR.xorg-server}/mi 13.PATH: ${X11SRCDIR.xorg-server}/mi
14SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c 14SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
@@ -35,27 +35,26 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11  @@ -35,27 +35,26 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
35CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \ 35CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
36 -DHAS_SHM -DHAS_MMAP -UXFree86LOADER 36 -DHAS_SHM -DHAS_MMAP -UXFree86LOADER
37 37
38.include "../../Makefile.common" 38.include "../../Makefile.common"
39 39
40.if ${XSERVER_XFREE86} == "no" 40.if ${XSERVER_XFREE86} == "no"
41CPPFLAGS+= -UDDXTIME 41CPPFLAGS+= -UDDXTIME
42.endif 42.endif
43 43
44CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \ 44CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \
45 -UGLXEXT 45 -UGLXEXT
46CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \ 46CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \
47 -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \ 47 -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
48 -UXFree86LOADER \ 
49 -UGLXEXT 48 -UGLXEXT
50CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \ 49CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \
51 -UGLXEXT 50 -UGLXEXT
52 51
53COPTS.InitInput.c= -Wno-error 52COPTS.InitInput.c= -Wno-error
54COPTS.InitOutput.c= -Wno-error 53COPTS.InitOutput.c= -Wno-error
55 54
56LDADD+= ${LDADD.dix} \ 55LDADD+= ${LDADD.dix} \
57 ${LDADD.fb} \ 56 ${LDADD.fb} \
58 ${LDADD.mi} \ 57 ${LDADD.mi} \
59 ${LDADD.xfixes} \ 58 ${LDADD.xfixes} \
60 ${LDADD.Xext} \ 59 ${LDADD.Xext} \
61 ${LDADD.config} \ 60 ${LDADD.config} \
cvs diff -r1.15 -r1.16 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile 2016/08/14 03:43:04 1.15
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile 2016/10/08 20:03:04 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $ 1# $NetBSD: Makefile,v 1.16 2016/10/08 20:03:04 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "../../Makefile.Xserver" 5.include "../../Makefile.Xserver"
6 6
7PROG= Xvfb 7PROG= Xvfb
8 8
9.PATH: ${X11SRCDIR.xorg-server}/hw/vfb 9.PATH: ${X11SRCDIR.xorg-server}/hw/vfb
10.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man 10.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man
11.PATH: ${X11SRCDIR.xorg-server}/Xext 11.PATH: ${X11SRCDIR.xorg-server}/Xext
12.PATH: ${X11SRCDIR.xorg-server}/Xi 12.PATH: ${X11SRCDIR.xorg-server}/Xi
13.PATH: ${X11SRCDIR.xorg-server}/mi 13.PATH: ${X11SRCDIR.xorg-server}/mi
14SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c 14SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
@@ -34,27 +34,26 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11  @@ -34,27 +34,26 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
34 34
35CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \ 35CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
36 -DHAS_SHM -DHAS_MMAP -UXFree86LOADER 36 -DHAS_SHM -DHAS_MMAP -UXFree86LOADER
37 37
38.include "../../Makefile.common" 38.include "../../Makefile.common"
39 39
40.if ${XSERVER_XFREE86} == "no" 40.if ${XSERVER_XFREE86} == "no"
41CPPFLAGS+= -UDDXTIME 41CPPFLAGS+= -UDDXTIME
42.endif 42.endif
43 43
44CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \ 44CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \
45 -UGLXEXT 45 -UGLXEXT
46CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \ 46CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \
47 -UXFree86LOADER \ 
48 -UGLXEXT 47 -UGLXEXT
49CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \ 48CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \
50 -UGLXEXT 49 -UGLXEXT
51 50
52COPTS.InitInput.c= -Wno-error 51COPTS.InitInput.c= -Wno-error
53COPTS.InitOutput.c= -Wno-error 52COPTS.InitOutput.c= -Wno-error
54 53
55LDADD+= ${LDADD.dix} \ 54LDADD+= ${LDADD.dix} \
56 ${LDADD.fb} \ 55 ${LDADD.fb} \
57 ${LDADD.mi} \ 56 ${LDADD.mi} \
58 ${LDADD.xfixes} \ 57 ${LDADD.xfixes} \
59 ${LDADD.Xext} \ 58 ${LDADD.Xext} \
60 ${LDADD.config} \ 59 ${LDADD.config} \