[pkgsrc/trunk]: pkgsrc/audio/cmus Don't force ncurses on NetBSD 5.0+, curses ...

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7affffc8f4cb
branches:  trunk
changeset: 550213:7affffc8f4cb
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Mon Nov 17 13:30:34 2008 +0000

description:
Don't force ncurses on NetBSD 5.0+, curses works fine now.
Add some missing casts to the code.

diffstat:

 audio/cmus/Makefile         |   4 ++--
 audio/cmus/distinfo         |   6 +++++-
 audio/cmus/options.mk       |  13 +++++++++----
 audio/cmus/patches/patch-aa |  13 +++++++++++++
 audio/cmus/patches/patch-ab |  13 +++++++++++++
 audio/cmus/patches/patch-ac |  13 +++++++++++++
 audio/cmus/patches/patch-ad |  13 +++++++++++++
 7 files changed, 68 insertions(+), 7 deletions(-)

diffs (122 lines):

diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/Makefile
--- a/audio/cmus/Makefile       Mon Nov 17 11:52:51 2008 +0000
+++ b/audio/cmus/Makefile       Mon Nov 17 13:30:34 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/07/25 14:03:30 obache Exp $
+# $NetBSD: Makefile,v 1.14 2008/11/17 13:30:34 ahoka Exp $
 #
 
 DISTNAME=              cmus-2.2.0
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            audio
 MASTER_SITES=          http://mirror.greaterscope.net/cmus/
 EXTRACT_SUFX=          .tar.bz2
diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/distinfo
--- a/audio/cmus/distinfo       Mon Nov 17 11:52:51 2008 +0000
+++ b/audio/cmus/distinfo       Mon Nov 17 13:30:34 2008 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.3 2008/05/10 14:56:33 obache Exp $
+$NetBSD: distinfo,v 1.4 2008/11/17 13:30:34 ahoka Exp $
 
 SHA1 (cmus-2.2.0.tar.bz2) = a6472633ac55660eb3aec5d2ae0296da86903bb2
 RMD160 (cmus-2.2.0.tar.bz2) = 1287666c16332ad34222461e29d8355ef607e7b5
 Size (cmus-2.2.0.tar.bz2) = 155448 bytes
+SHA1 (patch-aa) = b5cd6e9c799ea581bfecd242130274c869ed2103
+SHA1 (patch-ab) = 1288149006ce37bd0ed69c020ae6e1992cb84743
+SHA1 (patch-ac) = 76f346d0338f38c3657f29851d717c62b89d0791
+SHA1 (patch-ad) = 8f750a81966d83839f7ca2d66728ce4a48072d73
diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/options.mk
--- a/audio/cmus/options.mk     Mon Nov 17 11:52:51 2008 +0000
+++ b/audio/cmus/options.mk     Mon Nov 17 13:30:34 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/07/16 14:04:29 ahoka Exp $
+# $NetBSD: options.mk,v 1.6 2008/11/17 13:30:34 ahoka Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.cmus
 PKG_SUPPORTED_OPTIONS=         flac mad vorbis arts ao mpcdec faad wavpack #alsa
@@ -129,8 +129,13 @@
 ###
 ### Wide curses support; otherwise, default to using narrow curses.
 ###
-.if !empty(PKG_OPTIONS:Mwide-curses)
-.  include "../../devel/ncursesw/buildlink3.mk"
+# cmus works fine with a 5.0+ NetBSD curses
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9].*-*)
+.    include "../../mk/curses.buildlink3.mk"
 .else
-.  include "../../devel/ncurses/buildlink3.mk"
+.  if !empty(PKG_OPTIONS:Mwide-curses)
+.    include "../../devel/ncursesw/buildlink3.mk"
+.  else
+.    include "../../devel/ncurses/buildlink3.mk"
+.  endif
 .endif
diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/cmus/patches/patch-aa       Mon Nov 17 13:30:34 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2008/11/17 13:30:34 ahoka Exp $
+
+--- Doc/ttman.c.orig   2007-07-27 16:52:13.000000000 +0200
++++ Doc/ttman.c
+@@ -175,7 +175,7 @@ static int emit_keyword(const char *buf,
+       int i, len;
+ 
+       for (len = 0; len < size; len++) {
+-              if (!isalnum(buf[len]))
++              if (!isalnum((unsigned char)buf[len]))
+                       break;
+       }
+ 
diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/cmus/patches/patch-ab       Mon Nov 17 13:30:34 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2008/11/17 13:30:34 ahoka Exp $
+
+--- cmus.c.orig        2007-07-27 16:52:13.000000000 +0200
++++ cmus.c
+@@ -560,7 +560,7 @@ static int pl_handle_line(void *data, co
+       struct pl_data *d = data;
+       int i = 0;
+ 
+-      while (isspace(line[i]))
++      while (isspace((unsigned char)line[i]))
+               i++;
+       if (line[i] == 0)
+               return 0;
diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/cmus/patches/patch-ac       Mon Nov 17 13:30:34 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/11/17 13:30:34 ahoka Exp $
+
+--- command_mode.c.orig        2007-07-27 16:52:13.000000000 +0200
++++ command_mode.c
+@@ -495,7 +495,7 @@ inside:
+               goto err;
+ 
+       if (count == 1) {
+-              switch (tolower(*arg)) {
++              switch (tolower((unsigned char)*arg)) {
+               case 'h':
+                       seek *= 60;
+               case 'm':
diff -r c5a46cc84b8f -r 7affffc8f4cb audio/cmus/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/cmus/patches/patch-ad       Mon Nov 17 13:30:34 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/11/17 13:30:34 ahoka Exp $
+
+--- filters.c.orig     2007-07-27 16:52:13.000000000 +0200
++++ filters.c
+@@ -272,7 +272,7 @@ static int validate_filter_name(const ch
+       int i;
+ 
+       for (i = 0; name[i]; i++) {
+-              if (isalnum(name[i]))
++              if (isalnum((unsigned char)name[i]))
+                       continue;
+               if (name[i] == '_' || name[i] == '-')
+                       continue;