svn commit: r425197 - in head/net/wpa_gui: . files

[Jason E. Hale]

Author: jhale
Date: Thu Nov  3 09:18:03 2016
New Revision: 425197
URL: https://svnweb.freebsd.org/changeset/ports/425197

Log:
  Add qt4-imageformats runtime dependency so tray icon appears
  
  While here:
  Remake patches with "make makepatch"
  
  PR:		213783
  Submitted by:	<rs.os at t-online.de>

Added:
  head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c
     - copied, changed from r425196, head/net/wpa_gui/files/patch-wpa_ctrl.c
  head/net/wpa_gui/files/patch-src_utils_os__unix.c
     - copied, changed from r425196, head/net/wpa_gui/files/patch-os_unix.c
  head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp
     - copied, changed from r425196, head/net/wpa_gui/files/patch-wpagui.cpp
Deleted:
  head/net/wpa_gui/files/patch-os_unix.c
  head/net/wpa_gui/files/patch-wpa_ctrl.c
  head/net/wpa_gui/files/patch-wpagui.cpp
Modified:
  head/net/wpa_gui/Makefile

Modified: head/net/wpa_gui/Makefile
==============================================================================
--- head/net/wpa_gui/Makefile	Thu Nov  3 09:04:22 2016	(r425196)
+++ head/net/wpa_gui/Makefile	Thu Nov  3 09:18:03 2016	(r425197)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wpa_gui
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://w1.fi/releases/ \
 		http://partmedia.users.sourceforge.net/dist/:icons \
@@ -17,6 +17,7 @@ COMMENT=	Qt-based frontend for wpa_suppl
 
 LICENSE=	BSD3CLAUSE
 
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 WRKSRC_SUBDIR=	wpa_supplicant/wpa_gui-qt4
 
 PLIST_FILES=	"@mode 4555" \
@@ -30,7 +31,8 @@ PLIST_FILES=	"@mode 4555" \
 SUB_FILES=	pkg-message
 SUB_LIST=	LOCALBASE=${LOCALBASE}
 
-USE_QT4=	corelib gui moc_build rcc_build uic_build
+USE_QT4=	corelib gui moc_build rcc_build uic_build \
+		imageformats_run
 USES=		qmake
 INSTALLS_ICONS=	yes
 

Copied and modified: head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c (from r425196, head/net/wpa_gui/files/patch-wpa_ctrl.c)
==============================================================================
--- head/net/wpa_gui/files/patch-wpa_ctrl.c	Thu Nov  3 09:04:22 2016	(r425196, copy source)
+++ head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c	Thu Nov  3 09:18:03 2016	(r425197)
@@ -1,6 +1,6 @@
---- ../../src/common/wpa_ctrl.c.orig	2016-07-18 19:31:51.725862000 -0700
-+++ ../../src/common/wpa_ctrl.c
-@@ -477,6 +477,10 @@
+--- src/common/wpa_ctrl.c.orig	2015-09-27 19:02:05 UTC
++++ src/common/wpa_ctrl.c
+@@ -477,6 +477,10 @@ int wpa_ctrl_request(struct wpa_ctrl *ct
  	char *cmd_buf = NULL;
  	size_t _cmd_len;
  
@@ -11,7 +11,7 @@
  #ifdef CONFIG_CTRL_IFACE_UDP
  	if (ctrl->cookie) {
  		char *pos;
-@@ -554,6 +558,9 @@
+@@ -554,6 +558,9 @@ retry_send:
  				continue;
  			}
  			*reply_len = res;

Copied and modified: head/net/wpa_gui/files/patch-src_utils_os__unix.c (from r425196, head/net/wpa_gui/files/patch-os_unix.c)
==============================================================================
--- head/net/wpa_gui/files/patch-os_unix.c	Thu Nov  3 09:04:22 2016	(r425196, copy source)
+++ head/net/wpa_gui/files/patch-src_utils_os__unix.c	Thu Nov  3 09:18:03 2016	(r425197)
@@ -1,5 +1,5 @@
---- ../../src/utils/os_unix.c.orig	2015-09-27 19:02:05 UTC
-+++ ../../src/utils/os_unix.c
+--- src/utils/os_unix.c.orig	2015-09-27 19:02:05 UTC
++++ src/utils/os_unix.c
 @@ -23,6 +23,10 @@
  #include <mach/mach_time.h>
  #endif /* __MACH__ */

Copied and modified: head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp (from r425196, head/net/wpa_gui/files/patch-wpagui.cpp)
==============================================================================
--- head/net/wpa_gui/files/patch-wpagui.cpp	Thu Nov  3 09:04:22 2016	(r425196, copy source)
+++ head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp	Thu Nov  3 09:18:03 2016	(r425197)
@@ -1,5 +1,5 @@
---- wpagui.cpp.orig	2015-09-27 19:02:05 UTC
-+++ wpagui.cpp
+--- wpa_supplicant/wpa_gui-qt4/wpagui.cpp.orig	2015-09-27 19:02:05 UTC
++++ wpa_supplicant/wpa_gui-qt4/wpagui.cpp
 @@ -302,7 +302,8 @@ int WpaGui::openCtrlConnection(const cha
  #endif /* _DIRENT_HAVE_D_TYPE */