From 763fba901083020aaffa9e23c2e050fcb6e11971 Mon Sep 17 00:00:00 2001 From: bjs Date: Wed, 19 Dec 2007 08:17:45 +0000 Subject: Begone, ye unwanted patches. --- x11/xkeyboard-config/patches/patch-ac | 20 -------------- x11/xkeyboard-config/patches/patch-ad | 31 --------------------- x11/xkeyboard-config/patches/patch-ae | 13 --------- x11/xkeyboard-config/patches/patch-af | 52 ----------------------------------- x11/xkeyboard-config/patches/patch-ag | 13 --------- x11/xkeyboard-config/patches/patch-ah | 13 --------- x11/xkeyboard-config/patches/patch-ai | 11 -------- x11/xkeyboard-config/patches/patch-aj | 13 --------- x11/xkeyboard-config/patches/patch-ak | 13 --------- 9 files changed, 179 deletions(-) delete mode 100644 x11/xkeyboard-config/patches/patch-ac delete mode 100644 x11/xkeyboard-config/patches/patch-ad delete mode 100644 x11/xkeyboard-config/patches/patch-ae delete mode 100644 x11/xkeyboard-config/patches/patch-af delete mode 100644 x11/xkeyboard-config/patches/patch-ag delete mode 100644 x11/xkeyboard-config/patches/patch-ah delete mode 100644 x11/xkeyboard-config/patches/patch-ai delete mode 100644 x11/xkeyboard-config/patches/patch-aj delete mode 100644 x11/xkeyboard-config/patches/patch-ak (limited to 'x11/xkeyboard-config') diff --git a/x11/xkeyboard-config/patches/patch-ac b/x11/xkeyboard-config/patches/patch-ac deleted file mode 100644 index 3410db01711..00000000000 --- a/x11/xkeyboard-config/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- symbols/group.orig 2007-09-26 07:56:42.000000000 -0400 -+++ symbols/group -@@ -317,3 +317,15 @@ xkb_symbols "alt_caps_toggle" { - }; - }; - -+ -+// using the group(sclk_toggle) map, pressing the Scroll Lock key -+// toggles groups. -+partial modifier_keys -+xkb_symbols "sclk_toggle" { -+ virtual_modifiers AltGr; -+ key { -+ virtualMods= AltGr, -+ symbols[Group1] = [ ISO_Next_Group ] -+ }; -+}; -+ diff --git a/x11/xkeyboard-config/patches/patch-ad b/x11/xkeyboard-config/patches/patch-ad deleted file mode 100644 index 1ccf5ca7c10..00000000000 --- a/x11/xkeyboard-config/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- symbols/inet.orig 2007-09-26 07:56:42.000000000 -0400 -+++ symbols/inet -@@ -501,6 +501,18 @@ xkb_symbols "btc9019u" { - key { [ XF86Sleep ] }; - }; - -+// BTC 9116U -+partial alphanumeric_keys -+xkb_symbols "btc9116u" { -+ key { [ XF86Back ] }; -+ key { [ XF86Forward ] }; -+ key { [ XF86Stop ] }; -+ key { [ XF86HomePage ] }; -+ key { [ XF86Search ] }; -+ key { [ XF86Favorites ] }; -+ key { [ XF86Mail ] }; -+}; -+ - // Cherry Blue Line - - // Cherry Blue Line CyBo@rd -@@ -2026,6 +2038,7 @@ partial xkb_symbols "apple" { - key { [ XF86AudioLowerVolume ] }; - key { [ XF86AudioRaiseVolume ] }; - key { [ XF86RotateWindows ] }; -+ key { [ XF86PowerOff ] }; - // Really keyboard backlight off/up/down - key { [ XF86Launch0 ] }; - key { [ XF86Launch1 ] }; diff --git a/x11/xkeyboard-config/patches/patch-ae b/x11/xkeyboard-config/patches/patch-ae deleted file mode 100644 index c2c9ec99259..00000000000 --- a/x11/xkeyboard-config/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- symbols/level3.orig 2007-09-26 07:56:42.000000000 -0400 -+++ symbols/level3 -@@ -135,7 +135,7 @@ xkb_symbols "rwin_switch" { - // using the level3(enter_switch) map, the Enter key on the keypad - // temporarily chooses the third shift level. This is especially - // useful for Mac laptops which miss the right Alt key. --partial hidden modifier_keys -+partial modifier_keys - xkb_symbols "enter_switch" { - key { - type[Group1]="ONE_LEVEL", diff --git a/x11/xkeyboard-config/patches/patch-af b/x11/xkeyboard-config/patches/patch-af deleted file mode 100644 index ba2fc83bfe1..00000000000 --- a/x11/xkeyboard-config/patches/patch-af +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- symbols/pl.orig 2007-07-15 18:12:12.000000000 -0400 -+++ symbols/pl -@@ -11,11 +11,14 @@ xkb_symbols "basic" { - - name[Group1]="Poland"; - -+ key { [ q, Q ] }; -+ key { [ w, W ] }; - key { [ e, E, eogonek, Eogonek ] }; - key { [ o, O, oacute, Oacute ] }; - - key { [ a, A, aogonek, Aogonek ] }; - key { [ s, S, sacute, Sacute ] }; -+ key { [ f, F ] }; - - key { [ z, Z, zabovedot, Zabovedot ] }; - key { [ x, X, zacute, Zacute ] }; -@@ -50,12 +53,15 @@ xkb_symbols "qwertz" { - key { [ plus, question, dead_diaeresis, questiondown ] }; - key { [apostrophe, asterisk, dead_cedilla, dead_ogonek ] }; - -+ key { [ q, Q ] }; -+ key { [ w, W ] }; - key { [ e, E, EuroSign, cent ] }; - key { [ zabovedot, nacute, division, dead_abovering ] }; - key { [ sacute, cacute, multiply, dead_macron ] }; - - key { [ s, S, dstroke, section ] }; - key { [ d, D, Dstroke, ETH ] }; -+ key { [ f, F ] }; - key { [ k, K, kra, ampersand ] }; - key { [ l, L, lstroke, Lstroke ] }; - key { [ lstroke, Lstroke, dollar, dead_doubleacute ] }; -@@ -136,6 +142,8 @@ xkb_symbols "csb" { - - name[Group1]="Poland - Kashubian"; - -+ key { [ q, Q ] }; -+ key { [ w, W ] }; - key { [ e, E, eacute, Eacute ] }; - key { [ r, R, ediaeresis, Ediaeresis ] }; - key { [ y, Y, EuroSign, cent ] }; -@@ -146,6 +154,7 @@ xkb_symbols "csb" { - - key { [ a, A, aogonek, Aogonek ] }; - key { [ s, S, atilde, Atilde ] }; -+ key { [ f, F ] }; - key { [ l, L, lstroke, Lstroke ] }; - - key { [ z, Z, zabovedot, Zabovedot ] }; diff --git a/x11/xkeyboard-config/patches/patch-ag b/x11/xkeyboard-config/patches/patch-ag deleted file mode 100644 index 5597a8aead1..00000000000 --- a/x11/xkeyboard-config/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- keycodes/evdev.orig 2007-09-24 17:02:14.000000000 -0400 -+++ keycodes/evdev -@@ -147,7 +147,7 @@ default xkb_keycodes "evdev" { - - = 93; // Hankaku/Zenkakau toggle - = 101; // Hiragana/Katakana toggle -- = 211; // backslash/underscore -+ // = 211; // backslash/underscore - = 100; // Henkan - = 102; // Muhenkan - = 132; // Yen diff --git a/x11/xkeyboard-config/patches/patch-ah b/x11/xkeyboard-config/patches/patch-ah deleted file mode 100644 index bc4486be61d..00000000000 --- a/x11/xkeyboard-config/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- rules/base.lists.part.orig 2007-09-26 07:56:42.000000000 -0400 -+++ rules/base.lists.part -@@ -28,7 +28,7 @@ - acpi airkey \ - apple armada asus_laptop azonaRF2300 \ - benqx brother \ -- btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \ -+ btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u btc9116u \ - cherryblue cherrybluea cherryblueb cherrycyboard \ - chicony chicony9885 \ - compaqeak8 compaqik7 compaqik13 compaqik18 \ diff --git a/x11/xkeyboard-config/patches/patch-ai b/x11/xkeyboard-config/patches/patch-ai deleted file mode 100644 index a595efefc67..00000000000 --- a/x11/xkeyboard-config/patches/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- rules/base.o_c.part.orig 2007-05-31 17:18:06.000000000 -0400 -+++ rules/base.o_c.part -@@ -1,6 +1,4 @@ - grp_led:num = +lednum(group_lock) - grp_led:caps = +ledcaps(group_lock) - grp_led:scroll = +ledscroll(group_lock) -- grp:caps_toggle = +ledcaps(group_lock) - japan:kana_lock = +japan(kana_lock) -- diff --git a/x11/xkeyboard-config/patches/patch-aj b/x11/xkeyboard-config/patches/patch-aj deleted file mode 100644 index d1ab8cd585c..00000000000 --- a/x11/xkeyboard-config/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- configure.orig 2007-11-08 22:19:01.000000000 -0500 -+++ configure -@@ -5110,7 +5110,7 @@ else - echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink" - fi - --if test "$enable_compat_rules" == "yes" ; then -+if test "$enable_compat_rules" = "yes" ; then - echo " Compatibility rules are included" - else - echo " Compatibility rules are not included" diff --git a/x11/xkeyboard-config/patches/patch-ak b/x11/xkeyboard-config/patches/patch-ak deleted file mode 100644 index 2d2995f42a9..00000000000 --- a/x11/xkeyboard-config/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $ - ---- rules/merge.sh.orig 2007-11-08 22:29:35.000000000 -0500 -+++ rules/merge.sh -@@ -10,7 +10,7 @@ fi - > $DEST - - for i in $*; do -- if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then -+ if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then - echo >> $DEST; - read hdr - echo "$hdr" >> $DEST -- cgit v1.2.3