Module Name: src Committed By: snj Date: Mon Feb 13 06:11:01 UTC 2017
Modified Files: src/distrib/sets/lists/xbase: mi src/external/mit/xorg/lib/xkeyboard-config: Makefile.xkbdata src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/types: Makefile Log Message: catch up with 2012 xkeyboard-config and stop generating *.dir To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/types/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.142 src/distrib/sets/lists/xbase/mi:1.143 --- src/distrib/sets/lists/xbase/mi:1.142 Mon Feb 13 04:23:19 2017 +++ src/distrib/sets/lists/xbase/mi Mon Feb 13 06:11:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.142 2017/02/13 04:23:19 snj Exp $ +# $NetBSD: mi,v 1.143 2017/02/13 06:11:01 snj Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -612,7 +612,7 @@ ./usr/X11R7/lib/X11/xkb/README.config -unknown- obsolete ./usr/X11R7/lib/X11/xkb/README.enhancing -unknown- obsolete ./usr/X11R7/lib/X11/xkb/compat base-x11-root xorg -./usr/X11R7/lib/X11/xkb/compat.dir -unknown- xorg +./usr/X11R7/lib/X11/xkb/compat.dir -unknown- obsolete ./usr/X11R7/lib/X11/xkb/compat/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/accessx -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/basic -unknown- xorg @@ -636,7 +636,7 @@ ./usr/X11R7/lib/X11/xkb/compat/xtest -unknown- xorg ./usr/X11R7/lib/X11/xkb/compiled base-x11-root xorg ./usr/X11R7/lib/X11/xkb/geometry base-x11-root xorg -./usr/X11R7/lib/X11/xkb/geometry.dir -unknown- xorg +./usr/X11R7/lib/X11/xkb/geometry.dir -unknown- obsolete ./usr/X11R7/lib/X11/xkb/geometry/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/amiga -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/ataritt -unknown- xorg @@ -680,7 +680,7 @@ ./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes base-x11-root xorg -./usr/X11R7/lib/X11/xkb/keycodes.dir -unknown- xorg +./usr/X11R7/lib/X11/xkb/keycodes.dir -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keycodes/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/aliases -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/amiga -unknown- xorg @@ -829,7 +829,7 @@ ./usr/X11R7/lib/X11/xkb/semantics/default -unknown- obsolete ./usr/X11R7/lib/X11/xkb/semantics/xtest -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols base-x11-root xorg -./usr/X11R7/lib/X11/xkb/symbols.dir -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols.dir -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/README -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/ad -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/af -unknown- xorg @@ -1224,7 +1224,7 @@ ./usr/X11R7/lib/X11/xkb/torture/sym_interp4 -unknown- obsolete ./usr/X11R7/lib/X11/xkb/torture/types -unknown- obsolete ./usr/X11R7/lib/X11/xkb/types base-x11-root xorg -./usr/X11R7/lib/X11/xkb/types.dir -unknown- xorg +./usr/X11R7/lib/X11/xkb/types.dir -unknown- obsolete ./usr/X11R7/lib/X11/xkb/types/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/types/basic -unknown- xorg ./usr/X11R7/lib/X11/xkb/types/cancel -unknown- xorg Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.2 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.2 Sat Dec 24 21:17:16 2016 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata Mon Feb 13 06:11:01 2017 @@ -1,27 +1,7 @@ -# $NetBSD: Makefile.xkbdata,v 1.2 2016/12/24 21:17:16 christos Exp $ +# $NetBSD: Makefile.xkbdata,v 1.3 2017/02/13 06:11:01 snj Exp $ XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME} .PATH: ${XKBDISTDIR} FILESDIR= ${X11LIBDIR}/xkb/${XKBNAME} - - -.if defined(XKBDIR) # { -FILES+= ${XKBNAME}.dir -FILESDIR_${XKBNAME}.dir=${X11LIBDIR}/xkb -CLEANFILES+= ${XKBNAME}.dir - -.include "${NETBSDSRCDIR}/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp" - -${XKBNAME}.dir: - ${_MKTARGET_CREATE} - rm -f ${.TARGET} - (cd ${XKBDISTDIR} && rm -f ${.OBJDIR}/${.TARGET}.tmp && \ - ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/${.TARGET}.tmp '*' && \ - sort ${.OBJDIR}/${.TARGET}.tmp > ${.OBJDIR}/${.TARGET} && \ - rm -f ${.OBJDIR}/${.TARGET}.tmp) - -realall: ${FILES} - -.endif # } Index: src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.3 Fri May 31 23:28:25 2013 +++ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile Mon Feb 13 06:11:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2017/02/13 06:11:01 snj Exp $ .include <bsd.own.mk> @@ -7,8 +7,6 @@ FILES= README accessx basic caps comple ledcaps lednum ledscroll level5 misc mousekeys \ olpc pc pc98 xfree86 xtest -XKBDIR= 1 - .include "../Makefile.xkbdata" .include <bsd.x11.mk> Index: src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.4 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.5 --- src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.4 Tue Nov 22 19:51:37 2016 +++ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile Mon Feb 13 06:11:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/11/22 19:51:37 snj Exp $ +# $NetBSD: Makefile,v 1.5 2017/02/13 06:11:01 snj Exp $ .include <bsd.own.mk> @@ -9,8 +9,6 @@ FILES= README amiga ataritt chicony del SUBDIR= digital_vndr sgi_vndr -XKBDIR= 1 - .include "../Makefile.xkbdata" .include <bsd.x11.mk> Index: src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.4 src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.5 --- src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.4 Tue Nov 22 19:51:37 2016 +++ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile Mon Feb 13 06:11:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/11/22 19:51:37 snj Exp $ +# $NetBSD: Makefile,v 1.5 2017/02/13 06:11:01 snj Exp $ .include <bsd.own.mk> @@ -8,8 +8,6 @@ FILES= README aliases amiga ataritt emp SUBDIR= digital_vndr sgi_vndr -XKBDIR= 1 - .include "../Makefile.xkbdata" .include <bsd.x11.mk> Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.11 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.12 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.11 Tue Nov 22 19:51:37 2016 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Mon Feb 13 06:11:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2016/11/22 19:51:37 snj Exp $ +# $NetBSD: Makefile,v 1.12 2017/02/13 06:11:01 snj Exp $ .include <bsd.own.mk> @@ -31,8 +31,6 @@ SUBDIR= digital_vndr fujitsu_vndr hp_vn nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr \ xfree68_vndr -XKBDIR= 1 - .include "../Makefile.xkbdata" .include <bsd.x11.mk> Index: src/external/mit/xorg/lib/xkeyboard-config/types/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/types/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/types/Makefile:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/types/Makefile:1.2 Fri May 28 12:38:35 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/types/Makefile Mon Feb 13 06:11:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:35 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2017/02/13 06:11:01 snj Exp $ .include <bsd.own.mk> @@ -6,8 +6,6 @@ XKBNAME= types FILES= README basic cancel caps complete default extra \ iso9995 level5 mousekeys nokia numpad pc -XKBDIR= 1 - .include "../Makefile.xkbdata" .include <bsd.x11.mk>