6 files changed, 19 insertions, 43 deletions

diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile
index dba62a5538de..3ef2a36ab738 100644
--- a/net/wmwlmon/Makefile
+++ b/net/wmwlmon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wmwlmon
-PORTVERSION=	0.9
-PORTREVISION=	4
+PORTVERSION=	1.0
 CATEGORIES=	net windowmaker
 MASTER_SITES=	http://www.nazgul.ch/dev/ \
 		http://dougbarton.us/Downloads/
@@ -29,7 +28,7 @@ IGNORE=		needs WLAN infrastructure from 6.0-RELEASE or newer
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-wl.c ${PATCHDIR}/extra-patch-wmwlmon.1
 pre-everything::
 	@${ECHO_CMD} "==========================================================="
-	@${ECHO_CMD} "On FreeBSD > 700052 there is no wi(4) support in {PORTNAME}"
+	@${ECHO_CMD} "On FreeBSD > 700052 there is no wi(4) support in ${PORTNAME}"
 	@${ECHO_CMD} "==========================================================="
 .endif
 
diff --git a/net/wmwlmon/distinfo b/net/wmwlmon/distinfo
index 2921e5c17000..e42ac9dc763b 100644
--- a/net/wmwlmon/distinfo
+++ b/net/wmwlmon/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmwlmon-0.9.tar.gz) = 21d58bf93e190d925bd750ff24382405
-SHA256 (wmwlmon-0.9.tar.gz) = 1b3ae38bf6a00ca8c8c73370cda7fce108b754cb1f6757e20714eef70b8d48d2
-SIZE (wmwlmon-0.9.tar.gz) = 15012
+MD5 (wmwlmon-1.0.tar.gz) = f7f3871d7e05388df384922d28ca9cb1
+SHA256 (wmwlmon-1.0.tar.gz) = d260828a3eadc39adf487d08384a2226de3e10298acf3e630865d6985edb170e
+SIZE (wmwlmon-1.0.tar.gz) = 15097
diff --git a/net/wmwlmon/files/extra-patch-wl.c b/net/wmwlmon/files/extra-patch-wl.c
index aaa9b6108e8f..01a400729411 100644
--- a/net/wmwlmon/files/extra-patch-wl.c
+++ b/net/wmwlmon/files/extra-patch-wl.c
@@ -1,6 +1,6 @@
---- ./wl.c.orig 2006-05-10 06:57:57.000000000 +0300
-+++ ./wl.c      2008-05-10 11:03:57.000000000 +0300
-@@ -283,6 +284,7 @@
+--- wl.c.orig	2008-05-12 21:42:17.000000000 -0700
++++ wl.c	2008-05-15 21:27:36.000000000 -0700
+@@ -283,6 +283,7 @@
  int
  get_wi_signal(const char *interface)
  {
@@ -8,12 +8,12 @@
  	int		s;
  	struct ifreq	ifr;
  	struct wi_req	wreq;
-@@ -319,6 +321,9 @@
+@@ -319,6 +320,9 @@
  #ifdef __FreeBSD__
  	return (wreq.wi_val[1]);
  #endif
 +#else
-+	return -1;
++	return (-1);
 +#endif
  }
  
diff --git a/net/wmwlmon/files/extra-patch-wmwlmon.1 b/net/wmwlmon/files/extra-patch-wmwlmon.1
index 14e2a6878ca4..b41194fab860 100644
--- a/net/wmwlmon/files/extra-patch-wmwlmon.1
+++ b/net/wmwlmon/files/extra-patch-wmwlmon.1
@@ -1,10 +1,10 @@
---- ./wmwlmon.1.orig	2008-05-10 11:04:09.000000000 +0300
-+++ ./wmwlmon.1	2008-05-10 11:04:42.000000000 +0300
-@@ -98,6 +98,6 @@
- causing troubles, please report me, including a dmesg and a problem
- explanation.
+--- wmwlmon.1.orig	2008-05-13 10:42:02.000000000 -0700
++++ wmwlmon.1	2008-05-15 21:30:56.000000000 -0700
+@@ -105,7 +105,6 @@
+ .It iwi(4)
+ .It ral(4)
+ .It upgt(4)
+-.It wi(4)
+ .It wpi(4)
+ .El
  .Pp
--Full supported devices known yet: ath(4), iwi(4), wi(4)
-+Full supported devices known yet: ath(4), iwi(4)
- .Pp
- Partial supported devices known yet: ipw(4)
diff --git a/net/wmwlmon/files/patch-bitmaps__wmwlmon_mask.xbm b/net/wmwlmon/files/patch-bitmaps__wmwlmon_mask.xbm
deleted file mode 100644
index 619476a5e73f..000000000000
--- a/net/wmwlmon/files/patch-bitmaps__wmwlmon_mask.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./bitmaps/wmwlmon_mask.xbm.orig	2005-10-20 15:57:17.000000000 +0300
-+++ ./bitmaps/wmwlmon_mask.xbm	2008-05-10 11:35:46.000000000 +0300
-@@ -1,6 +1,6 @@
- #define wmwlmon_mask_width 64
- #define wmwlmon_mask_height 64
--static unsigned char wmwlmon_mask_bits[] = {
-+static char wmwlmon_mask_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff,
diff --git a/net/wmwlmon/files/patch-wl.c b/net/wmwlmon/files/patch-wl.c
deleted file mode 100644
index 8239f4882043..000000000000
--- a/net/wmwlmon/files/patch-wl.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./wl.c.orig	2006-05-10 06:57:57.000000000 +0300
-+++ ./wl.c	2008-05-10 11:03:57.000000000 +0300
-@@ -261,7 +261,8 @@
- 		uint8_t *vp;
- 		sr = (struct ieee80211req_scan_result *)cp;
- 		vp = (u_int8_t *)(sr + 1);
--		strlcpy(network_id, vp, sr->isr_ssid_len + 1);
-+		memcpy(network_id, vp, sr->isr_ssid_len);
-+		network_id[sizeof(network_id) - 1] = '\0';
- 		if (!strcmp(network_id, network))
- 			return (sr->isr_rssi);
- 		cp += sr->isr_len;
-