CVS commit: pkgsrc/databases/py-psycopg2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Apr  5 09:45:13 UTC 2018

Modified Files:
        pkgsrc/databases/py-psycopg2: distinfo
Added Files:
        pkgsrc/databases/py-psycopg2/patches: patch-psycopg_solaris__support.c
            patch-psycopg_solaris__support.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/py-psycopg2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c \
    pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h

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

Modified files:

Index: pkgsrc/databases/py-psycopg2/distinfo
diff -u pkgsrc/databases/py-psycopg2/distinfo:1.30 pkgsrc/databases/py-psycopg2/distinfo:1.31
--- pkgsrc/databases/py-psycopg2/distinfo:1.30  Mon Feb 12 08:15:37 2018
+++ pkgsrc/databases/py-psycopg2/distinfo       Thu Apr  5 09:45:13 2018
@@ -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

Added files:

Index: pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c
diff -u /dev/null pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c:1.1
--- /dev/null   Thu Apr  5 09:45:13 2018
+++ pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.c       Thu Apr  5 09:45:13 2018
@@ -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)
Index: pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h
diff -u /dev/null pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h:1.1
--- /dev/null   Thu Apr  5 09:45:13 2018
+++ pkgsrc/databases/py-psycopg2/patches/patch-psycopg_solaris__support.h       Thu Apr  5 09:45:13 2018
@@ -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) */