Tue Feb 3 05:08:39 2009 UTC ()
reapply fix to xorg build for case insensitive objdir to avoid conflict
between lib/xkbfile/xkbmisc.c and lib/X11/XKBMisc.c
original fix was in src/tools/xkbcomp


(dbj)
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/xkbcomp/Makefile
diff -r0 -r1.1 src/external/mit/xorg/tools/xkbcomp/xkbfile-xkbmisc.c
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/xkbcomp/Attic/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/tools/xkbcomp/Attic/Makefile 2008/07/29 05:01:22 1.1.1.1
+++ src/external/mit/xorg/tools/xkbcomp/Attic/Makefile 2009/02/03 05:08:39 1.2
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2009/02/03 05:08:39 dbj Exp $
2 2
3NOMAN= 1 3NOMAN= 1
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7HOSTPROG= xkbcomp 7HOSTPROG= xkbcomp
8.PATH: ${X11SRCDIR.xkbcomp} 8.PATH: ${X11SRCDIR.xkbcomp}
9.PATH: ${X11SRCDIR.X11}/src 9.PATH: ${X11SRCDIR.X11}/src
10 10
11SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \ 11SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
12 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \ 12 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \
13 symbols.c geometry.c xkbpath.c listing.c \ 13 symbols.c geometry.c xkbpath.c listing.c \
14 xkbparse.y parseutils.c utils.c 14 xkbparse.y parseutils.c utils.c
15 15
16SRCS+= xkbcomp-stubs.c xkbcomp-KeyBind.c 16SRCS+= xkbcomp-stubs.c xkbcomp-KeyBind.c
17 17
18.PATH: ${X11SRCDIR.xkbfile}/src 18.PATH: ${X11SRCDIR.xkbfile}/src
19SRCS+= xkbatom.c xkberrs.c xkbmisc.c xkbout.c xkmread.c xkbtext.c \ 19SRCS+= xkbatom.c xkberrs.c xkbout.c xkmread.c xkbtext.c \
20 cout.c xkmout.c 20 cout.c xkmout.c
21 21
 22SRCS+= xkbfile-xkbmisc.c
 23
22.PATH: ${X11SRCDIR.X11}/src/xkb 24.PATH: ${X11SRCDIR.X11}/src/xkb
23SRCS+= KeysymStr.c StrKeysym.c Quarks.c Xrm.c 25SRCS+= KeysymStr.c StrKeysym.c Quarks.c Xrm.c
24SRCS+= XKB.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c \ 26SRCS+= XKB.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c \
25 XKBGeom.c XKBRdBuf.c  27 XKBGeom.c XKBRdBuf.c
26 28
27HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \ 29HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
28 -I${DESTDIR}${X11INCDIR}/X11 \ 30 -I${DESTDIR}${X11INCDIR}/X11 \
29 -I. \ 31 -I. \
30 -I${X11SRCDIR.X11}/src \ 32 -I${X11SRCDIR.X11}/src \
31 -I${X11SRCDIR.X11}/src/xkb \ 33 -I${X11SRCDIR.X11}/src/xkb \
32 -I${X11SRCDIR.xkbfile}/include/X11/extensions \ 34 -I${X11SRCDIR.xkbfile}/include/X11/extensions \
33 -I${X11SRCDIR.${HOSTPROG}} \ 35 -I${X11SRCDIR.${HOSTPROG}} \
34 -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\" -DXKB 36 -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\" -DXKB
File Added: src/external/mit/xorg/tools/xkbcomp/Attic/xkbfile-xkbmisc.c
/*	$NetBSD: xkbfile-xkbmisc.c,v 1.1 2009/02/03 05:08:39 dbj Exp $	*/

/* This file exists to differentiate between
 * lib/xkbfile/xkbmisc.c and lib/X11/XKBMisc.c
 * which causes objdir conflicts on case-insensitive filesystems
 */

#include <../../../libxkbfile/dist/src/xkbmisc.c>