[package] update wavemon to 0.7.0, patch from koniu

SVN-Revision: 24170

diff --git a/net/wavemon/Makefile b/net/wavemon/Makefile
index cad1eca3e05c9078ed6d04bfbe19f3d58a0b7557..7faa3877359d4ab872ac753e13babc58af94f700 100644 (file)
--- a/net/wavemon/Makefile
+++ b/net/wavemon/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wavemon
-PKG_VERSION:=0.4.0b
+PKG_VERSION:=0.7.0
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.janmorgenstern.de/
-PKG_MD5SUM:=2baab37eb967fc38dc53f8e4f609daac
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases
+PKG_MD5SUM:=3544b79d5cf3b521a06621d2af96b4f6
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/wavemon/patches/001-gcc_fixes.patch b/net/wavemon/patches/001-gcc_fixes.patch
deleted file mode 100644 (file)
index f89728a..0000000
--- a/net/wavemon/patches/001-gcc_fixes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur wavemon-0.4.0b-orig/conf.c wavemon-0.4.0b/conf.c
---- wavemon-0.4.0b-orig/conf.c 2005-07-08 23:49:09.000000000 -0400
-+++ wavemon-0.4.0b/conf.c      2005-07-08 23:48:05.000000000 -0400
-@@ -409,8 +409,8 @@
-                                                                               fatal_error("parse error in %s, line %d: '%s' is not a valid argument here", cfname, lnum, rv);
-                                                                       }
-                                                                       break;
--                                      case t_sep:     /* gcc -Wall sucks */
--                                      case t_func:
-+                                      case t_sep: ;   /* gcc -Wall sucks */
-+                                      case t_func: ;
-                               }
-                       }
-               }
-@@ -481,7 +481,7 @@
-                                                       break;
-                               case t_listval: sprintf(rv, "%s", (char *)ci->v);
-                               case t_sep: break;
--                              case t_func:
-+                              case t_func: ;
-                       }
-                       
-                       add = 1;
-diff -ur wavemon-0.4.0b-orig/conf_scr.c wavemon-0.4.0b/conf_scr.c
---- wavemon-0.4.0b-orig/conf_scr.c     2005-07-08 23:49:09.000000000 -0400
-+++ wavemon-0.4.0b/conf_scr.c  2005-07-08 23:48:05.000000000 -0400
-@@ -63,7 +63,7 @@
-                       case t_listval: strncpy(s, (char *)item->v, 32);
-                                                       break;
-                       case t_sep:             /* gcc -Wall sucks */
--                      case t_func:
-+                      case t_func: ;
-               }
- 
-               if (!item->unit) {
-@@ -135,8 +135,8 @@
-                                               }
-                                               strncpy((char *)item->v, ll_get(item->list, tmp), 32);
-                                               break;
--              case t_sep:             /* gcc -Wall sucks */
--              case t_func:
-+              case t_sep: ;           /* gcc -Wall sucks */
-+              case t_func: ;
-       }
- }     
- 
-diff -ur wavemon-0.4.0b-orig/llist.c wavemon-0.4.0b/llist.c
---- wavemon-0.4.0b-orig/llist.c        2005-07-08 23:46:09.000000000 -0400
-+++ wavemon-0.4.0b/llist.c     2005-07-08 23:47:28.000000000 -0400
-@@ -352,7 +352,7 @@
-                                       *((int *)l->e) = va_arg(*ap, int);
-                                       break;
-               case 's':       l->e = (void *)malloc(sizeof(char *));
--                                      (char *)l->e = strdup(va_arg(*ap, char *));
-+                                      l->e = strdup(va_arg(*ap, char *));
-                                       break;
-               case 'f':       l->e = (void *)malloc(sizeof(double));
-                                       *((double *)l->e) = va_arg(*ap, double);
-diff -ur wavemon-0.4.0b-orig/wavemon.c wavemon-0.4.0b/wavemon.c
---- wavemon-0.4.0b-orig/wavemon.c      2005-07-08 23:49:09.000000000 -0400
-+++ wavemon-0.4.0b/wavemon.c   2005-07-08 23:48:05.000000000 -0400
-@@ -170,7 +170,7 @@
- 
-       if (conf.dump == 1) {
-         dump_parameters(&conf);
--        exit();
-+        exit(0);
-       }
- 
-       /* initialize the ncurses interface */

diff --git a/net/wavemon/patches/002-wireless_tools.patch b/net/wavemon/patches/002-wireless_tools.patch
deleted file mode 100644 (file)
index 8506997..0000000
--- a/net/wavemon/patches/002-wireless_tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- wavemon-0.4.0b.orig/iw_if.h        2002-12-21 06:18:30.000000000 -0600
-+++ wavemon-0.4.0b/iw_if.h     2006-03-12 09:05:48.000000000 -0600
-@@ -19,6 +19,9 @@
-  */
- 
- #include <netdb.h>
-+#include <linux/types.h>
-+#include <linux/socket.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
- 
- #define IW_STACKSIZE 1024