Add DragonFly to the systems with socklen_t. Remove an useless

make_block call which depends on the size of FILE.

4 files changed, 24 insertions, 11 deletions

diff --git a/games/abuse/distinfo b/games/abuse/distinfo
index 74bdf3da5a9..d39bb0f0f9c 100644
--- a/games/abuse/distinfo
+++ b/games/abuse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:11:54 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/11/11 15:20:41 joerg Exp $
 
 SHA1 (abuse_pd.tgz) = 52a703abea31d6f00937d4cc0160af7a454e6630
 RMD160 (abuse_pd.tgz) = 0f69cc38d422fcbf72a36d42433221701a120dfb
@@ -13,10 +13,11 @@ SHA1 (patch-ad) = 9003fe5ddd04be69c1d40b96ba995f453429ccb8
 SHA1 (patch-ae) = 3720352c2b73ed62e943d3c271a8e6c1f7f896d1
 SHA1 (patch-af) = 0558623285241b78372a4088e61844aa7ece7649
 SHA1 (patch-ag) = 7c3b32799059805e054399c7e5c7edb8da66be45
-SHA1 (patch-ah) = 67bbbeff32c5ece603cabee270c6242b8ccef676
-SHA1 (patch-ai) = 89dc9e69fd151623c4743338356b94ee3f09dee0
+SHA1 (patch-ah) = 27ed912740199f6a43df22c24012c1e50662aa8e
+SHA1 (patch-ai) = 7aa37a69dea617e7024317d806b68e7bdcabdd8e
 SHA1 (patch-aj) = e23fb30a64303de78ba708ce1d35adbdd6bd01ee
 SHA1 (patch-ak) = 93b3a07045bd00e3f4e0515526513fd057a0b048
 SHA1 (patch-al) = 657bb4544d5cabd8df3c2af1943bc72a855566f3
 SHA1 (patch-am) = 6520c422349f3c0d2bad4d861dc391abda734ae2
 SHA1 (patch-an) = 35c22e102679e7fa6742762a4acc1a33c877be8d
+SHA1 (patch-ao) = 5227d54b5d1b431265e57469c80f4269ca167b8e
diff --git a/games/abuse/patches/patch-ah b/games/abuse/patches/patch-ah
index bee401a9d94..7002c40765c 100644
--- a/games/abuse/patches/patch-ah
+++ b/games/abuse/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.1 2002/07/16 14:26:20 agc Exp $
+$NetBSD: patch-ah,v 1.2 2005/11/11 15:20:41 joerg Exp $
 
---- imlib/port/unix/jnet.c	2002/07/16 13:49:13	1.1
-+++ imlib/port/unix/jnet.c	2002/07/16 13:53:23
-@@ -30,6 +30,12 @@
+--- imlib/port/unix/jnet.c.orig	1996-05-24 20:48:19.000000000 +0000
++++ imlib/port/unix/jnet.c
+@@ -30,6 +30,12 @@ extern "C" {
  #include "macs.hpp"
  #include "jmalloc.hpp"
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define SOCKLEN_TYPE	__socklen_t
 +#else
 +#define SOCKLEN_TYPE	int
@@ -15,7 +15,7 @@ $NetBSD: patch-ah,v 1.1 2002/07/16 14:26:20 agc Exp $
  int net_init(int protocol) 
  { 
    if (protocol==TCPIP_PROTOCOL)    // UNIX always has TCPIP!
-@@ -146,7 +152,7 @@
+@@ -146,7 +152,7 @@ out_socket *unix_in_socket::check_for_co
  
    if (FD_ISSET(fd,&set))
    {
diff --git a/games/abuse/patches/patch-ai b/games/abuse/patches/patch-ai
index 14cce8b0406..dedcd2b5bcc 100644
--- a/games/abuse/patches/patch-ai
+++ b/games/abuse/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2002/07/16 14:26:20 agc Exp $
+$NetBSD: patch-ai,v 1.2 2005/11/11 15:20:41 joerg Exp $
 
 --- abuse/src/net/mac/tcpip.hpp	2002/07/16 13:57:41	1.1
 +++ abuse/src/net/mac/tcpip.hpp	2002/07/16 13:59:05
@@ -6,7 +6,7 @@ $NetBSD: patch-ai,v 1.1 2002/07/16 14:26:20 agc Exp $
    void broadcastable();
  } ;
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define SOCKLEN_TYPE	__socklen_t
 +#else
 +#define SOCKLEN_TYPE	int
diff --git a/games/abuse/patches/patch-ao b/games/abuse/patches/patch-ao
new file mode 100644
index 00000000000..09f3271fad3
--- /dev/null
+++ b/games/abuse/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2005/11/11 15:20:41 joerg Exp $
+
+--- imlib/mdlread.c.orig	2005-11-11 14:47:29.000000000 +0000
++++ imlib/mdlread.c
+@@ -110,7 +110,6 @@ image **read_mdl(char *fn, palette *&pal
+   char buf[50];
+   unsigned short xy[2],i,j;
+   clear_errors();
+-  make_block(sizeof(FILE));
+   im=NULL;
+   total=0;
+   startn--;