Pull-up leaf package wpa_gui. Fully resolves PR pkg/47605. OK'd by wiz@ in

private mail.

4 files changed, 31 insertions, 40 deletions

diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index 674e1c08d0d..3d7ff4ce2b3 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2013/02/16 11:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2013/03/24 14:33:14 rodent Exp $
 
-DISTNAME=	wpa_supplicant-0.7.3
+DISTNAME=	wpa_supplicant-2.0
 PKGNAME=	${DISTNAME:S/supplicant/gui/}
-PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
@@ -13,14 +12,18 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 BUILD_DIRS=	wpa_supplicant
-BUILD_TARGET=	wpa_gui
+BUILD_TARGET=	wpa_gui-qt4
 USE_TOOLS+=	gmake
 
+LRELEASE=	${QTDIR}/bin/lrelease 
+MAKE_ENV+=	LRELEASE=${LRELEASE}
+
 INSTALLATION_DIRS=	sbin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wpa_supplicant/wpa_gui/wpa_gui ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/wpa_supplicant/wpa_gui-qt4/wpa_gui \
+		${DESTDIR}${PREFIX}/sbin
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wpa_gui/distinfo b/net/wpa_gui/distinfo
index b43a90d5a63..4530e72a259 100644
--- a/net/wpa_gui/distinfo
+++ b/net/wpa_gui/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2011/09/03 10:33:12 shattered Exp $
+$NetBSD: distinfo,v 1.5 2013/03/24 14:33:14 rodent Exp $
 
-SHA1 (wpa_supplicant-0.7.3.tar.gz) = ca51db8931fabf386352c87422f3e62fb44c3fe3
-RMD160 (wpa_supplicant-0.7.3.tar.gz) = e22f0440d64c943e4b0886eefa3418e75ea01b60
-Size (wpa_supplicant-0.7.3.tar.gz) = 1638224 bytes
-SHA1 (patch-aa) = 82a2ae08b2d3cd2883ebcae7049825d8a9455cbd
-SHA1 (patch-ab) = 511f97805528f518822f60459f6d900f56e38eb3
+SHA1 (wpa_supplicant-2.0.tar.gz) = 78a456ff3c4af4b9bae2e0908a40f48755ffc59c
+RMD160 (wpa_supplicant-2.0.tar.gz) = f9e4729de5c6bee0142986b114fdc3fffb7a28f2
+Size (wpa_supplicant-2.0.tar.gz) = 2044281 bytes
+SHA1 (patch-aa) = 0cda7d9fad3108459dab3b178e9bf7ffbb6ba761
diff --git a/net/wpa_gui/patches/patch-aa b/net/wpa_gui/patches/patch-aa
index 2e13cb7bcb0..b748e2fc64e 100644
--- a/net/wpa_gui/patches/patch-aa
+++ b/net/wpa_gui/patches/patch-aa
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2009/08/22 06:33:40 dsainty Exp $
+$NetBSD: patch-aa,v 1.3 2013/03/24 14:33:14 rodent Exp $
 
---- wpa_supplicant/Makefile.orig	2006-10-22 19:05:39.000000000 -0400
-+++ wpa_supplicant/Makefile	2006-10-22 19:05:53.000000000 -0400
-@@ -1163,7 +1163,7 @@ windows-bin: $(WINALL)
- 	$(STRIP) $(WINALL)
+Don't hardcode QMAKE or LRELEASE.
+
+--- wpa_supplicant/Makefile.orig	2013-01-12 15:42:53.000000000 +0000
++++ wpa_supplicant/Makefile
+@@ -1596,10 +1596,10 @@ wpa_gui:
+ 	@echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
+ 
+ wpa_gui-qt4/Makefile:
+-	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro 
++	$(QMAKE) -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro 
  
- wpa_gui/Makefile:
--	qmake -o wpa_gui/Makefile wpa_gui/wpa_gui.pro 
-+	$(QMAKE) -o wpa_gui/Makefile wpa_gui/wpa_gui.pro 
+ wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts
+-	lrelease wpa_gui-qt4/wpa_gui.pro
++	$(LRELEASE) wpa_gui-qt4/wpa_gui.pro
  
- wpa_gui: wpa_gui/Makefile
- 	$(MAKE) -C wpa_gui
+ wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm
+ 	$(MAKE) -C wpa_gui-qt4
diff --git a/net/wpa_gui/patches/patch-ab b/net/wpa_gui/patches/patch-ab
deleted file mode 100644
index f1d0338b203..00000000000
--- a/net/wpa_gui/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/08/22 06:33:40 dsainty Exp $
-
---- wpa_supplicant/wpa_gui/wpagui.ui.h.orig	2006-11-27 14:14:56.000000000 +0000
-+++ wpa_supplicant/wpa_gui/wpagui.ui.h
-@@ -10,12 +10,7 @@
- ** destructor.
- *****************************************************************************/
- 
--
--#ifdef __MINGW32__
--/* Need to get getopt() */
- #include <unistd.h>
--#endif
--
- #include <stdlib.h>
- 
- void WpaGui::init()