Received: by mail.netbsd.org (Postfix, from userid 605) id C585284EAD; Mon, 26 Mar 2018 09:34:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EDDCE84D60 for ; Mon, 26 Mar 2018 09:34:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id lF8Qx94lnN-l for ; Mon, 26 Mar 2018 09:34:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2FD1C84D24 for ; Mon, 26 Mar 2018 09:34:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 26232FB40; Mon, 26 Mar 2018 09:34:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1522056869100190" MIME-Version: 1.0 Date: Mon, 26 Mar 2018 09:34:29 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/www/ap-uwsgi To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180326093429.26232FB40@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. --_----------=_1522056869100190 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Mar 26 09:34:29 UTC 2018 Modified Files: pkgsrc/www/ap-uwsgi: Makefile Log Message: ap-uwsgi: added CONFLICT with apache24>=2.4.30 as mod_proxy_uwsgi is built-in To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap-uwsgi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1522056869100190 Content-Disposition: inline Content-Length: 700 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/ap-uwsgi/Makefile diff -u pkgsrc/www/ap-uwsgi/Makefile:1.2 pkgsrc/www/ap-uwsgi/Makefile:1.3 --- pkgsrc/www/ap-uwsgi/Makefile:1.2 Fri Mar 16 23:39:33 2018 +++ pkgsrc/www/ap-uwsgi/Makefile Mon Mar 26 09:34:29 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/03/16 23:39:33 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2018/03/26 09:34:29 adam Exp $ .include "../../www/py-uwsgi/Makefile.common" @@ -7,6 +7,8 @@ LICENSE= apache-2.0 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} COMMENT= Apache proxy backend for the uWSGI protocol +CONFLICTS+= apache24>=2.4.30 + APACHE_MODULE= YES APACHE_MODULE_SRCDIR= ${WRKSRC}/apache2 APACHE_MODULE_SRC= mod_proxy_uwsgi.c --_----------=_1522056869100190--