From owner-svn-ports-head@freebsd.org  Sat Oct 14 19:30:22 2017
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 2F4E9E2ABC0;
 Sat, 14 Oct 2017 19:30:22 +0000 (UTC)
 (envelope-from thierry@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 E8DEF7DD58;
 Sat, 14 Oct 2017 19:30:21 +0000 (UTC)
 (envelope-from thierry@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9EJULRn069368;
 Sat, 14 Oct 2017 19:30:21 GMT (envelope-from thierry@FreeBSD.org)
Received: (from thierry@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9EJULTf069367;
 Sat, 14 Oct 2017 19:30:21 GMT (envelope-from thierry@FreeBSD.org)
Message-Id: <201710141930.v9EJULTf069367@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: thierry set sender to
 thierry@FreeBSD.org using -f
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Sat, 14 Oct 2017 19:30:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r452084 - head/cad/scotch
X-SVN-Group: ports-head
X-SVN-Commit-Author: thierry
X-SVN-Commit-Paths: head/cad/scotch
X-SVN-Commit-Revision: 452084
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.23
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: Sat, 14 Oct 2017 19:30:22 -0000

Author: thierry
Date: Sat Oct 14 19:30:20 2017
New Revision: 452084
URL: https://svnweb.freebsd.org/changeset/ports/452084

Log:
  Fix CONFLICTS.
  
  Reported by:	FreeBSD Ports Conflicts Scanner

Modified:
  head/cad/scotch/Makefile

Modified: head/cad/scotch/Makefile
==============================================================================
--- head/cad/scotch/Makefile	Sat Oct 14 19:10:06 2017	(r452083)
+++ head/cad/scotch/Makefile	Sat Oct 14 19:30:20 2017	(r452084)
@@ -16,7 +16,7 @@ LICENSE_NAME=	CeCILL-C
 LICENSE_FILE=	${WRKSRC}/doc/CeCILL-C_V1-en.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-CONFLICTS=	gbase-0.* gmap-2006.*
+CONFLICTS=	gbase-0.* gmap-2015.*
 
 USES=		gmake