Add DragonFly support.

9 files changed, 70 insertions, 25 deletions

diff --git a/graphics/dx/distinfo b/graphics/dx/distinfo
index dac2d94a6f2..5b20d85f542 100644
--- a/graphics/dx/distinfo
+++ b/graphics/dx/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 08:45:04 agc Exp $
+$NetBSD: distinfo,v 1.11 2006/04/28 20:33:30 joerg Exp $
 
 SHA1 (dx-4.3.2.tar.gz) = e05c28b8db33c9e647bede27d1cc3cfd4146d524
 RMD160 (dx-4.3.2.tar.gz) = 855c9ce1bdd953873178eb2840b68cd35cf2b0a2
 Size (dx-4.3.2.tar.gz) = 9904514 bytes
-SHA1 (patch-ab) = 3daeff45ae9a15d556895b6c7a60edee1e00ec61
+SHA1 (patch-aa) = 170dc8ec2533a576adbd32915d24ad522abf0079
+SHA1 (patch-ab) = 782e073f9c8395483ff8699338d60a1d6a2ecced
 SHA1 (patch-ac) = 4702813a5fa9efc48e947ec0b2ce4099c303d521
-SHA1 (patch-ad) = 4a1a74772d4c9fd6838a52ae210f4562e6d4591e
+SHA1 (patch-ad) = b8ac0bdfeadff9477f22f6f83a902d120b48050f
 SHA1 (patch-ae) = c9c63152d4e87be5016026858636a2e774580c96
-SHA1 (patch-af) = 4873080df4c3f055f5b30c349ccd9e9cf70f12e1
-SHA1 (patch-aj) = accb0b163687c73c68ad00b50b66c2d7252e487f
-SHA1 (patch-am) = 45f1320ac827165e8a89aebdcffe245a7f84e6b5
+SHA1 (patch-af) = fa47ef009350bdb17d705020fc8d06e84b707516
+SHA1 (patch-ag) = 7dea64ca4fe5c429270a4c12bd31f5c37972b364
+SHA1 (patch-aj) = 7be876086ddd62b551823c28d6a60e19ba15a20e
+SHA1 (patch-am) = 6b9f8137bc92d0a42118f723af90e0a5db65bae9
 SHA1 (patch-an) = e7eb5d67c9c9c5492be94b02afc4eb7856da77dc
 SHA1 (patch-ap) = d67158b45960b86cad02d2364158d1667990c294
 SHA1 (patch-ar) = cafb9f3eec34cc3909eea194c644497ad53960ca
-SHA1 (patch-ba) = 4c8a7bbc12f5c0fd4e0ff496dc6232df4693a664
+SHA1 (patch-ba) = 41d20e76feebdb049729e46ca4240ccc41f51b1d
diff --git a/graphics/dx/patches/patch-aa b/graphics/dx/patches/patch-aa
new file mode 100644
index 00000000000..794bc6a1fd3
--- /dev/null
+++ b/graphics/dx/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.4 2006/04/28 20:33:30 joerg Exp $
+
+--- src/exec/dpexec/ccm.c.orig	2006-04-22 18:17:03.000000000 +0000
++++ src/exec/dpexec/ccm.c
+@@ -19,6 +19,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ 
+ #if defined(HAVE_SYS_TYPES_H)
+@@ -82,7 +83,6 @@ _dxfSetupServer(int pport, int *psock,
+     u_short port;
+     int sts;
+     int oldPort;
+-    extern int errno; /* from <errno.h> */
+     int tries;
+ 
+     port = pport;
+@@ -224,7 +224,6 @@ _dxfCompleteServer(int sock, 
+     int length;
+     int fd;
+     int sts;
+-    extern int errno; /* from <errno.h> */
+     fd_set fds;
+ #ifdef   DXD_HAS_WINSOCKETS
+     int width = FD_SETSIZE;
diff --git a/graphics/dx/patches/patch-ab b/graphics/dx/patches/patch-ab
index f2131632bda..e895a566922 100644
--- a/graphics/dx/patches/patch-ab
+++ b/graphics/dx/patches/patch-ab
@@ -1,11 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2006/04/28 20:33:30 joerg Exp $
 
 --- configure.orig	2003-09-26 22:13:01.000000000 +0000
-+++ configure	2004-04-20 19:09:10.000000000 +0000
-@@ -18614,6 +18614,8 @@
++++ configure
+@@ -18614,6 +18614,10 @@ else
  	    ac_cv_dx_arch=unknown
  	    if test $unameS = "FreeBSD" ; then
  		ac_cv_dx_arch=freebsd
++	    elif test $unameS = "DragonFly" ; then
++		ac_cv_dx_arch=dragonfly
 +	    elif test $unameS = "NetBSD" ; then
 +		ac_cv_dx_arch=netbsd
  	    elif test `echo $unameS | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` = "yes" ; then
diff --git a/graphics/dx/patches/patch-ad b/graphics/dx/patches/patch-ad
index 9571c9da550..31a09e34e84 100644
--- a/graphics/dx/patches/patch-ad
+++ b/graphics/dx/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2006/04/28 20:33:30 joerg Exp $
 
 --- include/dx/arch.h.orig	2003-07-12 00:12:02.000000000 +0000
 +++ include/dx/arch.h	2004-04-20 19:22:51.000000000 +0000
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 2004/04/20 22:11:48 drochner Exp $
   * FreeBSD (and probably NetBSD and OpenBSD)
   */
 -#if defined(freebsd)
-+#if defined(freebsd) || defined(__NetBSD__)
++#if defined(freebsd) || defined(__NetBSD__) || defined(__DragonFly__)
  
  #undef F_CHAR_READY
  #define F_CHAR_READY(fp) ((fp)->_r > 0 || (fp)->_ub._base)
diff --git a/graphics/dx/patches/patch-af b/graphics/dx/patches/patch-af
index 7bb84a1d6a9..93c94092c56 100644
--- a/graphics/dx/patches/patch-af
+++ b/graphics/dx/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $
+$NetBSD: patch-af,v 1.2 2006/04/28 20:33:30 joerg Exp $
 --- src/exec/dxmods/_compoper1.c.orig	Sun Sep 26 23:18:48 1999
 +++ src/exec/dxmods/_compoper1.c	Sun Sep 26 23:19:04 1999
 @@ -457,6 +457,9 @@
  #ifdef freebsd
  #   define trunc(x) ((float)((int)(x)))
  #endif
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#   define trunc(x) ((float)((int)(x)))
 +#endif
  #ifdef cygwin
diff --git a/graphics/dx/patches/patch-ag b/graphics/dx/patches/patch-ag
new file mode 100644
index 00000000000..f03d16b9d46
--- /dev/null
+++ b/graphics/dx/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.5 2006/04/28 20:33:30 joerg Exp $
+
+--- src/exec/dpexec/socket.c.orig	2006-04-22 18:24:46.000000000 +0000
++++ src/exec/dpexec/socket.c
+@@ -120,7 +120,6 @@ _dxf_ExInitServer(int pport)
+     int fd;
+     int sts;
+     int oldPort;
+-    extern int errno; /* from <errno.h> */
+     int tries;
+     fd_set fds;
+     int width = FD_SETSIZE;
diff --git a/graphics/dx/patches/patch-aj b/graphics/dx/patches/patch-aj
index 2bd0bd6e026..d507240f03f 100644
--- a/graphics/dx/patches/patch-aj
+++ b/graphics/dx/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2002/02/05 22:23:33 drochner Exp $
+$NetBSD: patch-aj,v 1.3 2006/04/28 20:33:30 joerg Exp $
 
 --- src/uipp/startup/StartupWindow.C.orig	Tue May  8 17:01:47 2001
 +++ src/uipp/startup/StartupWindow.C	Tue Feb  5 12:28:46 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.2 2002/02/05 22:23:33 drochner Exp $
  // polling loop that runs once every few seconds and checks the child pid.
  //
 -#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos)
-+#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__)
++#if defined(ibm6000) || defined(hp700) || defined(alphax) || defined(sun4) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__) || defined(__DragonFly__)
  #define USE_WAIT3 1
  #endif
  
diff --git a/graphics/dx/patches/patch-am b/graphics/dx/patches/patch-am
index b1162e5e371..24e503d217e 100644
--- a/graphics/dx/patches/patch-am
+++ b/graphics/dx/patches/patch-am
@@ -1,13 +1,14 @@
-$NetBSD: patch-am,v 1.5 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-am,v 1.6 2006/04/28 20:33:30 joerg Exp $
 
 --- src/uipp/dxuilib/PacketIF.C.orig	2003-09-26 17:38:11.000000000 +0000
 +++ src/uipp/dxuilib/PacketIF.C	2004-04-20 19:26:00.000000000 +0000
-@@ -1418,7 +1418,7 @@
+@@ -1418,9 +1418,6 @@ void PacketIF::connectAsServer(int pport
      int fd;
      int sts;
      int oldPort;
 -#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(solaris)
-+#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(solaris) && !defined(__NetBSD__)
-     extern int errno;
- #endif
+-    extern int errno;
+-#endif
      int tries;
+     fd_set fds;
+     int  width = getdtablesize();
diff --git a/graphics/dx/patches/patch-ba b/graphics/dx/patches/patch-ba
index b79593bd1ed..4532230dd8a 100644
--- a/graphics/dx/patches/patch-ba
+++ b/graphics/dx/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-ba,v 1.2 2006/04/28 20:33:30 joerg Exp $
 
 --- src/exec/libdx/memory.c.orig	2004-04-20 20:55:28.000000000 +0000
 +++ src/exec/libdx/memory.c	2004-04-20 21:05:24.000000000 +0000
@@ -7,7 +7,7 @@ $NetBSD: patch-ba,v 1.1 2004/04/20 22:11:48 drochner Exp $
  #endif
  
 -#if freebsd
-+#if defined(freebsd) || defined(__NetBSD__)
++#if defined(freebsd) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
@@ -16,7 +16,7 @@ $NetBSD: patch-ba,v 1.1 2004/04/20 22:11:48 drochner Exp $
  #endif
  
 -#ifdef freebsd
-+#if defined(freebsd) || defined(__NetBSD__)
++#if defined(freebsd) || defined(__NetBSD__) || defined(__DragonFly__)
  #define initvalues
  #define SMALL_BASE    0               /* use data segment */
  #define SMALL_GET     _dxfgetmem      /* expand by using DosSetMem */
@@ -25,7 +25,7 @@ $NetBSD: patch-ba,v 1.1 2004/04/20 22:11:48 drochner Exp $
  #endif
  
 -#if freebsd
-+#if defined(freebsd) || defined(__NetBSD__)
++#if defined(freebsd) || defined(__NetBSD__) || defined(__DragonFly__)
    int mib[2],hw_physmem;
    size_t len;