Fixes patch for DragonFly BSD for if_wavelan_ieee.h's path.

PR#44321 by Sascha Wildner.

Still broken for 2.8.2, because `struct wi_req' is disabled in
the include file, but it was changed in DragonFly master.

13 files changed, 29 insertions, 29 deletions

diff --git a/net/gtk_wicontrol/distinfo b/net/gtk_wicontrol/distinfo
index 6aff2613bb4..33dc56423c5 100644
--- a/net/gtk_wicontrol/distinfo
+++ b/net/gtk_wicontrol/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2010/02/11 21:30:54 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/01/03 07:38:57 obache Exp $
 
 SHA1 (gtk_wicontrol-0.17.tar.gz) = be477075dcc82b6a549d1d6b8f4bb6ef7be2bfc5
 RMD160 (gtk_wicontrol-0.17.tar.gz) = b2b36c9b7810c28fea48e505d48768b125500a42
 Size (gtk_wicontrol-0.17.tar.gz) = 116130 bytes
 SHA1 (patch-aa) = b1b5a3f4764af06d345e6041e5cec0042334a7e2
 SHA1 (patch-ab) = 57fa282111a8d0f65aeda5336830f17db49d96cf
-SHA1 (patch-ac) = 740009f59c72526511c2b8b5f330dafa36593a36
-SHA1 (patch-ad) = 1f3e7780f83efd666cef444c0d2c3c8b5383e9eb
-SHA1 (patch-ae) = 7975912eefe0c015f6737388866ca017b3724799
+SHA1 (patch-ac) = 9453411c44e5c6efe13ab4a1eaf189b715811cb0
+SHA1 (patch-ad) = cebba304b78d69c9f34a96f750e166ae7940fd6f
+SHA1 (patch-ae) = eb738c150df4d01de55ed237ea39c59e79f9292f
 SHA1 (patch-af) = 9fd14fbb5ab19e27c2a19d0be3ea2c899c0397d1
diff --git a/net/gtk_wicontrol/patches/patch-ac b/net/gtk_wicontrol/patches/patch-ac
index af63d38f7d5..1126fcb432f 100644
--- a/net/gtk_wicontrol/patches/patch-ac
+++ b/net/gtk_wicontrol/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2006/03/22 22:03:46 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2011/01/03 07:38:58 obache Exp $
 
 --- src/wiinfo.c.orig	2006-03-22 21:38:09.000000000 +0000
 +++ src/wiinfo.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.4 2006/03/22 22:03:46 joerg Exp $
  #elif defined(HAVE_DEV_IC_WI_IEEE_H)
  #include <dev/ic/wi_ieee.h>
 +#elif defined(__DragonFly__)
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
  #endif
  
  void 
diff --git a/net/gtk_wicontrol/patches/patch-ad b/net/gtk_wicontrol/patches/patch-ad
index 99db4f236dc..2a59f4d04b7 100644
--- a/net/gtk_wicontrol/patches/patch-ad
+++ b/net/gtk_wicontrol/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2006/03/22 22:03:46 joerg Exp $
+$NetBSD: patch-ad,v 1.5 2011/01/03 07:38:58 obache Exp $
 
 --- src/main.c.orig	2006-03-22 21:38:03.000000000 +0000
 +++ src/main.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.4 2006/03/22 22:03:46 joerg Exp $
  #elif defined(HAVE_DEV_IC_WI_IEEE_H)
  #include <dev/ic/wi_ieee.h>
 +#elif defined(__DragonFly__)
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
  #endif
   
  #include "interface.h"
diff --git a/net/gtk_wicontrol/patches/patch-ae b/net/gtk_wicontrol/patches/patch-ae
index 502df832e63..b98d4984fce 100644
--- a/net/gtk_wicontrol/patches/patch-ae
+++ b/net/gtk_wicontrol/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2006/03/22 22:03:46 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2011/01/03 07:38:58 obache Exp $
 
 --- src/callbacks.c.orig	2006-03-22 21:37:39.000000000 +0000
 +++ src/callbacks.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.3 2006/03/22 22:03:46 joerg Exp $
  #elif defined(HAVE_DEV_IC_WI_IEEE_H)
  #include <dev/ic/wi_ieee.h>
 +#elif defined(__DragonFly__)
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
  #endif
  
  #include "callbacks.h"
diff --git a/net/wimon/distinfo b/net/wimon/distinfo
index a7e9cc09800..9b17ad9289b 100644
--- a/net/wimon/distinfo
+++ b/net/wimon/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/09/24 13:53:17 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/01/03 07:38:58 obache Exp $
 
 SHA1 (wimon-0.3.tar.gz) = 8be1bc6d4917adee5641310258fe77f8b265013f
 RMD160 (wimon-0.3.tar.gz) = d8670b1ceb1fde0c0001b2e6ca39a82909cd42d4
 Size (wimon-0.3.tar.gz) = 8103 bytes
-SHA1 (patch-aa) = 5edbd8bbebf8aa31f6a95d4c1c5370a7d61f0e1a
+SHA1 (patch-aa) = 47713b06e1d5e4ca6e96af593edb41eedce8d42f
 SHA1 (patch-ab) = 8bd60329cd0bb61ceff81e58774d1fabba65e9e7
diff --git a/net/wimon/patches/patch-aa b/net/wimon/patches/patch-aa
index 4f9a4991f00..2104c527e9b 100644
--- a/net/wimon/patches/patch-aa
+++ b/net/wimon/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2006/01/08 21:29:50 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2011/01/03 07:38:58 obache Exp $
 
 --- showi.c.orig	2006-01-08 21:26:47.000000000 +0000
 +++ showi.c
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1 2006/01/08 21:29:50 joerg Exp $
 +#elif defined(__DragonFly__)
 +#include <net/if_var.h>
 +#include <net/ethernet.h>
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
 +#include <sys/endian.h>
 +
  #else
diff --git a/net/wistumbler/distinfo b/net/wistumbler/distinfo
index f7a2b96b322..29d197e6d90 100644
--- a/net/wistumbler/distinfo
+++ b/net/wistumbler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/03/23 17:20:22 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/01/03 07:38:58 obache Exp $
 
 SHA1 (wistumbler-20020816.tar.gz) = fe980cdd4934dbb70411e4ce0394adef56e21999
 RMD160 (wistumbler-20020816.tar.gz) = df6744ac26dc498063834da5475a70ecc0f34ab2
 Size (wistumbler-20020816.tar.gz) = 9327 bytes
 SHA1 (patch-aa) = 662f467fbf9f51c83843f88ec4d854fb19fd2a43
-SHA1 (patch-ab) = f2ebb7a7bb0b23aa917bd5134e1249084b5317b3
-SHA1 (patch-ac) = 901ddc023805973beb2ea2086487b91b8de1f769
+SHA1 (patch-ab) = 71fac9af69d0167960dc9a1c482899aec9d6a882
+SHA1 (patch-ac) = ebbe0bec6e3ae3cb456e09e78bd1b7b7a9f4ed3c
diff --git a/net/wistumbler/patches/patch-ab b/net/wistumbler/patches/patch-ab
index 2b8d0295b8c..500f5946128 100644
--- a/net/wistumbler/patches/patch-ab
+++ b/net/wistumbler/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2006/03/23 17:20:22 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2011/01/03 07:38:59 obache Exp $
 
 --- stumbler.c.orig	2002-08-16 14:27:13.000000000 +0000
 +++ stumbler.c
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2006/03/23 17:20:22 joerg Exp $
 +#include <dev/ic/wi_ieee.h>
 +#elif defined(__DragonFly__)
 +#include <netproto/802_11/ieee80211.h>
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
 +#else
  #include <net/if_ieee80211.h> 
  #include <dev/ic/wi_ieee.h>
diff --git a/net/wistumbler/patches/patch-ac b/net/wistumbler/patches/patch-ac
index c58bcb67ffb..4a228a19e9c 100644
--- a/net/wistumbler/patches/patch-ac
+++ b/net/wistumbler/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2006/03/23 17:20:22 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2011/01/03 07:38:59 obache Exp $
 
 --- wicontrol.c.orig	2002-08-11 14:18:51.000000000 +0000
 +++ wicontrol.c
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2006/03/23 17:20:22 joerg Exp $
 +#include <net/ethernet.h>
 +
 +#include <netproto/802_11/ieee80211.h>
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
  #else
  #include <netinet/in.h>
  #include <netinet/if_ether.h>
diff --git a/net/wistumbler2/distinfo b/net/wistumbler2/distinfo
index e78ca109ff4..38cc45f8149 100644
--- a/net/wistumbler2/distinfo
+++ b/net/wistumbler2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2008/10/02 13:35:02 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/01/03 07:38:59 obache Exp $
 
 SHA1 (wistumbler2-2.0pre10.tar.gz) = 1167dfbc53cdf43cca357fefd2153be9f4657669
 RMD160 (wistumbler2-2.0pre10.tar.gz) = 27a1539c93560c753d9951c5c236108bf38d8639
 Size (wistumbler2-2.0pre10.tar.gz) = 45972 bytes
 SHA1 (patch-aa) = 0b5c4409489d334f235373b67dcb3344f7839ea2
 SHA1 (patch-ab) = de998de5ac130b42c068ecefcd179644e3f8c0b9
-SHA1 (patch-ac) = 039363ed35c94c971187d9bf98f97c7560b3fbeb
+SHA1 (patch-ac) = a2adc57c034dcde0c2105aaff4e0721b17d83a7b
 SHA1 (patch-ad) = caae5b0afe7e9a1650f0954e88d6e152e98ad77a
 SHA1 (patch-ae) = 04ff3efea6225917e872522eb3fabcb0a0e83eeb
 SHA1 (patch-af) = a024d16ffd945f609a1c15077438c0ea419e1023
diff --git a/net/wistumbler2/patches/patch-ac b/net/wistumbler2/patches/patch-ac
index 2bc18cbfb5e..b587b44c0e6 100644
--- a/net/wistumbler2/patches/patch-ac
+++ b/net/wistumbler2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2006/01/08 21:22:58 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2011/01/03 07:38:59 obache Exp $
 
 --- src/stumbler.h.orig	2006-01-08 21:09:38.000000000 +0000
 +++ src/stumbler.h
@@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.3 2006/01/08 21:22:58 joerg Exp $
 +#elif defined(__DragonFly__)
 +#include <netproto/802_11/ieee80211.h>
 +#include <net/ethernet.h>
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
  #elif defined(__OpenBSD__)
  #include "cdefs.h"
  #include <sys/socket.h>
diff --git a/net/xfce4-wavelan-plugin/distinfo b/net/xfce4-wavelan-plugin/distinfo
index bc9853a8183..789ad965753 100644
--- a/net/xfce4-wavelan-plugin/distinfo
+++ b/net/xfce4-wavelan-plugin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/04/16 15:42:03 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/01/03 07:38:59 obache Exp $
 
 SHA1 (xfce4-wavelan-plugin-0.5.4.tar.gz) = d45d8a13a1512fdb74aacf09c5b6ae99c4743fdd
 RMD160 (xfce4-wavelan-plugin-0.5.4.tar.gz) = 30d4893812004cfe0cf115790eb72daf92b4db5f
 Size (xfce4-wavelan-plugin-0.5.4.tar.gz) = 596378 bytes
-SHA1 (patch-aa) = e38c49773a4e6890d75d17a7fea905d655baee4d
+SHA1 (patch-aa) = 13c3fa4e0d50419e5b77c8c7bf9d07b367ec69dc
diff --git a/net/xfce4-wavelan-plugin/patches/patch-aa b/net/xfce4-wavelan-plugin/patches/patch-aa
index d2bef74dbc3..314f2218a9b 100644
--- a/net/xfce4-wavelan-plugin/patches/patch-aa
+++ b/net/xfce4-wavelan-plugin/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2007/04/16 15:42:03 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2011/01/03 07:38:59 obache Exp $
 
 --- panel-plugin/wi_bsd.c.orig	2007-04-16 14:57:08.000000000 +0000
 +++ panel-plugin/wi_bsd.c
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/16 15:42:03 joerg Exp $
 +#elif defined(__DragonFly__)
 +#include <net/if_var.h>
 +#include <net/ethernet.h>
-+#include <netproto/802_11/if_wavelan_ieee.h>
++#include <dev/netif/wi/if_wavelan_ieee.h>
 +#include <sys/endian.h>
  #else
  #include <netinet/in.h>