Date: Fri, 5 Jul 2013 20:39:40 GMT From: Kevin Zheng <kevinz5000@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180333: [patch] Update net/wpa_gui to 0.7.3 Message-ID: <201307052039.r65KdeSP060229@oldred.freebsd.org> Resent-Message-ID: <201307052040.r65Ke0op058456@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180333 >Category: ports >Synopsis: [patch] Update net/wpa_gui to 0.7.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jul 05 20:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Kevin Zheng >Release: 9.1-RELEASE-p4 >Organization: >Environment: FreeBSD sigma.local 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:38:17 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: wpa_gui is way behind the base wpa_supplicant version. I've decided to update wpa_gui to version 0.7.3, which is the version of wpa_supplicant included in the FreeBSD 9.X branch. FreeBSD 8.X uses 0.6.8, but these are close enough to be cross-compatible. The new version fixes several roaming bugs and includes a slightly improved user interface. I've taken the liberty to add PNG icon support because some desktop environments don't like SVG (e.g. XFCE). The committer should put a copy of both distfiles into the FreeBSD mirror, as I don't trust my personal website (keep it as a MASTER_SITE, though). Summary of changes: - Update to 0.7.3 - Add a distfile that includes the wpa_gui's icons in PNG format - Remove dependency on qt3support (this is "wpa_gui-qt4") - Switch to included desktop icon instead of DESKTOP_ENTRIES - Replace tab with space in pkg-decr on the WWW line - Use pkg-plist because we need @dirrmtry >How-To-Repeat: >Fix: Apply the attached patch. Patch attached with submission follows: diff -ruN /usr/ports/net/wpa_gui/Makefile ./Makefile --- /usr/ports/net/wpa_gui/Makefile 2013-02-22 05:50:28.000000000 -0600 +++ ./Makefile 2013-07-05 15:28:05.000000000 -0500 @@ -1,30 +1,36 @@ # Created by: Ilya Bakulin <webmaster@kibab.com> -# $FreeBSD: ports/net/wpa_gui/Makefile,v 1.6 2013/02/22 11:50:28 svnexp Exp $ +# $FreeBSD: head/net/wpa_gui/Makefile 312761 2013-02-22 10:58:15Z makc $ PORTNAME= wpa_gui -PORTVERSION= 0.5.11 -PORTREVISION= 3 +PORTVERSION= 0.7.3 CATEGORIES= net -MASTER_SITES= http://hostap.epitest.fi/releases/ +MASTER_SITES= http://hostap.epitest.fi/releases/ \ + http://quasarp.dyndns.org/dist/freebsd/:icons DISTNAME= wpa_supplicant-${PORTVERSION} +DISTFILES= ${DISTNAME}.tar.gz \ + wpa-gui-icons.tar.gz:icons MAINTAINER= webmaster@kibab.com COMMENT= Qt-based frontend for wpa_supplicant -PLIST_FILES= sbin/${PORTNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/wpa_gui-qt4 -USE_QT4= gui qt3support qmake_build moc_build uic_build -QMAKE_ARGS+= PREFIX=${PREFIX} HAS_CONFIGURE= yes MAKE_JOBS_SAFE= yes +USE_QT4= gui moc_build qmake_build rcc_build uic_build +WRKSRC= ${WRKDIR}/${DISTNAME}/wpa_supplicant/wpa_gui-qt4 -DESKTOP_ENTRIES= "${PORTNAME}" "Frontend for WPA Supplicant" "" \ - "${PORTNAME}" "System;Qt;" "true" +post-patch: + @${REINPLACE_CMD} -e "s|Exec=wpa_gui|Exec=${PREFIX}/sbin/wpa_gui|" \ + ${WRKSRC}/wpa_gui.desktop + ${MV} ${WRKDIR}/icons/hicolor ${WRKSRC}/icons do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin + @${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg ${PREFIX}/share/pixmaps .include <bsd.port.mk> diff -ruN /usr/ports/net/wpa_gui/distinfo ./distinfo --- /usr/ports/net/wpa_gui/distinfo 2011-03-20 07:53:16.000000000 -0500 +++ ./distinfo 2013-07-05 14:23:32.000000000 -0500 @@ -1,2 +1,4 @@ -SHA256 (wpa_supplicant-0.5.11.tar.gz) = 5b4e73dc489a118293a3d08291730c3fab82c3542e1ad1fb12267180c3478f19 -SIZE (wpa_supplicant-0.5.11.tar.gz) = 723321 +SHA256 (wpa_supplicant-0.7.3.tar.gz) = d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 +SIZE (wpa_supplicant-0.7.3.tar.gz) = 1638224 +SHA256 (wpa-gui-icons.tar.gz) = c0d2adb4d8d9f58c015e4862a5ab50c7a562b6bb641e1bb6a0cc841249573b42 +SIZE (wpa-gui-icons.tar.gz) = 3797 diff -ruN /usr/ports/net/wpa_gui/files/patch-wpa_gui.pro ./files/patch-wpa_gui.pro --- /usr/ports/net/wpa_gui/files/patch-wpa_gui.pro 1969-12-31 18:00:00.000000000 -0600 +++ ./files/patch-wpa_gui.pro 2013-07-05 13:24:19.000000000 -0500 @@ -0,0 +1,10 @@ +--- ./wpa_gui.pro.orig 2010-09-07 10:43:39.000000000 -0500 ++++ ./wpa_gui.pro 2013-07-05 13:24:16.000000000 -0500 +@@ -26,6 +26,7 @@ + } else { + DEFINES += CONFIG_CTRL_IFACE_UNIX + SOURCES += ../../src/utils/os_unix.c ++ RESOURCES += icons_png.qrc + } + + INCLUDEPATH += . .. ../../src ../../src/utils diff -ruN /usr/ports/net/wpa_gui/pkg-descr ./pkg-descr --- /usr/ports/net/wpa_gui/pkg-descr 2009-01-18 17:11:07.000000000 -0600 +++ ./pkg-descr 2013-07-05 10:25:39.000000000 -0500 @@ -1,3 +1,3 @@ wpa_gui is a nice GUI frontend for wpa_supplicant tool. -WWW: http://hostap.epitest.fi/wpa_supplicant/ +WWW: http://hostap.epitest.fi/wpa_supplicant/ diff -ruN /usr/ports/net/wpa_gui/pkg-plist ./pkg-plist --- /usr/ports/net/wpa_gui/pkg-plist 1969-12-31 18:00:00.000000000 -0600 +++ ./pkg-plist 2013-07-05 12:36:32.000000000 -0500 @@ -0,0 +1,4 @@ +sbin/wpa_gui +share/applications/wpa_gui.desktop +share/pixmaps/wpa_gui.svg +@dirrmtry share/applications >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307052039.r65KdeSP060229>