From owner-svn-ports-head@freebsd.org Thu Apr 13 16:53:18 2017 Return-Path: Delivered-To: svn-ports-head@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 3EB31D3CBEB; Thu, 13 Apr 2017 16:53:18 +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 mx1.freebsd.org (Postfix) with ESMTPS id E70DA1AE; Thu, 13 Apr 2017 16:53:17 +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 v3DGrGg1033204; Thu, 13 Apr 2017 16:53:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3DGrGYt033203; Thu, 13 Apr 2017 16:53:16 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201704131653.v3DGrGYt033203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 13 Apr 2017 16:53:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438454 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 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: Thu, 13 Apr 2017 16:53:18 -0000 Author: amdmi3 Date: Thu Apr 13 16:53:16 2017 New Revision: 438454 URL: https://svnweb.freebsd.org/changeset/ports/438454 Log: - Simplify substitution of options in build config - Switch to options helpers - Add missing pkgconfig dependency, fix build with JSON - Cosmetic fixes Deleted: head/www/uwsgi/files/patch-buildconf-base.ini Modified: head/www/uwsgi/Makefile Modified: head/www/uwsgi/Makefile ============================================================================== --- head/www/uwsgi/Makefile Thu Apr 13 16:52:09 2017 (r438453) +++ head/www/uwsgi/Makefile Thu Apr 13 16:53:16 2017 (r438454) @@ -13,40 +13,10 @@ COMMENT= Developer-friendly WSGI server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python ssl +USES= pkgconfig python ssl USE_PYTHON= distutils USE_RC_SUBR= uwsgi -USERS= uwsgi -GROUPS= uwsgi - -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= libxml2.so:textproc/libxml2 - -.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= libxml2 -.else -O_XML= false -.endif - CFLAGS+= -I${OPENSSLINC} LDFLAGS+= ${OPENSSL_LDFLAGS} MAKE_ENV+= CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_EMBED_PLUGINS=cgi @@ -55,18 +25,40 @@ PYSETUP= uwsgiconfig.py PYDISTUTILS_BUILD_TARGET= --build PYDISTUTILS_BUILDARGS= --verbose +USERS= uwsgi +GROUPS= uwsgi + PLIST_FILES= bin/uwsgi \ %%PYTHON_SITELIBDIR%%/uwsgidecorators.py +OPTIONS_DEFINE= DEBUG JSON PCRE XML + +DEBUG_VARS= PYDISTUTILS_BUILDARGS+=--debug + +JSON_VARS= BUILDCONF_JSON=jansson +JSON_LIB_DEPENDS= libjansson.so:devel/jansson + +PCRE_VARS= BUILDCONF_PCRE=true +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 + +.include + post-patch: - ${REINPLACE_CMD} -e s#@JSON@#${O_JSON}# -e s#@XML@#${O_XML}# -e s#@PCRE@#${O_PCRE}# ${WRKSRC}/buildconf/base.ini +.for var in JSON PCRE XML + @${REINPLACE_CMD} -e '/^${var:tl} =/ s|= .*|= ${BUILDCONF_${var}:Ufalse}|' ${WRKSRC}/buildconf/base.ini +.endfor do-configure: @${DO_NADA} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/uwsgidecorators.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include