diff options
author | joerg <joerg@pkgsrc.org> | 2006-01-20 22:44:50 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-01-20 22:44:50 +0000 |
commit | e0b67161d790f62c254d9a09703b541d30d1620d (patch) | |
tree | 303af229f97dd9ff5e748bf03650ec392afa03bf /net/dctc/patches | |
parent | c5f7aa589aac13fc1fb66860d5dd73c103a31d56 (diff) | |
download | pkgsrc-e0b67161d790f62c254d9a09703b541d30d1620d.tar.gz |
USE_LIBTOOL=yes
Avoid union shm on DragonFly, it conflicts with system provided version.
Hack around some namespace pollution in arpa/inet.h inherited from
FreeBSD which results in G_LOCK(inet_ptona) being partly mapped to
G_LOCK(__inet_ptona), but not consistently.
Diffstat (limited to 'net/dctc/patches')
-rw-r--r-- | net/dctc/patches/patch-ac | 10 | ||||
-rw-r--r-- | net/dctc/patches/patch-ae | 10 | ||||
-rw-r--r-- | net/dctc/patches/patch-af | 13 | ||||
-rw-r--r-- | net/dctc/patches/patch-ag | 13 |
4 files changed, 38 insertions, 8 deletions
diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac index a6a2cba0c80..6ca13a91543 100644 --- a/net/dctc/patches/patch-ac +++ b/net/dctc/patches/patch-ac @@ -1,16 +1,18 @@ -$NetBSD: patch-ac,v 1.6 2005/12/05 20:50:45 rillig Exp $ +$NetBSD: patch-ac,v 1.7 2006/01/20 22:44:50 joerg Exp $ --- src/keyboard_master.c.orig Sun Jun 22 10:40:35 2003 +++ src/keyboard_master.c -@@ -39,7 +40,6 @@ +@@ -39,8 +39,7 @@ $Id: keyboard_master.c,v 1.1 2003/06/22 #include <openssl/md4.h> #include <glib.h> -#if !(defined(BSD) && (BSD >= 199103)) - #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) +- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) ++ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__DragonFly__) /* union semun is defined by including <sys/sem.h> */ #else -@@ -51,7 +51,6 @@ + /* according to X/OPEN we have to define it ourselves */ +@@ -51,7 +50,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22 struct seminfo *__buf; /* buffer for IPC_INFO */ }; #endif diff --git a/net/dctc/patches/patch-ae b/net/dctc/patches/patch-ae index 306085cc58c..f74e6f0c7b9 100644 --- a/net/dctc/patches/patch-ae +++ b/net/dctc/patches/patch-ae @@ -1,16 +1,18 @@ -$NetBSD: patch-ae,v 1.2 2003/06/10 13:20:25 wiz Exp $ +$NetBSD: patch-ae,v 1.3 2006/01/20 22:44:50 joerg Exp $ --- src/keyboard.c.orig Sun May 18 08:48:16 2003 +++ src/keyboard.c Tue Jun 10 12:04:22 2003 -@@ -39,7 +39,6 @@ +@@ -39,8 +39,7 @@ $Id: keyboard.c,v 1.11 2003/06/28 14:40: #include <openssl/md4.h> #include <glib.h> -#if !(defined(BSD) && (BSD >= 199103)) - #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) +- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) ++ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__DragonFly__) /* union semun is defined by including <sys/sem.h> */ #else -@@ -51,7 +50,6 @@ + /* according to X/OPEN we have to define it ourselves */ +@@ -51,7 +50,6 @@ $Id: keyboard.c,v 1.11 2003/06/28 14:40: struct seminfo *__buf; /* buffer for IPC_INFO */ }; #endif diff --git a/net/dctc/patches/patch-af b/net/dctc/patches/patch-af new file mode 100644 index 00000000000..cb0345bcda7 --- /dev/null +++ b/net/dctc/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.6 2006/01/20 22:44:50 joerg Exp $ + +--- src/sema.c.orig 2006-01-20 22:04:29.000000000 +0000 ++++ src/sema.c +@@ -42,7 +42,7 @@ $Id: sema.c,v 1.14 2003/06/24 07:05:17 e + #include "sema.h" + + #if !(defined(BSD) && (BSD >= 199103)) +- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) ++ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__DragonFly__) + /* union semun is defined by including <sys/sem.h> */ + #else + /* according to X/OPEN we have to define it ourselves */ diff --git a/net/dctc/patches/patch-ag b/net/dctc/patches/patch-ag new file mode 100644 index 00000000000..18dacdba086 --- /dev/null +++ b/net/dctc/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.3 2006/01/20 22:44:50 joerg Exp $ + +--- src/sema_master.c.orig 2006-01-20 22:39:38.000000000 +0000 ++++ src/sema_master.c +@@ -41,7 +41,7 @@ $Id: sema_master.c,v 1.1 2003/06/22 08:4 + #include "sema_master.h" + + #if !(defined(BSD) && (BSD >= 199103)) +- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) ++ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__DragonFly__) + /* union semun is defined by including <sys/sem.h> */ + #else + /* according to X/OPEN we have to define it ourselves */ |