From owner-svn-ports-all@freebsd.org  Thu Sep  7 20:27:09 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EA81E0DC69;
 Thu,  7 Sep 2017 20:27:09 +0000 (UTC) (envelope-from cy@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 EE90668568;
 Thu,  7 Sep 2017 20:27:08 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87KR7nB027705;
 Thu, 7 Sep 2017 20:27:07 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87KR7wf027704;
 Thu, 7 Sep 2017 20:27:07 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201709072027.v87KR7wf027704@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 7 Sep 2017 20:27:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r449427 - head/sysutils/syslog-ng311
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/sysutils/syslog-ng311
X-SVN-Commit-Revision: 449427
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.23
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: Thu, 07 Sep 2017 20:27:09 -0000

Author: cy
Date: Thu Sep  7 20:27:07 2017
New Revision: 449427
URL: https://svnweb.freebsd.org/changeset/ports/449427

Log:
  Remove a redundant conflict.
  
  Reported by:	 Craig Leres <leres@ee.lbl.gov>

Modified:
  head/sysutils/syslog-ng311/Makefile

Modified: head/sysutils/syslog-ng311/Makefile
==============================================================================
--- head/sysutils/syslog-ng311/Makefile	Thu Sep  7 20:13:17 2017	(r449426)
+++ head/sysutils/syslog-ng311/Makefile	Thu Sep  7 20:27:07 2017	(r449427)
@@ -23,7 +23,7 @@ BROKEN_sparc64=		fails to link: Internal error: Segmen
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]* eventlog*
+		syslog-ng-devel-[0-9]*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes