summaryrefslogtreecommitdiff
path: root/net/dctc/patches/patch-ac
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-01-20 22:44:50 +0000
committerjoerg <joerg@pkgsrc.org>2006-01-20 22:44:50 +0000
commite0b67161d790f62c254d9a09703b541d30d1620d (patch)
tree303af229f97dd9ff5e748bf03650ec392afa03bf /net/dctc/patches/patch-ac
parentc5f7aa589aac13fc1fb66860d5dd73c103a31d56 (diff)
downloadpkgsrc-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/patch-ac')
-rw-r--r--net/dctc/patches/patch-ac10
1 files changed, 6 insertions, 4 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