From owner-dev-commits-ports-main@freebsd.org Thu Sep 16 02:46:27 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 92B94673078; Thu, 16 Sep 2021 02:46:27 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H91gR3hhCz3JW7; Thu, 16 Sep 2021 02:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FEF219B1A; Thu, 16 Sep 2021 02:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18G2kR9O037750; Thu, 16 Sep 2021 02:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18G2kR3o037749; Thu, 16 Sep 2021 02:46:27 GMT (envelope-from git) Date: Thu, 16 Sep 2021 02:46:27 GMT Message-Id: <202109160246.18G2kR3o037749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 8cad6db18c4d - main - math/cado-nfs: Add CONFLICTS line. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cad6db18c4d719a8d72b28f9039dffda8724335 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 02:46:27 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cad6db18c4d719a8d72b28f9039dffda8724335 commit 8cad6db18c4d719a8d72b28f9039dffda8724335 Author: Yuri Victorovich AuthorDate: 2021-09-15 23:51:23 +0000 Commit: Yuri Victorovich CommitDate: 2021-09-16 02:45:21 +0000 math/cado-nfs: Add CONFLICTS line. --- math/cado-nfs/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile index f77833c60ed6..db8d7b42ac8b 100644 --- a/math/cado-nfs/Makefile +++ b/math/cado-nfs/Makefile @@ -10,6 +10,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= pkg-static: Unable to access file /wrkdirs/usr/ports/math/cado-nfs/work/stage/usr/local/lib/cado-nfs-3.0.0/linalg/bwc/lingen_pz:No such file or directory +CONFLICTS_BUILD= libfmt # bundled libfmt conflicts with package-installed headers BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ bash:shells/bash \