svn commit: r562112 - in head/www/uwsgi: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Jan 20 06:10:58 2021
New Revision: 562112
URL: https://svnweb.freebsd.org/changeset/ports/562112

Log:
  - Allow to build uWSGI with COROAE and LOGPIPE plugins
  - Drop now useless -fno-common bandaid added in r552097
  
  PR:		246167
  Submitted by:	Tomohiro Hosaka

Added:
  head/www/uwsgi/files/patch-plugins_coroae_uwsgiplugin.py   (contents, props changed)
Modified:
  head/www/uwsgi/Makefile

Modified: head/www/uwsgi/Makefile
==============================================================================
--- head/www/uwsgi/Makefile	Wed Jan 20 06:09:10 2021	(r562111)
+++ head/www/uwsgi/Makefile	Wed Jan 20 06:10:58 2021	(r562112)
@@ -35,11 +35,16 @@ OPTIONS_DEFINE=		DEBUG JSON PCRE XML SSL
 OPTIONS_DEFAULT=	SSL
 
 OPTIONS_GROUP=		PLG
-OPTIONS_GROUP_PLG=	PSGI
+OPTIONS_GROUP_PLG=	COROAE LOGPIPE PSGI
 
 PLG_DESC=		Enable plugins
+COROAE_DESC=		Coro::AnyEvent support
+LOGPIPE_DESC=		Pipe logger support
 PSGI_DESC=		PSGI embedded plugin
 
+COROAE_BUILD_DEPENDS=	p5-Coro>=0:devel/p5-Coro
+COROAE_IMPLIES=		PSGI
+
 DEBUG_VARS=		PYDISTUTILS_BUILDARGS+=--debug
 
 JSON_VARS=		BUILDCONF_JSON=jansson
@@ -62,11 +67,12 @@ post-patch:
 .for var in JSON PCRE XML SSL
 	@${REINPLACE_CMD} -e '/^${var:tl} =/ s|= .*|= ${BUILDCONF_${var}:Ufalse}|' ${WRKSRC}/buildconf/base.ini
 .endfor
-	@${REINPLACE_CMD} -e '/ifdef/s,APPLE,${OPSYS},' \
-		${WRKSRC}/plugins/psgi/psgi_plugin.c
 
-post-patch-PSGI-on:
-	@${REINPLACE_CMD} -e 's/%(main_plugin)s,/%(main_plugin)s, psgi,/' ${WRKSRC}/buildconf/base.ini
+.for plugin in COROAE LOGPIPE PSGI
+post-patch-${plugin}-on:
+	@${REINPLACE_CMD} -e 's/%(main_plugin)s,/& ${plugin:tl},/' \
+		${WRKSRC}/buildconf/base.ini
+.endfor
 
 do-configure:
 	@${DO_NADA}

Added: head/www/uwsgi/files/patch-plugins_coroae_uwsgiplugin.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/uwsgi/files/patch-plugins_coroae_uwsgiplugin.py	Wed Jan 20 06:10:58 2021	(r562112)
@@ -0,0 +1,11 @@
+--- plugins/coroae/uwsgiplugin.py.orig	2020-06-17 09:03:34 UTC
++++ plugins/coroae/uwsgiplugin.py
+@@ -9,7 +9,7 @@ for p in search_paths:
+         coroapi = p
+ 
+ if not coroapi:
+-    print "unable to find the Coro perl module !!!"
++    print("unable to find the Coro perl module !!!")
+     sys.exit(1)
+ 
+ NAME='coroae'