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
--- 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,8 +1,14 @@
-# $NetBSD: Makefile.xkbdata,v 1.1 2009/06/11 01:49:20 mrg Exp $
+# $NetBSD: Makefile.xkbdata,v 1.1.28.1 2018/06/06 15:09:51 martin Exp $
XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME}
.PATH: ${XKBDISTDIR}
+
+.SUFFIXES: .in
+
+.in:
+ ${TOOL_SED} -e 's,<_,<,g' -e 's,</_,</,g' < ${.ALLSRC} > ${.TARGET}
+
FILESDIR= ${X11LIBDIR}/xkb/${XKBNAME}
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/05/29 07:58:24 ghen Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2018/06/06 15:09:51 martin Exp $
#
# When upgrading, re-assemble the files base, base.lst, evdev and
# evdev.lst by running ./configure && make in the dist directory,
@@ -7,14 +7,14 @@
.include <bsd.own.mk>
XKBNAME= rules
-FILES= README base base.lst base.extras.xml.in base.xml.in \
- evdev evdev.lst evdev.extras.xml.in evdev.xml.in \
- xfree98 xkb.dtd
+GENFILES= base.extras.xml base.xml evdev.extras.xml evdev.xml
+FILES= README base base.lst evdev evdev.lst xfree98 xkb.dtd
+FILES+= ${GENFILES}
+CLEAN+= ${GENFILES}
-FILESNAME_base.xml.in= base.xml
-FILESNAME_base.extras.xml.in= base.extras.xml
-FILESNAME_evdev.xml.in= evdev.xml
-FILESNAME_evdev.extras.xml.in= evdev.extras.xml
+.for i in ${GENFILES}
+FILESBUILD_${i}= yes
+.endfor
SYMLINKS= base ${FILESDIR}/xorg \
base.lst ${FILESDIR}/xorg.lst \