Use fileno, it is portable. Add DragonFly support.

3 files changed, 20 insertions, 18 deletions

diff --git a/games/nighthawk/distinfo b/games/nighthawk/distinfo
index b89b6cdad65..b9d214a8588 100644
--- a/games/nighthawk/distinfo
+++ b/games/nighthawk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/06/07 05:41:38 minskim Exp $
+$NetBSD: distinfo,v 1.9 2006/01/13 00:13:54 joerg Exp $
 
 SHA1 (nighthawk-2.1.tgz) = 117cd7d2c496a0d9e44b1b6d02523ad1cb0de1bf
 RMD160 (nighthawk-2.1.tgz) = 3973ff63c4525de65ae4dd3803d355c102968997
@@ -8,9 +8,9 @@ RMD160 (nighthawk-2.1a.patch) = 4b4bf8f7c4092ecc5ea231fab83de99977e77306
 Size (nighthawk-2.1a.patch) = 8543 bytes
 SHA1 (patch-aa) = 34a11d0be9d7f83e341a85af986042013ad804ba
 SHA1 (patch-ab) = 1e0b921ad6920f74341b78e7d9804313e0269663
-SHA1 (patch-ac) = e51ee631a604a38570328b2472f958a64e39f169
+SHA1 (patch-ac) = 910c7a1d20490b2eb52fcab2ed022eca1b41e38e
 SHA1 (patch-ad) = 2cb1ad86cd8fbfcfbc0ece05ce3d65508a57fe68
 SHA1 (patch-ae) = 1699979e5013e86dc158722faef525b46ce30076
 SHA1 (patch-ba) = 3bf82814d23305a686317ea36ff03698d65157ee
-SHA1 (patch-bb) = beb63b9e3400c774534dd8b9832cfb314bc684ff
+SHA1 (patch-bb) = f0f4a540e41a9f961b03f9960914436d400ebaaf
 SHA1 (patch-bc) = 8bbcd9bd7bcde579a9b7ddb26ef60ffc05362b7e
diff --git a/games/nighthawk/patches/patch-ac b/games/nighthawk/patches/patch-ac
index d23aa1242bd..6def97e6db2 100644
--- a/games/nighthawk/patches/patch-ac
+++ b/games/nighthawk/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2005/06/07 05:00:19 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2006/01/13 00:13:54 joerg Exp $
 
 --- src/nighthawk.cc.orig	1998-06-22 06:28:05.000000000 -0500
 +++ src/nighthawk.cc
@@ -10,15 +10,12 @@ $NetBSD: patch-ac,v 1.3 2005/06/07 05:00:19 minskim Exp $
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/stat.h>
-@@ -85,7 +86,11 @@ FILE *lopen(char *filename,char *mode)
+@@ -85,7 +86,7 @@ FILE *lopen(char *filename,char *mode)
    FILE *fp;
  
    if((fp = fopen(filename,mode)) != NULL)
-+#ifdef __NetBSD__
-+    flock(fp->_file,LOCK_EX);
-+#else
-     flock(fp->_fileno,LOCK_EX);
-+#endif
+-    flock(fp->_fileno,LOCK_EX);
++    flock(fileno(fp),LOCK_EX);
    return fp;
  }
  
diff --git a/games/nighthawk/patches/patch-bb b/games/nighthawk/patches/patch-bb
index 72506a4927c..b8e4ac7df04 100644
--- a/games/nighthawk/patches/patch-bb
+++ b/games/nighthawk/patches/patch-bb
@@ -1,17 +1,22 @@
-$NetBSD: patch-bb,v 1.3 2005/06/07 05:33:20 minskim Exp $
+$NetBSD: patch-bb,v 1.4 2006/01/13 00:13:54 joerg Exp $
 
 --- src_sound/dsp_mixxer.c.orig	1998-06-22 05:41:31.000000000 -0500
 +++ src_sound/dsp_mixxer.c
-@@ -23,6 +23,8 @@
+@@ -19,10 +19,10 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#ifdef Linux
++#if defined(Linux) || defined( FreeBSD) || defined(__DragonFly__)
   #include <sys/soundcard.h>
- #elif FreeBSD
-  #include <machine/soundcard.h>
+-#elif FreeBSD
+- #include <machine/soundcard.h>
 +#elif defined(__NetBSD__)
 + #include <soundcard.h>
  #endif
  #include "funktracker_defs.h"
  #include "funktracker.h"
-@@ -91,7 +93,7 @@ void init_dsp_buffers(void)
+@@ -91,7 +91,7 @@ void init_dsp_buffers(void)
    register int x;
  
    calc_mix_buffer(funk_info.bpm_rate);
@@ -20,7 +25,7 @@ $NetBSD: patch-bb,v 1.3 2005/06/07 05:33:20 minskim Exp $
    for(x = 0;x < mix_buffer_size;x++)
    {
      *(left_mix_buffer + x) = 0;
-@@ -187,7 +189,7 @@ void close_dsp(void)
+@@ -187,7 +187,7 @@ void close_dsp(void)
  {
    if(dsp_fp != -1)
    {
@@ -29,7 +34,7 @@ $NetBSD: patch-bb,v 1.3 2005/06/07 05:33:20 minskim Exp $
      close(dsp_fp);
    }
  }
-@@ -247,12 +249,12 @@ int open_dsp(int srate,int prec,int st)
+@@ -247,12 +247,12 @@ int open_dsp(int srate,int prec,int st)
    if(dsp_alloc_bufs())
    {
      printf("Allocated dsp buffers..\n");
@@ -44,7 +49,7 @@ $NetBSD: patch-bb,v 1.3 2005/06/07 05:33:20 minskim Exp $
          funk_info.precision,
          funk_info.stereo == 8 ? "mono" : "stereo",
          funk_info.sampling_rate,
-@@ -265,7 +267,7 @@ int open_dsp(int srate,int prec,int st)
+@@ -265,7 +265,7 @@ int open_dsp(int srate,int prec,int st)
        return 1;
      }
      else