Fix build for OpenBSD and Bitrig (from sevan@'s report).

5 files changed, 30 insertions, 14 deletions

diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo
index 5f1e65b1008..c96f7fa18a0 100644
--- a/www/py-uwsgi/distinfo
+++ b/www/py-uwsgi/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.24 2015/04/03 15:21:59 rodent Exp $
+$NetBSD: distinfo,v 1.25 2015/04/06 02:35:54 rodent Exp $
 
 SHA1 (uwsgi-2.0.10.tar.gz) = 31bae2dac113af8d95dbc9b982df139ff61ce209
 RMD160 (uwsgi-2.0.10.tar.gz) = 24d9f7528ed3d5f20b962a60512ab9ab1a43ef35
 Size (uwsgi-2.0.10.tar.gz) = 779820 bytes
-SHA1 (patch-base.ini) = f1b61f8323a7be92ebae5c87b8a32b3109145036
-SHA1 (patch-uwsgi.h) = 911aa69e7973b92c726fa293748ae6a875b45353
-SHA1 (patch-uwsgiconfig.py) = 9d84206e86168465d83eec640bd4b575fc428d43
+SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30
+SHA1 (patch-core_logging.c) = bce3b6fe0e54d25ad631671363b0872f9084e0f2
+SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808
+SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020
diff --git a/www/py-uwsgi/patches/patch-base.ini b/www/py-uwsgi/patches/patch-base.ini
index 853eb63aafb..0785f61c5fa 100644
--- a/www/py-uwsgi/patches/patch-base.ini
+++ b/www/py-uwsgi/patches/patch-base.ini
@@ -1,8 +1,8 @@
-$NetBSD: patch-base.ini,v 1.3 2014/01/23 14:47:05 wiz Exp $
+$NetBSD: patch-base.ini,v 1.4 2015/04/06 02:35:54 rodent Exp $
 
 Build CGI plugin too. Add directive for uuid detection.
 
---- buildconf/base.ini.orig	2013-12-30 08:44:59.000000000 +0000
+--- buildconf/base.ini.orig	2015-03-17 07:34:34.000000000 +0000
 +++ buildconf/base.ini
 @@ -4,6 +4,7 @@ yaml = true
  json = auto
diff --git a/www/py-uwsgi/patches/patch-core_logging.c b/www/py-uwsgi/patches/patch-core_logging.c
new file mode 100644
index 00000000000..267007fbecc
--- /dev/null
+++ b/www/py-uwsgi/patches/patch-core_logging.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-core_logging.c,v 1.1 2015/04/06 02:35:54 rodent Exp $
+
+Fix build for OpenBSD and Bitrig.
+
+--- core/logging.c.orig	2015-03-17 07:34:34.000000000 +0000
++++ core/logging.c
+@@ -13,7 +13,7 @@
+ #define _FILE_OFFSET_BITS 64
+ #endif
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__Bitrig__)
+ #include <sys/sysctl.h>
+ #endif
+ 
diff --git a/www/py-uwsgi/patches/patch-uwsgi.h b/www/py-uwsgi/patches/patch-uwsgi.h
index f5bc36d57ad..af4091887cf 100644
--- a/www/py-uwsgi/patches/patch-uwsgi.h
+++ b/www/py-uwsgi/patches/patch-uwsgi.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-uwsgi.h,v 1.5 2014/01/23 14:47:05 wiz Exp $
+$NetBSD: patch-uwsgi.h,v 1.6 2015/04/06 02:35:54 rodent Exp $
 
 Avoid clash with sys/user.h inclusion in logging.c on DragonFly BSD.
 
---- uwsgi.h.orig	2013-12-30 08:44:59.000000000 +0000
+--- uwsgi.h.orig	2015-03-17 07:34:34.000000000 +0000
 +++ uwsgi.h
-@@ -323,6 +323,10 @@ extern int pivot_root(const char *new_ro
+@@ -327,6 +327,10 @@ extern int pivot_root(const char *new_ro
  #elif defined(__CYGWIN__)
  #elif defined(__HURD__)
  #else
diff --git a/www/py-uwsgi/patches/patch-uwsgiconfig.py b/www/py-uwsgi/patches/patch-uwsgiconfig.py
index e485c4cd539..55b97434e5b 100644
--- a/www/py-uwsgi/patches/patch-uwsgiconfig.py
+++ b/www/py-uwsgi/patches/patch-uwsgiconfig.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-uwsgiconfig.py,v 1.9 2014/02/17 01:01:12 rodent Exp $
+$NetBSD: patch-uwsgiconfig.py,v 1.10 2015/04/06 02:35:54 rodent Exp $
 
 Disable inclusion of certain packages by default. Use options framework instead.
 
---- uwsgiconfig.py.orig	2013-12-30 08:44:59.000000000 +0000
+--- uwsgiconfig.py.orig	2015-03-17 07:34:34.000000000 +0000
 +++ uwsgiconfig.py
-@@ -68,6 +68,7 @@ report = {
+@@ -73,6 +73,7 @@ report = {
      'timer': False,
      'filemonitor': False,
      'pcre': False,
@@ -12,7 +12,7 @@ Disable inclusion of certain packages by default. Use options framework instead.
      'routing': False,
      'capabilities': False,
      'yaml': False,
-@@ -816,6 +817,8 @@ class uConf(object):
+@@ -851,6 +852,8 @@ class uConf(object):
          if locking_mode == 'auto':
              if uwsgi_os == 'Linux' or uwsgi_os == 'SunOS':
                  locking_mode = 'pthread_mutex'
@@ -21,7 +21,7 @@ Disable inclusion of certain packages by default. Use options framework instead.
              # FreeBSD umtx is still not ready for process shared locking
              # starting from FreeBSD 9 posix semaphores can be shared between processes
              elif uwsgi_os in ('FreeBSD', 'GNU/kFreeBSD'):
-@@ -1019,10 +1022,11 @@ class uConf(object):
+@@ -1054,10 +1057,11 @@ class uConf(object):
              self.libs.append('-lcap')
              report['capabilities'] = True