From owner-svn-ports-all@freebsd.org  Sat May  5 16:51:58 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 030FDFB32DC;
 Sat,  5 May 2018 16:51:58 +0000 (UTC)
 (envelope-from antoine@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 A730F6FFF9;
 Sat,  5 May 2018 16:51:57 +0000 (UTC)
 (envelope-from antoine@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 A032B20555;
 Sat,  5 May 2018 16:51:57 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w45Gpvb9045109;
 Sat, 5 May 2018 16:51:57 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w45Gpv5A045091;
 Sat, 5 May 2018 16:51:57 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201805051651.w45Gpv5A045091@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 5 May 2018 16:51:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r469129 - head/french/aster
X-SVN-Group: ports-head
X-SVN-Commit-Author: antoine
X-SVN-Commit-Paths: head/french/aster
X-SVN-Commit-Revision: 469129
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: Sat, 05 May 2018 16:51:58 -0000

Author: antoine
Date: Sat May  5 16:51:57 2018
New Revision: 469129
URL: https://svnweb.freebsd.org/changeset/ports/469129

Log:
  Mark BROKEN: conflicting dependencies
  
  pkg-static: metis-5.1.0_3 conflicts with metis-edf-5.1.0.a1,1 (installs files into the same place).  Problematic file: /usr/local/bin/cmpfillin
  
  Reported by:	pkg-fallout

Modified:
  head/french/aster/Makefile

Modified: head/french/aster/Makefile
==============================================================================
--- head/french/aster/Makefile	Sat May  5 16:47:39 2018	(r469128)
+++ head/french/aster/Makefile	Sat May  5 16:51:57 2018	(r469129)
@@ -12,6 +12,8 @@ COMMENT=	Code_Aster finite element method solver
 
 LICENSE=	GPLv2
 
+BROKEN=		conflicting dependencies
+
 #-----------------------------------------------------------------------
 # You may define these options:
 #