4 files changed, 78 insertions, 7 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 8089a50333b..a861a8f5496 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2011/08/23 13:06:49 obache Exp $
+# $NetBSD: Makefile,v 1.95 2011/12/01 10:48:07 wiz Exp $
 
 DISTNAME=	SDL-1.2.14
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
@@ -34,10 +34,6 @@ NASMFLAGS_a.out=	-f aoutb
 CONFIGURE_ARGS+=	--disable-nasm
 .endif
 
-.if ${OPSYS:MNetBSD}
-CONFIGURE_ARGS+=	--disable-video-wscons
-.endif
-
 CONFIGURE_ENV+=		NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 MAKE_ENV+=		NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index ea729daff8c..829066dffb6 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2011/08/02 17:02:38 joerg Exp $
+$NetBSD: distinfo,v 1.56 2011/12/01 10:48:07 wiz Exp $
 
 SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd
 RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801
@@ -6,3 +6,5 @@ Size (SDL-1.2.14.tar.gz) = 4014154 bytes
 SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
 SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580
 SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
+SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 8830225dd54394b2b18fb45a50de7e883fa773ea
+SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 5b6e7823272ed33db314063450c4bf85ea1a0127
diff --git a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
new file mode 100644
index 00000000000..d58cc8b12f9
--- /dev/null
+++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.1 2011/12/01 10:48:08 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)
+   }
+ 
+   switch (private->kbdType) {
+-#ifdef WSKBD_TYPE_ZAURUS
++#if defined(WSKBD_TYPE_ZAURUS) || defined(__NetBSD__)
++#if defined(__NetBSD)
++  case default:
++#else
+   case WSKBD_TYPE_ZAURUS:
++#endif
+     /* top row */
+     keymap[2] = SDLK_1;
+     keymap[3] = SDLK_2;
+@@ -222,10 +226,12 @@ void WSCONS_InitOSKeymap(_THIS)
+     break;
+ #endif /* WSKBD_TYPE_ZAURUS */
+ 
++#ifndef __NetBSD__
+   default:
+     WSCONS_ReportError("Unable to map keys for keyboard type %u", 
+ 		       private->kbdType);
+     break;
++#endif
+   }
+ }
+ 
diff --git a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c
new file mode 100644
index 00000000000..7a9d076a3ff
--- /dev/null
+++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsvideo.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_video_wscons_SDL__wsconsvideo.c,v 1.1 2011/12/01 10:48:08 wiz Exp $
+
+Fix tty device and color patterns for wscons driver on NetBSD.
+
+--- src/video/wscons/SDL_wsconsvideo.c.orig	2009-10-12 23:07:14.000000000 +0000
++++ src/video/wscons/SDL_wsconsvideo.c
+@@ -141,7 +141,13 @@ VideoBootStrap WSCONS_bootstrap = {
+   WSCONS_CreateDevice
+ };
+ 
++#ifdef __NetBSD__
++#define WSCONSDEV_FORMAT "/dev/ttyE%01x"
++#endif
++
++#ifdef __OpenBSD__
+ #define WSCONSDEV_FORMAT "/dev/ttyC%01x"
++#endif
+ 
+ int WSCONS_VideoInit(_THIS, SDL_PixelFormat *vformat)
+ {
+@@ -184,6 +190,11 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFor
+     return -1;
+   }
+   if (private->info.depth > 8) {
++#ifdef _NetBSD__
++    private->redMask = 0x0000ff;
++    private->greenMask = 0x00ff00;
++    private->blueMask = 0xff0000;
++#else
+     if (wstype == WSDISPLAY_TYPE_SUN24 ||
+ 	wstype == WSDISPLAY_TYPE_SUNCG12 ||
+ 	wstype == WSDISPLAY_TYPE_SUNCG14 ||
+@@ -202,6 +213,7 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFor
+       WSCONS_ReportError("Unknown video hardware");
+       return -1;
+     }
++#endif
+   } else {
+     WSCONS_ReportError("Displays with 8 bpp or less are not supported");
+     return -1;