Date: Mon, 30 Aug 2021 16:55:02 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 421d8a31223d - main - multimedia/makemkv: fix up CONFLICTS_BUILD Message-ID: <202108301655.17UGt24l069351@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=421d8a31223d363e0b5890184d1a8c3ba1891371 commit 421d8a31223d363e0b5890184d1a8c3ba1891371 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2021-08-30 16:53:52 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108301655.17UGt24l069351>