sophia: Update to 2.2.

[Charlotte Koch <dressupgeekout%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <dressupgeekout%gmail.com@localhost>
Pushed By:	cfkoch
Date:		Tue May 11 22:22:20 2021 -0700
Changeset:	8df2bff32968321a4e8b10097f536286ed1bd75f

Modified Files:
	sophia/Makefile
	sophia/distinfo
	sophia/patches/patch-sophia_std_ss_stdvfc.c
Added Files:
	sophia/patches/patch-sophia_std_ss_thread.c

Log Message:
sophia: Update to 2.2.

Also change my MAINTAINER email address. (It's the same person, though!)

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

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

diffstat:
 sophia/Makefile                             |  4 ++--
 sophia/distinfo                             | 11 ++++++-----
 sophia/patches/patch-sophia_std_ss_stdvfc.c |  2 ++
 sophia/patches/patch-sophia_std_ss_thread.c | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diffs:
diff --git a/sophia/Makefile b/sophia/Makefile
index d392566e76..5c618dc50f 100644
--- a/sophia/Makefile
+++ b/sophia/Makefile
@@ -2,12 +2,12 @@
 
 DISTNAME=	sophia-version_${VERSION}
 PKGNAME=	sophia-${VERSION}
-VERSION=	2.1
+VERSION=	2.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pmwkaa/}
 GITHUB_TAG=	v${VERSION}
 
-MAINTAINER=	cfkoch%edgebsd.org@localhost
+MAINTAINER=	dressupgeekout%gmail.com@localhost
 HOMEPAGE=	http://sophia.systems/
 COMMENT=	Modern embeddable key-value database
 LICENSE=	2-clause-bsd
diff --git a/sophia/distinfo b/sophia/distinfo
index e671f592e2..785e6a4b71 100644
--- a/sophia/distinfo
+++ b/sophia/distinfo
@@ -1,7 +1,8 @@
 $NetBSD$
 
-SHA1 (sophia-version_2.1.tar.gz) = 667263ecbca4c711c265c8bc00e2dbe5db0c4c7e
-RMD160 (sophia-version_2.1.tar.gz) = cd01318efaa4a9c6c7ba3e624d6c217c6f0e2b6a
-SHA512 (sophia-version_2.1.tar.gz) = eef29f81ce54bae0ce684bb4091399d22216ce0d594575c43493310812439152fd9a036ffb77e0b42f7cbc63fdbe899e8b73930b42b8699b02646430053bb201
-Size (sophia-version_2.1.tar.gz) = 944144 bytes
-SHA1 (patch-sophia_std_ss_stdvfc.c) = 2e4e8219f58984297027a4fb12a7e2d71f962373
+SHA1 (sophia-version_2.2.tar.gz) = 111800e5894e91866f8546c34c8c16b5f3634022
+RMD160 (sophia-version_2.2.tar.gz) = 1d529900f8083288c9248f3799e29d7cbb3e5634
+SHA512 (sophia-version_2.2.tar.gz) = 714f61c5df82f4546e202d82e98451a8559eb2e04f56c905d894580f9288a55527121bb4c29b03d86468ed0d85bed353af0769fc74f9c4830e47cceba1784655
+Size (sophia-version_2.2.tar.gz) = 342669 bytes
+SHA1 (patch-sophia_std_ss_stdvfc.c) = 2a30d2d9d1d898a5a878bc2f7524ffc7ae781b47
+SHA1 (patch-sophia_std_ss_thread.c) = 6fef6948747dabb5e52be2b9e7e102519eca3398
diff --git a/sophia/patches/patch-sophia_std_ss_stdvfc.c b/sophia/patches/patch-sophia_std_ss_stdvfc.c
index 190c5cc4d0..f304bb99fb 100644
--- a/sophia/patches/patch-sophia_std_ss_stdvfc.c
+++ b/sophia/patches/patch-sophia_std_ss_stdvfc.c
@@ -1,4 +1,6 @@
 $NetBSD$
+
+NetBSD also has mmap().
 --- sophia/std/ss_stdvfs.c.orig	2018-02-06 22:08:26.000000000 -0800
 +++ sophia/std/ss_stdvfs.c	2018-02-06 22:09:25.000000000 -0800
 @@ -232,7 +232,8 @@
diff --git a/sophia/patches/patch-sophia_std_ss_thread.c b/sophia/patches/patch-sophia_std_ss_thread.c
new file mode 100644
index 0000000000..f67017c4a5
--- /dev/null
+++ b/sophia/patches/patch-sophia_std_ss_thread.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Handle NetBSD's signature for pthread_setname_np().
+--- sophia/std/ss_thread.c.orig	2021-05-11 22:17:18.146851368 -0700
++++ sophia/std/ss_thread.c	2021-05-11 22:19:13.344406344 -0700
+@@ -59,6 +59,8 @@
+ 	#if defined(__APPLE__)
+ 		(void)t;
+ 		return pthread_setname_np(name);
++	#elif defined(__NetBSD__)
++		return pthread_setname_np(t->id, name, NULL);
+ 	#else
+ 		return pthread_setname_np(t->id, name);
+ 	#endif