CVS commit: pkgsrc/www/py-meinheld

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 30 12:51:57 UTC 2017

Modified Files:
        pkgsrc/www/py-meinheld: Makefile distinfo
Added Files:
        pkgsrc/www/py-meinheld/patches: patch-meinheld_server_util.c
            patch-setup.py

Log Message:
py-meinheld: fix build on NetBSD.

Add missing dependency on gunicorn.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-meinheld/Makefile \
    pkgsrc/www/py-meinheld/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c \
    pkgsrc/www/py-meinheld/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/www/py-meinheld/Makefile
diff -u pkgsrc/www/py-meinheld/Makefile:1.1 pkgsrc/www/py-meinheld/Makefile:1.2
--- pkgsrc/www/py-meinheld/Makefile:1.1 Fri Sep 29 14:39:35 2017
+++ pkgsrc/www/py-meinheld/Makefile     Sat Sep 30 12:51:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/09/29 14:39:35 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/30 12:51:57 wiz Exp $
 
 DISTNAME=      meinheld-0.6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +11,7 @@ COMMENT=      Python WSGI HTTP server
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-greenlet>=0.4.5<0.5:../../devel/py-greenlet
+DEPENDS+=      ${PYPKGPREFIX}-gunicorn-[0-9]*:../../www/py-gunicorn
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/py-meinheld/distinfo
diff -u pkgsrc/www/py-meinheld/distinfo:1.1 pkgsrc/www/py-meinheld/distinfo:1.2
--- pkgsrc/www/py-meinheld/distinfo:1.1 Fri Sep 29 14:39:35 2017
+++ pkgsrc/www/py-meinheld/distinfo     Sat Sep 30 12:51:57 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2017/09/29 14:39:35 joerg Exp $
+$NetBSD: distinfo,v 1.2 2017/09/30 12:51:57 wiz Exp $
 
 SHA1 (meinheld-0.6.1.tar.gz) = d3b1c307e26e131da5030a18a5d750d788a37893
 RMD160 (meinheld-0.6.1.tar.gz) = b8a7a17385b21c0bf6570b7e9c41a5e9934c9ed4
 SHA512 (meinheld-0.6.1.tar.gz) = 02b8c8573c244e92a7dbf86524a7e1c1fe02a7aa1b107fc3d07d02b6ba22d70cbd7ddb6f8f3470db740dba3138ecee36dc2f00dd5d1e63c83435bea0f0344a9b
 Size (meinheld-0.6.1.tar.gz) = 79703 bytes
-SHA1 (patch-requirements__test.txt) = 4ba4d4af3e979932694bb6b2d434d584ffdc7563
+SHA1 (patch-meinheld_server_util.c) = 61d5f8b580002f369d371dc968d502a8f141b912
+SHA1 (patch-setup.py) = c0192d15c97fb40d4b6c102a602eab8d07b18626

Added files:

Index: pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c
diff -u /dev/null pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c:1.1
--- /dev/null   Sat Sep 30 12:51:57 2017
+++ pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c Sat Sep 30 12:51:57 2017
@@ -0,0 +1,35 @@
+$NetBSD: patch-meinheld_server_util.c,v 1.1 2017/09/30 12:51:57 wiz Exp $
+
+Add NetBSD support.
+
+--- meinheld/server/util.c.orig        2015-09-16 12:56:12.000000000 +0000
++++ meinheld/server/util.c
+@@ -7,7 +7,7 @@ setup_listen_sock(int fd)
+     int on = 1, r = -1;
+ #ifdef linux
+     r = setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &on, sizeof(on));
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+     struct accept_filter_arg afa;
+     bzero(&afa, sizeof(afa));
+     strcpy(afa.af_name, "httpready");
+@@ -63,6 +63,9 @@ enable_cork(client_t *client)
+     setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &on, sizeof(on));
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+     setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof(on));
++#elif defined(__NetBSD__)
++    /* not supported */
++    return 1;
+ #else
+ #error
+ #endif
+@@ -81,6 +84,9 @@ disable_cork(client_t *client)
+         setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &off, sizeof(off));
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+         setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &off, sizeof(off));
++#elif defined(__NetBSD__)
++    /* not supported */
++    return 1;
+ #else
+ #error
+ #endif
Index: pkgsrc/www/py-meinheld/patches/patch-setup.py
diff -u /dev/null pkgsrc/www/py-meinheld/patches/patch-setup.py:1.1
--- /dev/null   Sat Sep 30 12:51:57 2017
+++ pkgsrc/www/py-meinheld/patches/patch-setup.py       Sat Sep 30 12:51:57 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2017/09/30 12:51:57 wiz Exp $
+
+Add NetBSD support.
+
+--- setup.py.orig      2016-11-01 23:46:07.000000000 +0000
++++ setup.py
+@@ -41,6 +41,8 @@ def get_picoev_file():
+         poller_file = 'meinheld/server/picoev_kqueue.c'
+     elif "FreeBSD" == platform.system():
+         poller_file = 'meinheld/server/picoev_kqueue.c'
++    elif "NetBSD" == platform.system():
++        poller_file = 'meinheld/server/picoev_kqueue.c'
+     else:
+         print("Sorry, not support .")
+         sys.exit(1)