From 1d75ab7274352083900c76cbf92136497a34d14c Mon Sep 17 00:00:00 2001 From: ghen Date: Fri, 28 May 2010 12:38:34 +0000 Subject: [PATCH] Update to xkeyboard-config 1.9. --- distrib/sets/lists/xbase/mi | 53 +++++++++++++++---- .../mit/xorg/lib/xkeyboard-config/Makefile | 6 ++- .../xorg/lib/xkeyboard-config/compat/Makefile | 8 +-- .../lib/xkeyboard-config/geometry/Makefile | 6 +-- .../lib/xkeyboard-config/keycodes/Makefile | 4 +- .../xorg/lib/xkeyboard-config/rules/Makefile | 12 +++-- .../lib/xkeyboard-config/symbols/Makefile | 19 +++---- .../xkeyboard-config/symbols/extras/Makefile | 11 ++++ .../symbols/macintosh_vndr/Makefile | 4 +- .../symbols/nokia_vndr/Makefile | 11 ++++ .../symbols/sun_vndr/Makefile | 6 +-- .../xorg/lib/xkeyboard-config/types/Makefile | 4 +- 12 files changed, 103 insertions(+), 41 deletions(-) create mode 100644 external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile create mode 100644 external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr/Makefile diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index acb9d10bd6d0..00057624b740 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.92 2010/05/25 13:13:55 nonaka Exp $ +# $NetBSD: mi,v 1.93 2010/05/28 12:38:34 ghen Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1845,6 +1845,7 @@ ./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 +./usr/X11R7/lib/X11/xkb/compat/caps -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/complete -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/default -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/iso9995 -unknown- xorg @@ -1889,6 +1890,7 @@ ./usr/X11R7/lib/X11/xkb/geometry/macintosh -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/microsoft -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/nec -unknown- xorg +./usr/X11R7/lib/X11/xkb/geometry/nokia -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/northgate -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/pc -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/sgi -obsolete- obsolete @@ -1902,6 +1904,7 @@ ./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg +./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 @@ -1915,6 +1918,7 @@ ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr base-x11-root xorg ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/lk -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/pc -unknown- xorg +./usr/X11R7/lib/X11/xkb/keycodes/empty -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/evdev -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/fujitsu -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/hp -unknown- xorg @@ -2025,9 +2029,11 @@ ./usr/X11R7/lib/X11/xkb/rules base-x11-root xorg ./usr/X11R7/lib/X11/xkb/rules/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/base -unknown- xorg +./usr/X11R7/lib/X11/xkb/rules/base.extras.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/base.lst -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/base.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/evdev -unknown- xorg +./usr/X11R7/lib/X11/xkb/rules/evdev.extras.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/evdev.lst -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/evdev.xml -unknown- xorg ./usr/X11R7/lib/X11/xkb/rules/sgi -unknown- obsolete @@ -2065,9 +2071,11 @@ ./usr/X11R7/lib/X11/xkb/symbols/ben -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/bg -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/br -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/brai -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/bs -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/bt -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/bw -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/by -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ca -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ca_enhanced -unknown- obsolete @@ -2099,9 +2107,14 @@ ./usr/X11R7/lib/X11/xkb/symbols/ee -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/el -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/en_US -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/empty -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/epo -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/es -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/et -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras base-x11-root xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/apl -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/rs -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/us -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/eurosign -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/fi -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/fo -unknown- xorg @@ -2145,6 +2158,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/iu -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/jp -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/kan -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/ke -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/keypad -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/kg -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/kh -unknown- xorg @@ -2185,11 +2199,12 @@ ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/ch -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/de -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/dk -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/es -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/es -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/fi -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/fr -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/gb -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/it -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/jp -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/nl -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/no -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/pt -unknown- xorg @@ -2198,7 +2213,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/mao -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/me -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/mk -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/ml -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/ml -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/mm -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/mn -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/mt -unknown- xorg @@ -2212,6 +2227,10 @@ ./usr/X11R7/lib/X11/xkb/symbols/ng -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/nl -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/no -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr base-x11-root xorg +./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr/rx-44 -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr/rx-51 -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr/su-8w -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/np -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ogham -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/olpc -unknown- xorg @@ -2312,6 +2331,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/si -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sk -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sk_qwerty -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sn -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sony -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sony/us -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr base-x11-root xorg @@ -2323,45 +2343,59 @@ ./usr/X11R7/lib/X11/xkb/symbols/sun/us -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sun/usb -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr base-x11-root xorg -./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/cs -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ara -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/be -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/br -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ca -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ch -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/cs -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/cz -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/de -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/dk -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ee -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/es -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/fi -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/fr -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/gb -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/gr -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/hu -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/hu -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/it -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/jp -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ko -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ko -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/kr -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/lt -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/lv -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/nl -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/no -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/pl -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/pt -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ro -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ru -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/se -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/sk -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/solaris -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/sw -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/sw -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tr -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tuv -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tw -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ua -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/us -unknown- xorg -./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/usb -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/usb -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sy -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/syr -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/syr_phonetic -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/tel -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/terminate -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/th -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/th_pat -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/th_tis -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/tj -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/tm -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/tml -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/tr -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/tr_f -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/typo -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/tz -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ua -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/us -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/us_group2 -unknown- obsolete @@ -2405,6 +2439,7 @@ ./usr/X11R7/lib/X11/xkb/types/iso9995 -unknown- xorg ./usr/X11R7/lib/X11/xkb/types/level5 -unknown- xorg ./usr/X11R7/lib/X11/xkb/types/mousekeys -unknown- xorg +./usr/X11R7/lib/X11/xkb/types/nokia -unknown- xorg ./usr/X11R7/lib/X11/xkb/types/numpad -unknown- xorg ./usr/X11R7/lib/X11/xkb/types/pc -unknown- xorg ./usr/X11R7/lib/X11/xkb/xkbcomp -unknown- xorg diff --git a/external/mit/xorg/lib/xkeyboard-config/Makefile b/external/mit/xorg/lib/xkeyboard-config/Makefile index c003cfbaab32..f218c2b88420 100644 --- a/external/mit/xorg/lib/xkeyboard-config/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/Makefile @@ -1,5 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:20 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ -SUBDIR= compat geometry keycodes keymap rules semantics symbols types +SUBDIR= compat geometry keycodes keymap rules semantics symbols types + +PKGCONFIG= xkeyboard-config .include diff --git a/external/mit/xorg/lib/xkeyboard-config/compat/Makefile b/external/mit/xorg/lib/xkeyboard-config/compat/Makefile index 55db8a00dffc..24b3f06a3e1f 100644 --- a/external/mit/xorg/lib/xkeyboard-config/compat/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/compat/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:21 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ .include XKBNAME= compat -FILES= README accessx basic complete default iso9995 japan keypad \ - ledcaps lednum ledscroll level5 misc mousekeys norepeat \ - olpc pc pc98 xfree86 xtest +FILES= README accessx basic caps complete default iso9995 japan \ + keypad ledcaps lednum ledscroll level5 misc mousekeys \ + norepeat olpc pc pc98 xfree86 xtest XKBDIR= 1 diff --git a/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile b/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile index c1bf665992da..7dffa6c9d8e2 100644 --- a/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:21 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ .include XKBNAME= geometry FILES= README amiga ataritt chicony dell everex fujitsu hhk hp \ - keytronic kinesis macintosh microsoft nec northgate pc \ - sony sun thinkpad winbook + keytronic kinesis macintosh microsoft nec nokia northgate \ + pc sony sun thinkpad typematrix winbook SUBDIR= digital_vndr sgi_vndr diff --git a/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile b/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile index 5bfe09d7613a..3206b65b70d3 100644 --- a/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:21 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ .include XKBNAME= keycodes -FILES= README aliases amiga ataritt evdev fujitsu hp ibm \ +FILES= README aliases amiga ataritt empty evdev fujitsu hp ibm \ macintosh sony sun xfree86 xfree98 SUBDIR= digital_vndr sgi_vndr diff --git a/external/mit/xorg/lib/xkeyboard-config/rules/Makefile b/external/mit/xorg/lib/xkeyboard-config/rules/Makefile index 62be69de3d02..4a55fff973e5 100644 --- a/external/mit/xorg/lib/xkeyboard-config/rules/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/rules/Makefile @@ -1,14 +1,16 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ .include XKBNAME= rules -FILES= README base base.lst base.xml.in \ - evdev evdev.lst evdev.xml.in \ +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_evdev.xml.in= evdev.xml +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 SYMLINKS= base ${FILESDIR}/xorg \ base.lst ${FILESDIR}/xorg.lst \ diff --git a/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile b/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile index b570dd57612b..e9299d0e3783 100644 --- a/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile @@ -1,34 +1,35 @@ -# $NetBSD: Makefile,v 1.2 2009/12/13 04:57:16 nonaka Exp $ +# $NetBSD: Makefile,v 1.3 2010/05/28 12:38:35 ghen Exp $ .include XKBNAME= symbols FILES= ad af al altwin am ara az \ - ba bd be bg br braille bt by \ + ba bd be bg br brai bt bw by \ ca capslock cd ch cn compose ctrl cz \ de dk \ - ee epo es et eurosign \ + ee empty epo es et eurosign \ fi fo fr \ gb ge gh gn gr group \ hr hu \ ie il in inet iq ir is it \ jp \ - keypad kg kh kpdl kr kz \ + ke keypad kg kh kpdl kr kz \ la latam latin level3 level5 lk lt lv \ - ma mao me mk mm mn mt mv \ + ma mao me mk ml mm mn mt mv \ nbsp ng nl no np \ olpc \ pc pk pl pt \ ro rs ru \ - se shift si sk srvr_ctrl sy \ - th tj tr \ + se shift si sk sn srvr_ctrl sy \ + terminate th tj tm tr typo tz \ ua us uz \ vn \ za -SUBDIR= digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \ - sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr +SUBDIR= digital_vndr extras fujitsu_vndr hp_vndr macintosh_vndr \ + nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr \ + xfree68_vndr XKBDIR= 1 diff --git a/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile b/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile new file mode 100644 index 000000000000..0616df79a35f --- /dev/null +++ b/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 2010/05/28 12:38:35 ghen Exp $ + +.include + +FILESDIR= ${X11LIBDIR}/xkb/symbols/extras +FILES= apl rs us + +.PATH: ${X11SRCDIR.xkeyboard-config}/symbols/extras + +.include +.include diff --git a/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile b/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile index 973c95f56a53..c3dea1a64a04 100644 --- a/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:35 ghen Exp $ .include FILESDIR= ${X11LIBDIR}/xkb/symbols/macintosh_vndr -FILES= apple ch de dk es fi fr gb it nl no pt se us +FILES= apple ch de dk fi fr gb it jp nl no pt se us .PATH: ${X11SRCDIR.xkeyboard-config}/symbols/macintosh_vndr diff --git a/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr/Makefile b/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr/Makefile new file mode 100644 index 000000000000..56ce666a4810 --- /dev/null +++ b/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr/Makefile @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 2010/05/28 12:38:35 ghen Exp $ + +.include + +FILESDIR= ${X11LIBDIR}/xkb/symbols/nokia_vndr +FILES= rx-44 rx-51 su-8w + +.PATH: ${X11SRCDIR.xkeyboard-config}/symbols/nokia_vndr + +.include +.include diff --git a/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile b/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile index 20a33164072a..537e3db0f9ac 100644 --- a/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:23 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:35 ghen Exp $ .include FILESDIR= ${X11LIBDIR}/xkb/symbols/sun_vndr -FILES= cs cz de dk es fi fr gb gr hu it jp ko lt lv nl no \ - pl pt ru se solaris sw tr tuv tw us usb +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 .PATH: ${X11SRCDIR.xkeyboard-config}/symbols/sun_vndr diff --git a/external/mit/xorg/lib/xkeyboard-config/types/Makefile b/external/mit/xorg/lib/xkeyboard-config/types/Makefile index 32c7f856e78e..05d18bc3824d 100644 --- a/external/mit/xorg/lib/xkeyboard-config/types/Makefile +++ b/external/mit/xorg/lib/xkeyboard-config/types/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2009/06/11 01:49:23 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:35 ghen Exp $ .include XKBNAME= types FILES= README basic cancel caps complete default extra \ - iso9995 level5 mousekeys numpad pc + iso9995 level5 mousekeys nokia numpad pc XKBDIR= 1