Building X11 fails on case-insensitive file-system (with a fix)

[Adam <adam%NetBSD.org@localhost>]

Hello,

I know it's not mission critical, but a nuisance, at least to me.

After the recent Xorg update, I can't cross-build NetBSD on Mac OS X. The 
problem is with the case-insensitive HFS and the fact, that these two files 
with the same name:

/usr/X11R7/include/X11/extensions/XKBstr.h
/usr/X11R7/include/xorg/xkbstr.h


The error I get:

In file included from 
/dist/xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/sdksyms.c:311:
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:46:
 error: expected specifier-qualifier-list before 'XkbDescPtr'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:102:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:135:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:142:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:195:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:203:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:224:
 error: expected ')' before 'char'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:230:
 error: expected ')' before 'int'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:242:
 error: expected declaration specifiers or '...' before 'XColor'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:250:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:255:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:260:
 error: expected '=', ',', ';', 'asm' or '__attribute__' before 
'XkbChangeKbdDisplay'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:266:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:272:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:431:
 error: expected declaration specifiers or '...' before 'XkbComponentNamesPtr'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:432:
 error: expected declaration specifiers or '...' before 'Display'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:433:
 error: expected declaration specifiers or '...' before 'XkbDescPtr'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:438:
 error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XkbMergeFile'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:450:
 error: expected ')' before '*' token


I fixed it with this change:

--- external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile     23 Nov 
2010 10:19:55 -0000      1.8
+++ external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile     4 Dec 
2010 20:03:13 -0000
@@ -29,7 +29,6 @@
                -I${X11SRCDIR.xorg-server}/mi \
                -I${X11SRCDIR.xorg-server}/xfixes \
                -I${DESTDIR}${X11INCDIR}/X11 \
-               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg

May I commit?

Kind regards,
Adam