Update Xfce to 4.12.0.

This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release.  For more information
about the thousands of changes in each major release since then, please see:

  Xfce 4.12 announcement:
    http://www.xfce.org/about/news

  Xfce 4.12 tour:
    http://www.xfce.org/about/tour

  Xfce 4.10 announcement:
    http://www.xfce.org/about/news/?post=1335571200

  Xfce 4.10 tour:
    http://www.xfce.org/about/tour410

  Xfce 4.8 announcement:
    http://www.xfce.org/about/news/?post=1295136000

  Xfce 4.8 tour:
    http://www.xfce.org/about/tour48

The pkgsrc changes since then are:

  New packages:
    archivers/xfce4-thunar-archive
    graphics/elementary-xfce-icon-theme
    mail/xfce4-mailwatch-plugin
    misc/xfce4-time-out-plugin
    multimedia/xfce4-thunar-media-tags
    sysutils/xfce4-mount-plugin
    sysutils/xfce4-taskmanager
    sysutils/xfce4-thunar-vcs
    sysutils/xfce4-verve-plugin
    x11/xfce4-garcon
    x11/xfce4-notifyd
    x11/xfce4-tumbler
    x11/xfce4-whiskermenu-plugin

  Renamed packages:
    devel/xfconf to devel/xfce4-conf
    x11/libxfce4menu to x11/libxfce4ui
    x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter

  Updated packages:
    audio/xfce4-mixer
    audio/xfce4-xmms-plugin
    devel/xfce4-dev-tools
    editors/xfce4-mousepad
    graphics/ristretto
    meta-pkgs/xfce4-extras
    meta-pkgs/xfce4
    misc/xfce4-weather-plugin
    multimedia/xfce4-mpc-plugin
    net/xfce4-wavelan-plugin
    sysutils/xfce4-appfinder
    sysutils/xfce4-battery-plugin
    sysutils/xfce4-cpugraph-plugin
    sysutils/xfce4-diskperf-plugin
    sysutils/xfce4-fsguard-plugin
    sysutils/xfce4-genmon-plugin
    sysutils/xfce4-netload-plugin
    sysutils/xfce4-quicklauncher-plugin
    sysutils/xfce4-systemload-plugin
    sysutils/xfce4-thunar
    sysutils/xfce4-xarchiver
    sysutils/xfce4-xkb-plugin
    textproc/xfce4-dict-plugin
    time/xfce4-datetime-plugin
    time/xfce4-orage
    time/xfce4-timer-plugin
    wm/xfce4-wm-themes
    wm/xfce4-wm
    x11/libxfce4gui
    x11/libxfce4util
    x11/xfce4-clipman-plugin
    x11/xfce4-desktop
    x11/xfce4-exo
    x11/xfce4-eyes-plugin
    x11/xfce4-gtk2-engine
    x11/xfce4-notes-plugin
    x11/xfce4-panel
    x11/xfce4-places-plugin
    x11/xfce4-session
    x11/xfce4-settings
    x11/xfce4-terminal

  Removed packages:
    sysutils/xfce4-volman
    x11/xfce4-utils

This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit.  A massive thanks to them.  Any issues with the
import are mine alone as the committer-by-proxy.

6 files changed, 287 insertions, 80 deletions

diff --git a/net/xfce4-wavelan-plugin/Makefile b/net/xfce4-wavelan-plugin/Makefile
index 8cfd1ae1ca5..ff92d280af7 100644
--- a/net/xfce4-wavelan-plugin/Makefile
+++ b/net/xfce4-wavelan-plugin/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.37 2014/05/05 00:48:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/21 08:56:39 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.5.4
-
-DISTNAME=	xfce4-wavelan-plugin-${XFCE4_VERSION}
-EXTRACT_SUFX=	.tar.gz
-PKGREVISION=	21
+DISTNAME=	xfce4-wavelan-plugin-0.5.11
 CATEGORIES=	sysutils
-MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-wavelan-plugin/
+MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.5/
+
+HOMEPAGE=	http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
 COMMENT=	Xfce WLAN plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/net/xfce4-wavelan-plugin/PLIST b/net/xfce4-wavelan-plugin/PLIST
index c00010003b7..13ef7b52f30 100644
--- a/net/xfce4-wavelan-plugin/PLIST
+++ b/net/xfce4-wavelan-plugin/PLIST
@@ -1,12 +1,42 @@
-@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:11 martti Exp $
-libexec/xfce4/panel-plugins/xfce4-wavelan-plugin
+@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:39 jperkin Exp $
+lib/xfce4/panel/plugins/libwavelan.la
+share/locale/ar/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/be/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/da/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/es/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/eu/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/fr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/hr/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/hu/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/id/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/it/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/ja/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/kk/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/ko/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/lv/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/nb/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/pl/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/pt/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/sq/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/tr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ug/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ur/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/locale/vi/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/xfce4/panel-plugins/wavelan.desktop
+share/locale/zh_CN/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/xfce4/panel/plugins/wavelan.desktop
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
deleted file mode 100644
index 62f18062023..00000000000
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.38 2014/05/05 00:48:16 ryoon Exp $
-
-BUILDLINK_TREE+=	xfce4-wavelan-plugin
-
-.if !defined(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK)
-XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.5.3
-BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.5.4nb21
-BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
-
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-wavelan-plugin
diff --git a/net/xfce4-wavelan-plugin/distinfo b/net/xfce4-wavelan-plugin/distinfo
index 789ad965753..4ce537b2673 100644
--- a/net/xfce4-wavelan-plugin/distinfo
+++ b/net/xfce4-wavelan-plugin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2011/01/03 07:38:59 obache Exp $
+$NetBSD: distinfo,v 1.9 2015/04/21 08:56:39 jperkin 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) = 13c3fa4e0d50419e5b77c8c7bf9d07b367ec69dc
+SHA1 (xfce4-wavelan-plugin-0.5.11.tar.bz2) = 18e080897eecdcd44abfa877820b6f9c0d506ca3
+RMD160 (xfce4-wavelan-plugin-0.5.11.tar.bz2) = 6164c493e9515bcb846e14d9528eee917d6ceef9
+Size (xfce4-wavelan-plugin-0.5.11.tar.bz2) = 293840 bytes
+SHA1 (patch-panel-plugin_wi__bsd.c) = 891df958216419eb3eb66eb0a229e3e6c574ad12
diff --git a/net/xfce4-wavelan-plugin/patches/patch-aa b/net/xfce4-wavelan-plugin/patches/patch-aa
deleted file mode 100644
index 314f2218a9b..00000000000
--- a/net/xfce4-wavelan-plugin/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$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
-@@ -24,7 +24,7 @@
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) 
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
- 
- #include <sys/types.h>
- #include <sys/cdefs.h>
-@@ -43,22 +43,24 @@
- #if __FreeBSD_version >= 500033
- #include <sys/endian.h>
- #endif
-+#elif defined(__DragonFly__)
-+#include <net/if_var.h>
-+#include <net/ethernet.h>
-+#include <dev/netif/wi/if_wavelan_ieee.h>
-+#include <sys/endian.h>
- #else
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
- #ifdef __NetBSD__
--#include <net80211/ieee80211.h>
--#include <net80211/ieee80211_ioctl.h>
--#include <dev/ic/wi_ieee.h>
-+#  include <net80211/ieee80211.h>
-+#  include <net80211/ieee80211_ioctl.h>
-+#  include <dev/ic/wi_ieee.h>
-+#elif defined(__OpenBSD__)
-+#  include <net/if_ieee80211.h>
-+#  include <dev/ic/if_wi_ieee.h>
-+#  define le16toh(x) letoh16(x)
- #else
--#if !defined(__OpenBSD__)
--#include <dev/pcmcia/if_wavelan_ieee.h>
--#endif
--#endif
--#ifdef __OpenBSD__
--#include <net/if_ieee80211.h>
--#include <dev/ic/if_wi_ieee.h>
--#define le16toh(x) letoh16(x)
-+#  include <dev/pcmcia/if_wavelan_ieee.h>
- #endif
- #endif
- 
diff --git a/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c b/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c
new file mode 100644
index 00000000000..daaf0fe9f8e
--- /dev/null
+++ b/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c
@@ -0,0 +1,244 @@
+$NetBSD: patch-panel-plugin_wi__bsd.c,v 1.1 2015/04/21 08:56:39 jperkin Exp $
+
+Add NetBSD support.
+--- panel-plugin/wi_bsd.c.orig	2012-04-09 16:45:20.000000000 +0000
++++ panel-plugin/wi_bsd.c
+@@ -26,14 +26,9 @@
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#if !defined(__FreeBSD_kernel__) && defined(__FreeBSD__)
+-#define __FreeBSD_kernel__ __FreeBSD__
+-#endif
+-#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
+-#define __FreeBSD_kernel_version __FreeBSD_version
+-#endif
++#include <sys/param.h>
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD_kernel_kernel__) || defined(__OpenBSD__) 
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) 
+ 
+ #include <sys/types.h>
+ #include <sys/cdefs.h>
+@@ -44,20 +39,14 @@
+ 
+ #include <net/if.h>
+ #include <net/if_media.h>
+-#ifdef __FreeBSD_kernel__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <netinet/in.h>
+ #include <netinet/if_ether.h>
+ #include <sys/endian.h>
+-#if __FreeBSD_kernel_version >= 700000
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #include <net80211/ieee80211_ioctl.h>
+ #else
+-#include <net/if_var.h>
+-#include <net/ethernet.h>
+-#include <dev/wi/if_wavelan_ieee.h>
+-#endif
+-#else
+ #ifdef __NetBSD__
+ #include <net80211/ieee80211.h>
+ #include <net80211/ieee80211_ioctl.h>
+@@ -107,13 +96,9 @@ struct wi_device
+ };
+ 
+ static int _wi_carrier(const struct wi_device *);
+-#if defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ static int _wi_vendor(const struct wi_device *, char *, size_t);
+-#if __FreeBSD_kernel_version > 700000
+ static int _wi_getval(const struct wi_device *, struct ieee80211req_scan_result *);
+-#else
+-static int _wi_getval(const struct wi_device *, struct wi_req *);
+-#endif
+ #endif
+ static int _wi_netname(const struct wi_device *, char *, size_t);
+ static int _wi_quality(const struct wi_device *, int *);
+@@ -160,7 +145,7 @@ wi_query(struct wi_device *device, struc
+ 
+   strlcpy(stats->ws_qunit, "dBm", 4);
+   /* check vendor (independent of carrier state) */
+-#if defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+   if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK)
+     return(result);
+ #endif
+@@ -294,12 +279,10 @@ _wi_rate(const struct wi_device *device,
+ }
+ #endif
+ 
+-/* seems only FreeBSD supports this operation */
+-#if defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ static int
+ _wi_vendor(const struct wi_device *device, char *buffer, size_t len)
+ {
+-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+    /*
+     * We use sysctl to get a device description
+     */
+@@ -316,59 +299,30 @@ _wi_vendor(const struct wi_device *devic
+    dev_number = (int)strtol(c, NULL, 10);
+    *c = '\0';
+ 
++   /*
++    * Also, wlan doesn't present dev.wlan.N.%desc, need to use
++    * underlying driver name, instead: dev.ath.0.%desc, so we
++    * need to get the parent's name.
++    */
++   if(strcmp(dev_name, "wlan") == 0) {
++      snprintf(mib, sizeof(mib), "net.%s.%d.%%parent", dev_name, dev_number);
++      if(sysctlbyname(mib, dev_name, &len, NULL, 0) == -1)
++         return (WI_NOSUCHDEV);
++
++      c = dev_name;
++      while(!isdigit(*c)) c++;
++      dev_number = (int)strtol(c, NULL, 10);
++      *c = '\0';
++      len = WI_MAXSTRLEN;
++   }
++
+    snprintf(mib, sizeof(mib), "dev.%s.%d.%%desc", dev_name, dev_number);
+    if(sysctlbyname(mib, buffer, &len, NULL, 0) == -1)
+       return (WI_NOSUCHDEV);
+-#else
+-#define WI_RID_STA_IDENTITY_LUCENT	0x1
+-#define WI_RID_STA_IDENTITY_PRISMII	0x2
+-#define WI_RID_STA_IDENTITY_SAMSUNG	0x3
+-#define WI_RID_STA_IDENTITY_DLINK	0x6
+-  const char* vendor = "Unknown";
+-  struct wi_req wr;
+-  int result;
+-
+-  bzero((void*)&wr, sizeof(wr));
+-  wr.wi_len = WI_MAX_DATALEN;
+-  wr.wi_type = WI_RID_STA_IDENTITY;
+-
+-  if ((result = _wi_getval(device, &wr)) != WI_OK){
+-    /* For the Atheros, IDENTITY does not work. */
+-    if (strcmp(device->interface, "ath") != 0)
+-      return(result);
+-  }
+-  else if (wr.wi_len < 4)
+-    return(WI_NOSUCHDEV);
+-
+-  switch (wr.wi_val[1]) {
+-  case WI_RID_STA_IDENTITY_LUCENT:
+-    vendor = "Lucent";
+-    break;
+-
+-  case WI_RID_STA_IDENTITY_PRISMII:
+-    vendor = "generic PRISM II";
+-    break;
+-
+-  case WI_RID_STA_IDENTITY_SAMSUNG:
+-		vendor = "Samsung";
+-		break;
+-	case WI_RID_STA_IDENTITY_DLINK:
+-		vendor = "D-Link";
+-		break;
+-  }
+-
+-  snprintf(buffer, len, "%s (ID %d, version %d.%d)", vendor,
+-      wr.wi_val[0], wr.wi_val[2], wr.wi_val[3]);
+-#endif
+ 
+   return(WI_OK);
+ }
+-#endif /* wi_vendor */
+ 
+-/* NetBSD and FreeBSD 6.x uses old wi_* API */
+-#if defined(__NetBSD__) || defined(__FreeBSD_kernel__)
+-/* FreeBSD 7.x use its own new iee80211 API */
+-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+ static int
+ _wi_getval(const struct wi_device *device, struct ieee80211req_scan_result *scan)
+ {
+@@ -393,7 +347,9 @@ _wi_getval(const struct wi_device *devic
+ 
+    return(WI_OK);
+ }
+-#else
++#endif
++
++#if defined(__NetBSD__)
+ static int
+ _wi_getval(const struct wi_device *device, struct wi_req *wr)
+ {
+@@ -409,10 +365,11 @@ _wi_getval(const struct wi_device *devic
+   return(WI_OK);
+ }
+ #endif
++
+ static int
+ _wi_netname(const struct wi_device *device, char *buffer, size_t len)
+ {
+-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    struct ieee80211req ireq;
+ 
+    memset(&ireq, 0, sizeof(ireq));
+@@ -423,7 +380,7 @@ _wi_netname(const struct wi_device *devi
+    ireq.i_len = len; 
+    if (ioctl(device->socket, SIOCG80211, &ireq) < 0) 
+       return WI_NOSUCHDEV;
+-#else
++#elif defined(__NetBSD__)
+   struct wi_req wr;
+   int result;
+ 
+@@ -443,7 +400,7 @@ _wi_netname(const struct wi_device *devi
+ static int
+ _wi_quality(const struct wi_device *device, int *quality)
+ {
+-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    struct ieee80211req_scan_result req;
+    int result;
+    bzero(&req, sizeof(req));
+@@ -451,8 +408,16 @@ _wi_quality(const struct wi_device *devi
+    if((result = _wi_getval(device, &req)) != WI_OK)
+       return (result);
+ 
+-   *quality = req.isr_rssi;
+-#else
++   /*
++    * FreeBSD's wlan stats:
++    *	signal (in dBm) = rssi * 2 + noise;
++    *	quality_bars    = 4 * (signal - noise);
++    * or
++    *	quality_bars    = rssi * 8;
++    * but, per wi_query(), above, we need to return strength in dBm, so... 
++    */
++   *quality = req.isr_rssi * 2 + req.isr_noise;
++#elif defined(__NetBSD__)
+   struct wi_req wr;
+   int result;
+ 
+@@ -475,7 +440,7 @@ _wi_quality(const struct wi_device *devi
+ static int
+ _wi_rate(const struct wi_device *device, int *rate)
+ {
+-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    struct ieee80211req_scan_result req;
+    int result, i, high;
+    bzero(&req, sizeof(req));
+@@ -488,7 +453,7 @@ _wi_rate(const struct wi_device *device,
+          high = req.isr_rates[i] & IEEE80211_RATE_VAL;
+    
+    *rate = high / 2;
+-#else
++#elif defined(__NetBSD__)
+   struct wi_req wr;
+   int result;
+ 
+@@ -505,5 +470,4 @@ _wi_rate(const struct wi_device *device,
+   return(WI_OK);
+ }
+ 
+-#endif  /* defined(__NetBSD__) || defined(__FreeBSD_kernel__) */
+ #endif