ports/123728: [maintainer update] update to version 1.0
luked at pobox.com
luked at pobox.com
Fri May 16 07:10:02 UTC 2008
>Number: 123728
>Category: ports
>Synopsis: [maintainer update] update to version 1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri May 16 07:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Luke Dean <LukeD at pobox.com>
>Release: FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD greentower.lukas.is-a-geek.org 7.0-STABLE FreeBSD 7.0-STABLE #0: Sun Apr 20 09:15:24 PDT 2008 lukas at greentower.lukas.is-a-geek.org:/usr/obj/usr/src/sys/CUSTOM i386
>Description:
Update to version 1.0
Patches for gcc 4.2 compatibility are no longer necessary, so remove:
patch-bitmaps__wmwlmon_mask.xbm
patch-wl.c
>How-To-Repeat:
>Fix:
--- upgrade.diff begins here ---
diff -ruN wmwlmon.bak/Makefile wmwlmon/Makefile
--- wmwlmon.bak/Makefile 2008-05-11 14:25:16.000000000 -0700
+++ wmwlmon/Makefile 2008-05-15 21:32:43.000000000 -0700
@@ -6,8 +6,8 @@
#
PORTNAME= wmwlmon
-PORTVERSION= 0.9
-PORTREVISION= 4
+PORTVERSION= 1.0
+PORTREVISION= 0
CATEGORIES= net windowmaker
MASTER_SITES= http://www.nazgul.ch/dev/ \
http://dougbarton.us/Downloads/
@@ -29,7 +29,7 @@
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 -ruN wmwlmon.bak/distinfo wmwlmon/distinfo
--- wmwlmon.bak/distinfo 2006-06-03 21:50:36.000000000 -0700
+++ wmwlmon/distinfo 2008-05-15 21:23:32.000000000 -0700
@@ -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 -ruN wmwlmon.bak/files/extra-patch-wl.c wmwlmon/files/extra-patch-wl.c
--- wmwlmon.bak/files/extra-patch-wl.c 2008-05-11 14:25:16.000000000 -0700
+++ wmwlmon/files/extra-patch-wl.c 2008-05-15 21:28:25.000000000 -0700
@@ -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 -ruN wmwlmon.bak/files/extra-patch-wmwlmon.1 wmwlmon/files/extra-patch-wmwlmon.1
--- wmwlmon.bak/files/extra-patch-wmwlmon.1 2008-05-12 20:20:19.000000000 -0700
+++ wmwlmon/files/extra-patch-wmwlmon.1 2008-05-15 21:31:35.000000000 -0700
@@ -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 -ruN wmwlmon.bak/files/patch-bitmaps__wmwlmon_mask.xbm wmwlmon/files/patch-bitmaps__wmwlmon_mask.xbm
--- wmwlmon.bak/files/patch-bitmaps__wmwlmon_mask.xbm 2008-05-10 02:00:09.000000000 -0700
+++ wmwlmon/files/patch-bitmaps__wmwlmon_mask.xbm 1969-12-31 16:00:00.000000000 -0800
@@ -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 -ruN wmwlmon.bak/files/patch-wl.c wmwlmon/files/patch-wl.c
--- wmwlmon.bak/files/patch-wl.c 2008-05-10 02:00:09.000000000 -0700
+++ wmwlmon/files/patch-wl.c 1969-12-31 16:00:00.000000000 -0800
@@ -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;
-
--- upgrade.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list