From owner-svn-ports-all@freebsd.org Mon May 30 15:14:19 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D042B54E20; Mon, 30 May 2016 15:14:19 +0000 (UTC) (envelope-from demon@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 mx1.freebsd.org (Postfix) with ESMTPS id C67FC120F; Mon, 30 May 2016 15:14:18 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4UFEHU1032578; Mon, 30 May 2016 15:14:17 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4UFEHsv032576; Mon, 30 May 2016 15:14:17 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201605301514.u4UFEHsv032576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Mon, 30 May 2016 15:14:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416156 - in head/www/uwsgi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2016 15:14:19 -0000 Author: demon Date: Mon May 30 15:14:17 2016 New Revision: 416156 URL: https://svnweb.freebsd.org/changeset/ports/416156 Log: Add OPTIONal support for json, xml and pcre plugins. Modified: head/www/uwsgi/Makefile head/www/uwsgi/files/patch-buildconf-base.ini Modified: head/www/uwsgi/Makefile ============================================================================== --- head/www/uwsgi/Makefile Mon May 30 14:58:21 2016 (r416155) +++ head/www/uwsgi/Makefile Mon May 30 15:14:17 2016 (r416156) @@ -3,6 +3,7 @@ PORTNAME= uwsgi PORTVERSION= 2.0.13 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://projects.unbit.it/downloads/ @@ -16,11 +17,34 @@ USES= python USE_PYTHON= distutils USE_RC_SUBR= uwsgi -OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE= DEBUG JSON PCRE XML DEBUG_VARS= PYDISTUTILS_BUILDARGS+=--debug +JSON_LIB_DEPENDS= libjansson.so:devel/jansson +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +XML_LIB_DEPENDS= libexpat.so:textproc/expat2 + +.include + +.if ${PORT_OPTIONS:MJSON} +O_JSON= jansson +.else +O_JSON= false +.endif + +.if ${PORT_OPTIONS:MPCRE} +O_PCRE= true +.else +O_PCRE= false +.endif + +.if ${PORT_OPTIONS:MXML} +O_XML= expat +CFLAGS+= "-I${LOCALBASE}/include" +.else +O_XML= false +.endif -LDFLAGS+= "-L${LOCALBASE}/lib" MAKE_ENV+= CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_EMBED_PLUGINS=cgi PYSETUP= uwsgiconfig.py @@ -30,6 +54,9 @@ PYDISTUTILS_BUILDARGS= --verbose PLIST_FILES= bin/uwsgi \ %%PYTHON_SITELIBDIR%%/uwsgidecorators.py +post-patch: + ${REINPLACE_CMD} -e s#@JSON@#${O_JSON}# -e s#@XML@#${O_XML}# -e s#@PCRE@#${O_PCRE}# ${WRKSRC}/buildconf/base.ini + do-configure: @${DO_NADA} Modified: head/www/uwsgi/files/patch-buildconf-base.ini ============================================================================== --- head/www/uwsgi/files/patch-buildconf-base.ini Mon May 30 14:58:21 2016 (r416155) +++ head/www/uwsgi/files/patch-buildconf-base.ini Mon May 30 15:14:17 2016 (r416156) @@ -3,14 +3,13 @@ @@ -1,9 +1,9 @@ [uwsgi] -xml = auto -+xml = false ++xml = @XML@ yaml = true -json = auto --ssl = auto ++json = @JSON@ + ssl = auto -pcre = auto -+json = false -+ssl = false -+pcre = false ++pcre = @PCRE@ routing = auto debug = false unbit = false