Add the appropriate types to various network system call prototypes, so

that configuration works on NetBSD.

Fixes a problem highlighted in recent i386 bulk build report.

3 files changed, 69 insertions, 2 deletions

diff --git a/net/dante/Makefile b/net/dante/Makefile
index 0d0d99656b4..6d0b57b5549 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/19 22:25:30 agc Exp $
 #
 
 DISTNAME=		dante-1.1.9
@@ -18,6 +18,11 @@ 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/distinfo b/net/dante/distinfo
index 8b68acc3fcc..45e277528e0 100644
--- a/net/dante/distinfo
+++ b/net/dante/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:13 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/19 22:25:30 agc 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
diff --git a/net/dante/patches/patch-ab b/net/dante/patches/patch-ab
new file mode 100644
index 00000000000..82359963297
--- /dev/null
+++ b/net/dante/patches/patch-ab
@@ -0,0 +1,61 @@
+$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"],