cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unmark BROKEN on 7.X and later, by stopping treating wi as special.

Browse Source 
Reported by:	pav
Approved by:	KT Sin <ktsin__at__acm.org> (maintainer)
This commit is contained in:
Hajimu UMEMOTO 2007-10-27 07:36:52 +00:00
parent a6a2f0dd82
commit 6d2bbb8a57
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=202127
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/gkrellmwireless2/Makefile
View File

@ -22,10 +22,4 @@ WRKSRC= ${WRKDIR}/gkrellmwireless
USE_X_PREFIX= yes
USE_GMAKE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Does not compile with GCC 4.2
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

31
net/gkrellmwireless2/files/patch-ume-scan.diff
View File

@ -1,8 +1,8 @@
Index: wireless.c
diff -u wireless.c.orig wireless.c
--- wireless.c.orig Sat Dec 6 22:19:55 2003
+++ wireless.c Mon May 15 00:18:15 2006
@@ -94,6 +94,37 @@
diff -u -p wireless.c.orig wireless.c
--- wireless.c.orig 2002-12-07 00:01:13.000000000 +0900
+++ wireless.c 2007-10-04 02:52:24.000000000 +0900
@@ -93,6 +93,37 @@ wcard_t *found_wcard(gchar *interface) {
#if defined(__FreeBSD__) || defined(__NetBSD__)
/* FreeBSD & NetBSD specific */
@ -40,7 +40,7 @@ diff -u wireless.c.orig wireless.c
static int
find_wi_card(void) {
/* possible interfaces */
@@ -162,18 +193,55 @@
@@ -161,18 +192,56 @@ find_an_card(void) {
return ret;
}
#endif /* !defined(__NetBSD__) */
@ -94,35 +94,46 @@ diff -u wireless.c.orig wireless.c
+}
+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 600034 */
+
+#if !defined(__FreeBSD__) || __FreeBSD_version < 700052
static int
get_wi_link_quality(wcard_t *card, float *quality, float *level, float *noise) {
/* wireless info request struct */
@@ -257,6 +325,13 @@
@@ -210,6 +279,7 @@ get_wi_link_quality(wcard_t *card, float
return TRUE;
}
+#endif /* !defined(__FreeBSD__) || __FreeBSD_version < 700052 */
#if !defined(__NetBSD__)
static int
@@ -256,6 +326,15 @@ get_an_link_quality(wcard_t *card, float
static int
get_link_quality(wcard_t *card, float *quality, float *level, float *noise) {
+#if defined(__FreeBSD__) && __FreeBSD_version >= 600034
+ if (strncmp(card->ifname, "an", 2) == 0 && isnumber(card->ifname[2]))
+ return get_an_link_quality(card,quality,level,noise);
+#if !defined(__FreeBSD__) || __FreeBSD_version < 700052
+ else if (strncmp(card->ifname, "wi", 2) == 0 && isnumber(card->ifname[2]))
+ return get_wi_link_quality(card,quality,level,noise);
+#endif /* !defined(__FreeBSD__) || __FreeBSD_version < 700052 */
+ return get_scan_link_quality(card,quality,level,noise);
+#else
switch (card->ifname[0]) {
#if !defined(__NetBSD__)
case 'a': /* an card */
@@ -266,6 +341,7 @@
@@ -265,6 +344,7 @@ get_link_quality(wcard_t *card, float *q
return get_wi_link_quality(card,quality,level,noise);
}
return FALSE;
+#endif
}
#endif
static int
Index: wireless.h
diff -u wireless.h.orig wireless.h
--- wireless.h.orig Sat Dec 6 22:19:55 2003
+++ wireless.h Sun May 14 23:45:09 2006
--- wireless.h.orig 2002-12-07 00:01:13.000000000 +0900
+++ wireless.h 2007-10-04 02:33:03.000000000 +0900
@@ -24,6 +24,11 @@
#include <sys/socket.h>
#include <sys/sockio.h>