Received: by mail.netbsd.org (Postfix, from userid 605) id AEF9984EC9; Fri, 16 Mar 2018 23:39:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C6D4F84D5D for ; Fri, 16 Mar 2018 23:39:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PF2hZDiLfZEV for ; Fri, 16 Mar 2018 23:39:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EF8BE84D21 for ; Fri, 16 Mar 2018 23:39:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E64C5FB40; Fri, 16 Mar 2018 23:39:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1521243594157970" MIME-Version: 1.0 Date: Fri, 16 Mar 2018 23:39:54 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/www/py-uwsgi To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20180316233954.E64C5FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1521243594157970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Fri Mar 16 23:39:54 UTC 2018 Modified Files: pkgsrc/www/py-uwsgi: Makefile Makefile.common options.mk Log Message: Unbreak the option handling. Restore openssl and PCRE option. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/py-uwsgi/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-uwsgi/Makefile.common cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-uwsgi/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1521243594157970 Content-Disposition: inline Content-Length: 4041 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/py-uwsgi/Makefile diff -u pkgsrc/www/py-uwsgi/Makefile:1.39 pkgsrc/www/py-uwsgi/Makefile:1.40 --- pkgsrc/www/py-uwsgi/Makefile:1.39 Fri Mar 2 16:14:46 2018 +++ pkgsrc/www/py-uwsgi/Makefile Fri Mar 16 23:39:54 2018 @@ -1,16 +1,21 @@ -# $NetBSD: Makefile,v 1.39 2018/03/02 16:14:46 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2018/03/16 23:39:54 joerg Exp $ .include "Makefile.common" +LICENSE= gnu-gpl-v2 # with linking exception PKGNAME= ${PYPKGPREFIX}-${DISTNAME} COMMENT= Feature-rich WSGI server +USE_LANGUAGES= c +USE_TOOLS+= pkg-config + PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} EGG_NAME= ${DISTNAME:S/uwsgi/uWSGI/} .include "options.mk" -INSTALL_ENV+= UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG}${UWSGI_JSON}${UWSGI_PCRE}${UWSGI_SSL}${UWSGI_UUID}${UWSGI_XML}${UWSGI_YAML}" +INSTALL_ENV+= UWSGI_INCLUDES=${PREFIX}/include +INSTALL_ENV+= UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG};${UWSGI_JSON};${UWSGI_PCRE};${UWSGI_SSL};${UWSGI_UUID};${UWSGI_XML};${UWSGI_YAML}" INSTALLATION_DIRS+= share/examples/${PYPKGPREFIX}-uwsgi post-install: @@ -18,5 +23,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/* \ ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi +.include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-uwsgi/Makefile.common diff -u pkgsrc/www/py-uwsgi/Makefile.common:1.1 pkgsrc/www/py-uwsgi/Makefile.common:1.2 --- pkgsrc/www/py-uwsgi/Makefile.common:1.1 Fri Mar 2 16:15:35 2018 +++ pkgsrc/www/py-uwsgi/Makefile.common Fri Mar 16 23:39:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2018/03/02 16:15:35 joerg Exp $ +# $NetBSD: Makefile.common,v 1.2 2018/03/16 23:39:54 joerg Exp $ # # used by www/ap-uwsgi/Makefile # used by www/py-uwsgi/Makefile @@ -14,10 +14,5 @@ LICENSE= gnu-gpl-v2 # with linking excep PATCHDIR= ${.CURDIR}/../../www/py-uwsgi/patches DISTINFO_FILE= ${.CURDIR}/../../www/py-uwsgi/distinfo -USE_LANGUAGES= c -USE_TOOLS+= pkg-config - -INSTALL_ENV+= UWSGI_INCLUDES=${PREFIX}/include - .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" Index: pkgsrc/www/py-uwsgi/options.mk diff -u pkgsrc/www/py-uwsgi/options.mk:1.2 pkgsrc/www/py-uwsgi/options.mk:1.3 --- pkgsrc/www/py-uwsgi/options.mk:1.2 Tue Feb 13 08:34:03 2018 +++ pkgsrc/www/py-uwsgi/options.mk Fri Mar 16 23:39:54 2018 @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2018/02/13 08:34:03 adam Exp $ +# $NetBSD: options.mk,v 1.3 2018/03/16 23:39:54 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.py-uwsgi -PKG_SUPPORTED_OPTIONS= debug uuid yaml -PKG_SUGGESTED_OPTIONS+= libxml2 +PKG_SUPPORTED_OPTIONS= debug openssl pcre uuid yaml +PKG_SUGGESTED_OPTIONS+= libxml2 openssl PKG_OPTIONS_OPTIONAL_GROUPS+= json xml PKG_OPTIONS_GROUP.json= jansson yajl @@ -15,7 +15,6 @@ UWSGI_DEBUG= debug=false UWSGI_DEBUG= debug=true .endif -UWSGI_XML= xml=auto .if !empty(PKG_OPTIONS:Mexpat) .include "../../textproc/expat/buildlink3.mk" UWSGI_XML= xml=expat @@ -26,7 +25,6 @@ UWSGI_XML= xml=libxml2 UWSGI_XML= xml=false .endif -UWSGI_JSON= json=auto .if !empty(PKG_OPTIONS:Mjansson) .include "../../textproc/jansson/buildlink3.mk" UWSGI_JSON= json=jansson @@ -38,7 +36,20 @@ BROKEN= The yajl option requires a yajl UWSGI_JSON= json=false .endif -UWSGI_UUID= uuid=auto +.if !empty(PKG_OPTIONS:Mopenssl) +.include "../../security/openssl/buildlink3.mk" +UWSGI_SSL= ssl=true +.else +UWSGI_SSL= ssl=false +.endif + +.if !empty(PKG_OPTIONS:Mpcre) +.include "../../devel/pcre/buildlink3.mk" +UWSGI_PCRE= pcre=true +.else +UWSGI_PCRE= pcre=false +.endif + .if !empty(PKG_OPTIONS:Muuid) .include "../../devel/libuuid/buildlink3.mk" UWSGI_UUID= uuid=true @@ -46,7 +57,6 @@ UWSGI_UUID= uuid=true UWSGI_UUID= uuid=false .endif -UWSGI_YAML= yaml=auto .if !empty(PKG_OPTIONS:Myaml) .include "../../textproc/libyaml/buildlink3.mk" UWSGI_YAML= yaml=true --_----------=_1521243594157970--