Update to 1.1.13.

Changes since 1.1.9:
Logging fixes (deprecating -l option to sockd)
Two commercial modules available, redirect and bandwidth (not included in pkg)
Some more from the 'Changes' file:
o Move daemon() call to later so more errors can be reported, suggested
  by Borsenkow Andrej <Andrej.Borsenkow@mow.siemens.ru>.
o fix problem when linking with libsocks;
  NISHIMURA Daisuke <nishi@graco.c.u-tokyo.ac.jp>.
o fix some problems when socksifying, making certain programs
  hang forever (e.g. certain versions/installations of "ssh -X").
  Thanks to NISHIMURA Daisuke <nishi@graco.c.u-tokyo.ac.jp> for
  diagnosis, help and testing.
o Don't mark the rule as good either if sockscf.state.unfixedpamdata,
  fixes bug reported by Jerry Murdock" <jmurdock@itraktech.com>.
o fix a bug preventing the list given in a 'user:' keyword from
  being checked correctly. Reported by Oleg Bulavsky <bulch@ftc.ru>.
o "-h" prints out configfile used, based on suggestion from
  dh_tsc_10@ugcs.net.
o fix bugs that reset some defaults at the wrong time, reported by
  dh_tsc_10@ugcs.net.
o prototype script for generation of graphs with usage information included
  (bin/sockd-graphgen). Contact us if you run a socks server with significant
  usage, and you are willing to help with testing.
o Some minor optimisations in server i/o code, at the cost of some
  timer accuracy concerning bandwidth limiting/client expiration.
o prefix "socks" to some global variables to avoid collisions during
  socksify.  Reported by Don Reid <donr@cvs.agilent.com>.
o capi/socks.h needs Rxxx prototypes to work with a c++
  compiler. Noted by Alex Morozov <alex@idisys.iae.nsk.su>.
o If Rgetsockname() is called on a socket that a previous uncompleted
  Rconnect() has been done on, try to sleep until Rconnect() has
  finished instead of returning ENOBUFS.  Hoped to help compatibility
  with some applications.
o Modified httpproxy code a little, based on patch from
  dh_tsc_10@ugcs.net.
o Code for selecting which of multiple external ipaddresses to use
  on a global basis based on routing.
  Code contributed by Tom Chan <tchan@austin.rr.com>.
o Rename "pamservicename" to "pam.servicename".
o Fix memory overrun problem in Rgethostbyname*().  Found and
  diagnosed by dme@dme.org, thanks.
o new method added: "pam".  Code contributed by
  Patrick Bihan-Faou, MindStep Corporation, patrick@mindstep.com.
o let client-rules have their own global methodline, "clientmethod",
  default value set to "none".
  The global "method" is only used for socks-rules now.
o delay checking of password/etc til we have received the socks
  request (rather than during negotiation, as was the case).
  Required for supporting passwordbased authentication via non-socks
  methods, e.g. pam.
o socklen_t definition updated for NetBSD 1.5U.
  Problem report and patch submitted by Janne Snabb <snabb@ssh.com>.
o Output from 'config.guess' is not sufficient to determine use
  of elf on NetBSD.
  Problem report and patch submitted by Janne Snabb <snabb@ssh.com>

5 files changed, 12 insertions, 80 deletions

diff --git a/net/dante/Makefile b/net/dante/Makefile
index 6d0b57b5549..c9d3b838ef6 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/12/19 22:25:30 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/07/12 14:47:03 wiz Exp $
 #
 
-DISTNAME=		dante-1.1.9
+DISTNAME=		dante-1.1.13
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.inet.no/pub/socks/
 
@@ -18,11 +18,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--with-socks-conf=${PREFIX}/etc/socks.conf
 CONFIGURE_ARGS+=	--with-sockd-conf=${PREFIX}/etc/sockd.conf
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dante
 .for cfg in sockd.conf socks-simple.conf socks.conf
diff --git a/net/dante/PLIST b/net/dante/PLIST
index 56b12ae45ec..9c8e80e3b6d 100644
--- a/net/dante/PLIST
+++ b/net/dante/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/07/12 14:47:03 wiz Exp $
 bin/socksify
 include/dante/socks.h
-lib/libdsocks.a
 lib/libdsocks.la
 lib/libdsocks.so
 lib/libdsocks.so.1
diff --git a/net/dante/distinfo b/net/dante/distinfo
index 45e277528e0..330265328fd 100644
--- a/net/dante/distinfo
+++ b/net/dante/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/12/19 22:25:30 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/07/12 14:47:03 wiz Exp $
 
-SHA1 (dante-1.1.9.tar.gz) = 688065e1be67ae58203a9fd3c8e62955aa1a9d5d
-Size (dante-1.1.9.tar.gz) = 468506 bytes
-SHA1 (patch-aa) = a1b1243f2b4a254dfda5ce1dc1886b45bae2e397
-SHA1 (patch-ab) = 54f924504309f44b40a05b35e1e406d37ace6b30
+SHA1 (dante-1.1.13.tar.gz) = d6a1b95816621fc782cad86445649c2d4b330872
+Size (dante-1.1.13.tar.gz) = 802417 bytes
+SHA1 (patch-aa) = c581f950378da250643453b27698b213f8341a25
diff --git a/net/dante/patches/patch-aa b/net/dante/patches/patch-aa
index 95be536d12a..d149d15667f 100644
--- a/net/dante/patches/patch-aa
+++ b/net/dante/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2001/03/20 12:46:50 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/07/12 14:47:04 wiz Exp $
 
---- capi/Makefile.in.orig	Tue Mar 20 12:38:20 2001
+--- capi/Makefile.in.orig	Mon Jun 24 10:52:57 2002
 +++ capi/Makefile.in
-@@ -29,7 +29,7 @@
+@@ -31,7 +31,7 @@
  libdir = @libdir@
  infodir = @infodir@
  mandir = @mandir@
 -includedir = @includedir@
 +includedir = @includedir@/dante
  oldincludedir = /usr/include
- 
- DESTDIR =
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
diff --git a/net/dante/patches/patch-ab b/net/dante/patches/patch-ab
deleted file mode 100644
index 82359963297..00000000000
--- a/net/dante/patches/patch-ab
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/12/19 22:25:31 agc Exp $
-
-Fix up for NetBSD prototypes
-
---- configure.in	2001/12/19 22:16:23	1.1
-+++ configure.in	2001/12/19 22:18:30
-@@ -718,31 +718,31 @@
- 	["int"],
- 	["int"],
- 	["const struct sockaddr *" "__CONST_SOCKADDR_ARG" "struct sockaddr *" "const void *" "__const struct sockaddr *"],
--	["socklen_t" "int" "size_t"])
-+	["socklen_t" "int" "size_t" "__socklen_t"])
- 
- 	L_SOCKPROTO(${PROTO_ACCEPT}.accept, [failproto=t],
- 	["int"],
- 	["int"],
- 	["struct sockaddr *" "__SOCKADDR_ARG" "__const struct sockaddr *" "void *"],
--	["socklen_t *" "int *" "Psocklen_t" "size_t *"])
-+	["socklen_t *" "int *" "Psocklen_t" "size_t *" "__socklen_t *"])
- 
- 	L_SOCKPROTO(bind, [failproto=t],
- 	["int"],
- 	["int"],
- 	["const struct sockaddr *" "__CONST_SOCKADDR_ARG" "struct sockaddr *" "const void *" "__const struct sockaddr *"],
--	["socklen_t" "int" "size_t"])
-+	["socklen_t" "int" "size_t" "__socklen_t"])
- 
- 	L_SOCKPROTO(${PROTO_GETPEERNAME}.getpeername, [failproto=t],
- 	["int"],
- 	["int"],
- 	["struct sockaddr *" "__SOCKADDR_ARG" "void *"],
--	["socklen_t *" "int *" "Psocklen_t" "size_t *"])
-+	["socklen_t *" "int *" "Psocklen_t" "size_t *" "__socklen_t *"])
- 
- 	L_SOCKPROTO(${PROTO_GETSOCKNAME}.getsockname, [failproto=t],
- 	["int"],
- 	["int"],
- 	["struct sockaddr *" "__SOCKADDR_ARG" "void *"],
--	["int *" "socklen_t *" "Psocklen_t" "size_t *"])
-+	["int *" "socklen_t *" "Psocklen_t" "size_t *" "__socklen_t *"])
- 
- 	L_SOCKPROTO(${PROTO_RECVFROM}.recvfrom, [failproto=t],
- 	["ssize_t" "int"],
-@@ -751,7 +751,7 @@
- 	["size_t" "int"],
- 	["int" "unsigned int"],
- 	["struct sockaddr *" "__SOCKADDR_ARG" "void *"],
--	["socklen_t *" "int *" "Psocklen_t" "size_t *"])
-+	["socklen_t *" "int *" "Psocklen_t" "size_t *" "__socklen_t *"])
- 
- 	L_SOCKPROTO(send, [failproto=t],
- 	["ssize_t" "int"],
-@@ -767,7 +767,7 @@
- 	["size_t" "int"],
- 	["int" "unsigned int"],
- 	["const struct sockaddr *" "__CONST_SOCKADDR_ARG" "const void *" "__const struct sockaddr *"],
--	["socklen_t" "int" "size_t"])
-+	["socklen_t" "int" "size_t" "__socklen_t"])
- 
- 	L_SOCKPROTO(recv, [failproto=t],
- 	["ssize_t" "int"],