Add some unistd.h includes to get some prototypes, fix conditional

inclusion to include sys/time.h and unistd.h even if sys/select.h
exist, otherwise not all prototypes and types exist on DragonFly.

5 files changed, 80 insertions, 1 deletions

diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 7da3d38024e..8ea81a504c4 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/07 22:59:48 wulf Exp $
+$NetBSD: distinfo,v 1.2 2005/12/01 19:02:45 joerg Exp $
 
 SHA1 (gnuradio-core-2.5.tar.gz) = 9f18c2328fa5b06b0205a1206e82e6e49f4fadf7
 RMD160 (gnuradio-core-2.5.tar.gz) = b0f7d233c59e529fb3b8e0dc7c9ea3c3d105d9c5
 Size (gnuradio-core-2.5.tar.gz) = 1117321 bytes
+SHA1 (patch-aa) = 0e78c7fa1efc5545225825739965d7ba34718862
+SHA1 (patch-ab) = 8b99492bda024fe1f6b28076ddce10a002d86975
+SHA1 (patch-ac) = f7fe23cce5bfadfd6f99713caca1d0f5fd308e75
+SHA1 (patch-ad) = b60be38b16b48caa990969d14673d9b56581ed9c
diff --git a/ham/gnuradio-core/patches/patch-aa b/ham/gnuradio-core/patches/patch-aa
new file mode 100644
index 00000000000..d04d608be16
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1 2005/12/01 19:02:45 joerg Exp $
+
+--- src/lib/runtime/gr_dispatcher.cc.orig	2005-12-01 18:16:32.000000000 +0000
++++ src/lib/runtime/gr_dispatcher.cc
+@@ -29,18 +29,17 @@
+ #include <errno.h>
+ 
+ #ifdef HAVE_SELECT
++#  ifdef HAVE_SYS_TIME_H
++#    include <sys/time.h>
++#  endif
+ #  ifdef HAVE_SYS_SELECT_H
+ #    include <sys/select.h>
+-#  else
+-#    ifdef HAVE_SYS_TIME_H
+-#      include <sys/time.h>
+-#    endif
+-#    ifdef HAVE_SYS_TYPES_H
+-#      include <sys/types.h>
+-#    endif
+-#    ifdef HAVE_UNISTD_H
+-#      include <unistd.h>
+-#    endif
++#  endif
++#  ifdef HAVE_SYS_TYPES_H
++#    include <sys/types.h>
++#  endif
++#  ifdef HAVE_UNISTD_H
++#    include <unistd.h>
+ #  endif
+ #endif
+ 
diff --git a/ham/gnuradio-core/patches/patch-ab b/ham/gnuradio-core/patches/patch-ab
new file mode 100644
index 00000000000..28afbc7a4a3
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2005/12/01 19:02:45 joerg Exp $
+
+--- src/lib/runtime/gr_error_handler.cc.orig	2005-12-01 18:18:08.000000000 +0000
++++ src/lib/runtime/gr_error_handler.cc
+@@ -48,6 +48,10 @@
+ #include <assert.h>
+ #include <stdexcept>
+ 
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ static gr_error_handler	*s_default_handler = 0;
+ static gr_error_handler *s_silent_handler = 0;
+ 
diff --git a/ham/gnuradio-core/patches/patch-ac b/ham/gnuradio-core/patches/patch-ac
new file mode 100644
index 00000000000..879c6b35fd6
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2005/12/01 19:02:45 joerg Exp $
+
+--- src/lib/io/gr_file_descriptor_sink.cc.orig	2005-12-01 18:41:47.000000000 +0000
++++ src/lib/io/gr_file_descriptor_sink.cc
+@@ -32,6 +32,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <stdexcept>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ 
+ gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
diff --git a/ham/gnuradio-core/patches/patch-ad b/ham/gnuradio-core/patches/patch-ad
new file mode 100644
index 00000000000..eecff153fdb
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2005/12/01 19:02:45 joerg Exp $
+
+--- src/lib/io/gr_file_descriptor_source.cc.orig	2005-12-01 18:44:09.000000000 +0000
++++ src/lib/io/gr_file_descriptor_source.cc
+@@ -32,6 +32,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <stdexcept>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ 
+ gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,