From owner-dev-commits-ports-all@freebsd.org Mon Aug 30 16:55:03 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 4526E659BB1; Mon, 30 Aug 2021 16:55:03 +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 4GyxJR1SBHz3k9S; Mon, 30 Aug 2021 16:55:03 +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 1771E21813; Mon, 30 Aug 2021 16:55:03 +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 17UGt255069352; Mon, 30 Aug 2021 16:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17UGt24l069351; Mon, 30 Aug 2021 16:55:02 GMT (envelope-from git) Date: Mon, 30 Aug 2021 16:55:02 GMT Message-Id: <202108301655.17UGt24l069351@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 421d8a31223d - main - multimedia/makemkv: fix up CONFLICTS_BUILD MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 421d8a31223d363e0b5890184d1a8c3ba1891371 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, 30 Aug 2021 16:55:03 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=421d8a31223d363e0b5890184d1a8c3ba1891371 commit 421d8a31223d363e0b5890184d1a8c3ba1891371 Author: Matthias Andree AuthorDate: 2021-08-30 16:53:52 +0000 Commit: Matthias Andree CommitDate: 2021-08-30 16:54:33 +0000 multimedia/makemkv: fix up CONFLICTS_BUILD Pointy hat to: mandree@ PR: 257946 --- multimedia/makemkv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index 9df41c52f8d8..c133922a9074 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -47,7 +47,7 @@ BUILD_DEPENDS= nasm>0:devel/nasm \ WRKSRC= ${WRKDIR}/makemkv-oss-${PORTVERSION} -CONFLICTS_BUILD= v4l_compat +CONFLICTS_BUILD= v4l_compat-* SUB_FILES= update-makemkv-drives SUB_LIST= LINUXBASE=${LINUXBASE}