[pkgsrc/trunk]: pkgsrc/net/wimon Fix build on NetBSD-current, patch from Anon.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/64980aa0f7af
branches:  trunk
changeset: 634145:64980aa0f7af
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 09 18:10:16 2014 +0000

description:
Fix build on NetBSD-current, patch from Anon.
While here: set LICENSE, add comments to patches.

diffstat:

 net/wimon/Makefile         |   4 ++--
 net/wimon/distinfo         |   6 +++---
 net/wimon/patches/patch-aa |   4 +++-
 net/wimon/patches/patch-ab |  27 ++++++++++++++++++++++++---
 4 files changed, 32 insertions(+), 9 deletions(-)

diffs (82 lines):

diff -r a215f3b1ec21 -r 64980aa0f7af net/wimon/Makefile
--- a/net/wimon/Makefile        Fri May 09 17:19:49 2014 +0000
+++ b/net/wimon/Makefile        Fri May 09 18:10:16 2014 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 17:19:19 asau Exp $
-#
+# $NetBSD: Makefile,v 1.12 2014/05/09 18:10:16 wiz Exp $
 
 DISTNAME=      wimon-0.3
 PKGREVISION=   1
@@ -9,6 +8,7 @@
 MAINTAINER=    imil%gcu.info@localhost
 HOMEPAGE=      http://imil.net/wimon/
 COMMENT=       Tool that shows a real-time graph of your wireless connection
+LICENSE=       original-bsd
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r a215f3b1ec21 -r 64980aa0f7af net/wimon/distinfo
--- a/net/wimon/distinfo        Fri May 09 17:19:49 2014 +0000
+++ b/net/wimon/distinfo        Fri May 09 18:10:16 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2011/01/03 07:38:58 obache Exp $
+$NetBSD: distinfo,v 1.7 2014/05/09 18:10:16 wiz Exp $
 
 SHA1 (wimon-0.3.tar.gz) = 8be1bc6d4917adee5641310258fe77f8b265013f
 RMD160 (wimon-0.3.tar.gz) = d8670b1ceb1fde0c0001b2e6ca39a82909cd42d4
 Size (wimon-0.3.tar.gz) = 8103 bytes
-SHA1 (patch-aa) = 47713b06e1d5e4ca6e96af593edb41eedce8d42f
-SHA1 (patch-ab) = 8bd60329cd0bb61ceff81e58774d1fabba65e9e7
+SHA1 (patch-aa) = 30dc6b67123b892b6e30ed1dc85ca76bc8de790c
+SHA1 (patch-ab) = 6d51b89c24cdf1a410ddfe38ea78e72d40082785
diff -r a215f3b1ec21 -r 64980aa0f7af net/wimon/patches/patch-aa
--- a/net/wimon/patches/patch-aa        Fri May 09 17:19:49 2014 +0000
+++ b/net/wimon/patches/patch-aa        Fri May 09 18:10:16 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2011/01/03 07:38:58 obache Exp $
+$NetBSD: patch-aa,v 1.3 2014/05/09 18:10:16 wiz Exp $
+
+DragonFly support.
 
 --- showi.c.orig       2006-01-08 21:26:47.000000000 +0000
 +++ showi.c
diff -r a215f3b1ec21 -r 64980aa0f7af net/wimon/patches/patch-ab
--- a/net/wimon/patches/patch-ab        Fri May 09 17:19:49 2014 +0000
+++ b/net/wimon/patches/patch-ab        Fri May 09 18:10:16 2014 +0000
@@ -1,7 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2006/09/24 13:53:17 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2014/05/09 18:10:16 wiz Exp $
 
---- wimon.c.orig       2006-09-24 15:51:09.000000000 +0000
-+++ wimon.c
+Only define MAX if it's not defined yet.
+Remove unused variable.
+
+--- wimon.c.orig       2004-07-13 03:38:18.000000000 -0400
++++ wimon.c    2014-05-09 12:55:58.000000000 -0400
 @@ -50,7 +50,9 @@
        wattroff(a, b); \
  } 
@@ -12,3 +15,21 @@
  #define ABS(a) ((a)>0?(a):-(a))
  #define INTERVAL (5)
  
+@@ -165,7 +167,7 @@ print_str_items(WINDOW *cur_win, const c
+ static void
+ show_infos(struct wi_infos wi)
+ {
+-      int x, y, cur_w = COLS - (BORDER * 2) - 6; /* 6 == strlen("ssid: ") */
++      int x, cur_w = COLS - (BORDER * 2) - 6; /* 6 == strlen("ssid: ") */
+ 
+       wmove(main_win, 1, 2);
+ 
+@@ -175,7 +177,7 @@ show_infos(struct wi_infos wi)
+       print_int_items(main_win, "tx rate (Mbps)", wi.curtxrate);
+       wprintw(main_win, " | ");
+       /* if stlen(ssid) > screen width, reduce ssid to window width - diff */
+-      getyx(main_win, y, x);
++      x = getcurx(main_win);
+       x = cur_w - (x + wi.curssidlen);
+       if (x <= 0) {
+               wi.curssid[wi.curssidlen + x] = '\0';