From 70bddd8faa9d831ac46e8f916ce01a6233045323 Mon Sep 17 00:00:00 2001
From: rtr <rtr@NetBSD.org>
Date: Sun, 7 Sep 2008 13:12:28 +0000
Subject: [PATCH] use XLOCALE.DEFINES from bsd.x11.mk

---
 external/mit/xorg/lib/libX11/Makefile.libx11 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/external/mit/xorg/lib/libX11/Makefile.libx11 b/external/mit/xorg/lib/libX11/Makefile.libx11
index f7b45358e82d..fe7e754f075e 100644
--- a/external/mit/xorg/lib/libX11/Makefile.libx11
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.2 2008/07/31 01:35:04 mrg Exp $
+#	$NetBSD: Makefile.libx11,v 1.3 2008/09/07 13:12:28 rtr Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.${LIB}}/src
@@ -410,10 +410,9 @@ XCURSOR_DEFINES=	-DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.1\"
 XDMAUTHDEFS=		-DHASXDMAUTH
 XF86BIGFONT_DEFINES=	-DXF86BIGFONT
 XKB_DEFINES=		-DXKB
-XLC_DEFINES=		-DXLOCALEDIR=\"${X11LIBDIR}/locale\"
+XLC_DEFINES=		${XLOCALE.DEFINES}
 XTRANS_XIM_DEFINES=	-DXIM_t -DTRANS_CLIENT
 XTRANS_X_DEFINES=	-DX11_t -DTRANS_CLIENT
-LOCALE_DEFINES=		-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
 
 CPPFLAGS.ErrDes.c=	$(EDB_DEFINES)
 CPPFLAGS.StrKeysym.c=	$(KDB_DEFINES)
@@ -433,7 +432,6 @@ CPPFLAGS.lcFile.c=	$(XLC_DEFINES) $(SETID_DEFINES)
 CPPFLAGS.KeyBind.c=	$(XKB_DEFINES)
 CPPFLAGS.XKBBind.c=	$(XKB_DEFINES)
 CPPFLAGS.imConv.c=	$(XKB_DEFINES)
-CPPFLAGS.lcFile.c=	$(LOCALE_DEFINES)
 
 #BUILDSYMLINKS=	transport.c x11trans.c \
 #		transport.c ximtrans.c