From owner-svn-ports-head@freebsd.org  Thu Jun 16 15:48:47 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 25591A7388B;
 Thu, 16 Jun 2016 15:48:47 +0000 (UTC)
 (envelope-from feld@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 E96BD11C7;
 Thu, 16 Jun 2016 15:48:46 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5GFmkXx029553;
 Thu, 16 Jun 2016 15:48:46 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5GFmk25029552;
 Thu, 16 Jun 2016 15:48:46 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201606161548.u5GFmk25029552@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 16 Jun 2016 15:48:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416974 - head/www/mod_cloudflare
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jun 2016 15:48:47 -0000

Author: feld
Date: Thu Jun 16 15:48:45 2016
New Revision: 416974
URL: https://svnweb.freebsd.org/changeset/ports/416974

Log:
  www/mod_cloudflare: add conflict with www/mod_remoteip

Modified:
  head/www/mod_cloudflare/Makefile

Modified: head/www/mod_cloudflare/Makefile
==============================================================================
--- head/www/mod_cloudflare/Makefile	Thu Jun 16 15:35:31 2016	(r416973)
+++ head/www/mod_cloudflare/Makefile	Thu Jun 16 15:48:45 2016	(r416974)
@@ -10,6 +10,8 @@ COMMENT=	Cloudflare fork of mod_remoteip
 
 LICENSE=	APACHE20
 
+CONFLICTS_INSTALL=	${PKGNAMEPREFIX}mod_remoteip-*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 GH_TAGNAME=	340fa0a