Fri Jun 23 15:56:45 2017 UTC ()
Avoid sys/user.h on NetBSD.


(joerg)
diff -r1.29 -r1.30 pkgsrc/www/py-uwsgi/distinfo
diff -r1.2 -r1.3 pkgsrc/www/py-uwsgi/patches/patch-core_logging.c
cvs diff -r1.29 -r1.30 pkgsrc/www/py-uwsgi/distinfo (expand / switch to unified diff)

--- pkgsrc/www/py-uwsgi/distinfo 2017/04/08 12:04:27 1.29
+++ pkgsrc/www/py-uwsgi/distinfo 2017/06/23 15:56:45 1.30
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.29 2017/04/08 12:04:27 adam Exp $ 1$NetBSD: distinfo,v 1.30 2017/06/23 15:56:45 joerg Exp $
2 2
3SHA1 (uwsgi-2.0.15.tar.gz) = 7e2606a6c61a2d6a48f0bb970408336529b7b158 3SHA1 (uwsgi-2.0.15.tar.gz) = 7e2606a6c61a2d6a48f0bb970408336529b7b158
4RMD160 (uwsgi-2.0.15.tar.gz) = 5a6a3e9547aff9e2e4070e90aca3148540ba78b0 4RMD160 (uwsgi-2.0.15.tar.gz) = 5a6a3e9547aff9e2e4070e90aca3148540ba78b0
5SHA512 (uwsgi-2.0.15.tar.gz) = cb3ce7dc9eb9806151b04b04dc80ac7204cb4ddadf295eea98d5ebbf3a8c02f4b0bfb9a0490997c5edf427e39d3073a2d5b4fe7bd8ec458b30c0aab8e1da9bef 5SHA512 (uwsgi-2.0.15.tar.gz) = cb3ce7dc9eb9806151b04b04dc80ac7204cb4ddadf295eea98d5ebbf3a8c02f4b0bfb9a0490997c5edf427e39d3073a2d5b4fe7bd8ec458b30c0aab8e1da9bef
6Size (uwsgi-2.0.15.tar.gz) = 795070 bytes 6Size (uwsgi-2.0.15.tar.gz) = 795070 bytes
7SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30 7SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30
8SHA1 (patch-core_logging.c) = 8978d42354dd607ed28c00f514cbd296bcb6666d 8SHA1 (patch-core_logging.c) = caa986238142d24725df119cbecda1b9e3223d7e
9SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808 9SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808
10SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020 10SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020
cvs diff -r1.2 -r1.3 pkgsrc/www/py-uwsgi/patches/patch-core_logging.c (expand / switch to unified diff)

--- pkgsrc/www/py-uwsgi/patches/patch-core_logging.c 2016/11/04 21:39:00 1.2
+++ pkgsrc/www/py-uwsgi/patches/patch-core_logging.c 2017/06/23 15:56:45 1.3
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: patch-core_logging.c,v 1.2 2016/11/04 21:39:00 maya Exp $ 1$NetBSD: patch-core_logging.c,v 1.3 2017/06/23 15:56:45 joerg Exp $
2 2
3Fix build for Bitrig. 3Fix build for Bitrig.
4 4
5--- core/logging.c.orig 2016-10-03 08:16:59.000000000 +0000 5--- core/logging.c.orig 2017-03-30 22:11:36.000000000 +0000
6+++ core/logging.c 6+++ core/logging.c
7@@ -1,7 +1,7 @@ 7@@ -1,8 +1,10 @@
8 #ifndef __DragonFly__ 8 #ifndef __DragonFly__
9 #include <uwsgi.h> 9 #include <uwsgi.h>
10 #endif 10 #endif
11-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 11-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
12+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__Bitrig__) 12+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__Bitrig__)
 13+# if !defined(__NetBSD__)
13 #include <sys/user.h> 14 #include <sys/user.h>
 15+# endif
14 #include <sys/sysctl.h> 16 #include <sys/sysctl.h>
15 #include <kvm.h> 17 #include <kvm.h>
 18 #elif defined(__sun__)