Index: head/net/wpa_gui/Makefile
===================================================================
--- head/net/wpa_gui/Makefile	(revision 398808)
+++ head/net/wpa_gui/Makefile	(revision 398809)
@@ -1,34 +1,44 @@
 # Created by: Ilya Bakulin <webmaster@kibab.com>
 # $FreeBSD$
 
 PORTNAME=	wpa_gui
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	net
-MASTER_SITES=	http://hostap.epitest.fi/releases/ \
+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
+
+WRKSRC_SUBDIR=	wpa_supplicant/wpa_gui-qt4
+
 PLIST_FILES=	sbin/wpa_gui \
 		share/applications/wpa_gui.desktop \
-		share/pixmaps/wpa_gui.svg
-WRKSRC=		${WRKDIR}/${DISTNAME}/wpa_supplicant/wpa_gui-qt4
+		share/icons/hicolor/16x16/apps/wpa_gui.png \
+		share/icons/hicolor/scalable/apps/wpa_gui.svg
+
 USE_QT4=	gui moc_build rcc_build uic_build
 USES=		qmake
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|Exec=wpa_gui|Exec=${PREFIX}/sbin/wpa_gui|" \
-	    ${WRKSRC}/wpa_gui.desktop
-	${MV} ${WRKDIR}/icons/hicolor ${WRKSRC}/icons
+	@${REINPLACE_CMD} -e \
+		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
+		${WRKSRC}/wpa_gui.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg ${STAGEDIR}${PREFIX}/share/pixmaps
+	${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
+	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 
 .include <bsd.port.mk>
Index: head/net/wpa_gui/distinfo
===================================================================
--- head/net/wpa_gui/distinfo	(revision 398808)
+++ head/net/wpa_gui/distinfo	(revision 398809)
@@ -1,4 +1,4 @@
-SHA256 (wpa_supplicant-2.4.tar.gz) = 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122
-SIZE (wpa_supplicant-2.4.tar.gz) = 2525648
+SHA256 (wpa_supplicant-2.5.tar.gz) = cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316
+SIZE (wpa_supplicant-2.5.tar.gz) = 2607336
 SHA256 (wpa-gui-icons.tar.gz) = c0d2adb4d8d9f58c015e4862a5ab50c7a562b6bb641e1bb6a0cc841249573b42
 SIZE (wpa-gui-icons.tar.gz) = 3797
Index: head/net/wpa_gui/files/patch-os_unix.c
===================================================================
--- head/net/wpa_gui/files/patch-os_unix.c	(nonexistent)
+++ head/net/wpa_gui/files/patch-os_unix.c	(revision 398809)
@@ -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-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/pkg-descr
===================================================================
--- head/net/wpa_gui/pkg-descr	(revision 398808)
+++ head/net/wpa_gui/pkg-descr	(revision 398809)
@@ -1,3 +1,3 @@
 wpa_gui is a nice GUI frontend for wpa_supplicant tool. 
 
-WWW: http://hostap.epitest.fi/wpa_supplicant/
+WWW: http://w1.fi/wpa_supplicant/