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.

6 files changed, 51 insertions, 12 deletions

diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 8ab639357e5..ab7a9221bfd 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/01/06 15:10:06 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/20 22:44:50 joerg Exp $
 #
 
 DISTNAME=	dctc-0.85.4
@@ -14,9 +14,16 @@ COMMENT=	Direct Connect clone (Direct Connect Text Client)
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
 USE_TOOLS+=		gmake perl:run
+USE_LIBTOOL=		YES
 
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
 
+SUBST_CLASSES+=		inethack
+SUBST_FILES.inethack=	src/dc_manage.c src/dc_manage_master.c
+SUBST_FILES.inethack+=	src/main.c src/main_master.c src/var.h
+SUBST_SED.inethack+=	-e 's,\(G_.*LOCK.*(\)inet_ntoa,\1my_inet_ntoa,g'
+SUBST_STAGE.inethack=	post-patch
+
 post-configure:
 	@${TOUCH} ${WRKSRC}/stamp-h.in ${WRKSRC}/config.h.in
 	@${TOUCH} ${WRKSRC}/config.status ${WRKSRC}/stamp-h
diff --git a/net/dctc/distinfo b/net/dctc/distinfo
index ace2cdcfbb1..e353b4cc735 100644
--- a/net/dctc/distinfo
+++ b/net/dctc/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.16 2005/12/05 20:50:45 rillig Exp $
+$NetBSD: distinfo,v 1.17 2006/01/20 22:44:50 joerg Exp $
 
 SHA1 (dctc-0.85.4.tar.gz) = 8422f041ccd398fcabb032a6ece9f2f50d827bb7
 RMD160 (dctc-0.85.4.tar.gz) = ded2d6e8f8de47c50ef689d0c49f6b3bcc2439f6
 Size (dctc-0.85.4.tar.gz) = 493733 bytes
 SHA1 (patch-aa) = 62cae1e95c3422cb8b184cd8ee13989073b9fc06
 SHA1 (patch-ab) = 4a28cc7d9e2a22c52ad319bbda0893d70fd000be
-SHA1 (patch-ac) = 6f73d5b954bc69c7b83e25411ae3819101c5d4e3
+SHA1 (patch-ac) = 6022b17a25d40dc3422ec7e8211e5135ae055d9b
 SHA1 (patch-ad) = ce699efbc6d009146a909e2ffac83435fdb2932e
-SHA1 (patch-ae) = d53881200e85a4ebcb62b37d8acbe5ab8bddabae
+SHA1 (patch-ae) = a278298de38640a17d08044a40d1eb8a186a3b90
+SHA1 (patch-af) = dac4a55daa91baf05d8d8eb9dc61540030fcfd98
+SHA1 (patch-ag) = 4a334f1f3d9748d7394d6081d8d32619e7860640
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 */