Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ap-utils/Makefile,v
retrieving revision 1.8
diff -N -u -p Makefile
--- Makefile	22 May 2010 14:03:23 -0000	1.8
+++ Makefile	26 Jun 2010 03:56:56 -0000
@@ -2,13 +2,11 @@
 
 COMMENT=	wireless access point configuration tools
 
-DISTNAME=	ap-utils-1.3.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	ap-utils-1.5
 CATEGORIES=	net
 EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://ap-utils.polesye.net/
-MAINTAINER=	Chris Kuethe <ckuethe@ualberta.ca>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +15,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c curses menu
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ap-utils/}
+MASTER_SITES=	ftp://linux.zhitomir.net/ap-utils/
 
 MODULES=	devel/gettext converters/libiconv
 
@@ -25,6 +23,7 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+=	--without-included-gettext \
 			--with-libiconv-prefix=${LOCALBASE} \
 			--with-libintl-prefix=${LOCALBASE}
+CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 
 post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ap-utils/distinfo,v
retrieving revision 1.4
diff -N -u -p distinfo
--- distinfo	5 Apr 2007 16:20:07 -0000	1.4
+++ distinfo	26 Jun 2010 03:56:56 -0000
@@ -1,5 +1,5 @@
-MD5 (ap-utils-1.3.2.tar.bz2) = QZ134FG9aMpfYKNghbpL2g==
-RMD160 (ap-utils-1.3.2.tar.bz2) = zlj+rGlKBcuXvQvp3F+smblDKRk=
-SHA1 (ap-utils-1.3.2.tar.bz2) = G+kNno3yFO9CL/1YHC0pwrlh6ow=
-SHA256 (ap-utils-1.3.2.tar.bz2) = I/ZalWARG6WWX4qGRsWDS66sERjeMqjnDBRJL4vnhQc=
-SIZE (ap-utils-1.3.2.tar.bz2) = 280243
+MD5 (ap-utils-1.5.tar.bz2) = 69sqAzAmSMk5rJZWF94oiQ==
+RMD160 (ap-utils-1.5.tar.bz2) = KoHy3+TP+MBhQaEU8f6ya6jLi34=
+SHA1 (ap-utils-1.5.tar.bz2) = h858gAKWLVOo1VpaIUg+MLh1l2Y=
+SHA256 (ap-utils-1.5.tar.bz2) = 8B0GhlDw8FxbN1MUfuCl09/AdzLJeIuylWg+ZkFaMl0=
+SIZE (ap-utils-1.5.tar.bz2) = 409480
? np
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N -u -p patches/patch-Makefile_in
--- /dev/null	25 Jun 2010 21:56:56 -0000
+++ patches/patch-Makefile_in	26 Jun 2010 03:56:56 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig	Fri Jun 25 21:39:40 2010
++++ Makefile.in	Fri Jun 25 21:39:43 2010
+@@ -158,7 +158,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = lib src ap-gl Documentation intl po
++SUBDIRS = lib src ap-gl Documentation po
+ 
+ AUTOMAKE_OPTIONS = gnu 
+ 
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/ap-utils/patches/patch-configure,v
retrieving revision 1.3
diff -N -u -p patches/patch-configure
--- patches/patch-configure	9 Feb 2005 00:41:20 -0000	1.3
+++ patches/patch-configure	26 Jun 2010 03:56:56 -0000
@@ -1,37 +1,58 @@
-$OpenBSD: patch-configure,v 1.3 2005/02/09 00:41:20 alek Exp $
---- configure.orig	Wed May 28 11:56:16 2003
-+++ configure	Tue Feb  8 23:08:13 2005
-@@ -3887,13 +3887,13 @@ else
-   gt_save_CPPFLAGS="$CPPFLAGS"
-             CPPFLAGS="$CPPFLAGS $INCINTL"
-             gt_save_LIBS="$LIBS"
--            LIBS="$LIBS $LIBINTL"
-+            LIBS="$LIBS $LIBINTL $LIBICONV"
-                         cat > conftest.$ac_ext <<EOF
- #line 3893 "configure"
- #include "confdefs.h"
+$OpenBSD$
+--- configure.orig	Fri Jun 25 21:20:03 2010
++++ configure	Fri Jun 25 21:38:41 2010
+@@ -6433,12 +6433,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  #include <libintl.h>
  extern int _nl_msg_cat_cntr;
 -extern int *_nl_domain_bindings;
 +extern int *_nl_domain_bindings__;
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__
+   ;
+   return 0;
+ }
+@@ -6840,7 +6840,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *_nl_domain_bindings__;
  extern
  #ifdef __cplusplus
  "C"
-@@ -3901,7 +3901,7 @@ extern
- const char *_nl_expand_alias ();
- int main() {
+@@ -6886,7 +6886,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *_nl_domain_bindings__;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -6896,7 +6896,7 @@ int
+ main ()
+ {
  bindtextdomain ("", "");
 -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
 +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__ + *_nl_expand_alias (0)
- ; return 0; }
- EOF
- if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -4380,7 +4380,7 @@ s%@DATADIRNAME@%$DATADIRNAME%g
- s%@INSTOBJEXT@%$INSTOBJEXT%g
- s%@GENCAT@%$GENCAT%g
- s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
--s%@INTLLIBS@%$INTLLIBS%g
-+s%@INTLLIBS@%$LTLIBINTL $LTLIBICONV%g
- s%@LIBINTL@%$LIBINTL%g
- s%@LTLIBINTL@%$LTLIBINTL%g
- s%@POSUB@%$POSUB%g
+   ;
+   return 0;
+ }
+@@ -6951,9 +6951,9 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
+                 INTLOBJS="\$(GETTOBJS)"
+         BUILD_INCLUDED_LIBINTL=yes
+         USE_INCLUDED_LIBINTL=yes
+-        LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
+-        LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
+-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
++        LIBINTL="-lintl -liconv"
++        LTLIBINTL="-lint -liconv"
++        # LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+       fi
+ 
+       if test "$gt_use_preinstalled_gnugettext" = "yes" \
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: /cvs/ports/net/ap-utils/patches/patch-lib_Makefile_in,v
retrieving revision 1.4
diff -N -u -p patches/patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in	22 May 2010 14:03:24 -0000	1.4
+++ patches/patch-lib_Makefile_in	26 Jun 2010 03:56:56 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-lib_Makefile_in,v 1.4 2010/05/22 14:03:24 espie Exp $
---- lib/Makefile.in.orig	Wed May 28 12:02:27 2003
-+++ lib/Makefile.in	Sat May 22 15:50:39 2010
-@@ -104,7 +104,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
+--- lib/Makefile.in.orig	Sun Mar  6 15:36:29 2005
++++ lib/Makefile.in	Fri Jun 25 18:23:26 2010
+@@ -155,7 +155,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
 -INCLUDES = -I../intl
 +INCLUDES = 
  noinst_LIBRARIES = libap.a
- libap_a_SOURCES = ap-utils.h reset.c snmp.c
+ libap_a_SOURCES = ap-utils.h ap-curses.h reset.c snmp.c oui.c input.c menu.c scr.c wep.c wlan.c test.c stat.c set_community.c cmd.c radio.c aps.c ap_search.c sysinfo.c set_oeminfo.c common.c file.c
  EXTRA_libap_a_SOURCES = ber.c
Index: patches/patch-lib_ap-utils_h
===================================================================
RCS file: /cvs/ports/net/ap-utils/patches/patch-lib_ap-utils_h,v
retrieving revision 1.2
diff -N -u -p patches/patch-lib_ap-utils_h
--- patches/patch-lib_ap-utils_h	2 Jun 2003 02:02:36 -0000	1.2
+++ patches/patch-lib_ap-utils_h	26 Jun 2010 03:56:56 -0000
@@ -1,20 +1,12 @@
 $OpenBSD: patch-lib_ap-utils_h,v 1.2 2003/06/02 02:02:36 margarida Exp $
---- lib/ap-utils.h.orig	Tue May 20 13:32:31 2003
-+++ lib/ap-utils.h	Thu May 29 08:53:44 2003
-@@ -17,14 +17,14 @@
- #ifndef	_AP_CNF
- #define _AP_CNF 1
- 
--#include <stdint.h>
-+#include <sys/types.h>
- 
- #define TITLE "Wireless Access Point Utilites for Unix"
- 
- 
+--- lib/ap-utils.h.orig	Fri Jun 25 18:20:22 2010
++++ lib/ap-utils.h	Fri Jun 25 18:20:57 2010
+@@ -48,7 +48,7 @@ typedef unsigned int uint32_t;
+ #ifdef HAVE_GETTEXT
  /* GNU gettext stuff*/
  #include <locale.h>
 -#include <libgnuintl.h>
 +#include <intl/libgnuintl.h>
  #define _(String) gettext (String)
- 
- 
+ #else
+ #define _(String) (String)
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/net/ap-utils/patches/patch-src_Makefile_in,v
retrieving revision 1.3
diff -N -u -p patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in	9 Feb 2005 00:41:20 -0000	1.3
+++ /dev/null	26 Jun 2010 03:41:09 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2005/02/09 00:41:20 alek Exp $
---- src/Makefile.in.orig	Tue Feb  8 23:05:44 2005
-+++ src/Makefile.in	Tue Feb  8 23:06:00 2005
-@@ -108,7 +108,7 @@ USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- 
- DEFS = -DLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H
--INCLUDES = -I../lib -I../intl -I..
-+INCLUDES = -I../lib -I..
- LIBS = @INTLLIBS@ @LIBS@
- 
- bin_PROGRAMS = ap-config ap-mrtg
Index: patches/patch-src_file_c
===================================================================
RCS file: /cvs/ports/net/ap-utils/patches/patch-src_file_c,v
retrieving revision 1.1
diff -N -u -p patches/patch-src_file_c
--- patches/patch-src_file_c	22 May 2010 14:03:24 -0000	1.1
+++ /dev/null	26 Jun 2010 03:41:09 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_file_c,v 1.1 2010/05/22 14:03:24 espie Exp $
---- src/file.c.orig	Wed Feb 26 00:05:41 2003
-+++ src/file.c	Sat May 22 16:01:58 2010
-@@ -115,7 +115,8 @@ struct APList *parse_db_str(char *str)
- 
- int get_opts()
- {
--        extern char ap_type, *community;
-+        extern short ap_type;
-+	extern char *community;
- 	extern struct in_addr ap_ip;
- 	extern int sockfd;
- 	
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ap-utils/pkg/PLIST,v
retrieving revision 1.3
diff -N -u -p pkg/PLIST
--- pkg/PLIST	15 Sep 2004 18:17:38 -0000	1.3
+++ pkg/PLIST	26 Jun 2010 03:56:56 -0000
@@ -1,12 +1,22 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:17:38 espie Exp $
-bin/ap-config
-bin/ap-mrtg
+@bin bin/ap-auth
+@bin bin/ap-config
+@bin bin/ap-gl
+@bin bin/ap-mrtg
+@bin bin/ap-rrd
+@bin bin/ap-tftp
+@man man/man8/ap-auth.8
 @man man/man8/ap-config.8
+@man man/man8/ap-gl.8
 @man man/man8/ap-mrtg.8
+@man man/man8/ap-tftp.8
 @man man/man8/ap-trapd.8
-sbin/ap-trapd
+@bin sbin/ap-trapd
 share/examples/systrace/
 share/examples/systrace/bin_ap_config
 share/locale/fr/LC_MESSAGES/ap-utils.mo
+share/locale/nl/LC_MESSAGES/ap-utils.mo
 share/locale/pl/LC_MESSAGES/ap-utils.mo
+share/locale/ro/LC_MESSAGES/ap-utils.mo
+share/locale/tr/LC_MESSAGES/ap-utils.mo
 share/locale/uk/LC_MESSAGES/ap-utils.mo