Wed Jun 6 15:09:51 2018 UTC ()
Pull up following revision(s) (requested by youri in ticket #1608):

	external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata: revision 1.4
	external/mit/xorg/lib/xkeyboard-config/rules/Makefile: revision 1.4

Generate xml files properly. Noted by youri.
XXX: pullup-8


(martin)
diff -r1.1 -r1.1.28.1 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
diff -r1.3 -r1.3.24.1 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
cvs diff -r1.1 -r1.1.28.1 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata (expand / switch to unified diff)

--- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata 2009/06/11 01:49:20 1.1
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata 2018/06/06 15:09:51 1.1.28.1
@@ -1,19 +1,25 @@ @@ -1,19 +1,25 @@
1# $NetBSD: Makefile.xkbdata,v 1.1 2009/06/11 01:49:20 mrg Exp $ 1# $NetBSD: Makefile.xkbdata,v 1.1.28.1 2018/06/06 15:09:51 martin Exp $
2 2
3XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME} 3XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME}
4 4
5.PATH: ${XKBDISTDIR} 5.PATH: ${XKBDISTDIR}
6 6
 7.SUFFIXES: .in
 8
 9.in:
 10 ${TOOL_SED} -e 's,<_,<,g' -e 's,</_,</,g' < ${.ALLSRC} > ${.TARGET}
 11
 12
7FILESDIR= ${X11LIBDIR}/xkb/${XKBNAME} 13FILESDIR= ${X11LIBDIR}/xkb/${XKBNAME}
8 14
9 15
10.if defined(XKBDIR) # { 16.if defined(XKBDIR) # {
11FILES+= ${XKBNAME}.dir 17FILES+= ${XKBNAME}.dir
12FILESDIR_${XKBNAME}.dir=${X11LIBDIR}/xkb 18FILESDIR_${XKBNAME}.dir=${X11LIBDIR}/xkb
13CLEANFILES+= ${XKBNAME}.dir 19CLEANFILES+= ${XKBNAME}.dir
14 20
15.include "${NETBSDSRCDIR}/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp" 21.include "${NETBSDSRCDIR}/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp"
16 22
17${XKBNAME}.dir: 23${XKBNAME}.dir:
18 ${_MKTARGET_CREATE} 24 ${_MKTARGET_CREATE}
19 rm -f ${.TARGET} 25 rm -f ${.TARGET}
cvs diff -r1.3 -r1.3.24.1 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile 2010/05/29 07:58:24 1.3
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile 2018/06/06 15:09:51 1.3.24.1
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.3 2010/05/29 07:58:24 ghen Exp $ 1# $NetBSD: Makefile,v 1.3.24.1 2018/06/06 15:09:51 martin Exp $
2# 2#
3# When upgrading, re-assemble the files base, base.lst, evdev and 3# When upgrading, re-assemble the files base, base.lst, evdev and
4# evdev.lst by running ./configure && make in the dist directory, 4# evdev.lst by running ./configure && make in the dist directory,
5# and copy the resulting files back here. 5# and copy the resulting files back here.
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9XKBNAME= rules 9XKBNAME= rules
10FILES= README base base.lst base.extras.xml.in base.xml.in \ 10GENFILES= base.extras.xml base.xml evdev.extras.xml evdev.xml
11 evdev evdev.lst evdev.extras.xml.in evdev.xml.in \ 11FILES= README base base.lst evdev evdev.lst xfree98 xkb.dtd
12 xfree98 xkb.dtd 12FILES+= ${GENFILES}
13 13CLEAN+= ${GENFILES}
14FILESNAME_base.xml.in= base.xml 14
15FILESNAME_base.extras.xml.in= base.extras.xml 15.for i in ${GENFILES}
16FILESNAME_evdev.xml.in= evdev.xml 16FILESBUILD_${i}= yes
17FILESNAME_evdev.extras.xml.in= evdev.extras.xml 17.endfor
18 18
19SYMLINKS= base ${FILESDIR}/xorg \ 19SYMLINKS= base ${FILESDIR}/xorg \
20 base.lst ${FILESDIR}/xorg.lst \ 20 base.lst ${FILESDIR}/xorg.lst \
21 base.xml ${FILESDIR}/xorg.xml 21 base.xml ${FILESDIR}/xorg.xml
22 22
23.include "../Makefile.xkbdata" 23.include "../Makefile.xkbdata"
24 24
25.include <bsd.x11.mk> 25.include <bsd.x11.mk>
26.include <bsd.prog.mk> 26.include <bsd.prog.mk>