Module Name: src
Committed By: mrg
Date: Sun Aug 14 00:03:59 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xextbuiltin
src/external/mit/xorg/server/xorg-server/Xi: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
src/external/mit/xorg/server/xorg-server/doc: Makefile
src/external/mit/xorg/server/xorg-server/dri3: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/server/xorg-server/present: Makefile
src/external/mit/xorg/server/xorg-server/pseudoramiX: Makefile
src/external/mit/xorg/server/xorg-server/xfixes: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile
Log Message:
various build updates for xorg-server 1.18. with this and some other
uncommited work, Xvfb and Xnest both link.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/doc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/dri3/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/mi/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/present/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/xfixes/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/xkbstubs/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/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.23 src/external/mit/xorg/server/xorg-server/Makefile:1.24
--- src/external/mit/xorg/server/xorg-server/Makefile:1.23 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile Sun Aug 14 00:03:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2016/08/14 00:03:57 mrg Exp $
.include <bsd.own.mk>
@@ -13,7 +13,7 @@ SUBDIR.xfont=
SUBDIR= doc include .WAIT
SUBDIR+= glx
SUBDIR+= dix fb mi Xext miext os randr render
-SUBDIR+= present dri3 pseudoramiX
+SUBDIR+= present pseudoramiX
SUBDIR+= Xi xkb xkbstubs dbe record xfixes
SUBDIR+= damageext composite config .WAIT
SUBDIR+= hw
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.6 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.7
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.6 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin Sun Aug 14 00:03:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xextbuiltin,v 1.6 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile.Xextbuiltin,v 1.7 2016/08/14 00:03:57 mrg Exp $
SRCS.Xextbuiltin= bigreq.c geext.c shape.c sleepuntil.c \
sync.c xcmisc.c xtest.c
@@ -7,3 +7,4 @@ SRCS.Xextbuiltin+= panoramiX.c panoramiX
SRCS.Xextbuiltin+= xace.c
SRCS.Xextbuiltin+= security.c
SRCS.Xextbuiltin+= xf86bigfont.c
+SRCS.Xextbuiltin+= hashtable.c
Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.5 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.5 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -33,7 +33,10 @@ SRCS= allowev.c chgdctl.c chgfctl.c chg
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/miext/damage \
-I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/xfixes \
+ -I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.13 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.13 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -18,6 +18,7 @@ SRCS= atom.c colormap.c cursor.c device
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/doc/Makefile:1.4 src/external/mit/xorg/server/xorg-server/doc/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/doc/Makefile:1.4 Tue Aug 2 07:41:00 2011
+++ src/external/mit/xorg/server/xorg-server/doc/Makefile Sun Aug 14 00:03:58 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2011/08/02 07:41:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/14 00:03:58 mrg Exp $
.include <bsd.own.mk>
.include "../dix/Makefile.common"
.PATH: ${X11SRCDIR.xorg-server}/doc
-.PATH: ${X11SRCDIR.xorg-server}/doc/man
+.PATH: ${X11SRCDIR.xorg-server}/man
MAN= Xserver.1
X11EXTRAMANDEFS+= -e 's%__default_font_path__%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g'
Index: src/external/mit/xorg/server/xorg-server/dri3/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.1 src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.1 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/dri3/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -11,6 +11,7 @@ SRCS= dri3.c \
dri3_screen.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.13 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
.include <bsd.own.mk>
@@ -24,6 +24,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/os \
-I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
@@ -79,7 +80,8 @@ LDADD+= ${LDADD.dix} \
-lpixman-1 \
-lXdmcp \
-lz \
- -lm
+ -lm \
+ -lGL
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
@@ -108,7 +110,8 @@ DPADD+= ${DPADD.dix} \
${LIBPIXMAN1} \
${LIBXDMCP} \
${LIBZ} \
- ${LIBM}
+ ${LIBM} \
+ ${LIBGL}
.if ${MKCRYPTO:Uno} != "no"
LDADD+= -lcrypto
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.17 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2016/08/14 00:03:58 mrg Exp $
.include <bsd.own.mk>
@@ -25,6 +25,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/os \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.14 src/external/mit/xorg/server/xorg-server/include/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.14 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Sun Aug 14 00:03:58 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/14 00:03:58 mrg Exp $
.include <bsd.own.mk>
XORGSRC= ${X11SRCDIR.xorg-server}
-XORGINC_SUBDIR= Xext composite dbe exa fb include mi \
- miext/damage miext/shadow randr render xkb record
+XORGINC_SUBDIR= Xext composite dbe dri3 exa fb include mi \
+ miext/damage miext/shadow present randr render xkb record
XF86_SUBDIR= common ddc dri fbdevhw i2c int10 modes \
os-support os-support/bus parser rac ramdac shadowfb \
vbe vgahw xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
@@ -22,7 +22,6 @@ XF86_SUBDIR= common ddc dri fbdevhw i2c
INCSDIR=${X11INCDIR}/xorg
INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.h \
- bt829.h \
callback.h client.h closestr.h closure.h colormap.h \
colormapst.h compiler.h compositeext.h cursor.h cursorstr.h \
damage.h damagestr.h \
@@ -33,27 +32,29 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
edid.h exa.h exevents.h \
eventconvert.h events.h eventstr.h list.h \
extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
- fbpict.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \
+ fbpict.h fbrop.h fourcc.h gc.h gcstruct.h geext.h globals.h \
glx_extinit.h glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
mi.h micmap.h micoord.h \
migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
- mistruct.h mizerarc.h msp3430.h opaque.h \
+ mistruct.h mizerarc.h opaque.h \
nonsdk_extinit.h optionstr.h \
os.h picture.h picturestr.h pixmap.h pixmapstr.h \
present.h presentext.h \
property.h protocol-versions.h \
propertyst.h randrstr.h region.h regionstr.h resource.h \
- rgb.h sarea.h screenint.h scrnintstr.h selection.h servermd.h \
+ rgb.h sarea.h screenint.h scrnintstr.h \
+ securitysrv.h selection.h servermd.h \
shadow.h shadowfb.h shmint.h site.h \
- tda8425.h tda9850.h \
- tda9885.h uda1380.h validate.h vbe.h vbeModes.h vgaHW.h \
+ validate.h vbe.h vbeModes.h vgaHW.h \
window.h windowstr.h \
+ xaarop.h \
xkbDflts.h xkb.h set.h \
- xf86.h xf86Crtc.h xf86Cursor.h xf86DDC.h \
- xf86Modes.h xf86Module.h \
- xf86Opt.h xf86Optrec.h xf86Parser.h xf86Pci.h xf86PciInfo.h \
+ xf86.h xf86platformBus.h \
+ xf86Crtc.h xf86Cursor.h xf86DDC.h \
+ xf86Modes.h xf86Module.h xf86Optionstr.h xf86Opt.h xf86Optrec.h \
+ xf86Parser.h xf86Pci.h xf86PciInfo.h \
xf86Priv.h xf86Privstr.h xf86RamDac.h xf86RandR12.h \
- xf86Rename.h xf86Xinput.h xf86_OSlib.h \
+ xf86Xinput.h xf86_OSlib.h \
xf86_OSproc.h xf86cmap.h xf86fbman.h \
xf86i2c.h xf86int10.h xf86sbusBus.h xf86str.h xf86xv.h \
xkbstr.h xkbrules.h xserver-properties.h \
Index: src/external/mit/xorg/server/xorg-server/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.11 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.11 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -24,6 +24,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/..
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/miext/damage \
-I${X11SRCDIR.xorg-server}/Xi \
+ -I${X11SRCDIR.xorg-server}/composite \
+ -I${X11SRCDIR.xorg-server}/damageext \
+ -I${X11SRCDIR.xorg-server}/xfixes \
-I${X11SRCDIR.xorg-server}/hw/xnest \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.12 src/external/mit/xorg/server/xorg-server/os/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.12 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -10,7 +10,8 @@ SRCS= WaitFor.c access.c auth.c backtrac
io.c mitauth.c \
oscolor.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c \
- rpcauth.c xprintf.c xsha1.c
+ rpcauth.c xsha1.c \
+ reallocarray.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
@@ -29,37 +30,12 @@ CPPFLAGS+= ${X11FLAGS.DIX} \
-DUSE_RGB_TXT \
-UDDXTIME \
-DHAVE_SHA1_IN_LIBC \
+ -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
+ -DHAVE_STRCASESTR \
-DMONOTONIC_CLOCK
.include "../Makefile.common"
-.if 0
-# XXX The XFree86 Xserver has its own GetTimeInMillis(), however if we are
-# building XFree86 and Xmacppc or Xsun* we want both copies. The copy
-# here is linked into the non XFree86 server.
-#.if ${XSERVER_XFREE86} == "no" || \
-# ${XSERVER_XMACPPC} != "no" || \
-# ${XSERVER_XSUN} != "no"
-SRCS+= GetTimeInMillis.c
-SRCS+= ddxInitGlobals.c
-#.endif
-
-XDMCP_DEFINES= -DXDMCP -DXDMCP_NO_IPV6
-
-CPPFLAGS.WaitFor.c= ${X11FLAGS.EXTENSION}
-CPPFLAGS.access.c= ${XDMCP_DEFINES} -DBSD44SOCKETS -DHAS_GETIFADDRS
-CPPFLAGS.auth.c= ${XDMCP_DEFINES} -DHAVE_ARC4RANDOM
-CPPFLAGS.connection.c= ${XDMCP_DEFINES} -DBSD44SOCKETS
-CPPFLAGS.io.c= ${X11FLAGS.EXTENSION}
-CPPFLAGS.lbxio.c= ${X11FLAGS.EXTENSION}
-CPPFLAGS.oscolor.c= -DNDBM
-CPPFLAGS.osinit.c= -DADMPATH=\"/var/log/X\%smsgs\"
-CPPFLAGS.transport.c= -DBSD44SOCKETS
-CPPFLAGS.utils.c= ${XDMCP_DEFINES} ${X11FLAGS.EXTENSION}
-CPPFLAGS.xdmauth.c= ${XDMCP_DEFINES}
-CPPFLAGS.xdmcp.c= ${XDMCP_DEFINES} -DBSD44SOCKETS
-.endif
-
COPTS.xdmauth.c= -Wno-error # XXX
COPTS.xstrans.c= -Wno-error # XXX
COPTS.access.c= -Wno-error # XXX bigreqstr.h
Index: src/external/mit/xorg/server/xorg-server/present/Makefile
diff -u src/external/mit/xorg/server/xorg-server/present/Makefile:1.1 src/external/mit/xorg/server/xorg-server/present/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/present/Makefile:1.1 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/present/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -15,6 +15,11 @@ SRCS= present.c \
present_screen.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/miext/sync \
+ -I${X11SRCDIR.xorg-server}/xfixes \
+ -I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
diff -u src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile:1.1 src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile:1.1 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,6 +9,7 @@ LIB= pseudoramiX
SRCS= pseudoramiX.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/xfixes/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.3 src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.3 Sat Aug 22 02:40:28 2009
+++ src/external/mit/xorg/server/xorg-server/xfixes/Makefile Sun Aug 14 00:03:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/14 00:03:58 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -14,6 +14,10 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/fixes \
-I${X11SRCDIR.xorg-server}/render \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${X11SRCDIR.xorg-server}/Xi \
+ -I${X11SRCDIR.xorg-server}/xfixes \
+ -I${X11SRCDIR.xorg-server}/mi \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.9 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.9 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Sun Aug 14 00:03:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/14 00:03:59 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -25,6 +25,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/Xi \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/../include
Index: src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.2 src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.2 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile Sun Aug 14 00:03:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -16,6 +16,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/../include
