Get rid of stray /usr/X11R6 references

external/mit/xorg/bin/xkbevd/Makefile

@@ -1,10 +1,13 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/02/17 23:50:18 jmcneill Exp $
 
 .include <bsd.own.mk>
 
 PROG=	xkbevd
 SRCS=	xkbevd.c cfgscan.c cfgparse.y evargs.c printev.c utils.c
 
+CPPFLAGS+=-DDFLT_XKB_CONFIG_ROOT='"${X11ROOTDIR}/lib/X11/xkb"'
+CPPFLAGS+=-DDFLT_SOUND_CMD='"/usr/bin/audioplay"'
+CPPFLAGS+=-DDFLT_SOUND_DIR='"${X11ROOTDIR}/share/sounds/"'
 CPPFLAGS+=-I${X11SRCDIR.${PROG}}
 LDADD+=	-lxkbfile -lXext -lX11
 DPADD+=	${LIBXKBFILE} ${LIBXEXT} ${LIBX11}

external/mit/xorg/lib/libXaw6/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/04/03 16:21:08 perry Exp $
+#	$NetBSD: Makefile,v 1.5 2011/02/17 23:50:19 jmcneill Exp $
 
 NOCHECKVER=	yes	# we want to install an older version ...
 MKLINKLIB=	no
@@ -20,7 +20,7 @@ SRCS=	Actions.c AllWidgets.c AsciiSink.c AsciiSrc.c AsciiText.c \
 	XawI18n.c XawIm.c XawInit.c
 
 CPPFLAGS+=	-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H -DOLDXAW \
-		-DHAVE_ISWALNUM
+		-DHAVE_ISWALNUM -DPROJECT_ROOT=\"${X11ROOTDIR}\"
 
 LIBDPLIBS=\
 	Xmu	${.CURDIR}/../libXmu \

external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2010/11/23 08:22:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2011/02/17 23:50:19 jmcneill Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -22,6 +22,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/../include
 
 CPPFLAGS+=	${X11FLAGS.DIX}
+CPPFLAGS+=	-DPROJECTROOT='"${X11ROOTDIR}"'
 
 .include <bsd.x11.mk>
 LIBDIR=	${XMODULEDIR}