Mercurial > hgrepos > FreeBSD > ports > www > uwsginl

changeset 22:98faecd6ea00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MERGE: port revision 2 from uwsgi 2.0.16
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 09 Mar 2019 09:58:40 +0100
parents 70b8e449d563 (current diff) 5227737fcf74 (diff)
children b4145ca58f5d
files Makefile files/uwsginl.in
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Feb 21 22:25:05 2018 +0100
+++ b/Makefile	Sat Mar 09 09:58:40 2019 +0100
@@ -4,6 +4,7 @@
 
 PORTNAME=	uwsginl
 PORTVERSION=	2.0.16
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://projects.unbit.it/downloads/
 DISTNAME=	uwsgi-${DISTVERSION}
@@ -17,11 +18,9 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		pkgconfig python:build ssl
+USES=		pkgconfig python:build
 USE_RC_SUBR=	uwsginl
 
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	${OPENSSL_LDFLAGS}
 MAKE_ENV+=	CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_PROFILE=nolang.ini UWSGI_BIN_NAME=${PORTNAME} UWSGI_EMBED_PLUGINS=cgi,clock_realtime,echo,logpipe UWSGI_PROFILE_OVERRIDE=plugin_dir=${PREFIX}/${PLUGIN_DIR}
 
 USERS=		uwsgi
@@ -29,7 +28,9 @@
 
 PLIST_SUB=	PORTNAME=${PORTNAME} PLUGIN_DIR=${PLUGIN_DIR}
 
-OPTIONS_DEFINE=		DEBUGSYM UWSGIDEBUG JSON PCRE XML
+OPTIONS_DEFINE=		DEBUGSYM UWSGIDEBUG JSON PCRE XML SSL
+OPTIONS_DEFAULT=	SSL
+
 DEBUGSYM_DESC=		Build with debug symbols
 UWSGIDEBUG_DESC=	Enable uwsgi debugging (def UWSGI_DEBUG, implies DEBUG)
 
@@ -46,12 +47,17 @@
 XML_VARS=		BUILDCONF_XML=libxml2
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
+SSL_VARS=		BUILDCONF_SSL=true
+SSL_USES=		ssl
+SSL_CFLAGS=		-I${OPENSSLINC}
+SSL_LDFLAGS=		${OPENSSL_LDFLAGS}
+
 .include <bsd.port.options.mk>
 
 PLUGIN_DIR=	lib/${PORTNAME}/plugins
 
 post-patch:
-.for bcvar in DEBUG JSON PCRE XML
+.for bcvar in DEBUG JSON PCRE XML SSL
 	@${REINPLACE_CMD} -e '/^${bcvar:tl} =/ s|= .*|= ${BUILDCONF_${bcvar}:Ufalse}|' ${WRKSRC}/buildconf/base.ini
 .endfor
 
--- a/files/uwsginl.in	Wed Feb 21 22:25:05 2018 +0100
+++ b/files/uwsginl.in	Sat Mar 09 09:58:40 2019 +0100
@@ -92,7 +92,7 @@
 		eval uwsginl_logfile=\${uwsginl_${profile}_logfile:-"/var/log/${name}-${profile}.log"}
 		eval uwsginl_pidfile=\${uwsginl_${profile}_pidfile:-"/var/run/${name}-${profile}.pid"}
 		eval uwsginl_uid=\${uwsginl_${profile}_uid:-"${uwsginl_uid}"}
-		eval uwsginl_gid=\${uwsginl_${profile}_gid:-"${uwsginl_uid}"}
+		eval uwsginl_gid=\${uwsginl_${profile}_gid:-"${uwsginl_gid}"}
 		eval uwsginl_flags=\${uwsginl_${profile}_flags:-"${uwsginl_flags}"}
 		eval uwsginl_procname=\${uwsginl_${profile}_procname:-"${uwsginl_procname}"}
 		eval uwsginl_emperor=\${uwsginl_${profile}_emperor:-"${uwsginl_emperor}"}