From owner-svn-ports-all@freebsd.org  Mon Feb 12 20:02:51 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD284F17EA8;
 Mon, 12 Feb 2018 20:02:51 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5FCD76AD9B;
 Mon, 12 Feb 2018 20:02:51 +0000 (UTC) (envelope-from pi@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5AD6416977;
 Mon, 12 Feb 2018 20:02:51 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1CK2poU048743;
 Mon, 12 Feb 2018 20:02:51 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1CK2pjf048742;
 Mon, 12 Feb 2018 20:02:51 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201802122002.w1CK2pjf048742@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Mon, 12 Feb 2018 20:02:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r461646 - head/textproc/elasticsearch2
X-SVN-Group: ports-head
X-SVN-Commit-Author: pi
X-SVN-Commit-Paths: head/textproc/elasticsearch2
X-SVN-Commit-Revision: 461646
X-SVN-Commit-Repository: ports
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Feb 2018 20:02:51 -0000

Author: pi
Date: Mon Feb 12 20:02:51 2018
New Revision: 461646
URL: https://svnweb.freebsd.org/changeset/ports/461646

Log:
  textproc/elasticsearch2: add conflicts with elasticsearch6
  
  PR:		225836
  Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>

Modified:
  head/textproc/elasticsearch2/Makefile

Modified: head/textproc/elasticsearch2/Makefile
==============================================================================
--- head/textproc/elasticsearch2/Makefile	Mon Feb 12 20:00:26 2018	(r461645)
+++ head/textproc/elasticsearch2/Makefile	Mon Feb 12 20:02:51 2018	(r461646)
@@ -13,7 +13,7 @@ COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
 
-CONFLICTS=	elasticsearch-[0-9]* elasticsearch5-[0-9]*
+CONFLICTS=	elasticsearch-[0-9]* elasticsearch5-[0-9]* elasticsearch6-[0-9]*
 
 USES=		cpe
 NO_ARCH=	yes