From owner-svn-ports-head@FreeBSD.ORG  Thu Nov  7 11:47:07 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 55916ED9;
 Thu,  7 Nov 2013 11:47:07 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 29B56264C;
 Thu,  7 Nov 2013 11:47:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7Bl7dM056909;
 Thu, 7 Nov 2013 11:47:07 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7Bl68s056906;
 Thu, 7 Nov 2013 11:47:06 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201311071147.rA7Bl68s056906@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 7 Nov 2013 11:47:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333083 - in head/net/wpa_gui: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 11:47:07 -0000

Author: amdmi3
Date: Thu Nov  7 11:47:06 2013
New Revision: 333083
URL: http://svnweb.freebsd.org/changeset/ports/333083

Log:
  - Support staging
  - Fix build on CURRENT
  
  PR:		182452
  Submitted by:	amdmi3
  Approved by:	Ilya Bakulin <webmaster@kibab.com> (maintainer)

Modified:
  head/net/wpa_gui/Makefile
  head/net/wpa_gui/files/patch-wpagui.cpp

Modified: head/net/wpa_gui/Makefile
==============================================================================
--- head/net/wpa_gui/Makefile	Thu Nov  7 11:46:03 2013	(r333082)
+++ head/net/wpa_gui/Makefile	Thu Nov  7 11:47:06 2013	(r333083)
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/wpa_suppl
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|Exec=wpa_gui|Exec=${PREFIX}/sbin/wpa_gui|" \
 	    ${WRKSRC}/wpa_gui.desktop
@@ -32,8 +31,8 @@ do-configure:
 		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg ${PREFIX}/share/pixmaps
+	${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
 
 .include <bsd.port.mk>

Modified: head/net/wpa_gui/files/patch-wpagui.cpp
==============================================================================
--- head/net/wpa_gui/files/patch-wpagui.cpp	Thu Nov  7 11:46:03 2013	(r333082)
+++ head/net/wpa_gui/files/patch-wpagui.cpp	Thu Nov  7 11:47:06 2013	(r333083)
@@ -1,5 +1,5 @@
---- wpagui.cpp.orig	2010-09-07 15:43:39.000000000 +0000
-+++ wpagui.cpp
+--- wpagui.cpp.orig	2010-09-07 19:43:39.000000000 +0400
++++ wpagui.cpp	2013-11-07 14:07:50.086773239 +0400
 @@ -12,10 +12,7 @@
   * See README and COPYING for more details.
   */
@@ -11,3 +11,12 @@
  
  #ifdef CONFIG_NATIVE_WINDOWS
  #include <windows.h>
+@@ -27,6 +24,8 @@
+ #include <QImageReader>
+ #include <QSettings>
+ 
++#include <getopt.h>
++
+ #include "wpagui.h"
+ #include "dirent.h"
+ #include "common/wpa_ctrl.h"