diff options
| author | joerg <joerg> | 2006-05-12 08:25:47 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-05-12 08:25:47 +0000 |
| commit | 5350d7f6d5b3af45aaff5c21de5e4af5a530973b (patch) | |
| tree | 07fa8eebf6d85da12f037db06932b91d177b8431 /net/miredo/patches | |
| parent | ce8c1d6b7b27e8a9e3ae7c13db02278fb6f48247 (diff) | |
| download | pkgsrc-5350d7f6d5b3af45aaff5c21de5e4af5a530973b.tar.gz | |
Fix PLIST and bump revision. Add DragonFly work arounds for pthread.h
and fix net/if_var.h test as well.
Diffstat (limited to 'net/miredo/patches')
| -rw-r--r-- | net/miredo/patches/patch-ac | 17 | ||||
| -rw-r--r-- | net/miredo/patches/patch-ad | 32 | ||||
| -rw-r--r-- | net/miredo/patches/patch-ae | 12 |
3 files changed, 57 insertions, 4 deletions
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> + |