upgrade to 1.1.1

PR:		43746
Submitted by:	maintainer

7 files changed, 52 insertions, 17 deletions

diff --git a/net/ap-utils/Makefile b/net/ap-utils/Makefile
index c5521cf26d64..f88a4371c0e7 100644
--- a/net/ap-utils/Makefile
+++ b/net/ap-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ap-utils
-PORTVERSION=	1.0.4
+PORTVERSION=	1.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://ap-utils.polesye.net/files/ \
 		http://web.cs.cmu.edu/~dpelleg/download/
@@ -21,8 +21,9 @@ MAN8=		ap-trapd.8 ap-mrtg.8 ap-atmel.8 ap-nwn.8
 
 .if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Documentation/FAQ ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/uk
+	@cd ${WRKSRC}/Documentation && ${INSTALL_DATA} FAQ ${DOCSDIR}
+	@cd ${WRKSRC}/Documentation/uk && ${INSTALL_DATA} INSTALL README.atmel ${DOCSDIR}/uk
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/ap-utils/distinfo b/net/ap-utils/distinfo
index 0cfa30a68872..9df740d2db66 100644
--- a/net/ap-utils/distinfo
+++ b/net/ap-utils/distinfo
@@ -1 +1 @@
-MD5 (ap-utils-1.0.4.tar.bz2) = b4ce0e26cf1e418568b5554b6bb7ef93
+MD5 (ap-utils-1.1.1.tar.bz2) = a27c3963d70d23cd4c3ae639992abc1e
diff --git a/net/ap-utils/files/patch-aa b/net/ap-utils/files/patch-aa
index 90ee554e3166..a9f92e771804 100644
--- a/net/ap-utils/files/patch-aa
+++ b/net/ap-utils/files/patch-aa
@@ -1,12 +1,21 @@
---- nwn/ap-nwn.c.orig	Sat Aug 17 14:24:41 2002
-+++ nwn/ap-nwn.c	Sat Aug 17 14:24:51 2002
-@@ -22,6 +22,9 @@
+--- 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 @@
+  *
+  */
+ 
+-#include <netinet/in.h>
+ #include <stdlib.h>
  #include <string.h>
  #include "ap-utils.h"
  #include <menu.h>
-+#include <sys/types.h>
-+#include <sys/socket.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 <arpa/inet.h>
++#include <unistd.h>
  
+ WINDOW *sub_for_menu, *win_for_help, *main_win, *main_sub;
+ char *community;
diff --git a/net/ap-utils/files/patch-ab b/net/ap-utils/files/patch-ab
new file mode 100644
index 000000000000..daf4eb8dc10d
--- /dev/null
+++ b/net/ap-utils/files/patch-ab
@@ -0,0 +1,10 @@
+--- 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/ap-utils/files/patch-ac b/net/ap-utils/files/patch-ac
new file mode 100644
index 000000000000..7807e88e9a1c
--- /dev/null
+++ b/net/ap-utils/files/patch-ac
@@ -0,0 +1,12 @@
+--- 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/ap-utils/pkg-descr b/net/ap-utils/pkg-descr
index 40b9330727b8..4328230240a2 100644
--- a/net/ap-utils/pkg-descr
+++ b/net/ap-utils/pkg-descr
@@ -1,10 +1,10 @@
-Wireless Access Point Utilites for Unix are a set of tools to
-configure and monitor several popular wireless access points using
-SNMP. Among other things, they allow access restrictions, MAC
-authorization and WEP encryption for access points by Linksys,
-Netgear, SMC, and D-Link.
+A set of utilities to configure and monitor several popular
+wireless access points using SNMP. Among other things, they
+allow access restrictions, MAC authorization and WEP encryption
+for access points and "wireless gateways" by Linksys, Netgear,
+SMC, and D-Link.
 
 WWW: http://ap-utils.polesye.net/
 
-- Dan Pelleg
+ -- Dan Pelleg
 daniel+aputils@pelleg.org
diff --git a/net/ap-utils/pkg-plist b/net/ap-utils/pkg-plist
index c43f69740fae..8e539969da19 100644
--- a/net/ap-utils/pkg-plist
+++ b/net/ap-utils/pkg-plist
@@ -4,4 +4,7 @@ bin/ap-nwn
 sbin/ap-trapd
 share/locale/uk/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
+%%PORTDOCS%%@dirrm share/doc/ap-utils/uk
 %%PORTDOCS%%@dirrm share/doc/ap-utils