[pkgsrc/trunk]: pkgsrc/databases/py-psycopg2 py-psycopg2: Only supply timer f...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/737eaf8771bd
branches:  trunk
changeset: 378313:737eaf8771bd
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Apr 05 09:45:13 2018 +0000

description:
py-psycopg2: Only supply timer funcs if they are missing.

diffstat:

 databases/py-psycopg2/distinfo                                 |   4 +-
 databases/py-psycopg2/patches/patch-psycopg_solaris__support.c |  15 ++++++++
 databases/py-psycopg2/patches/patch-psycopg_solaris__support.h |  18 ++++++++++
 3 files changed, 36 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r a35e34b67b5e -r 737eaf8771bd databases/py-psycopg2/distinfo
--- a/databases/py-psycopg2/distinfo    Thu Apr 05 09:33:48 2018 +0000
+++ b/databases/py-psycopg2/distinfo    Thu Apr 05 09:45:13 2018 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.30 2018/02/12 08:15:37 adam Exp $
+$NetBSD: distinfo,v 1.31 2018/04/05 09:45:13 jperkin Exp $
 
 SHA1 (psycopg2-2.7.4.tar.gz) = d030339fdde7c99f81593d8933cb712aa72ab6c2
 RMD160 (psycopg2-2.7.4.tar.gz) = e4d938680cf375d4d92d1ec7104a803ca23e4947
 SHA512 (psycopg2-2.7.4.tar.gz) = e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034
 Size (psycopg2-2.7.4.tar.gz) = 425331 bytes
+SHA1 (patch-psycopg_solaris__support.c) = 2d024f2d34ebc84df51c652ccc710270f438bf0c
+SHA1 (patch-psycopg_solaris__support.h) = 2b563de72df84e04942ce144c8a0260ac79f7105
diff -r a35e34b67b5e -r 737eaf8771bd databases/py-psycopg2/patches/patch-psycopg_solaris__support.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c    Thu Apr 05 09:45:13 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-psycopg_solaris__support.c,v 1.1 2018/04/05 09:45:13 jperkin Exp $
+
+Only supply timeradd/timersub if they are missing.
+
+--- psycopg/solaris_support.c.orig     2018-02-06 02:48:43.000000000 +0000
++++ psycopg/solaris_support.c
+@@ -27,7 +27,7 @@
+ #include "psycopg/psycopg.h"
+ #include "psycopg/solaris_support.h"
+ 
+-#if defined(__sun) && defined(__SVR4)
++#if defined(__sun) && defined(__SVR4) && !defined(timeradd)
+ /* timeradd is missing on Solaris */
+ void
+ timeradd(struct timeval *a, struct timeval *b, struct timeval *c)
diff -r a35e34b67b5e -r 737eaf8771bd databases/py-psycopg2/patches/patch-psycopg_solaris__support.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h    Thu Apr 05 09:45:13 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-psycopg_solaris__support.h,v 1.1 2018/04/05 09:45:13 jperkin Exp $
+
+Only supply timeradd/timersub if they are missing.
+
+--- psycopg/solaris_support.h.orig     2018-02-06 02:48:43.000000000 +0000
++++ psycopg/solaris_support.h
+@@ -29,9 +29,10 @@
+ 
+ #if defined(__sun) && defined(__SVR4)
+ #include <sys/time.h>
+-
++#ifndef timeradd
+ extern HIDDEN void timeradd(struct timeval *a, struct timeval *b, struct timeval *c);
+ extern HIDDEN void timersub(struct timeval *a, struct timeval *b, struct timeval *c);
+ #endif
++#endif
+ 
+ #endif /* !defined(PSYCOPG_SOLARIS_SUPPORT_H) */