Sun Dec 11 10:48:59 2011 UTC ()
Fix build problem without WSKBD_TYPE_ZAURUS environment; NetBSD 4_STABLE.
Extra "case" was existed before default label of case statement.


(taca)
diff -r1.56 -r1.57 pkgsrc/devel/SDL/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c
cvs diff -r1.56 -r1.57 pkgsrc/devel/SDL/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/SDL/distinfo 2011/12/01 10:48:07 1.56
+++ pkgsrc/devel/SDL/distinfo 2011/12/11 10:48:58 1.57
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.56 2011/12/01 10:48:07 wiz Exp $ 1$NetBSD: distinfo,v 1.57 2011/12/11 10:48:58 taca Exp $
2 2
3SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd 3SHA1 (SDL-1.2.14.tar.gz) = ba625b4b404589b97e92d7acd165992debe576dd
4RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801 4RMD160 (SDL-1.2.14.tar.gz) = a3a9a691f5510eb5327ca159a034f55a70cb5801
5Size (SDL-1.2.14.tar.gz) = 4014154 bytes 5Size (SDL-1.2.14.tar.gz) = 4014154 bytes
6SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f 6SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
7SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580 7SHA1 (patch-ab) = 03758f707c39c6241214f5e9ecbd47f937d18580
8SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd 8SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd
9SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 8830225dd54394b2b18fb45a50de7e883fa773ea 9SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 7e11bb2bbef815560da7ac967b71f3a0b7e4da44
10SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 5b6e7823272ed33db314063450c4bf85ea1a0127 10SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 5b6e7823272ed33db314063450c4bf85ea1a0127
cvs diff -r1.1 -r1.2 pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c (expand / switch to unified diff)

--- pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c 2011/12/01 10:48:08 1.1
+++ pkgsrc/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c 2011/12/11 10:48:59 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.1 2011/12/01 10:48:08 wiz Exp $ 1$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.2 2011/12/11 10:48:59 taca Exp $
2 2
3"Port" to NetBSD. 3"Port" to NetBSD.
4 4
5--- src/video/wscons/SDL_wsconsevents.c.orig 2009-10-12 23:07:14.000000000 +0000 5--- src/video/wscons/SDL_wsconsevents.c.orig 2009-10-12 23:07:14.000000000 +0000
6+++ src/video/wscons/SDL_wsconsevents.c 6+++ src/video/wscons/SDL_wsconsevents.c
7@@ -146,8 +146,12 @@ void WSCONS_InitOSKeymap(_THIS) 7@@ -146,8 +146,12 @@ void WSCONS_InitOSKeymap(_THIS)
8 } 8 }
9  9
10 switch (private->kbdType) { 10 switch (private->kbdType) {
11-#ifdef WSKBD_TYPE_ZAURUS 11-#ifdef WSKBD_TYPE_ZAURUS
12+#if defined(WSKBD_TYPE_ZAURUS) || defined(__NetBSD__) 12+#if defined(WSKBD_TYPE_ZAURUS) || defined(__NetBSD__)
13+#if defined(__NetBSD) 13+#if !defined(WSKBD_TYPE_ZAURUS)
14+ case default: 14+ default:
15+#else 15+#else
16 case WSKBD_TYPE_ZAURUS: 16 case WSKBD_TYPE_ZAURUS:
17+#endif 17+#endif
18 /* top row */ 18 /* top row */
19 keymap[2] = SDLK_1; 19 keymap[2] = SDLK_1;
20 keymap[3] = SDLK_2; 20 keymap[3] = SDLK_2;
21@@ -222,10 +226,12 @@ void WSCONS_InitOSKeymap(_THIS) 21@@ -222,10 +226,12 @@ void WSCONS_InitOSKeymap(_THIS)
22 break; 22 break;
23 #endif /* WSKBD_TYPE_ZAURUS */ 23 #endif /* WSKBD_TYPE_ZAURUS */
24  24
25+#ifndef __NetBSD__ 25+#ifndef __NetBSD__
26 default: 26 default:
27 WSCONS_ReportError("Unable to map keys for keyboard type %u",  27 WSCONS_ReportError("Unable to map keys for keyboard type %u",