Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Aug 2018 14:51:29 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478210 - head/www/uwsgi
Message-ID:  <201808271451.w7REpTaK038977@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Aug 27 14:51:29 2018
New Revision: 478210
URL: https://svnweb.freebsd.org/changeset/ports/478210

Log:
  - Optionize SSL support
  - Remove bogus LIB_DEPENDS line
  - Whitespace fixes
  
  PR:		229205
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (eugene@zhegan.in, 2 months)

Modified:
  head/www/uwsgi/Makefile

Modified: head/www/uwsgi/Makefile
==============================================================================
--- head/www/uwsgi/Makefile	Mon Aug 27 14:29:15 2018	(r478209)
+++ head/www/uwsgi/Makefile	Mon Aug 27 14:51:29 2018	(r478210)
@@ -3,7 +3,7 @@
 
 PORTNAME=	uwsgi
 PORTVERSION=	2.0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
@@ -13,12 +13,10 @@ COMMENT=	Developer-friendly WSGI server which uses uws
 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
@@ -33,13 +31,14 @@ PLIST_FILES=	bin/uwsgi \
 
 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
 
@@ -52,12 +51,13 @@ PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 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
+SSL_VARS=		BUILDCONF_SSL=true
+SSL_USES=		ssl
+SSL_CFLAGS=		-I${OPENSSLINC}
+SSL_LDFLAGS=		${OPENSSL_LDFLAGS}
 
-.include <bsd.port.options.mk>
-
 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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808271451.w7REpTaK038977>