pooler: Patch for NetBSD

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Sun Nov 15 20:40:23 2020 -0600
Changeset:	0943892297e2b85d33946a857e56ac9cb0714ef4

Modified Files:
	pooler/distinfo
	pooler/patches/patch-Makefile
Added Files:
	pooler/patches/patch-bit-basics.h

Log Message:
pooler: Patch for NetBSD

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

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

diffstat:
 pooler/distinfo                   |  3 ++-
 pooler/patches/patch-Makefile     | 14 ++++++++++++++
 pooler/patches/patch-bit-basics.h | 21 +++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diffs:
diff --git a/pooler/distinfo b/pooler/distinfo
index 2fc79998be..29140175ea 100644
--- a/pooler/distinfo
+++ b/pooler/distinfo
@@ -4,4 +4,5 @@ SHA1 (pooler-1.75.tar.gz) = 1b8c92087d40c664dc6547b58cccaa966d7273a2
 RMD160 (pooler-1.75.tar.gz) = 2f0a7b2388fb20c18e231c3b3f917762f58b2d54
 SHA512 (pooler-1.75.tar.gz) = d72f063455aaf5eb9de30cbbfd649cc069af4192d2f2aaf4d20d5f70973a41a0e92f660842e306d557ab8737de0d95ce0021cfbd247251b2f0f3e255ca13b487
 Size (pooler-1.75.tar.gz) = 125999 bytes
-SHA1 (patch-Makefile) = 97f8c8a673564311be5ff4134eda83dd095252db
+SHA1 (patch-Makefile) = 32f05ccd92c60da7c7683ccbe696062a7c0b79b6
+SHA1 (patch-bit-basics.h) = d9405402333d495020e592bb47b8f35fa060bcf4
diff --git a/pooler/patches/patch-Makefile b/pooler/patches/patch-Makefile
index 7e91ecd040..22e4cb1c59 100644
--- a/pooler/patches/patch-Makefile
+++ b/pooler/patches/patch-Makefile
@@ -4,6 +4,20 @@ $NetBSD$
 
 --- Makefile.orig	2020-11-16 01:19:09.379126643 +0000
 +++ Makefile
+@@ -62,11 +62,11 @@ clean:
+ # an extra reminder that they're auto-generated (as well
+ # as the explanatory comment at the top)
+ 128.h 32.h 32-64.h: 64.h 64-128.h
+-	chmod +w 128.h 32.h 32-64.h 2>/dev/null || true
++	chmod u+w 128.h 32.h 32-64.h 2>/dev/null || true
+ 	sed -e s/64/128/g < 64.h > 128.h
+ 	sed -e s/64/32/g < 64.h > 32.h
+ 	sed -e s/64/32/g -e s/128/64/g < 64-128.h > 32-64.h
+-	chmod -w 128.h 32.h 32-64.h
++	chmod u-w 128.h 32.h 32-64.h
+ 
+ # -----------------------------------------------------
+ # Rules you won't need unless releasing new versions:
 @@ -130,6 +130,7 @@ publish-src: test-other
  # compatibility with bsd.port.mk:
  all: pooler
diff --git a/pooler/patches/patch-bit-basics.h b/pooler/patches/patch-bit-basics.h
new file mode 100644
index 0000000000..7f728a045f
--- /dev/null
+++ b/pooler/patches/patch-bit-basics.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+# Portability
+
+--- bit-basics.h.orig	2020-11-16 02:34:09.827273691 +0000
++++ bit-basics.h
+@@ -58,12 +58,14 @@ static inline int trail0_128(bit128 b) {
+     return trail0_64((bit64)b);
+ }
+ #endif
++/*
+ static inline int popcount32(bit32 i) {
+   return __builtin_popcount(i);
+ }
+ static inline int popcount64(bit64 i) {
+   return __builtin_popcountll(i);
+ }
++*/
+ #if Has_128bit
+ static inline int popcount128(bit128 i) {
+   return popcount64((bit64)i) + popcount64((bit64)(i>>64));