ncbi-blast+: ensure bswap_{32,64}() gets defined on NetBSD.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Fri May 26 10:06:54 2023 +0000
Changeset:	6084bc0f4fdc14b8c6fd00da33b20cc3bd4c5ff3

Modified Files:
	ncbi-blast+/Makefile
	ncbi-blast+/distinfo
Added Files:
	ncbi-blast+/patches/patch-src_util_checksum_cityhash_city.cc
	ncbi-blast+/patches/patch-src_util_checksum_farmhash_farmhash.cc

Log Message:
ncbi-blast+: ensure bswap_{32,64}() gets defined on NetBSD.

Remove dependency on having __BSWAP_RENAME defined, and
also remove conditional on __bswap_32 not being defined.

Should fix build problem on NetBSD.

Bump PKGREVISION.

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

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

diffstat:
 ncbi-blast+/Makefile                                |  1 +
 ncbi-blast+/distinfo                                |  2 ++
 .../patch-src_util_checksum_cityhash_city.cc        | 17 +++++++++++++++++
 .../patch-src_util_checksum_farmhash_farmhash.cc    | 21 +++++++++++++++++++++
 4 files changed, 41 insertions(+)

diffs:
diff --git a/ncbi-blast+/Makefile b/ncbi-blast+/Makefile
index 5d17d75459..321696149f 100644
--- a/ncbi-blast+/Makefile
+++ b/ncbi-blast+/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	ncbi-blast-2.13.0+-src
 PKGNAME=	${DISTNAME:S/+-src//:S/blast/blast+/}
+PKGREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PKGVERSION_NOREV}/
diff --git a/ncbi-blast+/distinfo b/ncbi-blast+/distinfo
index e3c951916e..f5dbdf91ab 100644
--- a/ncbi-blast+/distinfo
+++ b/ncbi-blast+/distinfo
@@ -9,4 +9,6 @@ SHA1 (patch-src_build-system_Makefile.in.top) = 71d5246867a8c985c1175c338fb0af66
 SHA1 (patch-src_build-system_cmake_cmake-cfg-xcode.sh) = 9167a5092d30da46a06b0be05199afa3b08680c6
 SHA1 (patch-src_build-system_configure) = 95185d53179a69a1b1cfa6870aca36dd962d2c43
 SHA1 (patch-src_build-system_helpers_Makefile.run__with__lock.app) = d69b9e349646c970c3b296707f917defbe39cccd
+SHA1 (patch-src_util_checksum_cityhash_city.cc) = ff8e84d90a4fc0d9d33e17abd05ed8e9f2de12fc
+SHA1 (patch-src_util_checksum_farmhash_farmhash.cc) = 9b56d69ab7c0da328c35bba4dde04134dd80efc6
 SHA1 (patch-src_util_checksum_farmhash_farmhash.h) = c3ff60de9a9020d3b706c2bff37f6f4cde4e6b6b
diff --git a/ncbi-blast+/patches/patch-src_util_checksum_cityhash_city.cc b/ncbi-blast+/patches/patch-src_util_checksum_cityhash_city.cc
new file mode 100644
index 0000000000..29376089d9
--- /dev/null
+++ b/ncbi-blast+/patches/patch-src_util_checksum_cityhash_city.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Ensure bswap_32() and bswap_64() is defined on NetBSD.
+
+--- src/util/checksum/cityhash/city.cc.orig	2018-09-28 20:34:39.000000000 +0000
++++ src/util/checksum/cityhash/city.cc
+@@ -82,10 +82,8 @@ static uint32 UNALIGNED_LOAD32(const cha
+ 
+ #include <sys/types.h>
+ #include <machine/bswap.h>
+-#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
+ #define bswap_32(x) bswap32(x)
+ #define bswap_64(x) bswap64(x)
+-#endif
+ 
+ #else
+ 
diff --git a/ncbi-blast+/patches/patch-src_util_checksum_farmhash_farmhash.cc b/ncbi-blast+/patches/patch-src_util_checksum_farmhash_farmhash.cc
new file mode 100644
index 0000000000..294cdd7ab0
--- /dev/null
+++ b/ncbi-blast+/patches/patch-src_util_checksum_farmhash_farmhash.cc
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Ensure bswap_32() and bswap_64() gets defined on NetBSD.
+
+--- src/util/checksum/farmhash/farmhash.cc.orig	2018-09-26 12:38:06.000000000 +0000
++++ src/util/checksum/farmhash/farmhash.cc
+@@ -158,12 +158,12 @@
+ 
+ #include <sys/types.h>
+ #include <machine/bswap.h>
+-#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
++#if defined(bswap_32) && defined(bswap_64)
+ #undef bswap_32
+ #undef bswap_64
++#endif
+ #define bswap_32(x) bswap32(x)
+ #define bswap_64(x) bswap64(x)
+-#endif
+ 
+ #elif defined(__HAIKU__)
+