First step to support DragonFly. Doesn't fully work yet, since

pthread_barrier_* is currently not implemented. Add USE_LIBTOOL.
Don't depend on EPROTO declaration.

4 files changed, 57 insertions, 14 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index a391e3b721c..7970f408040 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/07 18:26:53 rpaulo Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/14 01:58:47 joerg Exp $
 
 DISTNAME=	miredo-0.8.0
 CATEGORIES=	net
@@ -12,6 +12,7 @@ COMMENT=	Teredo IPv6 tunneling
 NOT_FOR_PLATFORM=	Interix-*-* NetBSD-[0-3]*-*
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
 EGDIR=		${PREFIX}/share/examples/miredo
 CONF_FILES=	${EGDIR}/miredo.conf-dist ${PKG_SYSCONFDIR}/miredo.conf
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index 6b5eb1b2ae0..433f4dbf760 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+$NetBSD: distinfo,v 1.2 2006/03/14 01:58:47 joerg Exp $
 
 SHA1 (miredo-0.8.0.tar.bz2) = 806a96730ef2687e8fbaea7c5bce7a9ffc2e7367
 RMD160 (miredo-0.8.0.tar.bz2) = ef9cc7c8db0188c5e5f364dbc8d24112e75a106f
 Size (miredo-0.8.0.tar.bz2) = 397357 bytes
-SHA1 (patch-aa) = 9be64b25c562af305c7ea76cbeddac2be1ae54fc
-SHA1 (patch-ab) = efae353e329580f6e8c1bff44503a6b967bd45de
+SHA1 (patch-aa) = a5d3876d3e23681a3dae58867619c75434cbd0a9
+SHA1 (patch-ab) = 88d38658f43c65206bd5c65cf23de596affcd150
 SHA1 (patch-ac) = b9bd7176a9a89956447b5cf4ae4e48d2c262f37b
+SHA1 (patch-ad) = 67f36caf1eca4909eb3a9c9d0c769d962cf1247c
+SHA1 (patch-ae) = 67341ce2087881d22b8f6a95666cd12c1a1c07ab
+SHA1 (patch-af) = d25bdc8544abd5fa3579c7901673e560447afa40
diff --git a/net/miredo/patches/patch-aa b/net/miredo/patches/patch-aa
index f64c64717d9..789bd7f8056 100644
--- a/net/miredo/patches/patch-aa
+++ b/net/miredo/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/14 01:58:47 joerg Exp $
 
 --- libteredo/server.c	2006-02-28 00:48:07.000000000 +0000
 +++ libteredo/server.c.new	2006-02-28 00:47:56.000000000 +0000
-@@ -49,6 +49,10 @@
+@@ -39,6 +39,7 @@
+ #include <stdlib.h>
+ 
+ #include <sys/types.h>
++#include <sys/uio.h>
+ #include <unistd.h> // close()
+ #include <sys/socket.h>
+ #include <netinet/in.h> // struct in6_addr
+@@ -49,6 +50,10 @@
  #include <pthread.h>
  #include <syslog.h>
  
@@ -13,3 +21,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
  #include "server.h"
  #include "v4global.h"
  #include "checksum.h"
+@@ -253,7 +258,9 @@ libteredo_send_ipv6 (const void *p, size
+ 				               /* ICMPv6 time exceeded */
+ 			case ECONNREFUSED: /* ICMPv6 unreach port unreachable */
+ 			case EMSGSIZE: /* ICMPv6 packet too big */
++#ifdef EPROTO
+ 			case EPROTO: /* ICMPv6 param prob (and other errors) */
++#endif
+ 				break;
+ 
+ 			default:
diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab
index edad5f2ae74..1509b30fbc9 100644
--- a/net/miredo/patches/patch-ab
+++ b/net/miredo/patches/patch-ab
@@ -1,8 +1,29 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+$NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
 
---- libtun6/tun6.c	2006-02-28 00:50:05.000000000 +0000
-+++ libtun6/tun6.c.new	2006-02-28 00:49:48.000000000 +0000
-@@ -89,6 +89,7 @@ static const char *os_driver = "FreeBSD"
+--- libtun6/tun6.c.orig	2006-02-02 21:01:54.000000000 +0000
++++ libtun6/tun6.c
+@@ -70,7 +70,8 @@ struct in6_ifreq {
+ static const char *os_driver = "Linux";
+ 
+ #elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || \
+-	defined (HAVE_NETBSD) || defined (HAVE_DARWIN)
++	defined (HAVE_NETBSD) || defined (HAVE_DARWIN) || \
++	defined (HAVE_DRAGONFLY)
+ /*
+  * BSD tunneling driver
+  * NOTE: the driver does NOT really work on NetBSD
+@@ -84,11 +85,18 @@ static const char *os_driver = "Linux";
+ # define USE_TUNHEAD
+ static const char *os_driver = "FreeBSD";
+ 
++# elif defined(HAVE_DRAGONFLY)
++#  include <net/if_var.h>
++#  include <net/tun/if_tun.h>
++# define USE_TUNHEAD
++static const char *os_driver = "DragonFly";
++
+ # elif defined (HAVE_OPENBSD)
+ #  define USE_TUNHEAD
  static const char *os_driver = "OpenBSD";
  
  # elif defined (HAVE_NETBSD)
@@ -10,21 +31,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
  static const char *os_driver = "NetBSD";
  
  # elif defined (HAVE_DARWIN)
-@@ -705,7 +706,7 @@ tun6_recv (const tun6 *t, const fd_set *
+@@ -705,7 +713,7 @@ tun6_recv (const tun6 *t, const fd_set *
  	/* TUNTAP driver */
  	if (head.tun_linux.proto != htons (ETH_P_IPV6))
  		return -1; /* only accept IPv6 packets */
 -#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD)
-+#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD)
++#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD) || defined(HAVE_DRAGONFLY)
  	/* FreeBSD driver */
  	if (head.tun_bsd != htonl (AF_INET6))
  		return -1;
-@@ -733,7 +734,7 @@ tun6_send (const tun6 *t, const void *pa
+@@ -733,7 +741,7 @@ tun6_send (const tun6 *t, const void *pa
  	uint16_t flags;
  	uint16_t proto;
  } head = { 0, htons (ETH_P_IPV6) };
 -#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD)
-+#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD)
++#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD) || defined(HAVE_DRAGONFLY)
  	uint32_t head = htonl (AF_INET6);
  #endif