vsearch: Clean up patch

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu May 9 09:49:27 2019 -0500
Changeset:	f39d1aabae0e17e27f1b059e30a29a982a5bdcca

Modified Files:
	vsearch/distinfo
	vsearch/patches/patch-src_vsearch.h

Log Message:
vsearch: Clean up patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f39d1aabae0e17e27f1b059e30a29a982a5bdcca

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vsearch/distinfo                    |  3 +--
 vsearch/patches/patch-src_vsearch.h | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diffs:
diff --git a/vsearch/distinfo b/vsearch/distinfo
index 0bd6323067..87cc57a95f 100644
--- a/vsearch/distinfo
+++ b/vsearch/distinfo
@@ -5,5 +5,4 @@ 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.cc) = d56b276d7596d11c0c1ae74e43328b9470afcefa
-SHA1 (patch-src_vsearch.h) = 9cc8309ed7a68dfcd5f4a173aabf131efcaa2562
+SHA1 (patch-src_vsearch.h) = 4bcf57815f6d3f1e29d712328854851f742411b4
diff --git a/vsearch/patches/patch-src_vsearch.h b/vsearch/patches/patch-src_vsearch.h
index 2fb6f614bf..a38442edab 100644
--- a/vsearch/patches/patch-src_vsearch.h
+++ b/vsearch/patches/patch-src_vsearch.h
@@ -1,10 +1,10 @@
 $NetBSD$
 
-# Portability
+# Add FreeBSD and NetBSD support
 
 --- src/vsearch.h.orig	2019-04-30 11:57:32.000000000 +0000
 +++ src/vsearch.h
-@@ -138,9 +138,7 @@
+@@ -138,30 +138,50 @@
  #define bswap_32(x) _byteswap_ulong(x)
  #define bswap_64(x) _byteswap_uint64(x)
  
@@ -15,7 +15,9 @@ $NetBSD$
  
  #define PROG_OS "macos"
  #include <sys/sysctl.h>
-@@ -149,20 +147,42 @@
+ #include <libkern/OSByteOrder.h>
++#include <sys/resource.h>
+ #define bswap_16(x) OSSwapInt16(x)
  #define bswap_32(x) OSSwapInt32(x)
  #define bswap_64(x) OSSwapInt64(x)
  
@@ -29,39 +31,37 @@ $NetBSD$
 -#endif
 -
  #include <sys/sysinfo.h>
-+#include <sys/resource.h>
  #include <byteswap.h>
++#include <sys/resource.h>
  
 -#endif
 +#elif defined(__FreeBSD__)
-+
+ 
 +#define PROG_OS "freebsd"
 +#include <sys/sysinfo.h>
 +#include <sys/resource.h>
-+
++#include <sys/endian.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/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
++// Alters behavior, but NetBSD 7 does not have getopt_long_only()
 +#define getopt_long_only getopt_long
 +
-+#else
++#else	// Other Unix
 +
 +#define PROG_OS "unknown"
 +#include <sys/sysinfo.h>
 +#include <byteswap.h>
+ #include <sys/resource.h>
  
  #endif
-