>Number:         24172
>Category:       pkg
>Synopsis:       wistumbler2 (current) doesn't build (3 patches included)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 20 22:33:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Noud de Brouwer
>Release:        1.6ZG
>Organization:
none
>Environment:
NetBSD host016.template 1.6ZG NetBSD 1.6ZG (GENERIC.MP) #0: Sun Jan 18 17:43:12 CET 2004  root@:/usr/src/sys/arch/i386/compile/GENERIC.MP i386

>Description:
cd src && make all && cd -
cc -O2 -I/usr/pkg/include -I/usr/X11R6/include -DUSE_GTK -Wall -g -I/usr/pkg/include/gtk-2.0 -I/usr/pkg/lib/gtk-2.0/include -I/usr/pkg/include/atk-1.0 -I/usr/pkg/include/pango-1.0 -I/usr/pkg/include -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/pkg/include/glib/glib-2.0 -I/usr/pkg/lib/glib-2.0/include -O2 -I/sys -c stumbler.c
stumbler.c:48:30: net/if_ieee80211.h: No such file or directory
In file included from stumbler.c:64:
stumbler.h:48:30: net/if_ieee80211.h: No such file or directory
stumbler.c: In function `print_clist':
stumbler.c:193: warning: dereferencing type-punned pointer will break strict-aliasing rules
stumbler.c:228: error: `IEEE80211_CAPINFO_PRIVACY' undeclared (first use in this function)

>How-To-Repeat:
clean install + pkgsrc.tar.gz dated 20040117
cd /usr/pkgsrc/net/wistumbler2; make
>Fix:
following 3 patches
(i'm not sure about __NetBSD_Version__'s value):

--- stumbler.h     2004-01-20 22:46:54.000000000 +0100
+++ stumbler.h.new  2004-01-20 22:50:00.000000000 +0100
@@ -45,7 +45,11 @@
 #include <dev/owi/if_ieee80211.h>
 #include <dev/wi/if_wavelan_ieee.h>
 #else
-#include <net/if_ieee80211.h>
+# if __NetBSD_Version__ > 106220000
+  #include <net80211/ieee80211.h>
+# else
+  #include <net/if_ieee80211.h>
+# endif
 #include <dev/ic/wi_ieee.h>
 #endif
 /* import from wistumbler.c */



--- stumbler.c     2004-01-20 22:52:52.000000000 +0100
+++ stumbler.c.new  2004-01-20 22:53:42.000000000 +0100
@@ -45,7 +45,11 @@
 #include <dev/owi/if_ieee80211.h>
 #include <dev/wi/if_wavelan_ieee.h>
 #else
-#include <net/if_ieee80211.h>
+#if __NetBSD_Version__ > 106220000
+  #include <net80211/ieee80211.h>
+# else
+  #include <net/if_ieee80211.h>
+# endif
 #include <dev/ic/wi_ieee.h>
 #endif
 #include <stdio.h>



--- wicontrol.c    2004-01-20 22:55:17.000000000 +0100
+++ wicontrol.c.new 2004-01-20 22:56:18.000000000 +0100
@@ -60,7 +60,11 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #ifdef __NetBSD__
-#include <net/if_ieee80211.h>
+# if __NetBSD_Version__ > 106220000
+  #include <net80211/ieee80211.h>
+# else
+  #include <net/if_ieee80211.h>
+# endif
 #include <dev/ic/wi_ieee.h>
 #else
 #include <dev/pcmcia/if_wavelan_ieee.h>

>Release-Note:
>Audit-Trail:
>Unformatted: