vsearch: Patch for NetBSD

diff --git a/vsearch/distinfo b/vsearch/distinfo
index 2aa3b0e67a1e2e2e534972e4ee9aa56d5e166dcc..0bd6323067a70c5a55a732beb2f83850bf9638bf 100644 (file)
--- a/vsearch/distinfo
+++ b/vsearch/distinfo
@@ -5,4 +5,5 @@ RMD160 (vsearch-2.13.3.tar.gz) = d8f00a88449fb827878b7e301f9127799ce3d43c
 SHA512 (vsearch-2.13.3.tar.gz) = a3c539d60ed6db8bdb964a1aee18e79a6b8ed397dc01d47aad873019a8f123ed8892b08536dfd5f785f8d327fee75d42b4a744f354f5c6e3bb03d0bf10f054e5
 Size (vsearch-2.13.3.tar.gz) = 233846 bytes
 SHA1 (patch-src_city.cc) = 3a5bcbca0a0c733a32a9d152189de10df3cb515f
-SHA1 (patch-src_vsearch.h) = 35318f5a3da82fa5ea3846be5c0f6617a8b6408a
+SHA1 (patch-src_vsearch.cc) = d56b276d7596d11c0c1ae74e43328b9470afcefa
+SHA1 (patch-src_vsearch.h) = 9cc8309ed7a68dfcd5f4a173aabf131efcaa2562

diff --git a/vsearch/patches/patch-src_vsearch.h b/vsearch/patches/patch-src_vsearch.h
index ca3c2df67d3c5b76e6da5d59b60b15f5b36d64af..2fb6f614bf1c4f0d6770b5683281bc6ee29e38e1 100644 (file)
--- a/vsearch/patches/patch-src_vsearch.h
+++ b/vsearch/patches/patch-src_vsearch.h
@@ -2,21 +2,20 @@ $NetBSD$
 
 # Portability
 
---- src/vsearch.h.orig 2019-04-30 11:57:32 UTC
+--- src/vsearch.h.orig 2019-04-30 11:57:32.000000000 +0000
 +++ src/vsearch.h
-@@ -138,10 +138,8 @@
+@@ -138,9 +138,7 @@
  #define bswap_32(x) _byteswap_ulong(x)
  #define bswap_64(x) _byteswap_uint64(x)
  
 -#else
+-
+-#ifdef __APPLE__
 +#elif defined(__APPLE__)
  
--#ifdef __APPLE__
--
  #define PROG_OS "macos"
  #include <sys/sysctl.h>
- #include <libkern/OSByteOrder.h>
-@@ -149,20 +147,28 @@
+@@ -149,20 +147,42 @@
  #define bswap_32(x) OSSwapInt32(x)
  #define bswap_64(x) OSSwapInt64(x)
  
@@ -35,15 +34,29 @@ $NetBSD$
  
 -#endif
 +#elif defined(__FreeBSD__)
- 
++
 +#define PROG_OS "freebsd"
 +#include <sys/sysinfo.h>
++#include <sys/resource.h>
++
++#define bswap_16(x) bswap16(x)
++#define bswap_32(x) bswap32(x)
++#define bswap_64(x) bswap64(x)
++
++#elif defined(__NetBSD__)
+ 
++#define PROG_OS "netbsd"
  #include <sys/resource.h>
++#include <sys/types.h>
++#include <sys/bswap.h>
 +
 +#define bswap_16(x) bswap16(x)
 +#define bswap_32(x) bswap32(x)
 +#define bswap_64(x) bswap64(x)
 +
++// Alters behavior, but NetBSD 7 does not have this function
++#define getopt_long_only getopt_long
++
 +#else
 +
 +#define PROG_OS "unknown"