Wed Mar 6 13:07:58 2019 UTC ()
Add uwsgi-sse_offload option for integrating the redis pubsub to Server
Sent Event bridge patch. Defaults to off.


(joerg)
diff -r1.42 -r1.43 pkgsrc/www/py-uwsgi/Makefile
diff -r1.34 -r1.35 pkgsrc/www/py-uwsgi/distinfo
diff -r1.4 -r1.5 pkgsrc/www/py-uwsgi/options.mk

cvs diff -r1.42 -r1.43 pkgsrc/www/py-uwsgi/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-uwsgi/Makefile 2019/02/27 12:15:54 1.42
+++ pkgsrc/www/py-uwsgi/Makefile 2019/03/06 13:07:58 1.43
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.42 2019/02/27 12:15:54 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2019/03/06 13:07:58 joerg Exp $
2 2
3DISTNAME= uwsgi-2.0.18 3DISTNAME= uwsgi-2.0.18
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= www python 5CATEGORIES= www python
6MASTER_SITES= ${MASTER_SITE_PYPI:=u/uWSGI/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=u/uWSGI/}
 7DISTFILES= ${DEFAULT_DISTFILES}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://uwsgi-docs.readthedocs.io/ 10HOMEPAGE= https://uwsgi-docs.readthedocs.io/
10COMMENT= Feature-rich WSGI server 11COMMENT= Feature-rich WSGI server
11LICENSE= gnu-gpl-v2 # with linking exception 12LICENSE= gnu-gpl-v2 # with linking exception
12 13
13USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
14 15
15PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} 16PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
16EGG_NAME= ${DISTNAME:S/uwsgi/uWSGI/} 17EGG_NAME= ${DISTNAME:S/uwsgi/uWSGI/}
17 18
18.include "options.mk" 19.include "options.mk"
19 20
20INSTALL_ENV+= UWSGI_INCLUDES=${PREFIX}/include 21INSTALL_ENV+= UWSGI_INCLUDES=${PREFIX}/include
21INSTALL_ENV+= UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG};${UWSGI_JSON};${UWSGI_PCRE};${UWSGI_SSL};${UWSGI_UUID};${UWSGI_XML};${UWSGI_YAML}" 22INSTALL_ENV+= UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG};${UWSGI_JSON};${UWSGI_PCRE};${UWSGI_SSE};${UWSGI_SSL};${UWSGI_UUID};${UWSGI_XML};${UWSGI_YAML}"
22INSTALLATION_DIRS+= share/examples/${PYPKGPREFIX}-uwsgi 23INSTALLATION_DIRS+= share/examples/${PYPKGPREFIX}-uwsgi
23 24
24post-install: 25post-install:
25 cd ${DESTDIR}${PREFIX}/bin && ${MV} uwsgi uwsgi-${PYVERSSUFFIX} || ${TRUE} 26 cd ${DESTDIR}${PREFIX}/bin && ${MV} uwsgi uwsgi-${PYVERSSUFFIX} || ${TRUE}
26 ${INSTALL_DATA} ${WRKSRC}/examples/* \ 27 ${INSTALL_DATA} ${WRKSRC}/examples/* \
27 ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi 28 ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi
28 29
29.include "../../devel/zlib/buildlink3.mk" 30.include "../../devel/zlib/buildlink3.mk"
30.include "../../lang/python/egg.mk" 31.include "../../lang/python/egg.mk"
31.include "../../mk/dlopen.buildlink3.mk" 32.include "../../mk/dlopen.buildlink3.mk"
32.include "../../mk/pthread.buildlink3.mk" 33.include "../../mk/pthread.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"

cvs diff -r1.34 -r1.35 pkgsrc/www/py-uwsgi/distinfo (expand / switch to unified diff)

--- pkgsrc/www/py-uwsgi/distinfo 2019/02/27 12:15:54 1.34
+++ pkgsrc/www/py-uwsgi/distinfo 2019/03/06 13:07:58 1.35
@@ -1,10 +1,14 @@ @@ -1,10 +1,14 @@
1$NetBSD: distinfo,v 1.34 2019/02/27 12:15:54 adam Exp $ 1$NetBSD: distinfo,v 1.35 2019/03/06 13:07:58 joerg Exp $
2 2
 3SHA1 (8253573a0db1c7d7b9d968d55669e70e40355bed.zip) = 7cf7aca4b0e5e64ebe5bec813f4f48c5b009eac5
 4RMD160 (8253573a0db1c7d7b9d968d55669e70e40355bed.zip) = b213ea821a3c12a6c092615ce02a3dd4bbaff0c6
 5SHA512 (8253573a0db1c7d7b9d968d55669e70e40355bed.zip) = f523d41c5c9a376b98b1e7c59e02b05a7d0aa5ad424add4a7ca1bb565c758c67368d29ee1939f1c8cdea7b55ec05ad9b8d5a293d40866c5936525f45290b17dd
 6Size (8253573a0db1c7d7b9d968d55669e70e40355bed.zip) = 11290 bytes
3SHA1 (uwsgi-2.0.18.tar.gz) = e7e402dd5b5c68a995585284c4529da9a686a0a9 7SHA1 (uwsgi-2.0.18.tar.gz) = e7e402dd5b5c68a995585284c4529da9a686a0a9
4RMD160 (uwsgi-2.0.18.tar.gz) = eb30a41097d306678203aa81bf5f4e27c722b8f8 8RMD160 (uwsgi-2.0.18.tar.gz) = eb30a41097d306678203aa81bf5f4e27c722b8f8
5SHA512 (uwsgi-2.0.18.tar.gz) = 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61 9SHA512 (uwsgi-2.0.18.tar.gz) = 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
6Size (uwsgi-2.0.18.tar.gz) = 801555 bytes 10Size (uwsgi-2.0.18.tar.gz) = 801555 bytes
7SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30 11SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30
8SHA1 (patch-core_logging.c) = caa986238142d24725df119cbecda1b9e3223d7e 12SHA1 (patch-core_logging.c) = caa986238142d24725df119cbecda1b9e3223d7e
9SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808 13SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808
10SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020 14SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020

cvs diff -r1.4 -r1.5 pkgsrc/www/py-uwsgi/options.mk (expand / switch to unified diff)

--- pkgsrc/www/py-uwsgi/options.mk 2018/03/19 09:28:04 1.4
+++ pkgsrc/www/py-uwsgi/options.mk 2019/03/06 13:07:58 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.4 2018/03/19 09:28:04 adam Exp $ 1# $NetBSD: options.mk,v 1.5 2019/03/06 13:07:58 joerg Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.py-uwsgi 3PKG_OPTIONS_VAR= PKG_OPTIONS.py-uwsgi
4PKG_SUPPORTED_OPTIONS= debug openssl pcre uuid yaml 4PKG_SUPPORTED_OPTIONS= debug openssl pcre uuid uwsgi-sse_offload yaml
5PKG_SUGGESTED_OPTIONS+= libxml2 openssl pcre 5PKG_SUGGESTED_OPTIONS+= libxml2 openssl pcre
6 6
7PKG_OPTIONS_OPTIONAL_GROUPS+= json xml 7PKG_OPTIONS_OPTIONAL_GROUPS+= json xml
8PKG_OPTIONS_GROUP.json= jansson yajl 8PKG_OPTIONS_GROUP.json= jansson yajl
9PKG_OPTIONS_GROUP.xml= expat libxml2 9PKG_OPTIONS_GROUP.xml= expat libxml2
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13UWSGI_DEBUG= debug=false 13UWSGI_DEBUG= debug=false
14.if !empty(PKG_OPTIONS:Mdebug) 14.if !empty(PKG_OPTIONS:Mdebug)
15UWSGI_DEBUG= debug=true 15UWSGI_DEBUG= debug=true
16.endif 16.endif
17 17
@@ -40,26 +40,39 @@ UWSGI_JSON= json=false @@ -40,26 +40,39 @@ UWSGI_JSON= json=false
40.include "../../security/openssl/buildlink3.mk" 40.include "../../security/openssl/buildlink3.mk"
41UWSGI_SSL= ssl=true 41UWSGI_SSL= ssl=true
42.else 42.else
43UWSGI_SSL= ssl=false 43UWSGI_SSL= ssl=false
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mpcre) 46.if !empty(PKG_OPTIONS:Mpcre)
47.include "../../devel/pcre/buildlink3.mk" 47.include "../../devel/pcre/buildlink3.mk"
48UWSGI_PCRE= pcre=true 48UWSGI_PCRE= pcre=true
49.else 49.else
50UWSGI_PCRE= pcre=false 50UWSGI_PCRE= pcre=false
51.endif 51.endif
52 52
 53.if !empty(PKG_OPTIONS:Muwsgi-sse_offload)
 54SSE_REVISION= 8253573a0db1c7d7b9d968d55669e70e40355bed
 55SSE_DISTNAME= ${SSE_REVISION}.zip
 56SITES.${SSE_DISTNAME}= https://github.com/unbit/uwsgi-sse-offload/archive/
 57DISTFILES+= ${SSE_DISTNAME}
 58UWSGI_SSE= sse_offload=true
 59INSTALL_ENV+= UWSGI_EMBED_PLUGINS=sse_offload
 60
 61post-extract: post-extract-sse
 62post-extract-sse:
 63 mv ${WRKDIR}/uwsgi-sse-offload-${SSE_REVISION} ${WRKSRC}/plugins/sse_offload
 64.endif
 65
53.if !empty(PKG_OPTIONS:Muuid) 66.if !empty(PKG_OPTIONS:Muuid)
54.include "../../devel/libuuid/buildlink3.mk" 67.include "../../devel/libuuid/buildlink3.mk"
55UWSGI_UUID= uuid=true 68UWSGI_UUID= uuid=true
56.else 69.else
57UWSGI_UUID= uuid=false 70UWSGI_UUID= uuid=false
58.endif 71.endif
59 72
60.if !empty(PKG_OPTIONS:Myaml) 73.if !empty(PKG_OPTIONS:Myaml)
61.include "../../textproc/libyaml/buildlink3.mk" 74.include "../../textproc/libyaml/buildlink3.mk"
62UWSGI_YAML= yaml=true 75UWSGI_YAML= yaml=true
63.else 76.else
64UWSGI_YAML= yaml=false 77UWSGI_YAML= yaml=false
65.endif 78.endif