changeset 21:5227737fcf74 origin

Update to the PORTREVISION 2 as of Fri Mar 08 21:12:59 2019 (version 2.0.16)
author Franz Glasner <fzglas.hg@dom66.de>
date Fri, 08 Mar 2019 21:21:52 +0100
parents 9b7ee2483282
children 98faecd6ea00 4f666b0efd4a
files Makefile files/uwsgi.in
diffstat 2 files changed, 16 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Feb 21 22:10:03 2018 +0100
+++ b/Makefile	Fri Mar 08 21:21:52 2019 +0100
@@ -1,8 +1,9 @@
 # Created by: Daniel Gerzo <danger@FreeBSD.org>
-# $FreeBSD: head/www/uwsgi/Makefile 461691 2018-02-13 09:30:16Z vsevolod $
+# $FreeBSD: head/www/uwsgi/Makefile 494507 2019-03-03 12:50:54Z pi $
 
 PORTNAME=	uwsgi
 PORTVERSION=	2.0.16
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
@@ -12,12 +13,10 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		pkgconfig python ssl
+USES=		pkgconfig python
 USE_PYTHON=	distutils concurrent optsuffix
 USE_RC_SUBR=	uwsgi
 
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	${OPENSSL_LDFLAGS}
 MAKE_ENV+=	CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_EMBED_PLUGINS=cgi
 
 PYSETUP=			uwsgiconfig.py
@@ -32,13 +31,14 @@
 
 SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
-OPTIONS_DEFINE=	DEBUG JSON PCRE XML
+OPTIONS_DEFINE=		DEBUG JSON PCRE XML SSL
+OPTIONS_DEFAULT=	SSL
 
 OPTIONS_GROUP=		PLG
 OPTIONS_GROUP_PLG=	PSGI
 
-PLG_DESC=	Enable plugins
-PSGI_DESC=	PSGI embedded plugin
+PLG_DESC=		Enable plugins
+PSGI_DESC=		PSGI embedded plugin
 
 DEBUG_VARS=		PYDISTUTILS_BUILDARGS+=--debug
 
@@ -48,15 +48,18 @@
 PCRE_VARS=		BUILDCONF_PCRE=true
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
+PSGI_USES=		perl5
+
 XML_VARS=		BUILDCONF_XML=libxml2
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
-LIB_DEPENDS+=	libjansson.so:devel/jansson libpcre.so:devel/pcre libxml2.so:textproc/libxml2
-
-.include <bsd.port.options.mk>
+SSL_VARS=		BUILDCONF_SSL=true
+SSL_USES=		ssl
+SSL_CFLAGS=		-I${OPENSSLINC}
+SSL_LDFLAGS=		${OPENSSL_LDFLAGS}
 
 post-patch:
-.for var in JSON PCRE XML
+.for var in JSON PCRE XML SSL
 	@${REINPLACE_CMD} -e '/^${var:tl} =/ s|= .*|= ${BUILDCONF_${var}:Ufalse}|' ${WRKSRC}/buildconf/base.ini
 .endfor
 
--- a/files/uwsgi.in	Wed Feb 21 22:10:03 2018 +0100
+++ b/files/uwsgi.in	Fri Mar 08 21:21:52 2019 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/www/uwsgi/files/uwsgi.in 457125 2017-12-24 06:46:48Z tobik $
+# $FreeBSD: head/www/uwsgi/files/uwsgi.in 473044 2018-06-22 14:59:33Z swills $
 #
 # PROVIDE: uwsgi
 # REQUIRE: DAEMON
@@ -92,7 +92,7 @@
 		eval uwsgi_logfile=\${uwsgi_${profile}_logfile:-"/var/log/${name}-${profile}.log"}
 		eval uwsgi_pidfile=\${uwsgi_${profile}_pidfile:-"/var/run/${name}-${profile}.pid"}
 		eval uwsgi_uid=\${uwsgi_${profile}_uid:-"${uwsgi_uid}"}
-		eval uwsgi_gid=\${uwsgi_${profile}_gid:-"${uwsgi_uid}"}
+		eval uwsgi_gid=\${uwsgi_${profile}_gid:-"${uwsgi_gid}"}
 		eval uwsgi_flags=\${uwsgi_${profile}_flags:-"${uwsgi_flags}"}
 		eval uwsgi_procname=\${uwsgi_${profile}_procname:-"${uwsgi_procname}"}
 		eval uwsgi_emperor=\${uwsgi_${profile}_emperor:-"${uwsgi_emperor}"}