CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Tue Apr 27 03:58:55 UTC 2021 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile base base.lst evdev evdev.lst Log Message: updates for xkeyboard-config 2.32. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev 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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 Sun Nov 1 12:07:09 2020 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Tue Apr 27 03:58:55 2021 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@ +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.32" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(@appmansuffix@). +setxkbmap(1). .SH MODELS .TS left,box; @@ -203,8 +203,6 @@ teck227 Truly Ergonomic 227 teck229 Truly Ergonomic 229 apex300 SteelSeries Apex 300 (Apex RAW) chromebook Chromebook -teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys) -teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key) .TE .SH LAYOUTS @@ -221,6 +219,7 @@ us(euro) English (US, euro on 5) us(intl) English (US, intl., with dead keys) us(alt-intl) English (US, alt. intl.) us(colemak) English (Colemak) +us(colemak_dh) English (Colemak-DH) us(dvorak) English (Dvorak) us(dvorak-intl) English (Dvorak, intl., with dead keys) us(dvorak-alt-intl) English (Dvorak, alt. intl.) @@ -273,7 +272,6 @@ am(eastern-alt) Armenian (alt. eastern) _ at German (Austria) at(nodeadkeys) German (Austria, no dead keys) -at(sundeadkeys) German (Austria, Sun dead keys) at(mac) German (Austria, Macintosh) _ @@ -294,10 +292,8 @@ _ be Belgian be(oss) Belgian (alt.) be(oss_latin9) Belgian (Latin-9 only, alt.) -be(oss_sundeadkeys) Belgian (Sun dead keys, alt.) be(iso-alternate) Belgian (ISO, alt.) be(nodeadkeys) Belgian (no dead keys) -be(sundeadkeys) Belgian (Sun dead keys) be(wang) Belgian (Wang 724 AZERTY) _ @@ -340,7 +336,7 @@ in(hin-kagapa) Hindi (KaGaPa, phonetic) in(san-kagapa) Sanskrit (KaGaPa, phonetic) in(mar-kagapa) Marathi (KaGaPa, phonetic) in(eng) English (India, with rupee) -in(iipa) Indic (phonetic, IPA) +in(iipa) Indic IPA in(marathi) Marathi (enhanced Inscript) _ @@ -366,11 +362,11 @@ bg(bas_phonetic) Bulgarian (new phonetic bg(bekl) Bulgarian (enhanced) _ -dz Kabylian (azerty layout, no dead keys) -dz(azerty-deadkeys) Kabylian (azerty layout, with dead keys) -dz(qwerty-gb-deadkeys) Kabylian (qwerty-gb layout, with dead keys) -dz(qwerty-us-deadkeys) Kabylian (qwerty-us layout, with dead keys) -dz(ber) Kabylian (Algeria, Tifinagh) +dz Berber (Algeria, Latin) +dz(azerty-deadkeys) Kabyle (azerty layout, dead keys) +dz(qwerty-gb-deadkeys) Kabyle (qwerty-gb layout, dead keys) +dz(qwerty-us-deadkeys) Kabyle (qwerty-us layout, dead keys) +dz(ber) Berber (Algeria, Tifinagh) dz(ar) Arabic (Algeria) _ @@ -449,7 +445,6 @@ dk(dvorak) Danish (Dvorak) _ nl Dutch -nl(sundeadkeys) Dutch (Sun dead keys) nl(mac) Dutch (Macintosh) nl(std) Dutch (standard) @@ -492,14 +487,11 @@ fi(mac) Finnish (Macintosh) _ fr French fr(nodeadkeys) French (no dead keys) -fr(sundeadkeys) French (Sun dead keys) fr(oss) French (alt.) fr(oss_latin9) French (alt., Latin-9 only) fr(oss_nodeadkeys) French (alt., no dead keys) -fr(oss_sundeadkeys) French (alt., Sun dead keys) fr(latin9) French (legacy, alt.) fr(latin9_nodeadkeys) French (legacy, alt., no dead keys) -fr(latin9_sundeadkeys) French (legacy, alt., Sun dead keys) fr(bepo) French (BEPO) fr(bepo_latin9) French (BEPO, Latin-9 only) fr(bepo_afnor) French (BEPO, AFNOR) @@ -524,7 +516,7 @@ gh(avn) Avatime gh(gillbt) English (Ghana, GILLBT) _ -gn French (Guinea) +gn N'Ko (azerty) _ ge Georgian @@ -545,7 +537,6 @@ de(us) German (US) de(ro) Romanian (Germany)
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Mon Nov 2 00:25:46 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: transform @xkb_base@ instead of __xkb_base__ now. should fix build issues reported on -current. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/lib/xkeyboard-config/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.13 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.14 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.13 Mon Mar 11 06:25:55 2019 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Mon Nov 2 00:25:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/03/11 06:25:55 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2020/11/02 00:25:46 mrg Exp $ .include @@ -12,7 +12,7 @@ NOOBJ= # defined PKGCONFIG= xkeyboard-config X11EXTRAMANTRANSFORMS+= \ - __xkb_base__ ${X11LIBDIR}/xkb + @xkb_base@ ${X11LIBDIR}/xkb .include .include
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 1 12:07:09 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Log Message: merge new xkeyboard-config 2.31 parts. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 Thu Mar 12 21:55:31 2020 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Nov 1 12:07:09 2020 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG __miscmansuffix__ __vendorversion__ +.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@ .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(__appmansuffix__). +setxkbmap(@appmansuffix@). .SH MODELS .TS left,box; @@ -13,10 +13,12 @@ lB lB ___ lB l. Model Description +pc86 Generic 86-key PC pc101 Generic 101-key PC -pc102 Generic 102-key PC (intl.) +pc102 Generic 102-key PC pc104 Generic 104-key PC -pc105 Generic 105-key PC (intl.) +pc104alt Generic 104-key PC with L-shaped Enter key +pc105 Generic 105-key PC dell101 Dell 101-key PC latitude Dell Latitude laptop dellm65 Dell Precision M65 laptop @@ -214,6 +216,7 @@ lB l. Layout(Variant) Description us English (US) us(chr) Cherokee +us(haw) Hawaiian us(euro) English (US, euro on 5) us(intl) English (US, intl., with dead keys) us(alt-intl) English (US, alt. intl.) @@ -225,10 +228,11 @@ us(dvorak-l) English (Dvorak, left-hande us(dvorak-r) English (Dvorak, right-handed) us(dvorak-classic) English (classic Dvorak) us(dvp) English (programmer Dvorak) +us(symbolic) English (US, Symbolic) us(rus) Russian (US, phonetic) us(mac) English (Macintosh) us(altgr-intl) English (intl., with AltGr dead keys) -us(olpc2) English (the divide/multiply keys toggle the layout) +us(olpc2) English (the divide/multiply toggle the layout) us(hbs) Serbo-Croatian (US) us(norman) English (Norman) us(workman) English (Workman) @@ -245,10 +249,10 @@ af(uz-olpc) Uzbek (Afghanistan, OLPC) _ ara Arabic ara(azerty) Arabic (AZERTY) -ara(azerty_digits) Arabic (AZERTY/digits) -ara(digits) Arabic (digits) +ara(azerty_digits) Arabic (AZERTY, Eastern Arabic numerals) +ara(digits) Arabic (Eastern Arabic numerals) ara(qwerty) Arabic (QWERTY) -ara(qwerty_digits) Arabic (qwerty/digits) +ara(qwerty_digits) Arabic (QWERTY, Eastern Arabic numerals) ara(buckwalter) Arabic (Buckwalter) ara(olpc) Arabic (OLPC) ara(mac) Arabic (Macintosh) @@ -269,7 +273,7 @@ am(eastern-alt) Armenian (alt. eastern) _ at German (Austria) at(nodeadkeys) German (Austria, no dead keys) -at(sundeadkeys) German (Austria, with Sun dead keys) +at(sundeadkeys) German (Austria, Sun dead keys) at(mac) German (Austria, Macintosh) _ @@ -283,15 +287,17 @@ _ by Belarusian by(legacy) Belarusian (legacy) by(latin) Belarusian (Latin) +by(ru) Russian (Belarus) +by(intl) Belarusian (intl.) _ be Belgian be(oss) Belgian (alt.) -be(oss_latin9) Belgian (alt., Latin-9 only) -be(oss_sundeadkeys) Belgian (alt., with Sun dead keys) -be(iso-alternate) Belgian (alt. ISO) +be(oss_latin9) Belgian (Latin-9 only, alt.) +be(oss_sundeadkeys) Belgian (Sun dead keys, alt.) +be(iso-alternate) Belgian (ISO, alt.) be(nodeadkeys) Belgian (no dead keys) -be(sundeadkeys) Belgian (with Sun dead keys) +be(sundeadkeys) Belgian (Sun dead keys) be(wang) Belgian (Wang 724 AZERTY) _ @@ -304,14 +310,14 @@ in(ben) Bangla (India) in(ben_probhat) Bangla (India, Probhat) in(ben_baishakhi) Bangla (India, Baishakhi) in(ben_bornona) Bangla (India, Bornona) -in(ben_gitanjali) Bangla (India, Uni Gitanjali) +in(ben_gitanjali) Bangla (India, Gitanjali) in(ben_inscript) Bangla (India, Baishakhi Inscript) in(eeyek) Manipuri (Eeyek) in(guj) Gujarati in(guru) Punjabi (Gurmukhi) in(jhelum)
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: snj Date: Thu Mar 12 21:55:31 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man Log Message: regen for xkeyboard-config 2.29 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man 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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.6 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.6 Wed Mar 6 11:05:18 2019 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Thu Mar 12 21:55:31 2020 @@ -77,7 +77,6 @@ geniuscomfy2 Genius Comfy KB-21e-Scroll geniuskb19e Genius KB-19e NB geniuskkb2050hs Genius KKB-2050HS gyration Gyration -htcdream HTC Dream kinesis Kinesis logitech_base Logitech logitech_g15 Logitech G15 extra keys via G15daemon @@ -136,6 +135,7 @@ vsonku306 ViewSonic KU-306 Internet microsoftprose Microsoft Internet Pro (Swedish) microsoftoffice Microsoft Office Keyboard microsoftmult Microsoft Wireless Multimedia 1.0A +microsoftsurface Microsoft Surface microsoftelite Microsoft Natural Elite microsoftccurve2k Microsoft Comfort Curve 2000 oretec Ortek Multimedia/Internet MCK-800 @@ -197,7 +197,6 @@ targa_v811 Targa Visionary 811 unitekkb1925 Unitek KB-1925 compalfl90 FL90 creativedw7000 Creative Desktop Wireless 7000 -htcdream Htc Dream phone teck227 Truly Ergonomic 227 teck229 Truly Ergonomic 229 apex300 SteelSeries Apex 300 (Apex RAW) @@ -231,6 +230,7 @@ us(mac) English (Macintosh) us(altgr-intl) English (intl., with AltGr dead keys) us(olpc2) English (the divide/multiply keys toggle the layout) us(hbs) Serbo-Croatian (US) +us(norman) English (Norman) us(workman) English (Workman) us(workman-intl) English (Workman, intl., with dead keys) @@ -256,6 +256,7 @@ ara(mac) Arabic (Macintosh) _ al Albanian al(plisi) Albanian (Plisi) +al(veqilharxhi) Albanian (Veqilharxhi) _ am Armenian @@ -311,7 +312,6 @@ in(guru) Punjabi (Gurmukhi) in(jhelum) Punjabi (Gurmukhi Jhelum) in(kan) Kannada in(kan-kagapa) Kannada (KaGaPa phonetic) -in(kan-kagapa) Kannada (KaGaPa phonetic) in(mal) Malayalam in(mal_lalitha) Malayalam (Lalitha) in(mal_enhanced) Malayalam (enhanced Inscript, with rupee) @@ -399,6 +399,13 @@ cd French (Democratic Republic of the Co _ cn Chinese +cn(mon_trad) Mongolian (Bichig) +cn(mon_trad_todo) Mongolian Todo +cn(mon_trad_xibe) Mongolian Xibe +cn(mon_trad_manchu) Mongolian Manchu +cn(mon_trad_galik) Mongolian Galik +cn(mon_todo_galik) Mongolian Todo Galik +cn(mon_manchu_galik) Mongolian Manchu Galik cn(tib) Tibetan cn(tib_asciinum) Tibetan (with ASCII numerals) cn(ug) Uyghur @@ -416,6 +423,7 @@ cz Czech cz(bksl) Czech (with <\|> key) cz(qwerty) Czech (QWERTY) cz(qwerty_bksl) Czech (QWERTY, extended backslash) +cz(qwerty-mac) Czech (QWERTY, Macintosh) cz(ucw) Czech (UCW, only accented letters) cz(dvorak-ucw) Czech (US, Dvorak, UCW support) cz(rus) Russian (Czech, phonetic) @@ -464,9 +472,9 @@ fo(nodeadkeys) Faroese (no dead keys) _ fi Finnish +fi(winkeys) Finnish (Winkeys) fi(classic) Finnish (classic) fi(nodeadkeys) Finnish (classic, no dead keys) -fi(winkeys) Finnish (Winkeys) fi(smi) Northern Saami (Finland) fi(mac) Finnish (Macintosh) @@ -483,9 +491,11 @@ fr(latin9_nodeadkeys) French (legacy, al fr(latin9_sundeadkeys) French (legacy, alt., with Sun dead keys) fr(bepo) French (Bepo, ergonomic, Dvorak way) fr(bepo_latin9) French (Bepo, ergonomic, Dvorak way, Latin-9 only) +fr(bepo_afnor) French (Bepo, ergonomic, Dvorak way, AFNOR) fr(dvorak) French (Dvorak) fr(mac) French (Macintosh) fr(azerty) French (AZERTY) +fr(afnor) French (AFNOR standardized AZERTY) fr(bre) French (Breton) fr(oci) Occitan fr(geo) Georgian (France, AZERTY Tskapo) @@ -585,6 +595,7 @@ it(geo) Georgian (Italy) it(ibm) Italian (IBM 142) it(intl) Italian (intl., with dead keys) it(scn) Sicilian +it(fur) Friulian (Italy) _ jp Japanese @@ -628,6 +639,7 @@ lt(us) Lithuanian (US, with Lithuanian l lt(ibm) Lithuanian (IBM LST 1205-92) lt(lekp) Lithuanian (LEKP) lt(lekpa) Lithuanian (LEKPa) +lt(sgs) Samogitian _ lv Latvian @@ -658,6 +670,8 @@ mk(nodeadkeys) Macedonian (no dead keys) _ mt Maltese mt(us) Maltese (with US layout) +mt(alt-us) Maltese (US layout with AltGr overrides) +mt(alt-gb) Maltese (UK layout with AltGr overrides) _ mn Mongolian @@ -950,7 +964,11 @@ md Moldavian md(gag) Moldavian (Gagauz) _ -id Indonesian (Jawi) +id Indonesian (Arab Melayu, phonetic) +id(phoneticx) Indonesian (Arab Melayu, ext. phonetic) + +_ +jv Indonesian (Javanese) _ my Malay (Jawi, Arabic Keyboard) @@ -973,7 +991,7 @@ Option Description grp:switch Right Alt (while
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Wed Mar 6 11:05:18 UTC 2019 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev.lst Log Message: regen for xkeyboard-config 2.26. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.5 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.6 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.5 Sun Jan 13 19:21:27 2019 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Wed Mar 6 11:05:18 2019 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.25" "X Version 11" +.TH XKEYBOARD-CONFIG __miscmansuffix__ __vendorversion__ .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(1). +setxkbmap(__appmansuffix__). .SH MODELS .TS left,box; @@ -201,6 +201,9 @@ htcdream Htc Dream phone teck227 Truly Ergonomic 227 teck229 Truly Ergonomic 229 apex300 SteelSeries Apex 300 (Apex RAW) +chromebook Chromebook +teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys) +teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key) .TE .SH LAYOUTS @@ -308,6 +311,7 @@ in(guru) Punjabi (Gurmukhi) in(jhelum) Punjabi (Gurmukhi Jhelum) in(kan) Kannada in(kan-kagapa) Kannada (KaGaPa phonetic) +in(kan-kagapa) Kannada (KaGaPa phonetic) in(mal) Malayalam in(mal_lalitha) Malayalam (Lalitha) in(mal_enhanced) Malayalam (enhanced Inscript, with rupee) @@ -321,6 +325,7 @@ in(tam) Tamil (Inscript) in(tel) Telugu in(tel-kagapa) Telugu (KaGaPa phonetic) in(tel-sarala) Telugu (Sarala) +in(tel-kagapa) Telugu (KaGaPa phonetic) in(urd-phonetic) Urdu (phonetic) in(urd-phonetic3) Urdu (alt. phonetic) in(urd-winkeys) Urdu (Win keys) @@ -484,7 +489,7 @@ fr(azerty) French (AZERTY) fr(bre) French (Breton) fr(oci) Occitan fr(geo) Georgian (France, AZERTY Tskapo) -fr(us) French (US keyboard with French letters) +fr(us) French (US, with French letters) _ gh English (Ghana) @@ -613,6 +618,8 @@ latam(nodeadkeys) Spanish (Latin America latam(deadtilde) Spanish (Latin American, dead tilde) latam(sundeadkeys) Spanish (Latin American, with Sun dead keys) latam(dvorak) Spanish (Latin American, Dvorak) +latam(colemak) Spanish (Latin American, Colemak) +latam(colemak-gaming) Spanish (Latin American, Colemak for gaming) _ lt Lithuanian @@ -700,6 +707,7 @@ _ ru Russian ru(phonetic) Russian (phonetic) ru(phonetic_winkeys) Russian (phonetic, with Win keys) +ru(phonetic_yazherty) Russian (phonetic yazherty) ru(typewriter) Russian (typewriter) ru(legacy) Russian (legacy) ru(typewriter-legacy) Russian (typewriter, legacy) @@ -838,6 +846,7 @@ gb(dvorakukp) English (UK, Dvorak, with gb(mac) English (UK, Macintosh) gb(mac_intl) English (UK, intl., Macintosh) gb(colemak) English (UK, Colemak) +gb(pl) Polish (British keyboard) _ uz Uzbek @@ -897,7 +906,9 @@ sn Wolof _ brai Braille brai(left_hand) Braille (left-handed) +brai(left_hand_invert) Braille (left-handed inverted thumb) brai(right_hand) Braille (right-handed) +brai(right_hand_invert) Braille (right-handed inverted thumb) _ tm Turkmen @@ -1363,23 +1374,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa .SH FILES -/usr/local/share/X11/xkb/compat +__xkb_base__/compat -/usr/local/share/X11/xkb/compiled +__xkb_base__/compiled -/usr/local/share/X11/xkb/geometry +__xkb_base__/geometry -/usr/local/share/X11/xkb/keycodes +__xkb_base__/keycodes -/usr/local/share/X11/xkb/keymap +__xkb_base__/keymap -/usr/local/share/X11/xkb/rules +__xkb_base__/rules -/usr/local/share/X11/xkb/semantics +__xkb_base__/semantics -/usr/local/share/X11/xkb/symbols +__xkb_base__/symbols -/usr/local/share/X11/xkb/types +__xkb_base__/types .SH SEE ALSO -setxkbmap(1) +setxkbmap(__appmansuffix__) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.12 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.13 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.12 Sun Mar 11 20:17:19
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: snj Date: Sun Jan 13 19:21:27 UTC 2019 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man Log Message: regen for 2.25 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man 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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.4 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.5 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.4 Sun Mar 11 20:17:19 2018 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Jan 13 19:21:27 2019 @@ -1,5 +1,5 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.23.1" "X Version 11" +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.25" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION @@ -14,7 +14,7 @@ ___ lB l. Model Description pc101 Generic 101-key PC -pc102 Generic 101-key PC (intl.) +pc102 Generic 102-key PC (intl.) pc104 Generic 104-key PC pc105 Generic 105-key PC (intl.) dell101 Dell 101-key PC @@ -313,11 +313,11 @@ in(mal_lalitha) Malayalam (Lalitha) in(mal_enhanced) Malayalam (enhanced Inscript, with rupee) in(ori) Oriya in(olck) Ol Chiki -in(tam_unicode) Tamil (Unicode) -in(tam_keyboard_with_numerals) Tamil (keyboard with numerals) -in(tam_TAB) Tamil (TAB typewriter) -in(tam_TSCII) Tamil (TSCII typewriter) -in(tam) Tamil +in(tam_tamilnet) Tamil (TamilNet '99) +in(tam_tamilnet_with_tam_nums) Tamil (TamilNet '99 with Tamil numerals) +in(tam_tamilnet_TAB) Tamil (TamilNet '99, TAB encoding) +in(tam_tamilnet_TSCII) Tamil (TamilNet '99, TSCII encoding) +in(tam) Tamil (Inscript) in(tel) Telugu in(tel-kagapa) Telugu (KaGaPa phonetic) in(tel-sarala) Telugu (Sarala) @@ -377,6 +377,7 @@ cm(mmuock) Mmuock _ mm Burmese +mm(zawgyi) Burmese Zawgyi _ ca French (Canada) @@ -396,6 +397,7 @@ cn Chinese cn(tib) Tibetan cn(tib_asciinum) Tibetan (with ASCII numerals) cn(ug) Uyghur +cn(altgr-pinyin) Hanyu Pinyin (altgr) _ hr Croatian @@ -482,6 +484,7 @@ fr(azerty) French (AZERTY) fr(bre) French (Breton) fr(oci) Occitan fr(geo) Georgian (France, AZERTY Tskapo) +fr(us) French (US keyboard with French letters) _ gh English (Ghana) @@ -598,6 +601,7 @@ kz Kazakh kz(ruskaz) Russian (Kazakhstan, with Kazakh) kz(kazrus) Kazakh (with Russian) kz(ext) Kazakh (extended) +kz(latin) Kazakh (Latin) _ la Lao @@ -760,6 +764,7 @@ se(smi) Northern Saami (Sweden) se(mac) Swedish (Macintosh) se(svdvorak) Swedish (Svdvorak) se(us_dvorak) Swedish (based on US Intl. Dvorak) +se(us) Swedish (US, with Swedish letters) se(swl) Swedish Sign Language _ @@ -787,8 +792,8 @@ tj(legacy) Tajik (legacy) _ lk Sinhala (phonetic) -lk(tam_unicode) Tamil (Sri Lanka, Unicode) -lk(tam_TAB) Tamil (Sri Lanka, TAB Typewriter) +lk(tam_unicode) Tamil (Sri Lanka, TamilNet '99) +lk(tam_TAB) Tamil (Sri Lanka, TamilNet '99, TAB encoding) lk(us) Sinhala (US, with Sinhala letters) _ @@ -840,6 +845,8 @@ uz(latin) Uzbek (Latin) _ vn Vietnamese +vn(us) Vietnamese (US, with Vietnamese letters) +vn(fr) Vietnamese (French, with Vietnamese letters) _ kr Korean @@ -1305,7 +1312,6 @@ lB lB ___ lB l. Option Description -korean:hw_keys Hardware Hangul/Hanja keys korean:ralt_rctrl Right Alt as Hangul, right Ctrl as Hanja korean:rctrl_ralt Right Ctrl as Hangul, right Alt as Hanja
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
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, ${.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 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 \
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Mar 11 20:17:19 UTC 2018 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: regen these files for xkeyboard-config 2.23.1. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3 Mon Sep 4 16:51:11 2017 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Mar 11 20:17:19 2018 @@ -1,5 +1,5 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.21" "X Version 11" +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.23.1" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION @@ -18,7 +18,7 @@ pc102 Generic 101-key PC (intl.) pc104 Generic 104-key PC pc105 Generic 105-key PC (intl.) dell101 Dell 101-key PC -latitude Dell Latutude laptop +latitude Dell Latitude laptop dellm65 Dell Precision M65 laptop everex Everex STEPnote flexpro Keytronic FlexPro @@ -225,7 +225,7 @@ us(dvorak-classic) English (classic Dvor us(dvp) English (programmer Dvorak) us(rus) Russian (US, phonetic) us(mac) English (Macintosh) -us(altgr-intl) English (intl., with dead keys) +us(altgr-intl) English (intl., with AltGr dead keys) us(olpc2) English (the divide/multiply keys toggle the layout) us(hbs) Serbo-Croatian (US) us(workman) English (Workman) @@ -247,6 +247,7 @@ ara(digits) Arabic (digits) ara(qwerty) Arabic (QWERTY) ara(qwerty_digits) Arabic (qwerty/digits) ara(buckwalter) Arabic (Buckwalter) +ara(olpc) Arabic (OLPC) ara(mac) Arabic (Macintosh) _ @@ -290,15 +291,49 @@ be(sundeadkeys) Belgian (with Sun dead k be(wang) Belgian (Wang 724 AZERTY) _ +bd Bangla +bd(probhat) Bangla (Probhat) + +_ in Indian +in(ben) Bangla (India) +in(ben_probhat) Bangla (India, Probhat) +in(ben_baishakhi) Bangla (India, Baishakhi) +in(ben_bornona) Bangla (India, Bornona) +in(ben_gitanjali) Bangla (India, Uni Gitanjali) +in(ben_inscript) Bangla (India, Baishakhi Inscript) +in(eeyek) Manipuri (Eeyek) +in(guj) Gujarati +in(guru) Punjabi (Gurmukhi) +in(jhelum) Punjabi (Gurmukhi Jhelum) +in(kan) Kannada +in(kan-kagapa) Kannada (KaGaPa phonetic) +in(mal) Malayalam +in(mal_lalitha) Malayalam (Lalitha) +in(mal_enhanced) Malayalam (enhanced Inscript, with rupee) +in(ori) Oriya +in(olck) Ol Chiki +in(tam_unicode) Tamil (Unicode) +in(tam_keyboard_with_numerals) Tamil (keyboard with numerals) +in(tam_TAB) Tamil (TAB typewriter) +in(tam_TSCII) Tamil (TSCII typewriter) +in(tam) Tamil +in(tel) Telugu +in(tel-kagapa) Telugu (KaGaPa phonetic) +in(tel-sarala) Telugu (Sarala) in(urd-phonetic) Urdu (phonetic) in(urd-phonetic3) Urdu (alt. phonetic) in(urd-winkeys) Urdu (Win keys) +in(bolnagri) Hindi (Bolnagri) +in(hin-wx) Hindi (Wx) +in(hin-kagapa) Hindi (KaGaPa phonetic) +in(san-kagapa) Sanskrit (KaGaPa phonetic) +in(mar-kagapa) Marathi (KaGaPa phonetic) in(eng) English (India, with rupee) _ ba Bosnian -ba(alternatequotes) Bosnian (with guillements) +ba(alternatequotes) Bosnian (with guillemets) ba(unicode) Bosnian (with Bosnian digraphs) ba(unicodeus) Bosnian (US, with Bosnian digraphs) ba(us) Bosnian (US, with Bosnian letters) @@ -364,7 +399,7 @@ cn(ug) Uyghur _ hr Croatian -hr(alternatequotes) Croatian (with guillements) +hr(alternatequotes) Croatian (with guillemets) hr(unicode) Croatian (with Croatian digraphs) hr(unicodeus) Croatian (US, with Croatian digraphs) hr(us) Croatian (US, with Croatian letters) @@ -540,6 +575,8 @@ it(mac) Italian (Macintosh) it(us) Italian (US, with Italian letters) it(geo) Georgian (Italy) it(ibm) Italian (IBM 142) +it(intl) Italian (intl., with dead keys) +it(scn) Sicilian _ jp Japanese @@ -678,7 +715,7 @@ ru(bak) Bashkirian ru(chm) Mari ru(phonetic_azerty) Russian (phonetic, AZERTY) ru(phonetic_dvorak) Russian (phonetic, Dvorak) -ru(phonetic_fr) Russian Russian (phonetic, French) +ru(phonetic_fr) Russian (phonetic, French) _ rs Serbian @@ -693,7 +730,7 @@ rs(rue) Pannonian Rusyn _ si Slovenian -si(alternatequotes) Slovenian (with guillements) +si(alternatequotes) Slovenian (with
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: snj Date: Mon Sep 4 16:51:11 UTC 2017 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man Log Message: regen for xkeyboard-config 2.21 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man 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/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2 Mon Feb 13 02:34:11 2017 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Mon Sep 4 16:51:11 2017 @@ -1,5 +1,5 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.20" "X Version 11" +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.21" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION @@ -14,25 +14,25 @@ ___ lB l. Model Description pc101 Generic 101-key PC -pc102 Generic 102-key (Intl) PC +pc102 Generic 101-key PC (intl.) pc104 Generic 104-key PC -pc105 Generic 105-key (Intl) PC +pc105 Generic 105-key PC (intl.) dell101 Dell 101-key PC -latitude Dell Latitude series laptop -dellm65 Dell Precision M65 +latitude Dell Latutude laptop +dellm65 Dell Precision M65 laptop everex Everex STEPnote flexpro Keytronic FlexPro microsoft Microsoft Natural omnikey101 Northgate OmniKey 101 winbook Winbook Model XP5 -pc98 PC-98xx Series +pc98 PC-98 a4techKB21 A4Tech KB-21 a4techKBS8 A4Tech KBS-8 a4_rfkb23 A4Tech Wireless Desktop RFKB-23 airkey Acer AirKey V -azonaRF2300 Azona RF2300 wireless Internet Keyboard +azonaRF2300 Azona RF2300 wireless Internet scorpius Advance Scorpius KI -brother Brother Internet Keyboard +brother Brother Internet btc5113rf BTC 5113RF Multimedia btc5126t BTC 5126T btc6301urf BTC 6301URF @@ -44,34 +44,34 @@ btc9019u BTC 9019U btc9116u BTC 9116U Mini Wireless Internet and Gaming cherryblue Cherry Blue Line CyBo@rd cherryblueb Cherry CyMotion Master XPress -cherrybluea Cherry Blue Line CyBo@rd (alternate option) +cherrybluea Cherry Blue Line CyBo@rd (alt.) cherrycyboard Cherry CyBo@rd USB-Hub cherrycmexpert Cherry CyMotion Expert cherrybunlim Cherry B.UNLIMITED -chicony Chicony Internet Keyboard +chicony Chicony Internet chicony0108 Chicony KU-0108 chicony0420 Chicony KU-0420 chicony9885 Chicony KB-9885 -compaqeak8 Compaq Easy Access Keyboard -compaqik7 Compaq Internet Keyboard (7 keys) -compaqik13 Compaq Internet Keyboard (13 keys) -compaqik18 Compaq Internet Keyboard (18 keys) +compaqeak8 Compaq Easy Access +compaqik7 Compaq Internet (7 keys) +compaqik13 Compaq Internet (13 keys) +compaqik18 Compaq Internet (18 keys) cymotionlinux Cherry CyMotion Master Linux -armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard -presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard -ipaq Compaq iPaq Keyboard +armada Compaq Armada laptop +presario Compaq Presario laptop +ipaq Compaq iPaq dell Dell dellsk8125 Dell SK-8125 dellsk8135 Dell SK-8135 -dellusbmm Dell USB Multimedia Keyboard -inspiron Dell Laptop/notebook Inspiron 6xxx/8xxx -precision_m Dell Laptop/notebook Precision M series -dexxa Dexxa Wireless Desktop Keyboard -diamond Diamond 9801 / 9802 series +dellusbmm Dell USB Multimedia +inspiron Dell Inspiron 6000/8000 laptop +precision_m Dell Precision M laptop +dexxa Dexxa Wireless Desktop +diamond Diamond 9801/9802 dtk2000 DTK2000 ennyah_dkb1008 Ennyah DKB-1008 -fscaa1667g Fujitsu-Siemens Computers AMILO laptop -genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910 +fscaa1667g Fujitsu-Siemens Amilo laptop +genius Genius Comfy KB-16M/Multimedia KWD-910 geniuscomfy Genius Comfy KB-12e geniuscomfy2 Genius Comfy KB-21e-Scroll geniuskb19e Genius KB-19e NB @@ -79,127 +79,128 @@ geniuskkb2050hs Genius KKB-2050HS gyration Gyration htcdream HTC Dream kinesis Kinesis -logitech_base Logitech Generic Keyboard +logitech_base Logitech logitech_g15 Logitech G15 extra keys via G15daemon -hpi6 Hewlett-Packard Internet Keyboard -hp250x Hewlett-Packard SK-250x Multimedia Keyboard +hpi6 Hewlett-Packard Internet +hp250x Hewlett-Packard NEC SK-2500 Multimedia hpxe3gc Hewlett-Packard Omnibook XE3 GC hpxe3gf Hewlett-Packard Omnibook XE3 GF hpxt1000 Hewlett-Packard Omnibook XT1000 hpdv5 Hewlett-Packard Pavilion dv5 -hpzt11xx Hewlett-Packard Pavilion ZT11xx +hpzt11xx Hewlett-Packard Pavilion ZT1100 hp500fa Hewlett-Packard Omnibook 500 FA -hp5xx Hewlett-Packard Omnibook 5xx +hp5xx Hewlett-Packard Omnibook 500 hpnx9020 Hewlett-Packard nx9020 hp6000 Hewlett-Packard Omnibook 6000/6100 honeywell_euroboard Honeywell Euroboard -hpmini110 Hewlett-Packard Mini 110 Notebook
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Tue Aug 29 20:27:54 UTC 2017 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: update for xkeyboard-config 2.21. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.11 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10 Tue Nov 22 19:51:37 2016 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Aug 29 20:27:54 2017 @@ -126,7 +126,8 @@ sven sven303 symplon \ toshiba_s3000 trust trustda \ unitekkb1925 yahoo \ - teck227 teck229 + teck227 teck229 \ + apex300 ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \ cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \ @@ -192,6 +193,7 @@ thinkpad = thinkpad(intl) thinkpad60 = thinkpad(60) thinkpadz60 = thinkpad(60) + apex300 = steelseries(apex300) $tmgeometries = typematrix(%m) winbook = winbook(XP5) pc98 = nec(pc98) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.11 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10 Tue Nov 22 19:51:37 2016 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Tue Aug 29 20:27:54 2017 @@ -1,24 +1,24 @@ ! model pc101 Generic 101-key PC - pc102 Generic 102-key (Intl) PC + pc102 Generic 101-key PC (intl.) pc104 Generic 104-key PC - pc105 Generic 105-key (Intl) PC + pc105 Generic 105-key PC (intl.) dell101 Dell 101-key PC - latitudeDell Latitude series laptop - dellm65 Dell Precision M65 + latitudeDell Latutude laptop + dellm65 Dell Precision M65 laptop everex Everex STEPnote flexpro Keytronic FlexPro microsoft Microsoft Natural omnikey101 Northgate OmniKey 101 winbook Winbook Model XP5 - pc98PC-98xx Series + pc98PC-98 a4techKB21 A4Tech KB-21 a4techKBS8 A4Tech KBS-8 a4_rfkb23 A4Tech Wireless Desktop RFKB-23 airkey Acer AirKey V - azonaRF2300 Azona RF2300 wireless Internet Keyboard + azonaRF2300 Azona RF2300 wireless Internet scorpiusAdvance Scorpius KI - brother Brother Internet Keyboard + brother Brother Internet btc5113rf BTC 5113RF Multimedia btc5126tBTC 5126T btc6301urf BTC 6301URF @@ -30,34 +30,34 @@ btc9116uBTC 9116U Mini Wireless Internet and Gaming cherryblue Cherry Blue Line CyBo@rd cherryblueb Cherry CyMotion Master XPress - cherrybluea Cherry Blue Line CyBo@rd (alternate option) + cherrybluea Cherry Blue Line CyBo@rd (alt.) cherrycyboard Cherry CyBo@rd USB-Hub cherrycmexpert Cherry CyMotion Expert cherrybunlimCherry B.UNLIMITED - chicony Chicony Internet Keyboard + chicony Chicony Internet chicony0108 Chicony KU-0108 chicony0420 Chicony KU-0420 chicony9885 Chicony KB-9885 - compaqeak8 Compaq Easy Access Keyboard - compaqik7 Compaq Internet Keyboard (7 keys) - compaqik13 Compaq Internet Keyboard (13 keys) - compaqik18 Compaq Internet Keyboard (18 keys) + compaqeak8 Compaq Easy Access + compaqik7 Compaq Internet (7 keys) + compaqik13 Compaq Internet (13 keys) + compaqik18 Compaq Internet (18 keys) cymotionlinux Cherry CyMotion Master Linux - armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard - presarioLaptop/notebook Compaq (eg. Presario) Internet Keyboard - ipaqCompaq iPaq Keyboard + armada Compaq Armada laptop + presarioCompaq Presario laptop + ipaqCompaq iPaq dellDell dellsk8125 Dell SK-8125 dellsk8135 Dell SK-8135 - dellusbmm Dell USB Multimedia Keyboard - inspironDell Laptop/notebook Inspiron 6xxx/8xxx - precision_m Dell Laptop/notebook Precision M series - dexxa Dexxa Wireless Desktop Keyboard - diamond Diamond 9801 / 9802 series + dellusbmm Dell USB Multimedia + inspironDell Inspiron 6000/8000
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: christos Date: Sat Dec 24 21:17:17 UTC 2016 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile.xkbdata Log Message: sort codes for reproducibile builds. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata 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.1 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.1 Wed Jun 10 21:49:20 2009 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata Sat Dec 24 16:17:16 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.xkbdata,v 1.1 2009/06/11 01:49:20 mrg Exp $ +# $NetBSD: Makefile.xkbdata,v 1.2 2016/12/24 21:17:16 christos Exp $ XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME} @@ -17,7 +17,10 @@ CLEANFILES+= ${XKBNAME}.dir ${XKBNAME}.dir: ${_MKTARGET_CREATE} rm -f ${.TARGET} - (cd ${XKBDISTDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/${.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}
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Mon Jul 20 22:45:10 UTC 2015 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: rebuild these for xkeyboard-config 2.15. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.8 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.8 Fri Jul 11 19:14:09 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Jul 20 22:45:10 2015 @@ -1118,6 +1118,10 @@ ctrl:rctrl_ralt = +ctrl(rctrl_ralt) ctrl:menu_rctrl = +ctrl(menu_rctrl) ctrl:ralt_rctrl = +ctrl(ralt_rctrl) + ctrl:swap_lalt_lctl = +ctrl(swap_lalt_lctl) + ctrl:swap_lwin_lctl = +ctrl(swap_lwin_lctl) + ctrl:swap_rwin_rctl = +ctrl(swap_rwin_rctl) + ctrl:swap_lalt_lctl_lwin = +ctrl(swap_lalt_lctl_lwin) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:lwin-altgr = +compose(lwin-altgr) @@ -1160,6 +1164,8 @@ nbsp:level4nl = +nbsp(level4nl) japan:nicola_f_bs = +jp(nicola_f_bs) japan:hztg_escape = +jp(hztg_escape) + korean:ralt_rctrl = +kr(ralt_hangul)+kr(rctrl_hanja) + korean:rctrl_ralt = +kr(rctrl_hangul)+kr(ralt_hanja) kpdl:dot = +kpdl(dot) kpdl:comma= +kpdl(comma) kpdl:dotoss = +kpdl(dotoss) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.8 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.8 Fri Jul 11 19:14:09 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Mon Jul 20 22:45:10 2015 @@ -112,7 +112,7 @@ mx1998 Memorex MX1998 mx2500 Memorex MX2500 EZ-Access Keyboard mx2750 Memorex MX2750 - microsoft4000 Microsoft Natural Wireless Ergonomic Keyboard 4000 + microsoft4000 Microsoft Natural Ergonomic Keyboard 4000 microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 microsoftinet Microsoft Internet Keyboard microsoftproMicrosoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro @@ -311,6 +311,7 @@ qwerty ara: Arabic (qwerty) qwerty_digits ara: Arabic (qwerty/digits) buckwalter ara: Arabic (Buckwalter) + mac ara: Arabic (Macintosh) plisi-d1al: Albanian (Plisi D1) phoneticam: Armenian (phonetic) phonetic-altam: Armenian (alternative phonetic) @@ -500,6 +501,7 @@ 102_qwerty_dot_nodead hu: Hungarian (102/qwerty/dot/eliminate dead keys) Sundeadkeys is: Icelandic (Sun dead keys) nodeadkeys is: Icelandic (eliminate dead keys) + mac_legacy is: Icelandic (Macintosh, legacy) mac is: Icelandic (Macintosh) dvorak is: Icelandic (Dvorak) lyx il: Hebrew (lyx) @@ -523,6 +525,7 @@ nodeadkeys latam: Spanish (Latin American, eliminate dead keys) deadtilde latam: Spanish (Latin American, include dead tilde) sundeadkeys latam: Spanish (Latin American, Sun dead keys) + dvorak latam: Spanish (Latin American, Dvorak) std lt: Lithuanian (standard) us lt: Lithuanian (US keyboard with Lithuanian letters) ibm lt: Lithuanian (IBM LST 1205-92) @@ -591,6 +594,8 @@ srp ru: Serbian (Russia) bak ru: Bashkirian chm ru: Mari + phonetic_azerty ru: Russian (phonetic azerty) + phonetic_fr ru: Russian (phonetic French) yz rs: Serbian (Cyrillic, ZE and ZHE swapped) latin rs: Serbian (Latin) latinunicoders: Serbian (Latin Unicode) @@ -636,6 +641,7 @@ legacy tj: Tajik (legacy) tam_unicode lk: Tamil (Sri Lanka, Unicode) tam_TAB lk: Tamil (Sri Lanka, TAB Typewriter) + us lk: Sinhala (US keyboard with Sinhala letters) tis th: Thai (TIS-820.2538) pat th: Thai (Pattachote) f tr: Turkish (F) @@ -762,6 +768,7 @@ ctrl:ctrl_ralt Right Alt as Right Ctrl ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key + ctrl:swap_rwin_rctl Swap Right Win key with Right Ctrl key ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt grp_led Use
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Fri Jul 11 19:14:10 UTC 2014 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: update for xkeyboard-config 2.12. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7 Mon Mar 17 09:02:02 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Fri Jul 11 19:14:09 2014 @@ -976,22 +976,27 @@ ! layout variant = compat de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp$sun_compat = complete+japan(kana_lock) ! layout[1] variant[1] = compat de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp $sun_compat = complete+japan(kana_lock) ! layout[2] variant[2] = compat de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 + de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 jp $sun_compat = +complete+japan(kana_lock):2 ! layout[3] variant[3] = compat de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 + de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 jp $sun_compat = +complete+japan(kana_lock):3 ! layout[4] variant[4] = compat de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 + de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 jp $sun_compat = +complete+japan(kana_lock):4 ! model layout = compat @@ -1056,6 +1061,7 @@ grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) + grp:win_space_toggle = +group(win_space_toggle) grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:alt_space_toggle = +group(alt_space_toggle) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.7 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.7 Mon Mar 17 09:02:02 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Fri Jul 11 19:14:09 2014 @@ -311,6 +311,7 @@ qwerty ara: Arabic (qwerty) qwerty_digits ara: Arabic (qwerty/digits) buckwalter ara: Arabic (Buckwalter) + plisi-d1al: Albanian (Plisi D1) phoneticam: Armenian (phonetic) phonetic-altam: Armenian (alternative phonetic) eastern am: Armenian (eastern) @@ -344,7 +345,7 @@ kan-kagapa in: Kannada (KaGaPa phonetic) mal in: Malayalam mal_lalitha in: Malayalam (Lalitha) - mal_enhancedin: Malayalam (enhanced Inscript with Rupee Sign) + mal_enhancedin: Malayalam (enhanced Inscript, with rupee sign) ori in: Oriya tam_unicode in: Tamil (Unicode) tam_keyboard_with_numerals in: Tamil (keyboard with numerals) @@ -361,9 +362,9 @@ hin-kagapa in: Hindi (KaGaPa phonetic) san-kagapa in: Sanskrit (KaGaPa phonetic) mar-kagapa in: Marathi (KaGaPa phonetic) - eng in: English (India, with RupeeSign) - alternatequotes ba: Bosnian (use guillemets for quotes) - unicode ba: Bosnian (use Bosnian digraphs) + eng in: English (India, with rupee sign) + alternatequotes ba: Bosnian (with guillemets for quotes) + unicode ba: Bosnian (with Bosnian digraphs) unicodeus ba: Bosnian (US keyboard with Bosnian digraphs) us ba: Bosnian (US keyboard with Bosnian letters) nodeadkeys br: Portuguese (Brazil, eliminate dead keys) @@ -394,8 +395,8 @@ tib cn: Tibetan tib_asciinumcn: Tibetan (with ASCII numerals) ug cn: Uyghur - alternatequotes hr: Croatian (use guillemets for quotes) - unicode hr: Croatian (use Croatian digraphs) + alternatequotes hr: Croatian (with guillemets for quotes) + unicode hr: Croatian (with Croatian
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Mon Mar 17 09:02:02 UTC 2014 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: regenerate for xkeyboard-config 2.11. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6 Tue Feb 25 13:07:29 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Mar 17 09:02:02 2014 @@ -40,45 +40,6 @@ ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk -! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ - airkey \ - apple armada azonaRF2300 \ - benqx brother \ - btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb \ - cherrycyboard cherrycmexpert \ - chicony chicony0108 chicony0420 chicony9885 \ - compalfl90 \ - compaqeak8 compaqik7 compaqik13 compaqik18 \ - creativedw7000 \ - cymotionlinux \ - dell dellm65 inspiron dellusbmm \ - emachines ennyah_dkb1008 evdev \ - genius geniuscomfy2 \ - gyration honeywell_euroboard \ - hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ - ibm_spacesaver ipaq inspiron intel \ - logiaccess logicda logicink \ - logiex110 logiclx300 \ - logiinkse logiinkseusb logiitc logiik \ - logitech_base itouch logiultrax \ - logitech_g15 \ - logidinovo logidinovoedge \ - microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ - microsoftoffice microsoftmult \ - mx1998 mx2500 mx2750 \ - oretec \ - pc105 \ - presario propeller \ - qtronix \ - rapidaccess rapidaccess2 thinkpad60 \ - samsung4500 samsung4510 \ - silvercrest \ - sk1300 sk2500 sk6200 sk7100 \ - sven sven303 symplon \ - toshiba_s3000 trust trustda \ - unitekkb1925 yahoo // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ @@ -102,8 +63,6 @@ vn \ za -! $evdevkbds = ibm_spacesaver - ! $thinkpads = thinkpad thinkpad60 thinkpadz60 ! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \ @@ -125,6 +84,61 @@ ! $htcdreamlayouts = us it de +! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ + airkey \ + apple armada azonaRF2300 \ + benqx brother \ + btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ + cherryblue cherrybluea cherryblueb \ + cherrycyboard cherrycmexpert \ + chicony chicony0108 chicony0420 chicony9885 \ + compalfl90 \ + compaqeak8 compaqik7 compaqik13 compaqik18 \ + creativedw7000 \ + cymotionlinux \ + dell dellm65 inspiron dellusbmm \ + emachines ennyah_dkb1008 evdev \ + genius geniuscomfy2 \ + gyration honeywell_euroboard \ + hp250x hp5xx hp500fa hpdv5 \ + hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ + ibm_spacesaver ipaq inspiron intel \ + logiaccess logicda logicink \ + logiex110 logiclx300 \ + logiinkse logiinkseusb logiitc logiik \ + logitech_base itouch logiultrax \ + logitech_g15 \ + logidinovo logidinovoedge \ + microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ + microsoftoffice microsoftmult \ + mx1998 mx2500 mx2750 \ + oretec \ + pc105 \ + presario propeller \ + qtronix \ + rapidaccess rapidaccess2 thinkpad60 \ + samsung4500 samsung4510 \ + silvercrest \ + sk1300 sk2500 sk6200 sk7100 \ + sven sven303 symplon \ + toshiba_s3000 trust trustda \ + unitekkb1925 yahoo + +! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \ +
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: tsutsui Date: Tue Feb 25 13:07:29 UTC 2014 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: Update generated files which were missed on xkeyboard-config 2.9 import. http://mail-index.NetBSD.org/source-changes/2013/05/31/msg044255.html http://mail-index.NetBSD.org/source-changes/2013/05/31/msg044256.html http://mail-index.NetBSD.org/source-changes/2013/05/31/msg044258.html XXX: should be regenerated during build but no perl and intltools in tools To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst 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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.5 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.5 Mon Sep 26 15:19:45 2011 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Feb 25 13:07:29 2014 @@ -106,10 +106,22 @@ ! $thinkpads = thinkpad thinkpad60 thinkpadz60 -! $sun_t6_custom = ara be br ca ch cz de dk \ - ee es fi fr gb gr it kr \ - lt lv nl no pl pt ro ru \ - se sk tr tw ua +! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \ + sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \ + sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb + +! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb + +// Sun Type_6_7 keyboards with custom layouts +! $sun_custom = 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 tr tw ua us + +! $sun_var = sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \ + sun_type7 sun_type7_suncompat suncompat + +! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat ! $htcdreamlayouts = us it de @@ -119,10 +131,8 @@ amiga = amiga(de) ataritt = ataritt(de) empty = empty - sun4 = sun(type4_euro) - sun5 = sun(type5_euro) - sun6 = sun(type6_usb) - sun6euro = sun(type6tuv_usb) + $sun_jp = sun(type6_jp_usb) + $sun = sun(type6_usb) pc98 = xfree98(pc98) $applealu = macintosh(alukbd) macintosh_hhk = macintosh(hhk) @@ -173,6 +183,15 @@ hhk = hhk(basic) kinesis = kinesis(model100) $nokiamodels = nokia(%m) + sun_type6_jp = sun(type6jp) + sun_type6_usb = sun(type6) + sun_type6_euro_usb= sun(type6tuv) + sun_type6_jp_usb = sun(type6jp) + sun_type6_unix_usb= sun(type6unix) + sun_type7_jp_usb = sun(type6jp) + sun_type7_usb = sun(type7) + sun_type7_euro_usb= sun(type7tuv) + sun_type7_unix_usb= sun(type7unix) * = pc(pc104) ! model layout variant = symbols @@ -229,6 +248,7 @@ classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) + * $sun_custom $sun_var = pc+sun_vndr/%l%(v) ! model layout= symbols * ar = pc+ara @@ -247,7 +267,6 @@ * lo = pc+la * kan = pc+in(kan) * mi = pc+mao - * ml = pc+in(mal) * ogham = pc+ie(ogam) * ori = pc+ie(ori) * sapmi = pc+no(smi) @@ -314,18 +333,7 @@ classmate us = pc+%l(classmate) empty * = empty(basic) * empty = empty(basic) - sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(type4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(type5)+%l%(v) - sun6 us = pc+sun_vndr/us(type6) - sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) - sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) - sun6 * = pc+sun_vndr/us(type6)+%l%(v) - sun6euro us = pc+sun_vndr/us(type6) - sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) - sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) - sun6euro * = pc+sun_vndr/us(type6)+%l%(v) + $sun $sun_custom = pc+sun_vndr/%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) @@ -344,6 +352,8 @@ nokiasu8w * = nokia_vndr/su-8w(%l) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) + olpcm $olpclayouts = olpc+%l%(m) + olpcm * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) ws003sh *
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
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
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Fri May 31 23:50:51 UTC 2013 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: oops, semantics, not symbols, subdir was removed. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/xkeyboard-config/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.8 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.8 Fri May 31 23:28:25 2013 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri May 31 23:50:51 2013 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2013/05/31 23:28:25 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2013/05/31 23:50:51 mrg Exp $ .include bsd.own.mk -SUBDIR= compat geometry keycodes rules semantics types +SUBDIR= compat geometry keycodes rules symbols types NOOBJ= # defined
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: njoly Date: Mon Jul 25 15:41:59 UTC 2011 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: Include bsd.own.mk for obj directory. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/xkeyboard-config/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.6 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.7 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.6 Fri Jun 4 10:22:25 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Mon Jul 25 15:41:58 2011 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2010/06/04 10:22:25 ghen Exp $ +# $NetBSD: Makefile,v 1.7 2011/07/25 15:41:58 njoly Exp $ + +.include bsd.own.mk SUBDIR= compat geometry keycodes keymap rules semantics symbols types
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/symbols
Module Name:src Committed By: mrg Date: Sat Jul 23 12:02:02 UTC 2011 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Removed Files: src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile Log Message: updates for 2.3 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.4 -r0 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/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/symbols/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.7 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.7 Mon Feb 21 05:10:27 2011 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Sat Jul 23 12:02:02 2011 @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2011/02/21 05:10:27 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/07/23 12:02:02 mrg Exp $ .include bsd.own.mk XKBNAME= symbols -FILES= ad af al altwin am ara at az \ +FILES= ad af al altwin am apl ara at az \ ba bd be bg br brai bt bw by \ - ca capslock cd ch cn compose ctrl cz \ + ca capslock cd ch cm cn compose ctrl cz \ de dk \ ee empty epo es et eurosign \ fi fo fr \ @@ -22,12 +22,12 @@ pc ph pk pl pt \ ro rs ru rupeesign \ se shift si sk sn srvr_ctrl sy \ - terminate th tj tm tr typo tz \ + terminate th tj tm tr tw typo tz \ ua us uz \ vn \ za -SUBDIR= digital_vndr extras fujitsu_vndr hp_vndr macintosh_vndr \ +SUBDIR= digital_vndr fujitsu_vndr hp_vndr macintosh_vndr \ nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr \ xfree68_vndr
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Mon Feb 21 05:10:27 UTC 2011 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Log Message: install geometry/sanwa, symbols/ph and symbols/rupeesign. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/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/geometry/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.2 Fri May 28 12:38:34 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile Mon Feb 21 05:10:27 2011 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2011/02/21 05:10:27 mrg Exp $ .include bsd.own.mk XKBNAME= geometry FILES= README amiga ataritt chicony dell everex fujitsu hhk hp \ keytronic kinesis macintosh microsoft nec nokia northgate \ - pc sony sun thinkpad typematrix winbook + pc sanwa sony sun thinkpad typematrix winbook 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.6 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.7 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.6 Sun Nov 28 07:55:07 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Mon Feb 21 05:10:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/11/28 07:55:07 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2011/02/21 05:10:27 mrg Exp $ .include bsd.own.mk @@ -19,8 +19,8 @@ ma mao me mk ml mm mn mt mv \ nbsp ng nl no np \ olpc \ - pc pk pl pt \ - ro rs ru \ + pc ph pk pl pt \ + ro rs ru rupeesign \ se shift si sk sn srvr_ctrl sy \ terminate th tj tm tr typo tz \ ua us uz \
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 28 04:58:20 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile Log Message: revert back to xkeyboard-config 1.9 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.2 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.2 Mon Nov 22 00:27:55 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 28 04:58:20 2010 @@ -80,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - toshiba_s3000 trust trustda \ + tm2030USB toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -228,8 +228,6 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) - * ru chu = pc+extras/ru(chu) - * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -318,8 +316,6 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * ru(chu) = pc+extras/ru(chu) - * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -361,6 +357,11 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) + sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) + ws003sh * = pc+sharp_vndr/ws003sh(basic) + ws007sh * = pc+sharp_vndr/ws007sh(basic) + ws011sh * = pc+sharp_vndr/ws011sh(basic) + ws020sh * = pc+sharp_vndr/ws020sh(basic) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -444,8 +445,6 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl%(v[1]) * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * ru(chu) = pc+extras/ru(chu) - * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -517,8 +516,6 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) - * ru chu = pc+extras/ru(chu) - * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -603,8 +600,6 @@ * yu(unicodeyz) = +srp(latinunicodeyz):2 * apl = +extras/apl%(v[2]):2 * rs(combiningkeys) = +extras/rs(combiningkeys):2 - * ru(chu) = +extras/ru(chu):2 - * ir(ave) = +extras/ir(ave):2 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 * us(crd) = +extras/us(crd):2 * us(intl-unicode) = +extras/us(intl-unicode):2 @@ -692,8 +687,6 @@ * yu(unicodeyz) = +srp(latinunicodeyz):3 * apl = +extras/apl%(v[3]):3 * rs(combiningkeys) = +extras/rs(combiningkeys):3 - * ru(chu) = +extras/ru(chu):3 - * ir(ave) = +extras/ir(ave):3 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 * us(crd) = +extras/us(crd):3 * us(intl-unicode) = +extras/us(intl-unicode):3 @@ -781,8 +774,6 @@ * yu(unicodeyz) = +srp(latinunicodeyz):4 * apl = +extras/apl%(v[4]):4 * rs(combiningkeys) = +extras/rs(combiningkeys):4 - * ru(chu) = +extras/ru(chu):4 - * ir(ave) = +extras/ir(ave):4 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 * us(crd) = +extras/us(crd):4 * us(intl-unicode) = +extras/us(intl-unicode):4 @@ -842,8 +833,6 @@ * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 * rs combiningkeys = +extras/rs(combiningkeys):2 - * ru chu = +extras/ru(chu):2 - * ir ave = +extras/ir(ave):2 * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 * us
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 28 07:55:08 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile Log Message: re-updates for xkeyboard-config 2.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/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/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.3 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.3 Sun Nov 28 04:58:20 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 28 07:55:07 2010 @@ -80,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -228,6 +228,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -316,6 +318,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -357,11 +361,6 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) - sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) - ws003sh * = pc+sharp_vndr/ws003sh(basic) - ws007sh * = pc+sharp_vndr/ws007sh(basic) - ws011sh * = pc+sharp_vndr/ws011sh(basic) - ws020sh * = pc+sharp_vndr/ws020sh(basic) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -445,6 +444,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl%(v[1]) * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -516,6 +517,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -600,6 +603,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):2 * apl = +extras/apl%(v[2]):2 * rs(combiningkeys) = +extras/rs(combiningkeys):2 + * ru(chu) = +extras/ru(chu):2 + * ir(ave) = +extras/ir(ave):2 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 * us(crd) = +extras/us(crd):2 * us(intl-unicode) = +extras/us(intl-unicode):2 @@ -687,6 +692,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):3 * apl = +extras/apl%(v[3]):3 * rs(combiningkeys) = +extras/rs(combiningkeys):3 + * ru(chu) = +extras/ru(chu):3 + * ir(ave) = +extras/ir(ave):3 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 * us(crd) = +extras/us(crd):3 * us(intl-unicode) = +extras/us(intl-unicode):3 @@ -774,6 +781,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):4 * apl = +extras/apl%(v[4]):4 * rs(combiningkeys) = +extras/rs(combiningkeys):4 + * ru(chu) = +extras/ru(chu):4 + * ir(ave) = +extras/ir(ave):4 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 * us(crd) = +extras/us(crd):4 * us(intl-unicode) = +extras/us(intl-unicode):4 @@ -833,6 +842,8 @@ * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 * rs combiningkeys = +extras/rs(combiningkeys):2 + * ru chu = +extras/ru(chu):2 + * ir ave = +extras/ir(ave):2 * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 * us
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: ghen Date: Fri Jun 4 10:22:25 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: A suggestion from veego to fix it (taken from ../../include/fontsproto). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/xkeyboard-config/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.5 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.6 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5 Thu Jun 3 20:48:48 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri Jun 4 10:22:25 2010 @@ -1,8 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2010/06/03 20:48:48 ghen Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/04 10:22:25 ghen Exp $ SUBDIR= compat geometry keycodes keymap rules semantics symbols types +NOOBJ= # defined + PKGCONFIG= xkeyboard-config .include bsd.x11.mk +.include bsd.prog.mk .include bsd.subdir.mk
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: ghen Date: Thu Jun 3 10:38:34 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: .include bsd.lib.mk to handle the pkgconfig file correctly. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/xkeyboard-config/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.3 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.3 Fri May 28 13:01:23 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Thu Jun 3 10:38:34 2010 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2010/05/28 13:01:23 ghen Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/03 10:38:34 ghen Exp $ SUBDIR= compat geometry keycodes keymap rules semantics symbols types PKGCONFIG= xkeyboard-config .include bsd.x11.mk +.include bsd.lib.mk .include bsd.subdir.mk
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: ghen Date: Thu Jun 3 20:48:48 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: Revert previous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/xkeyboard-config/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.4 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.4 Thu Jun 3 10:38:34 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Thu Jun 3 20:48:48 2010 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/06/03 10:38:34 ghen Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/03 20:48:48 ghen Exp $ SUBDIR= compat geometry keycodes keymap rules semantics symbols types PKGCONFIG= xkeyboard-config .include bsd.x11.mk -.include bsd.lib.mk .include bsd.subdir.mk
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Thu Jun 11 01:49:23 UTC 2009 Added Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile 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/geometry/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/geometry/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes/sgi_vndr: Makefile 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/rules: Makefile src/external/mit/xorg/lib/xkeyboard-config/semantics: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/fujitsu_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/hp_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/nec_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sony_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/xfree68_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/torture: Makefile src/external/mit/xorg/lib/xkeyboard-config/types: Makefile Log Message: reachover build for xkeyboard-config To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xkeyboard-config/Makefile \ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/geometry/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/semantics/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/digital_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/fujitsu_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/hp_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/nec_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sgi_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sony_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/xfree68_vndr/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/torture/Makefile cvs rdiff -u -r0 -r1.1 \ 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. Added files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u /dev/null