A quick purousal thru our port's patches directory shows a *WAY* over use of

__FreeBSD__.

That said, add __OpenBSD__ and __NetBSD__ where approapiate.

8 files changed, 19 insertions, 19 deletions

diff --git a/archivers/arc/files/patch-aa b/archivers/arc/files/patch-aa
index 5d57698..5b2f9b5 100644
--- a/archivers/arc/files/patch-aa
+++ b/archivers/arc/files/patch-aa
@@ -62,7 +62,7 @@
   	tm.tm_mday = date & 31;
   	tm.tm_mon = ((date >> 5) & 15) - 1;
   	tm.tm_year = (date >> 9) + 80;
-+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
++ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
   	tvp[0].tv_sec = tmclock(&tm);
 + #else
 + 	tvp[0].tv_sec = timelocal(&tm);
diff --git a/archivers/bzip/files/patch-ab b/archivers/bzip/files/patch-ab
index cb8349e..8a349de 100644
--- a/archivers/bzip/files/patch-ab
+++ b/archivers/bzip/files/patch-ab
@@ -4,7 +4,7 @@
  #if BZ_UNIX_32
     #include <utime.h>
     #include <unistd.h>
-+#ifndef __FreeBSD__	/* stdlib already included above */
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)	/* stdlib already included above */
     #include <malloc.h>
 +#endif
     #include <sys/stat.h>
diff --git a/archivers/unarj/files/patch-aa b/archivers/unarj/files/patch-aa
index 2676a66..ad08f8f 100644
--- a/archivers/unarj/files/patch-aa
+++ b/archivers/unarj/files/patch-aa
@@ -31,7 +31,7 @@
 ! gettz(stamp)         /* returns the offset from GMT in seconds */
 ! time_t stamp;
   {
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + 	return -localtime(&stamp)->tm_gmtoff;
 + #else
   #define NOONOFFSET    43200L
@@ -73,7 +73,7 @@
   #endif
   
   typedef unsigned char  uchar;   /*  8 bits or more */
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
   typedef unsigned int   uint;    /* 16 - 32 bits or more */
   typedef unsigned short ushort;  /* 16 bits or more */
 + #endif
diff --git a/archivers/zoo/files/patch-aa b/archivers/zoo/files/patch-aa
index c11c215..a865419 100644
--- a/archivers/zoo/files/patch-aa
+++ b/archivers/zoo/files/patch-aa
@@ -17,7 +17,7 @@
 ! long gettz(t)
 ! long t;
   {
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +    return -localtime(&t)->tm_gmtoff;
 + #else
   #define SEC_IN_DAY	(24L * 60L * 60L)
@@ -54,7 +54,7 @@
   /* Standard UNIX-specific file attribute routines */
   #include "nixmode.i"
   
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + #include <unistd.h>
 + #else
   #ifndef SEEK_CUR
@@ -222,7 +222,7 @@
   /* uchar should be 8 bits or more */
   /* typedef unsigned char  uchar;   -- already in zoo.h */
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
   typedef unsigned int   uint;    /* 16 bits or more */
   #if !defined(__386BSD__) || !defined(_TYPES_H_)
   typedef unsigned short ushort;  /* 16 bits or more */
diff --git a/astro/xephem/files/patch-aa b/astro/xephem/files/patch-aa
index 135684f..e36da9c 100644
--- a/astro/xephem/files/patch-aa
+++ b/astro/xephem/files/patch-aa
@@ -78,7 +78,7 @@
  #include <errno.h>
  #include <perror.h>
  #else
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
  	extern char *sys_errlist[];
 +#endif
  	extern int errno;
diff --git a/audio/workman/files/patch-aa b/audio/workman/files/patch-aa
index cbe716f..969ffe5 100644
--- a/audio/workman/files/patch-aa
+++ b/audio/workman/files/patch-aa
@@ -218,7 +218,7 @@ diff -c --recursive ./plat_freebsd.c ../workman.new/./plat_freebsd.c
   	}
   
   	if (ioctl(d->fd, CDIOCREADSUBCHANNEL, &sc)) {
-! #if defined(__NetBSD__) || defined(__FreeBSD__)
+! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
   	    /* we need to release the device so the kernel will notice
   	       reloaded media */
   	    (void) close(d->fd);
@@ -252,12 +252,12 @@ diff -c --recursive ./plat_freebsd.c ../workman.new/./plat_freebsd.c
   	if (fstatfs(stbuf.st_rdev, &buf) == 0)
   		return (-3);
   
-! #if defined(__NetBSD__) || defined(__FreeBSD__)
+! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
   	rval = ioctl(d->fd, CDIOCALLOW);
   	if (rval == 0)
   #endif
   	    rval = ioctl(d->fd, CDIOCEJECT);
-! #if defined(__NetBSD__) || defined(__FreeBSD__)
+! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
   	if (rval == 0)
   	    rval = ioctl(d->fd, CDIOCPREVENT);
   #endif
@@ -300,7 +300,7 @@ diff -c --recursive ./workman_stubs.c ../workman.new/./workman_stubs.c
   Panel_item	quitbutton;
   char	*getenv(), *WMstrdup();
   
-+ #if defined(__FreeBSD__)
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + /* FreeBSD has a special directory for pidfiles, I guess. */
 + char	*pidfile = "/var/run/workman.pid";
 + #else
diff --git a/audio/xcdplayer/files/patch-ab b/audio/xcdplayer/files/patch-ab
index 645eedd..ed31ad6 100644
--- a/audio/xcdplayer/files/patch-ab
+++ b/audio/xcdplayer/files/patch-ab
@@ -6,7 +6,7 @@
   # include <X11/Xaw/Toggle.h>
   
   # include "cdrom_globs.h"
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + # include "cdrom_freebsd.h"
 + #endif
   #ifdef sun
@@ -74,7 +74,7 @@
   
   # include "debug.h"
   # include "cdrom_globs.h"
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + # include "cdrom_freebsd.h"
 + #endif
   #ifdef sun
@@ -88,7 +88,7 @@
   
   # include "debug.h"
   # include "cdrom_globs.h"
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + # include "cdrom_freebsd.h"
 + #endif
   #ifdef sun
@@ -139,7 +139,7 @@
   # include <stdio.h>
   
   # include "cdrom_globs.h"
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + # include "cdrom_freebsd.h"
 + #endif
   #ifdef sun
@@ -208,7 +208,7 @@
   
   # include "debug.h"
   # include "cdrom_globs.h"
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + # include "cdrom_freebsd.h"
 + #endif
   #ifdef sun
@@ -258,7 +258,7 @@
   
   # include "debug.h"
   # include "cdrom_globs.h"
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 + # include "cdrom_freebsd.h"
 + #endif
   #ifdef sun
diff --git a/converters/uudx/files/patch-aa b/converters/uudx/files/patch-aa
index 9ed9b05..fd36b1f 100644
--- a/converters/uudx/files/patch-aa
+++ b/converters/uudx/files/patch-aa
@@ -4,7 +4,7 @@
  #else

  #define strchr		index

  extern char	*strchr();

-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
  extern char	*sprintf();

 +#else
 +extern int	sprintf();