PR#45840 www/py-uwsgi: Fix DragonFly Port

4 files changed, 56 insertions, 3 deletions

diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo
index fb8f4aa3a85..fbc45f2c9c7 100644
--- a/www/py-uwsgi/distinfo
+++ b/www/py-uwsgi/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/01/09 07:08:25 sbd Exp $
+$NetBSD: distinfo,v 1.11 2012/05/15 12:56:38 marino Exp $
 
 SHA1 (uwsgi-0.9.8.6.tar.gz) = bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6
 RMD160 (uwsgi-0.9.8.6.tar.gz) = 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b
 Size (uwsgi-0.9.8.6.tar.gz) = 359620 bytes
-SHA1 (patch-uwsgiconfig.py) = d7d7e3143658b1860f6d79f288d76ecb21aaf660
+SHA1 (patch-logging.c) = 8912e05716ac7791b8ed0f59d2dc5186cc7aa5b7
+SHA1 (patch-uwsgi.h) = 5489362a5e1fd63fb5c2b797d6c090f46e0946be
+SHA1 (patch-uwsgiconfig.py) = 329edb3e368bbf2b01074414b6eab19f8ed41575
diff --git a/www/py-uwsgi/patches/patch-logging.c b/www/py-uwsgi/patches/patch-logging.c
new file mode 100644
index 00000000000..0d5e52eeceb
--- /dev/null
+++ b/www/py-uwsgi/patches/patch-logging.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-logging.c,v 1.1 2012/05/15 12:56:38 marino Exp $
+
+--- logging.c.orig	2011-09-11 05:50:42.000000000 +0000
++++ logging.c
+@@ -179,7 +179,7 @@ void get_memusage() {
+ 	kv = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
+ #endif
+ 	if (kv) {
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__)
+ 
+ 		struct kinfo_proc *kproc;
+ 		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
+@@ -187,6 +187,13 @@ void get_memusage() {
+ 			uwsgi.workers[uwsgi.mywid].vsz_size = kproc->ki_size;
+ 			uwsgi.workers[uwsgi.mywid].rss_size = kproc->ki_rssize * uwsgi.page_size;
+ 		}
++#elif defined(__DragonFly__)
++		struct kinfo_proc *kproc;
++		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
++		if (kproc && cnt > 0) {
++			uwsgi.workers[uwsgi.mywid].vsz_size = kproc->kp_vm_map_size;
++			uwsgi.workers[uwsgi.mywid].rss_size = kproc->kp_vm_rssize * uwsgi.page_size;
++		}
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+ 		struct kinfo_proc2 *kproc2;
+ 
diff --git a/www/py-uwsgi/patches/patch-uwsgi.h b/www/py-uwsgi/patches/patch-uwsgi.h
new file mode 100644
index 00000000000..a66af6a563b
--- /dev/null
+++ b/www/py-uwsgi/patches/patch-uwsgi.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-uwsgi.h,v 1.3 2012/05/15 12:56:38 marino Exp $
+
+--- uwsgi.h.orig	2011-09-11 05:50:42.000000000 +0000
++++ uwsgi.h
+@@ -210,6 +210,10 @@ extern int pivot_root(const char *new_ro
+ #include <sys/devpoll.h>
+ #elif defined(__HAIKU__)
+ #else
++#ifdef __DragonFly__
++/* avoid clash with sys/user.h inclusion in logging.c */
++#define _KERNEL_STRUCTURES 
++#endif /* __DragonFly__ */
+ #include <sys/event.h>
+ #endif
+ 
diff --git a/www/py-uwsgi/patches/patch-uwsgiconfig.py b/www/py-uwsgi/patches/patch-uwsgiconfig.py
index 2336ed053fd..c79ee11c036 100644
--- a/www/py-uwsgi/patches/patch-uwsgiconfig.py
+++ b/www/py-uwsgi/patches/patch-uwsgiconfig.py
@@ -1,9 +1,18 @@
-$NetBSD: patch-uwsgiconfig.py,v 1.3 2012/01/09 07:08:25 sbd Exp $
+$NetBSD: patch-uwsgiconfig.py,v 1.4 2012/05/15 12:56:38 marino Exp $
 
 Find include/uuid/uuid.h and lib/libuuid.so under the BUILDLINK_DIR.
 
 --- uwsgiconfig.py.orig	2011-09-11 05:54:27.000000000 +0000
 +++ uwsgiconfig.py
+@@ -325,7 +325,7 @@ class uConf(object):
+                 if int(sun_major) >= 5:
+                     if int(sun_minor) >= 10:
+                         event_mode = 'port'
+-            elif uwsgi_os in ('Darwin', 'FreeBSD', 'OpenBSD', 'NetBSD'):
++            elif uwsgi_os in ('Darwin', 'FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly'):
+                 event_mode = 'kqueue'
+ 
+         if event_mode == 'epoll':
 @@ -443,7 +443,7 @@ class uConf(object):
          has_json = False
          has_uuid = False