Index: head/net/wpa_gui/Makefile
===================================================================
--- head/net/wpa_gui/Makefile	(revision 425196)
+++ head/net/wpa_gui/Makefile	(revision 425197)
@@ -1,61 +1,63 @@
 # Created by: Ilya Bakulin <webmaster@kibab.com>
 # $FreeBSD$
 
 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 \
 		LOCAL/jgh/net/${PORTNAME}/:icons
 DISTNAME=	wpa_supplicant-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.gz \
 		wpa-gui-icons.tar.gz:icons
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt-based frontend for wpa_supplicant
 
 LICENSE=	BSD3CLAUSE
 
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 WRKSRC_SUBDIR=	wpa_supplicant/wpa_gui-qt4
 
 PLIST_FILES=	"@mode 4555" \
 		sbin/wpa_gui \
 		"@mode" \
 		share/applications/wpa_gui.desktop \
 		share/icons/hicolor/16x16/apps/wpa_gui.png \
 		share/icons/hicolor/scalable/apps/wpa_gui.svgz \
 		man/man8/wpa_gui.8.gz
 
 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
 
 OPTIONS_DEFINE=	DEBUG
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
 		${WRKSRC}/wpa_gui.desktop
 
 post-patch-DEBUG-on:
 	@${REINPLACE_CMD} -e \
 		's| release| debug|' \
 		${WRKSRC}/wpa_gui.pro
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
 	${INSTALL_DATA} ${WRKDIR}/icons/hicolor/16x16/apps/wpa_gui.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	@${GZIP_CMD} < ${WRKSRC}/icons/wpa_gui.svg \
 		> ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wpa_gui.svgz
 	@${GZIP_CMD} < ${WRKSRC}/../doc/docbook/wpa_gui.8 \
 		> ${STAGEDIR}${PREFIX}/man/man8/wpa_gui.8.gz
 
 .include <bsd.port.mk>
Index: head/net/wpa_gui/files/patch-os_unix.c
===================================================================
--- head/net/wpa_gui/files/patch-os_unix.c	(revision 425196)
+++ head/net/wpa_gui/files/patch-os_unix.c	(nonexistent)
@@ -1,13 +0,0 @@
---- ../../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__ */
- 
-+#ifdef __FreeBSD__
-+#define fdatasync fsync
-+#endif
-+
- #include "os.h"
- #include "common.h"
- 

Property changes on: head/net/wpa_gui/files/patch-os_unix.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/wpa_gui/files/patch-wpa_ctrl.c
===================================================================
--- head/net/wpa_gui/files/patch-wpa_ctrl.c	(revision 425196)
+++ head/net/wpa_gui/files/patch-wpa_ctrl.c	(nonexistent)
@@ -1,23 +0,0 @@
---- ../../src/common/wpa_ctrl.c.orig	2016-07-18 19:31:51.725862000 -0700
-+++ ../../src/common/wpa_ctrl.c
-@@ -477,6 +477,10 @@
- 	char *cmd_buf = NULL;
- 	size_t _cmd_len;
- 
-+#ifndef QT_NO_DEBUG
-+	fprintf(stderr, "CMD-SEND: %*s\n", cmd_len, cmd);
-+#endif // QT_NO_DEBUG
-+
- #ifdef CONFIG_CTRL_IFACE_UDP
- 	if (ctrl->cookie) {
- 		char *pos;
-@@ -554,6 +558,9 @@
- 				continue;
- 			}
- 			*reply_len = res;
-+#ifndef QT_NO_DEBUG
-+			fprintf(stderr, "CMD-RECV: %*s\n", *reply_len, reply);
-+#endif // QT_NO_DEBUG
- 			break;
- 		} else {
- 			return -2;

Property changes on: head/net/wpa_gui/files/patch-wpa_ctrl.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/wpa_gui/files/patch-wpagui.cpp
===================================================================
--- head/net/wpa_gui/files/patch-wpagui.cpp	(revision 425196)
+++ head/net/wpa_gui/files/patch-wpagui.cpp	(nonexistent)
@@ -1,12 +0,0 @@
---- wpagui.cpp.orig	2015-09-27 19:02:05 UTC
-+++ wpagui.cpp
-@@ -302,7 +302,8 @@ int WpaGui::openCtrlConnection(const cha
- #endif /* _DIRENT_HAVE_D_TYPE */
- 
- 				if (strcmp(dent->d_name, ".") == 0 ||
--				    strcmp(dent->d_name, "..") == 0)
-+				    strcmp(dent->d_name, "..") == 0 ||
-+				    (strlen(dent->d_name) > strlen(".pid") && !strcmp(dent->d_name + strlen(dent->d_name) - strlen(".pid"), ".pid")))
- 					continue;
- 				debug("Selected interface '%s'",
- 				      dent->d_name);

Property changes on: head/net/wpa_gui/files/patch-wpagui.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c
===================================================================
--- head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c	(nonexistent)
+++ head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c	(revision 425197)
@@ -0,0 +1,23 @@
+--- 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;
+ 
++#ifndef QT_NO_DEBUG
++	fprintf(stderr, "CMD-SEND: %*s\n", cmd_len, cmd);
++#endif // QT_NO_DEBUG
++
+ #ifdef CONFIG_CTRL_IFACE_UDP
+ 	if (ctrl->cookie) {
+ 		char *pos;
+@@ -554,6 +558,9 @@ retry_send:
+ 				continue;
+ 			}
+ 			*reply_len = res;
++#ifndef QT_NO_DEBUG
++			fprintf(stderr, "CMD-RECV: %*s\n", *reply_len, reply);
++#endif // QT_NO_DEBUG
+ 			break;
+ 		} else {
+ 			return -2;

Property changes on: head/net/wpa_gui/files/patch-src_common_wpa__ctrl.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/wpa_gui/files/patch-src_utils_os__unix.c
===================================================================
--- head/net/wpa_gui/files/patch-src_utils_os__unix.c	(nonexistent)
+++ head/net/wpa_gui/files/patch-src_utils_os__unix.c	(revision 425197)
@@ -0,0 +1,13 @@
+--- 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__ */
+ 
++#ifdef __FreeBSD__
++#define fdatasync fsync
++#endif
++
+ #include "os.h"
+ #include "common.h"
+ 

Property changes on: head/net/wpa_gui/files/patch-src_utils_os__unix.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp
===================================================================
--- head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp	(nonexistent)
+++ head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp	(revision 425197)
@@ -0,0 +1,12 @@
+--- 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 */
+ 
+ 				if (strcmp(dent->d_name, ".") == 0 ||
+-				    strcmp(dent->d_name, "..") == 0)
++				    strcmp(dent->d_name, "..") == 0 ||
++				    (strlen(dent->d_name) > strlen(".pid") && !strcmp(dent->d_name + strlen(dent->d_name) - strlen(".pid"), ".pid")))
+ 					continue;
+ 				debug("Selected interface '%s'",
+ 				      dent->d_name);

Property changes on: head/net/wpa_gui/files/patch-wpa__supplicant_wpa__gui-qt4_wpagui.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property