6 files changed, 20 insertions, 43 deletions

diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index f88a4371c0e7..b3d48d9ca894 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ap-utils
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2
 CATEGORIES=	net
 MASTER_SITES=	http://ap-utils.polesye.net/files/ \
 		http://web.cs.cmu.edu/~dpelleg/download/
@@ -17,7 +17,7 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-MAN8=		ap-trapd.8 ap-mrtg.8 ap-atmel.8 ap-nwn.8
+MAN8=		ap-trapd.8 ap-mrtg.8 ap-config.8
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/net-mgmt/ap-utils/distinfo b/net-mgmt/ap-utils/distinfo
index 9df740d2db66..4c3f2aee820b 100644
--- a/net-mgmt/ap-utils/distinfo
+++ b/net-mgmt/ap-utils/distinfo
@@ -1 +1 @@
-MD5 (ap-utils-1.1.1.tar.bz2) = a27c3963d70d23cd4c3ae639992abc1e
+MD5 (ap-utils-1.2.tar.bz2) = 9c1b84974c1f4eab07d9bd61148fd060
diff --git a/net-mgmt/ap-utils/files/patch-aa b/net-mgmt/ap-utils/files/patch-aa
index a9f92e771804..7e675e5bc766 100644
--- a/net-mgmt/ap-utils/files/patch-aa
+++ b/net-mgmt/ap-utils/files/patch-aa
@@ -1,21 +1,19 @@
---- nwn/ap-nwn.c.orig	Sun Oct  6 09:47:54 2002
-+++ nwn/ap-nwn.c	Sun Oct  6 09:46:10 2002
-@@ -18,15 +18,15 @@
-  *
+--- src/wlan.c.orig	Sat Nov  9 08:54:18 2002
++++ src/wlan.c	Sat Nov  9 08:55:28 2002
+@@ -19,13 +19,13 @@
   */
- 
--#include <netinet/in.h>
- #include <stdlib.h>
+ #include <ncurses.h>
  #include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <stdlib.h>
  #include "ap-utils.h"
  #include <menu.h>
--#include <arpa/inet.h>
--#include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <unistd.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
+ #include <unistd.h>
  
- WINDOW *sub_for_menu, *win_for_help, *main_win, *main_sub;
- char *community;
+ #define HIDE_ESSID _("[S] Insert ESSID in broadcast packets: %s")
diff --git a/net-mgmt/ap-utils/files/patch-ab b/net-mgmt/ap-utils/files/patch-ab
deleted file mode 100644
index daf4eb8dc10d..000000000000
--- a/net-mgmt/ap-utils/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/ap_search.c.orig	Sun Oct  6 08:36:00 2002
-+++ common/ap_search.c	Sun Oct  6 08:36:07 2002
-@@ -33,7 +33,6 @@
- #include <signal.h>
- #include <setjmp.h>
- #include <errno.h>
--#include <stdint.h>
- 
- sigjmp_buf position;
- extern char *community;
diff --git a/net-mgmt/ap-utils/files/patch-ac b/net-mgmt/ap-utils/files/patch-ac
deleted file mode 100644
index 7807e88e9a1c..000000000000
--- a/net-mgmt/ap-utils/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- atmel/wlan.c.orig	Sun Oct  6 09:40:30 2002
-+++ atmel/wlan.c	Sun Oct  6 09:40:47 2002
-@@ -19,6 +19,9 @@
-  */
- #include <ncurses.h>
- #include <string.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <stdlib.h>
- #include "ap-utils.h"
diff --git a/net-mgmt/ap-utils/pkg-plist b/net-mgmt/ap-utils/pkg-plist
index 8e539969da19..7bdcedc3693f 100644
--- a/net-mgmt/ap-utils/pkg-plist
+++ b/net-mgmt/ap-utils/pkg-plist
@@ -1,8 +1,9 @@
-bin/ap-atmel
+bin/ap-config
 bin/ap-mrtg
-bin/ap-nwn
 sbin/ap-trapd
+lib/charset.alias
 share/locale/uk/LC_MESSAGES/ap-utils.mo
+share/locale/fr/LC_MESSAGES/ap-utils.mo
 %%PORTDOCS%%share/doc/ap-utils/FAQ
 %%PORTDOCS%%share/doc/ap-utils/uk/INSTALL
 %%PORTDOCS%%share/doc/ap-utils/uk/README.atmel