Add DragonFly support.

5 files changed, 85 insertions, 34 deletions

diff --git a/games/plib/distinfo b/games/plib/distinfo
index 15b14103dcd..d93227beeaa 100644
--- a/games/plib/distinfo
+++ b/games/plib/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:12:01 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/03/28 23:05:05 joerg Exp $
 
 SHA1 (plib-1.6.0.tar.gz) = f2c0c8ba909e7df12850fafba9bb57152cb96976
 RMD160 (plib-1.6.0.tar.gz) = 7f9873fb15277bdb8f73e010b6381d04401fb1bd
 Size (plib-1.6.0.tar.gz) = 523897 bytes
-SHA1 (patch-aa) = 3c3adf01bd2107b1b91cac98410081a3f25f7b47
-SHA1 (patch-ab) = a4f82828a88e6d6605c3627e73f769ae8e0fcade
-SHA1 (patch-ac) = 167ddbc8de4448d94644cce8ac28d77aa70a2704
-SHA1 (patch-ad) = dca12d7e59048c33868930b7a30a95aa3c66a924
+SHA1 (patch-aa) = a887f535574f88ce3882868b000ca1d39b0a49c5
+SHA1 (patch-ab) = 308b6f2eabe9551012b9b4c272a124587191d170
+SHA1 (patch-ac) = 2cd987814a89d4a841f130ff1e138fe540cc7ff8
diff --git a/games/plib/patches/patch-aa b/games/plib/patches/patch-aa
index d1aa9f79cd8..28ee6c921c4 100644
--- a/games/plib/patches/patch-aa
+++ b/games/plib/patches/patch-aa
@@ -1,16 +1,35 @@
-$NetBSD: patch-aa,v 1.3 2003/09/22 12:27:29 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2006/03/28 23:05:05 joerg Exp $
 
 --- src/sl/slPortability.h.orig	Mon Sep 22 06:08:29 2003
 +++ src/sl/slPortability.h	Mon Sep 22 06:09:02 2003
-@@ -78,7 +78,11 @@
+@@ -35,7 +35,8 @@
+ 
+ /* the next lines are to define BSD */
+ /* see http://www.freebsd.org/handbook/porting.html for why we do this */
+-#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) \
++    && !defined(USG)
+ #include <sys/param.h>
+ #endif
+ 
+@@ -70,15 +71,17 @@
+ #include <limits.h>
+ #include <math.h>
+ 
+-#if (defined(__linux__) || defined(BSD)) && !defined(__NetBSD__)
++#if (defined(__linux__) || defined(BSD) || defined(__DragonFly__)) && !defined(__NetBSD__)
+ #define SL_USING_OSS_AUDIO 1
+ #endif
+ 
+ #ifdef SL_USING_OSS_AUDIO
  #  if defined(__linux__)
  #    include <linux/soundcard.h>
- #  elif defined(__FreeBSD__)
-+#  if __FreeBSD_version >= 500000
+-#  elif defined(__FreeBSD__)
+-#    include <machine/soundcard.h>
++#  elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000) || defined(__DragonFly__)
 +#    include <sys/soundcard.h>
-+#  else
- #    include <machine/soundcard.h>
-+#  endif
++#  elif (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#    include <machine/soundcard.h>
  #  else
      /*
        Tom thinks this file may be <sys/soundcard.h> under some
diff --git a/games/plib/patches/patch-ab b/games/plib/patches/patch-ab
index d30c3bcea2c..b644b2ebc33 100644
--- a/games/plib/patches/patch-ab
+++ b/games/plib/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.4 2003/09/22 12:27:29 xtraeme Exp $
+$NetBSD: patch-ab,v 1.5 2006/03/28 23:05:05 joerg Exp $
 
 --- src/js/js.h.orig	Mon Sep 22 06:05:53 2003
 +++ src/js/js.h	Mon Sep 22 06:06:47 2003
-@@ -63,7 +63,11 @@
+@@ -62,8 +62,12 @@
+ #  include <unistd.h>
  #  include <fcntl.h>
  
- #  if defined(__FreeBSD__) || defined(__NetBSD__)
-+#  if __FreeBSD_version >= 500000
+-#  if defined(__FreeBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#  if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 +#    include <sys/joystick.h>
 +#  else
  #    include <machine/joystick.h>
@@ -14,15 +16,60 @@ $NetBSD: patch-ab,v 1.4 2003/09/22 12:27:29 xtraeme Exp $
  #    define JS_DATA_TYPE joystick
  #    define JS_RETURN (sizeof(struct JS_DATA_TYPE))
  #  elif defined(__linux__)
-@@ -132,9 +136,9 @@
+@@ -111,7 +115,7 @@
+ #elif defined (macintosh)
+ #  define _JS_MAX_AXES 9
+ #else
+-#  if defined(__FreeBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #  define _JS_MAX_AXES 2
+ #  else
+ #  define _JS_MAX_AXES 9
+@@ -132,9 +136,9 @@ class jsJoystick
  
  
  
 -/*#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
    int          id ;
 -#endif*/
 +#endif
  #ifdef WIN32
    JOYINFOEX    js       ;
    UINT         js_id    ;
+@@ -312,7 +316,7 @@ class jsJoystick
+     }
+ 
+ #else
+-#  if defined(__FreeBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+     FILE *joyfile;
+     char joyfname[1024];
+     int noargs, in_no_axes;
+@@ -338,7 +342,7 @@ class jsJoystick
+     if ( error )
+       return ;
+ 
+-#  if defined(__FreeBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 
+     /*
+       FIXME: get joystick name for BSD
+@@ -494,7 +498,7 @@ public:
+ 
+ 
+ #else
+-#  if defined(__FreeBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+     //id = ident;
+     sprintf ( fname, "/dev/joy%d", ident ) ;
+ #  elif defined(__linux__)
+@@ -725,7 +729,7 @@ public:
+     }
+ 
+     if ( buttons )
+-#  if defined(__FreeBSD__) || defined(__NetBSD__)
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+       *buttons = ( js.b1 ? 1 : 0 ) | ( js.b2 ? 2 : 0 ) ;
+ #  else
+       *buttons = js.buttons ;
diff --git a/games/plib/patches/patch-ac b/games/plib/patches/patch-ac
index 96b26a7244f..2b1d9e04334 100644
--- a/games/plib/patches/patch-ac
+++ b/games/plib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2003/09/22 12:27:29 xtraeme Exp $
+$NetBSD: patch-ac,v 1.4 2006/03/28 23:05:05 joerg Exp $
 
 --- src/net/netSocket.cxx.orig	Mon Sep 22 06:03:03 2003
 +++ src/net/netSocket.cxx	Mon Sep 22 06:03:29 2003
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.3 2003/09/22 12:27:29 xtraeme Exp $
  #if defined(__CYGWIN__) || !defined (WIN32)
  
 -#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined (__FreeBSD__)
++#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__DragonFly__)
  #  include <netinet/in.h>
  #endif
  
diff --git a/games/plib/patches/patch-ad b/games/plib/patches/patch-ad
deleted file mode 100644
index b8dfdce9814..00000000000
--- a/games/plib/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2004/08/22 11:19:42 kristerw Exp $
-
---- src/sl/slPortability.h.orig	2004-03-19 03:18:23.000000000 +0100
-+++ src/sl/slPortability.h	2004-03-19 03:19:02.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- /* the next lines are to define BSD */
- /* see http://www.freebsd.org/handbook/porting.html for why we do this */
--#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) \
-+    && !defined(USG)
- #include <sys/param.h>
- #endif
-