Update distribution from wpa_supplicant version 0.4.9 to wpa_supplicant

version 0.6.9, to match net/wpa_supplicant.

The wpa_gui application appears largely unchanged according to the change log.

2009-01-06 - v0.6.7
        * fixed PSK editing in wpa_gui
2006-01-29 - v0.5.1
        * wpa_cli/wpa_gui: skip non-socket files in control directory when
          using UNIX domain sockets; this avoids selecting an incorrect
          interface (e.g., a PID file could be in this directory, even though
          use of this directory for something else than socket files is not
          recommended)

4 files changed, 19 insertions, 17 deletions

diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index b55f33c52fe..897fa22c6cc 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2008/04/07 18:25:38 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/08/22 06:33:40 dsainty Exp $
 
-DISTNAME=	wpa_supplicant-0.4.9
+DISTNAME=	wpa_supplicant-0.6.9
 PKGNAME=	${DISTNAME:S/supplicant/gui/}
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
@@ -8,17 +8,19 @@ MASTER_SITES=	http://hostap.epitest.fi/releases/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hostap.epitest.fi/wpa_supplicant/
 COMMENT=	QT GUI for wpa_supplicant(8)
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
+BUILD_DIRS=	wpa_supplicant
 BUILD_TARGET=	wpa_gui
 USE_TOOLS+=	gmake
 
 INSTALLATION_DIRS=	sbin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wpa_gui/wpa_gui ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/wpa_supplicant/wpa_gui/wpa_gui ${DESTDIR}${PREFIX}/sbin
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/net/wpa_gui/distinfo b/net/wpa_gui/distinfo
index 0199198b850..3b3accc2a59 100644
--- a/net/wpa_gui/distinfo
+++ b/net/wpa_gui/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2006/11/27 14:26:06 joerg Exp $
+$NetBSD: distinfo,v 1.3 2009/08/22 06:33:40 dsainty Exp $
 
-SHA1 (wpa_supplicant-0.4.9.tar.gz) = e6a5cd6fbb7f12cc0a074da212f4fd7fbde0aec0
-RMD160 (wpa_supplicant-0.4.9.tar.gz) = 627ddb6c12f15e08448606f24b3082b50f814a43
-Size (wpa_supplicant-0.4.9.tar.gz) = 483279 bytes
-SHA1 (patch-aa) = 6168171f82fe6dc2262d1be47a1da620e6e81752
-SHA1 (patch-ab) = b6e501a9ef26c26ecbaa8c87309596856fa94cc8
+SHA1 (wpa_supplicant-0.6.9.tar.gz) = 3764f7bda4e5c87caac2b9e134cb59996f073f09
+RMD160 (wpa_supplicant-0.6.9.tar.gz) = e8427935b17c354c2654250501236dcd3f239307
+Size (wpa_supplicant-0.6.9.tar.gz) = 1178238 bytes
+SHA1 (patch-aa) = 82a2ae08b2d3cd2883ebcae7049825d8a9455cbd
+SHA1 (patch-ab) = 511f97805528f518822f60459f6d900f56e38eb3
diff --git a/net/wpa_gui/patches/patch-aa b/net/wpa_gui/patches/patch-aa
index 6b0ef952ceb..2e13cb7bcb0 100644
--- a/net/wpa_gui/patches/patch-aa
+++ b/net/wpa_gui/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/22 23:20:21 rpaulo Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/22 06:33:40 dsainty Exp $
 
---- Makefile.orig	2006-10-22 19:05:39.000000000 -0400
-+++ Makefile	2006-10-22 19:05:53.000000000 -0400
-@@ -460,7 +460,7 @@ windows-bin: $(WINALL)
+--- 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)
  
  wpa_gui/Makefile:
diff --git a/net/wpa_gui/patches/patch-ab b/net/wpa_gui/patches/patch-ab
index 975873a6d35..f1d0338b203 100644
--- a/net/wpa_gui/patches/patch-ab
+++ b/net/wpa_gui/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2006/11/27 14:26:06 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2009/08/22 06:33:40 dsainty Exp $
 
---- wpa_gui/wpagui.ui.h.orig	2006-11-27 14:14:56.000000000 +0000
-+++ wpa_gui/wpagui.ui.h
+--- 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.
  *****************************************************************************/
@@ -12,6 +12,6 @@ $NetBSD: patch-ab,v 1.1 2006/11/27 14:26:06 joerg Exp $
  #include <unistd.h>
 -#endif
 -
+ #include <stdlib.h>
  
  void WpaGui::init()
- {