Another fix for keyboard handling, from Opolo Remo,

and a fix for the color patterns, also from him.
Bump PKGREVISION.

4 files changed, 18 insertions, 16 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 0b9240dca9b..ca49a6a9c02 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2012/01/24 09:11:00 sbd Exp $
+# $NetBSD: Makefile,v 1.100 2012/01/24 15:17:05 wiz Exp $
 
 DISTNAME=	SDL-1.2.14
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index be17e8e7050..74a04cd0bb5 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2011/12/29 10:00:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.60 2012/01/24 15:17:05 wiz Exp $
 
 SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd
 RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
 SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580
 SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = e2bbc5577a397e418c3fb565428b8fc558089802
-SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44
-SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 6a35135581a29107099eb184765d340d9d202dc2
+SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 30d90f7a717661f4c0fd0404c48c1081ee64d6fb
+SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 356a8817cc41dde5e24cb23f032215931f85a84b
diff --git a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
index 74d1f0a0421..da79ac3548c 100644
--- a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
+++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
@@ -1,28 +1,30 @@
-$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.2 2011/12/11 10:48:59 taca Exp $
+$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.3 2012/01/24 15:17:05 wiz Exp $
 
 "Port" to NetBSD.
 
 --- src/video/wscons/SDL_wsconsevents.c.orig	2009-10-12 23:07:14.000000000 +0000
 +++ src/video/wscons/SDL_wsconsevents.c
-@@ -146,8 +146,12 @@ void WSCONS_InitOSKeymap(_THIS)
+@@ -146,8 +146,11 @@ void WSCONS_InitOSKeymap(_THIS)
    }
  
    switch (private->kbdType) {
 -#ifdef WSKBD_TYPE_ZAURUS
-+#if defined(WSKBD_TYPE_ZAURUS) || defined(__NetBSD__)
-+#if !defined(WSKBD_TYPE_ZAURUS)
+-  case WSKBD_TYPE_ZAURUS:
++#if defined(__NetBSD__) || !defined(WSKBD_TYPE_ZAURUS)
 +  default:
 +#else
-   case WSKBD_TYPE_ZAURUS:
++  case WSKBD_TYPE_ZAURUS:
 +#endif
      /* top row */
      keymap[2] = SDLK_1;
      keymap[3] = SDLK_2;
-@@ -222,10 +226,12 @@ void WSCONS_InitOSKeymap(_THIS)
+@@ -220,12 +223,13 @@ void WSCONS_InitOSKeymap(_THIS)
+     keymap[77] = SDLK_RIGHT;
+     keymap[80] = SDLK_DOWN;
      break;
- #endif /* WSKBD_TYPE_ZAURUS */
+-#endif /* WSKBD_TYPE_ZAURUS */
  
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && defined(WSKBD_TYPE_ZAURUS)
    default:
      WSCONS_ReportError("Unable to map keys for keyboard type %u", 
  		       private->kbdType);
diff --git a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c
index bb1da9269c7..13e1831ff68 100644
--- a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c
+++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_video_wscons_SDL__wsconsvideo.c,v 1.2 2011/12/26 12:28:47 wiz Exp $
+$NetBSD: patch-src_video_wscons_SDL__wsconsvideo.c,v 1.3 2012/01/24 15:17:05 wiz Exp $
 
 Fix tty device and color patterns for wscons driver on NetBSD.
 
@@ -23,9 +23,9 @@ Fix tty device and color patterns for wscons driver on NetBSD.
    }
    if (private->info.depth > 8) {
 +#ifdef __NetBSD__
-+    private->redMask = 0x0000ff;
 +    private->greenMask = 0x00ff00;
-+    private->blueMask = 0xff0000;
++    private->blueMask = 0x0000ff;
++    private->redMask = 0xff0000;
 +#else
      if (wstype == WSDISPLAY_TYPE_SUN24 ||
  	wstype == WSDISPLAY_TYPE_SUNCG12 ||