From owner-svn-ports-head@freebsd.org Mon Aug 27 14:51:30 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7900F108CBF6; Mon, 27 Aug 2018 14:51:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2EA3474109; Mon, 27 Aug 2018 14:51:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10D8B1F17C; Mon, 27 Aug 2018 14:51:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7REpTQT038978; Mon, 27 Aug 2018 14:51:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7REpTaK038977; Mon, 27 Aug 2018 14:51:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201808271451.w7REpTaK038977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 27 Aug 2018 14:51:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478210 - head/www/uwsgi X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/www/uwsgi X-SVN-Commit-Revision: 478210 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 14:51:30 -0000 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 - 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