Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/xkeyboard-config catch up with xkeyboa...



details:   https://anonhg.NetBSD.org/src/rev/5bbdf4f4421b
branches:  trunk
changeset: 787073:5bbdf4f4421b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri May 31 23:28:25 2013 +0000

description:
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

diffstat:

 external/mit/xorg/lib/xkeyboard-config/Makefile                     |   4 +-
 external/mit/xorg/lib/xkeyboard-config/compat/Makefile              |   8 ++--
 external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile            |   4 +-
 external/mit/xorg/lib/xkeyboard-config/keymap/Makefile              |  16 ----------
 external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile |  11 ------
 external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile     |  12 -------
 external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile     |  12 -------
 external/mit/xorg/lib/xkeyboard-config/semantics/Makefile           |  11 ------
 external/mit/xorg/lib/xkeyboard-config/symbols/Makefile             |   6 +-
 external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile    |   4 +-
 10 files changed, 13 insertions(+), 75 deletions(-)

diffs (172 lines):

diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/Makefile   Fri May 31 22:49:15 2013 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/Makefile   Fri May 31 23:28:25 2013 +0000
@@ -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
 
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/compat/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/compat/Makefile    Fri May 31 22:49:15 2013 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/compat/Makefile    Fri May 31 23:28:25 2013 +0000
@@ -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
 
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile  Fri May 31 22:49:15 2013 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile  Fri May 31 23:28:25 2013 +0000
@@ -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
 
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/keymap/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/keymap/Makefile    Fri May 31 22:49:15 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/06/11 01:49:21 mrg Exp $
-
-.include <bsd.own.mk>
-
-XKBNAME=       keymap
-FILES=         README amiga ataritt macintosh sony xfree86 xfree98
-
-SUBDIR=                digital_vndr sgi_vndr sun_vndr
-
-XKBDIR=                1
-
-.include "../Makefile.xkbdata"
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile       Fri May 31 22:49:15 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/06/11 01:49:21 mrg Exp $
-
-.include <bsd.own.mk>
-
-FILESDIR=      ${X11LIBDIR}/xkb/keymap/digital_vndr
-FILES=         us
-
-.PATH:         ${X11SRCDIR.xkeyboard-config}/keymap/digital_vndr
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile   Fri May 31 22:49:15 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/06/11 01:49:21 mrg Exp $
-
-.include <bsd.own.mk>
-
-FILESDIR=      ${X11LIBDIR}/xkb/keymap/sgi_vndr
-FILES=         be bg ca ch cz de dk dvorak es fi fr gb hu \
-               it jp no pl pt ru se sk th us
-
-.PATH:         ${X11SRCDIR.xkeyboard-config}/keymap/sgi_vndr
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile   Fri May 31 22:49:15 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/06/11 01:49:22 mrg Exp $
-
-.include <bsd.own.mk>
-
-FILESDIR=      ${X11LIBDIR}/xkb/keymap/sun_vndr
-# ./all because 'all' is a make target
-FILES=         ./all de es fi fr no pl ru se uk us
-
-.PATH:         ${X11SRCDIR.xkeyboard-config}/keymap/sun_vndr
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/semantics/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/semantics/Makefile Fri May 31 22:49:15 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/06/11 01:49:22 mrg Exp $
-
-.include <bsd.own.mk>
-
-XKBNAME=       semantics
-FILES=         basic complete default xtest
-
-.include "../Makefile.xkbdata"
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile   Fri May 31 22:49:15 2013 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile   Fri May 31 23:28:25 2013 +0000
@@ -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 @@
        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 \
diff -r 203e25437972 -r 5bbdf4f4421b external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile  Fri May 31 22:49:15 2013 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile  Fri May 31 23:28:25 2013 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index