Fix PLIST and bump revision. Add DragonFly work arounds for pthread.h

and fix net/if_var.h test as well.

6 files changed, 67 insertions, 8 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 8c9d904f741..8dfba00b398 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/05/02 15:36:44 rpaulo Exp $
+# $NetBSD: Makefile,v 1.8 2006/05/12 08:25:47 joerg Exp $
 
 DISTNAME=	miredo-0.8.4
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.remlab.net/files/miredo/v0.8/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +13,7 @@ COMMENT=	Teredo IPv6 tunneling
 NOT_FOR_PLATFORM=	Interix-*-* NetBSD-[0-3]*-* SunOS-*-*
 
 GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
 EGDIR=		${PREFIX}/share/examples/miredo
diff --git a/net/miredo/PLIST b/net/miredo/PLIST
index bbed15375e3..e695b50c96f 100644
--- a/net/miredo/PLIST
+++ b/net/miredo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/05/02 15:36:09 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/05/12 08:25:47 joerg Exp $
 sbin/miredo
 sbin/miredo-server
 include/libteredo/teredo.h
@@ -7,6 +7,7 @@ include/libteredo/tunnel.h
 include/libtun6/tun6.h
 man/man5/miredo-server.conf.5
 man/man5/miredo.conf.5
+man/man8/miredo-checkconf.8
 man/man8/miredo-server.8
 man/man8/miredo.8
 lib/libteredo.a
@@ -19,6 +20,7 @@ lib/libtun6.la
 lib/libtun6.so
 lib/libtun6.so.0
 lib/libtun6.so.0.0.0
+sbin/miredo-checkconf
 share/examples/miredo/miredo.conf-dist
 share/examples/miredo/miredo-server.conf-dist
 @dirrm include/libteredo
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index 6bafa5fa4cf..f679d677065 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2006/05/02 15:36:09 rpaulo Exp $
+$NetBSD: distinfo,v 1.5 2006/05/12 08:25:47 joerg Exp $
 
 SHA1 (miredo-0.8.4.tar.bz2) = 57b2f3880c2e6ec0342478fd6fd329f457250de9
 RMD160 (miredo-0.8.4.tar.bz2) = f72409d4f63800e7f9adc833a1916c7a2939db07
 Size (miredo-0.8.4.tar.bz2) = 407550 bytes
 SHA1 (patch-aa) = 864290fea0303cf82bacace2cf955408983bbf18
 SHA1 (patch-ab) = 9299baae1f7741ddec743159aa871999eff8228a
-SHA1 (patch-ac) = 47f281a8f5088d0c5082a6a2d854b8aae8018641
+SHA1 (patch-ac) = 884e1d2fdadb3aebf096ab99afa1dc8fea2346e9
+SHA1 (patch-ad) = 0b6170f8bb8e3f501de6773e68fd0657036a17bd
+SHA1 (patch-ae) = d6deef1b94ed3e33bb0b0659ba0615416ca2be38
diff --git a/net/miredo/patches/patch-ac b/net/miredo/patches/patch-ac
index b826b83d43c..3efe63a74c0 100644
--- a/net/miredo/patches/patch-ac
+++ b/net/miredo/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2006/05/02 15:36:09 rpaulo Exp $
+$NetBSD: patch-ac,v 1.3 2006/05/12 08:25:47 joerg Exp $
 
---- libtun6/tun6.c.orig	2006-05-02 16:30:58.000000000 +0100
-+++ libtun6/tun6.c	2006-05-02 16:31:08.000000000 +0100
-@@ -213,7 +213,7 @@ tun6 *tun6_create (const char *req_name)
+--- libtun6/tun6.c.orig	2006-05-01 12:57:31.000000000 +0000
++++ libtun6/tun6.c
+@@ -94,6 +94,8 @@ static const char *os_driver = "BSD";
+ 
+ # if defined (HAVE_NET_IF_TUN_H)
+ #  include <net/if_tun.h> // TUNSIFHEAD, TUNSLMODE
++# elif defined(__DragonFly__)
++#  include <net/tun/if_tun.h>
+ # elif defined (__APPLE__)
+ #  define TUNSIFHEAD  _IOW('t', 96, int)
+ # endif
+@@ -213,7 +215,7 @@ tun6 *tun6_create (const char *req_name)
  		 * Some BSD variants or older kernel versions do not support /dev/tun,
  		 * so fallback to the old scheme.
  		 */
diff --git a/net/miredo/patches/patch-ad b/net/miredo/patches/patch-ad
new file mode 100644
index 00000000000..7cd9dc82591
--- /dev/null
+++ b/net/miredo/patches/patch-ad
@@ -0,0 +1,32 @@
+$NetBSD: patch-ad,v 1.3 2006/05/12 08:25:47 joerg Exp $
+
+--- compat/barrier.c.orig	2006-05-01 12:57:31.000000000 +0000
++++ compat/barrier.c
+@@ -30,7 +30,27 @@
+  ***********************************************************************/
+ 
+ #include <errno.h>
++
++#if defined(__DragonFly__)
++#define pthread_barrier_init sys_pthread_barrier_init
++#define pthread_barrier_destroy sys_pthread_barrier_destroy
++#define pthread_barrier_wait sys_pthread_barrier_wait
++#define pthread_barrier_t sys_pthread_barrier_t
++#define pthread_barrierattr_init sys_pthread_barrierattr_init
++#define pthread_barrierattr_destroy sys_pthread_barrierattr_destroy
++#define pthread_barrierattr_t sys_pthread_barrierattr_t
++#endif
+ #include <pthread.h>
++#if defined(__DragonFly__)
++#undef pthread_barrier_init
++#undef pthread_barrier_destroy
++#undef pthread_barrier_wait
++#undef pthread_barrier_t
++#undef pthread_barrierattr_init
++#undef pthread_barrierattr_destroy
++#undef pthread_barrierattr_t
++#undef PTHREAD_BARRIER_SERIAL_THREAD
++#endif
+ #include "barrier.h"
+ 
+ extern int
diff --git a/net/miredo/patches/patch-ae b/net/miredo/patches/patch-ae
new file mode 100644
index 00000000000..5624cfa0c38
--- /dev/null
+++ b/net/miredo/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2006/05/12 08:25:47 joerg Exp $
+
+--- configure.orig	2006-05-12 08:09:32.000000000 +0000
++++ configure
+@@ -20607,6 +20607,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
+