Module Name: src
Committed By: mrg
Date: Fri May 31 23:28:26 UTC 2013
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile
src/external/mit/xorg/lib/xkeyboard-config/compat: 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/symbols/sun_vndr: Makefile
Removed Files:
src/external/mit/xorg/lib/xkeyboard-config/keymap: Makefile
src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr:
Makefile
src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr: Makefile
src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr: Makefile
src/external/mit/xorg/lib/xkeyboard-config/semantics: Makefile
Log Message:
catch up with xkeyboard-config 2.9:
- remove keymap/ and semantics/ entirely.
- remove default keypad and norepeat from compat/
- add keycodes/olpc
- remove symbols/ad, add symbols/md
- remove symbols/sun_vndr/tuv
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/keymap/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/semantics/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/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
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.7 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.8
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.7 Mon Jul 25 15:41:58 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri May 31 23:28:25 2013
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/07/25 15:41:58 njoly Exp $
+# $NetBSD: Makefile,v 1.8 2013/05/31 23:28:25 mrg Exp $
.include <bsd.own.mk>
-SUBDIR= compat geometry keycodes keymap rules semantics symbols types
+SUBDIR= compat geometry keycodes rules semantics types
NOOBJ= # defined
Index: src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.2 Fri May 28 12:38:34 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile Fri May 31 23:28:25 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $
.include <bsd.own.mk>
XKBNAME= compat
-FILES= README accessx basic caps complete default iso9995 japan \
- keypad ledcaps lednum ledscroll level5 misc mousekeys \
- norepeat olpc pc pc98 xfree86 xtest
+FILES= README accessx basic caps complete iso9995 japan \
+ ledcaps lednum ledscroll level5 misc mousekeys \
+ olpc pc pc98 xfree86 xtest
XKBDIR= 1
Index: src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.2 Fri May 28 12:38:34 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile Fri May 31 23:28:25 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $
.include <bsd.own.mk>
XKBNAME= keycodes
FILES= README aliases amiga ataritt empty evdev fujitsu hp ibm \
- macintosh sony sun xfree86 xfree98
+ macintosh olpc sony sun xfree86 xfree98
SUBDIR= digital_vndr sgi_vndr
Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.8 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.9
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.8 Sat Jul 23 12:02:02 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Fri May 31 23:28:26 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2011/07/23 12:02:02 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/31 23:28:26 mrg Exp $
.include <bsd.own.mk>
XKBNAME= symbols
-FILES= ad af al altwin am apl ara at az \
+FILES= af al altwin am apl ara at az \
ba bd be bg br brai bt bw by \
ca capslock cd ch cm cn compose ctrl cz \
de dk \
@@ -16,7 +16,7 @@ FILES= ad af al altwin am apl ara at az
jp \
ke keypad kg kh kpdl kr kz \
la latam latin level3 level5 lk lt lv \
- ma mao me mk ml mm mn mt mv \
+ ma mao md me mk ml mm mn mt mv \
nbsp ng nl no np \
olpc \
pc ph pk pl pt \
Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile:1.2 Fri May 28 12:38:35 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile Fri May 31 23:28:26 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:35 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:26 mrg Exp $
.include <bsd.own.mk>
FILESDIR= ${X11LIBDIR}/xkb/symbols/sun_vndr
FILES= ara be br ca ch cz de dk ee es fi fr gb gr it jp kr \
- lt lv nl no pl pt ro ru se sk solaris tr tuv tw ua us
+ lt lv nl no pl pt ro ru se sk solaris tr tw ua us
.PATH: ${X11SRCDIR.xkeyboard-config}/symbols/sun_vndr
