From owner-svn-ports-head@freebsd.org  Sun Jun  7 17:37:12 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C986033274A;
 Sun,  7 Jun 2020 17:37:12 +0000 (UTC)
 (envelope-from glewis@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49g3VJ50YQz4L8p;
 Sun,  7 Jun 2020 17:37:12 +0000 (UTC)
 (envelope-from glewis@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 A691E16BF0;
 Sun,  7 Jun 2020 17:37:12 +0000 (UTC)
 (envelope-from glewis@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 057HbCUb045468;
 Sun, 7 Jun 2020 17:37:12 GMT (envelope-from glewis@FreeBSD.org)
Received: (from glewis@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 057HbCVF045467;
 Sun, 7 Jun 2020 17:37:12 GMT (envelope-from glewis@FreeBSD.org)
Message-Id: <202006071737.057HbCVF045467@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glewis set sender to
 glewis@FreeBSD.org using -f
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sun, 7 Jun 2020 17:37:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r538177 - head/sysutils/logstash6
X-SVN-Group: ports-head
X-SVN-Commit-Author: glewis
X-SVN-Commit-Paths: head/sysutils/logstash6
X-SVN-Commit-Revision: 538177
X-SVN-Commit-Repository: ports
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.33
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: Sun, 07 Jun 2020 17:37:12 -0000

Author: glewis
Date: Sun Jun  7 17:37:12 2020
New Revision: 538177
URL: https://svnweb.freebsd.org/changeset/ports/538177

Log:
  Update CONFLICTS

Modified:
  head/sysutils/logstash6/Makefile

Modified: head/sysutils/logstash6/Makefile
==============================================================================
--- head/sysutils/logstash6/Makefile	Sun Jun  7 17:36:31 2020	(r538176)
+++ head/sysutils/logstash6/Makefile	Sun Jun  7 17:37:12 2020	(r538177)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		cpe shebangfix
 
-CONFLICTS=	logstash-[0-9]* logstash5-[0-9]*
+CONFLICTS=	logstash-[0-9]* logstash5* logstash7*
 
 SHEBANG_FILES=	bin/*
 CPE_VENDOR=	elasticsearch