Module Name: src Committed By: christos Date: Fri Jun 1 01:21:02 UTC 2018
Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile.xkbdata src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile Log Message: Generate xml files properly. Noted by youri. XXX: pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3 Mon Feb 13 01:11:01 2017 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata Thu May 31 21:21:02 2018 @@ -1,7 +1,13 @@ -# $NetBSD: Makefile.xkbdata,v 1.3 2017/02/13 06:11:01 snj Exp $ +# $NetBSD: Makefile.xkbdata,v 1.4 2018/06/01 01:21:02 christos 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} Index: src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.3 Sat May 29 03:58:24 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Thu May 31 21:21:02 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/05/29 07:58:24 ghen Exp $ +# $NetBSD: Makefile,v 1.4 2018/06/01 01:21:02 christos 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 - -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 +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} + +.for i in ${GENFILES} +FILESBUILD_${i}= yes +.endfor SYMLINKS= base ${FILESDIR}/xorg \ base.lst ${FILESDIR}/xorg.lst \