From owner-dev-commits-ports-all@freebsd.org Mon Sep 27 05:20:37 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 159A76AEB60; Mon, 27 Sep 2021 05:20:37 +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 4HHrZD5zPnz3tSg; Mon, 27 Sep 2021 05:20:36 +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 A7EE631B7; Mon, 27 Sep 2021 05:20:36 +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 18R5Kavx083668; Mon, 27 Sep 2021 05:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18R5KaUk083667; Mon, 27 Sep 2021 05:20:36 GMT (envelope-from git) Date: Mon, 27 Sep 2021 05:20:36 GMT Message-Id: <202109270520.18R5KaUk083667@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 84dbd8991808 - main - math/qhull: Update CONFLICTS to include qhull8. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84dbd8991808d56830064768dd7435395bb7015e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 05:20:37 -0000 The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=84dbd8991808d56830064768dd7435395bb7015e commit 84dbd8991808d56830064768dd7435395bb7015e Author: Stephen Montgomery-Smith AuthorDate: 2021-09-27 05:20:05 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2021-09-27 05:20:05 +0000 math/qhull: Update CONFLICTS to include qhull8. --- math/qhull/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/math/qhull/Makefile b/math/qhull/Makefile index 42f6aa9bf6bb..3b97e7aed129 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -3,6 +3,7 @@ PORTNAME= qhull DISTVERSIONPREFIX= v DISTVERSION= 7.3.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math @@ -18,7 +19,7 @@ USES= cmake USE_GITHUB= yes USE_LDCONFIG= yes -CONFLICTS= qhull-8.* afni qhull5 +CONFLICTS= qhull8 afni qhull5 OPTIONS_DEFINE= DOCS