CVS commit: pkgsrc/net/xfce4-wavelan-plugin

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Tue Jun 20 22:30:56 UTC 2017

Modified Files:
        pkgsrc/net/xfce4-wavelan-plugin: Makefile distinfo
        pkgsrc/net/xfce4-wavelan-plugin/patches: patch-panel-plugin_wi__bsd.c

Log Message:
Update xfce4-wavelan-plugin to 0.6.0:

0.6.0 (2016/11/01):
---------
  * set progressbar minimal width/height so that it looks like with gtk+2
  * updated translations


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/xfce4-wavelan-plugin/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/xfce4-wavelan-plugin/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/xfce4-wavelan-plugin/Makefile
diff -u pkgsrc/net/xfce4-wavelan-plugin/Makefile:1.43 pkgsrc/net/xfce4-wavelan-plugin/Makefile:1.44
--- pkgsrc/net/xfce4-wavelan-plugin/Makefile:1.43       Sun Feb 12 06:25:54 2017
+++ pkgsrc/net/xfce4-wavelan-plugin/Makefile    Tue Jun 20 22:30:56 2017
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2017/02/12 06:25:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2017/06/20 22:30:56 youri Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=      xfce4-wavelan-plugin-0.5.12
+DISTNAME=      xfce4-wavelan-plugin-0.6.0
 CATEGORIES=    sysutils
-MASTER_SITES=  http://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.5/
+MASTER_SITES=  http://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/
 
 HOMEPAGE=      http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
 COMMENT=       Xfce WLAN plugin

Index: pkgsrc/net/xfce4-wavelan-plugin/distinfo
diff -u pkgsrc/net/xfce4-wavelan-plugin/distinfo:1.11 pkgsrc/net/xfce4-wavelan-plugin/distinfo:1.12
--- pkgsrc/net/xfce4-wavelan-plugin/distinfo:1.11       Wed Nov  4 00:35:46 2015
+++ pkgsrc/net/xfce4-wavelan-plugin/distinfo    Tue Jun 20 22:30:56 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 00:35:46 agc Exp $
+$NetBSD: distinfo,v 1.12 2017/06/20 22:30:56 youri Exp $
 
-SHA1 (xfce4-wavelan-plugin-0.5.12.tar.bz2) = f7437b48ea06a4d75e00d345b9aa5d28f863727a
-RMD160 (xfce4-wavelan-plugin-0.5.12.tar.bz2) = 7e83246743e137e7f8e6ea4a398edc79375fd5ad
-SHA512 (xfce4-wavelan-plugin-0.5.12.tar.bz2) = a25c6c576c5f8a76bb595137cf92fb6e18c7f5807bbe203d11cafdcbfdb9f6a4d8b7fd2322f448dab307eeb5067d44d1e41393b4aeb71fc1f0deca72af7c67cd
-Size (xfce4-wavelan-plugin-0.5.12.tar.bz2) = 302148 bytes
-SHA1 (patch-panel-plugin_wi__bsd.c) = 891df958216419eb3eb66eb0a229e3e6c574ad12
+SHA1 (xfce4-wavelan-plugin-0.6.0.tar.bz2) = 1f59e309638d40676226dc4ad86991841cca43f1
+RMD160 (xfce4-wavelan-plugin-0.6.0.tar.bz2) = e1392a374a9d40303499fe7e63c2a83e666c91ed
+SHA512 (xfce4-wavelan-plugin-0.6.0.tar.bz2) = 50dd069902d69071f0d4ab7036fa451ae6cdaca9fbeb56255d58a5864d4e4b3749267b1cc4b411e1073daac9678554f3d483d30aba759ef161425ba3cdd0306e
+Size (xfce4-wavelan-plugin-0.6.0.tar.bz2) = 303220 bytes
+SHA1 (patch-panel-plugin_wi__bsd.c) = d54a9cd0aff21461331f87b9e5f0a3acde5a7284

Index: pkgsrc/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c
diff -u pkgsrc/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c:1.1 pkgsrc/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c:1.2
--- pkgsrc/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c:1.1    Tue Apr 21 08:56:39 2015
+++ pkgsrc/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c        Tue Jun 20 22:30:56 2017
@@ -1,7 +1,8 @@
-$NetBSD: patch-panel-plugin_wi__bsd.c,v 1.1 2015/04/21 08:56:39 jperkin Exp $
+$NetBSD: patch-panel-plugin_wi__bsd.c,v 1.2 2017/06/20 22:30:56 youri Exp $
 
-Add NetBSD support.
---- panel-plugin/wi_bsd.c.orig 2012-04-09 16:45:20.000000000 +0000
+Add NetBSD support and fix FreeBSD.
+
+--- panel-plugin/wi_bsd.c.orig 2016-05-01 15:53:40.000000000 +0000
 +++ panel-plugin/wi_bsd.c
 @@ -26,14 +26,9 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -57,16 +58,16 @@ Add NetBSD support.
  #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
- 
+@@ -164,7 +149,7 @@ wi_query(struct wi_device *device, struc
    strlcpy(stats->ws_qunit, "dBm", 4);
+ #endif
    /* 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,
+@@ -305,12 +290,10 @@ _wi_rate(const struct wi_device *device,
  }
  #endif
  
@@ -80,7 +81,7 @@ Add NetBSD support.
     /*
      * We use sysctl to get a device description
      */
-@@ -316,59 +299,30 @@ _wi_vendor(const struct wi_device *devic
+@@ -327,59 +310,30 @@ _wi_vendor(const struct wi_device *devic
     dev_number = (int)strtol(c, NULL, 10);
     *c = '\0';
  
@@ -157,7 +158,7 @@ Add NetBSD support.
  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
+@@ -404,7 +358,9 @@ _wi_getval(const struct wi_device *devic
  
     return(WI_OK);
  }
@@ -168,7 +169,7 @@ Add NetBSD support.
  static int
  _wi_getval(const struct wi_device *device, struct wi_req *wr)
  {
-@@ -409,10 +365,11 @@ _wi_getval(const struct wi_device *devic
+@@ -420,10 +376,11 @@ _wi_getval(const struct wi_device *devic
    return(WI_OK);
  }
  #endif
@@ -181,7 +182,7 @@ Add NetBSD support.
     struct ieee80211req ireq;
  
     memset(&ireq, 0, sizeof(ireq));
-@@ -423,7 +380,7 @@ _wi_netname(const struct wi_device *devi
+@@ -434,7 +391,7 @@ _wi_netname(const struct wi_device *devi
     ireq.i_len = len; 
     if (ioctl(device->socket, SIOCG80211, &ireq) < 0) 
        return WI_NOSUCHDEV;
@@ -190,7 +191,7 @@ Add NetBSD support.
    struct wi_req wr;
    int result;
  
-@@ -443,7 +400,7 @@ _wi_netname(const struct wi_device *devi
+@@ -454,7 +411,7 @@ _wi_netname(const struct wi_device *devi
  static int
  _wi_quality(const struct wi_device *device, int *quality)
  {
@@ -199,7 +200,7 @@ Add NetBSD support.
     struct ieee80211req_scan_result req;
     int result;
     bzero(&req, sizeof(req));
-@@ -451,8 +408,16 @@ _wi_quality(const struct wi_device *devi
+@@ -462,8 +419,16 @@ _wi_quality(const struct wi_device *devi
     if((result = _wi_getval(device, &req)) != WI_OK)
        return (result);
  
@@ -218,7 +219,7 @@ Add NetBSD support.
    struct wi_req wr;
    int result;
  
-@@ -475,7 +440,7 @@ _wi_quality(const struct wi_device *devi
+@@ -486,7 +451,7 @@ _wi_quality(const struct wi_device *devi
  static int
  _wi_rate(const struct wi_device *device, int *rate)
  {
@@ -227,7 +228,7 @@ Add NetBSD support.
     struct ieee80211req_scan_result req;
     int result, i, high;
     bzero(&req, sizeof(req));
-@@ -488,7 +453,7 @@ _wi_rate(const struct wi_device *device,
+@@ -499,7 +464,7 @@ _wi_rate(const struct wi_device *device,
           high = req.isr_rates[i] & IEEE80211_RATE_VAL;
     
     *rate = high / 2;
@@ -236,7 +237,7 @@ Add NetBSD support.
    struct wi_req wr;
    int result;
  
-@@ -505,5 +470,4 @@ _wi_rate(const struct wi_device *device,
+@@ -516,5 +481,4 @@ _wi_rate(const struct wi_device *device,
    return(WI_OK);
  }