Date: Fri, 31 Jan 2014 10:07:24 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341971 - in head/sysutils/xfce4-wavelan-plugin: . files Message-ID: <201401311007.s0VA7OqZ042104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Fri Jan 31 10:07:24 2014 New Revision: 341971 URL: http://svnweb.freebsd.org/changeset/ports/341971 QAT: https://qat.redports.org/buildarchive/r341971/ Log: - Update to 0.5.11 - Replace USE_GMAKE by USES= gmake - Support STAGEDIR - Adjust dependencies Added: head/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin__wi_bsd.c (contents, props changed) Deleted: head/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c head/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi_bsd.c Modified: head/sysutils/xfce4-wavelan-plugin/Makefile head/sysutils/xfce4-wavelan-plugin/distinfo head/sysutils/xfce4-wavelan-plugin/pkg-descr head/sysutils/xfce4-wavelan-plugin/pkg-plist Modified: head/sysutils/xfce4-wavelan-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-wavelan-plugin/Makefile Fri Jan 31 10:02:39 2014 (r341970) +++ head/sysutils/xfce4-wavelan-plugin/Makefile Fri Jan 31 10:07:24 2014 (r341971) @@ -1,30 +1,20 @@ # Created by: Manuel Rabade Garica <mig@mig-29.net> # $FreeBSD$ -# $MCom: ports/sysutils/xfce4-wavelan-plugin/Makefile,v 1.1 2006/10/02 20:43:59 ahze Exp $ PORTNAME= xfce4-wavelan-plugin -PORTVERSION= 0.5.4 -PORTREVISION= 18 +PORTVERSION= 0.5.11 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Displays various information about a WaveLAN device -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png - +USE_BZIP2= yes GNU_CONFIGURE= yes -USES= gettext pkgconfig -USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libutil libgui panel - -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \ - s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \ - ${WRKSRC}/configure +USES= gettext pkgconfig gmake +USE_GNOME= gtk20 glib20 intltool intlhack +USE_XFCE= configenv libutil libmenu panel .include <bsd.port.mk> Modified: head/sysutils/xfce4-wavelan-plugin/distinfo ============================================================================== --- head/sysutils/xfce4-wavelan-plugin/distinfo Fri Jan 31 10:02:39 2014 (r341970) +++ head/sysutils/xfce4-wavelan-plugin/distinfo Fri Jan 31 10:07:24 2014 (r341971) @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-wavelan-plugin-0.5.4.tar.gz) = 5b8c5ea37561cc32f10b3aebac67cf14fc9216b748e194f3676f26d42a4f1c05 -SIZE (xfce4/xfce4-wavelan-plugin-0.5.4.tar.gz) = 596378 +SHA256 (xfce4/xfce4-wavelan-plugin-0.5.11.tar.bz2) = fe06c7ffc29c2d4ca7bc452b3356825354e276565de9b0a2d087ab55471755ae +SIZE (xfce4/xfce4-wavelan-plugin-0.5.11.tar.bz2) = 293840 Added: head/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin__wi_bsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin__wi_bsd.c Fri Jan 31 10:07:24 2014 (r341971) @@ -0,0 +1,151 @@ +--- ./panel-plugin/wi_bsd.c.orig 2012-04-09 16:45:20.000000000 +0000 ++++ ./panel-plugin/wi_bsd.c 2014-01-31 09:31:51.000000000 +0000 +@@ -52,10 +52,6 @@ + #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__ +@@ -111,8 +107,6 @@ + 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); +@@ -319,46 +313,6 @@ + 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); +@@ -393,21 +347,6 @@ + + return(WI_OK); + } +-#else +-static int +-_wi_getval(const struct wi_device *device, struct wi_req *wr) +-{ +- struct ifreq ifr; +- +- bzero((void*)&ifr, sizeof(ifr)); +- strlcpy(ifr.ifr_name, device->interface, sizeof(ifr.ifr_name)); +- ifr.ifr_data = (void*)wr; +- +- if (ioctl(device->socket, SIOCGWAVELAN, &ifr) < 0) +- return(WI_NOSUCHDEV); +- +- return(WI_OK); +-} + #endif + static int + _wi_netname(const struct wi_device *device, char *buffer, size_t len) +@@ -423,18 +362,6 @@ + ireq.i_len = len; + if (ioctl(device->socket, SIOCG80211, &ireq) < 0) + return WI_NOSUCHDEV; +-#else +- struct wi_req wr; +- int result; +- +- bzero((void *)&wr, sizeof(wr)); +- wr.wi_len = WI_MAX_DATALEN; +- wr.wi_type = WI_RID_CURRENT_SSID; +- +- if ((result = _wi_getval(device, &wr)) != WI_OK) +- return(result); +- +- strlcpy(buffer, (char *)&wr.wi_val[1], MIN(len, le16toh(wr.wi_val[0]) + 1)); + #endif + + return(WI_OK); +@@ -452,21 +379,6 @@ + return (result); + + *quality = req.isr_rssi; +-#else +- struct wi_req wr; +- int result; +- +- bzero((void *)&wr, sizeof(wr)); +- wr.wi_len = WI_MAX_DATALEN; +- wr.wi_type = WI_RID_COMMS_QUALITY; +- +- if ((result = _wi_getval(device, &wr)) != WI_OK) +- return(result); +- +- /* according to various implementation (conky, ifconfig) : +- wi_val[0] = quality, wi_val[1] = signal, wi_val[2] = noise +- but my ral only shows a value for signal, and it seems it's a dB value */ +- *quality = le16toh(wr.wi_val[1]); + #endif + + return(WI_OK); +@@ -488,18 +400,6 @@ + high = req.isr_rates[i] & IEEE80211_RATE_VAL; + + *rate = high / 2; +-#else +- struct wi_req wr; +- int result; +- +- bzero((void *)&wr, sizeof(wr)); +- wr.wi_len = WI_MAX_DATALEN; +- wr.wi_type = WI_RID_CUR_TX_RATE; +- +- if ((result = _wi_getval(device, &wr)) != WI_OK) +- return(result); +- +- *rate = le16toh(wr.wi_val[0]); + #endif + + return(WI_OK); Modified: head/sysutils/xfce4-wavelan-plugin/pkg-descr ============================================================================== --- head/sysutils/xfce4-wavelan-plugin/pkg-descr Fri Jan 31 10:02:39 2014 (r341970) +++ head/sysutils/xfce4-wavelan-plugin/pkg-descr Fri Jan 31 10:07:24 2014 (r341971) @@ -1,4 +1,4 @@ -WaveLAN plugin for the XFce4 panel. +WaveLAN plugin for the Xfce4 panel. Displays various information about a WaveLAN device: Modified: head/sysutils/xfce4-wavelan-plugin/pkg-plist ============================================================================== --- head/sysutils/xfce4-wavelan-plugin/pkg-plist Fri Jan 31 10:02:39 2014 (r341970) +++ head/sysutils/xfce4-wavelan-plugin/pkg-plist Fri Jan 31 10:07:24 2014 (r341971) @@ -1,15 +1,54 @@ -libexec/xfce4/panel-plugins/xfce4-wavelan-plugin +lib/xfce4/panel/plugins/libwavelan.la +lib/xfce4/panel/plugins/libwavelan.so +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 -@dirrmtry share/xfce4/panel-plugins -@dirrmtry share/xfce4 -@dirrmtry libexec/xfce4/panel-plugins -@dirrmtry libexec/xfce4 +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 +@dirrmtry share/xfce4/panel/plugins +@dirrmtry share/locale/ur_PK/LC_MESSAGES +@dirrmtry share/locale/ur_PK +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry lib/xfce4/panel/plugins
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401311007.s0VA7OqZ042104>