From nobody Mon Mar 6 07:20:24 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVVN83HB3z3wXmB; Mon, 6 Mar 2023 07:20:24 +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 4PVVN82SN5z3rDG; Mon, 6 Mar 2023 07:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678087224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brjP6CrF4hl6IBwQWTHL486w7iqr2MnktQDPTH55roM=; b=xjy4KGnuOSYlIHQNHFcY3Ouk89LvadA98xwEdKZ/lT81jk1V+r7zKVAIN+g0vTwVRZHoP1 x9nEQYOtPzN3L1bgXFOTTZUnJth9jBGMSvxcPItxomNVkYKSETJ0JXrEceOTsXHhKJu5Rq ATQhxH19+nOuhRnSNPQJ8lliCeNoX3e3/k5m0N6NLK/eN69E/BYCcPAlevo169SuPlpwMK ChRqp+/7eT9rhaxw0klO0Q0/+zM7O6P8I6QajJqTWCbfsz1xYk7A9pCIG/b4LYZ+8X2eOr tvaBV/W3cSZW+PpQgMMh8o9vaVccor3ZvhSW+GTYLpSRdMAhSHJopmyX1PRSMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678087224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brjP6CrF4hl6IBwQWTHL486w7iqr2MnktQDPTH55roM=; b=i0PHoVmB/ZnhFSq9NLPpUXuGUcwH5CjDrSOourJtaz8U69A/WhLs97gihGI/ViOp4RaxdP FcqxHDvaSNjOJH7GHhWbyZKnswC8Aov2Lsbhde2q+CLGAgM0YBh39Ccye8fMzWoHZi2LrH A+sXkNHQOEQFL4g8z5JzvZuWkHr5Iig5hQGc68L/nR5dfQnZvPg0qkg0c2xDb4NEWFBFCu rMIMc5ZlkBMdmVw6u5yOOhBKbABy1qovX0OXV5lDW6Z40hTqD2zBvYRNI7GdyAPuHKI/jT x0ZQ4is/vq/ddVnwpu5hWNSUFJsZD2yhyGn2Ont+lkLH8H5odBlL/+FHc1fRcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678087224; a=rsa-sha256; cv=none; b=wbzLme92jB1566Ehsq9WcPJT0yWl4GM/QUpotcSY1UsgfXvLk0+zk5xzY6W+pGWkEs7zHy xVWAqAxS1npiKmx54ycqz1XO6gRXjEWta3fxvlgRaVyEavAE2A9b6LsD+/VnTVZi5+v7P8 p9pjCgWwANmnbj+aKROonhnhvLYn72dqUDxeDeSZeFLLqSczAyUdfktDak5ZSmpyzrl7eW WMP3RGinlO1YEQT5bipuLSFNII7DC2MBsfFGm6QNaWtznUolnRLtqj4zcPtrp9DuIyW1hj MwUFwicoTLncW1RQv7Ml3AgdLwJp/WoxaD7RXOXd695yM0UKc1Vkw2ejpl1iEQ== 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 4PVVN81RmBzsv7; Mon, 6 Mar 2023 07:20:24 +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 3267KOXv013881; Mon, 6 Mar 2023 07:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3267KOpR013880; Mon, 6 Mar 2023 07:20:24 GMT (envelope-from git) Date: Mon, 6 Mar 2023 07:20:24 GMT Message-Id: <202303060720.3267KOpR013880@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: 0cbaec563506 - main - multimedia/mkvtoolnix: Fix CONFLICTS with -nox11 port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cbaec56350601191e89f59962f0e8a6bbac5fd2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cbaec56350601191e89f59962f0e8a6bbac5fd2 commit 0cbaec56350601191e89f59962f0e8a6bbac5fd2 Author: Thomas Zander AuthorDate: 2023-03-06 07:13:59 +0000 Commit: Thomas Zander CommitDate: 2023-03-06 07:13:59 +0000 multimedia/mkvtoolnix: Fix CONFLICTS with -nox11 port Reported by: keith.chiem@gmail.com (via mail) --- multimedia/mkvtoolnix/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 8294be130eda..4441bcface4a 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,6 +1,6 @@ PORTNAME= mkvtoolnix PORTVERSION= 74.0.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= multimedia audio MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ @@ -30,7 +30,7 @@ LIB_DEPENDS= libvorbis.so:audio/libvorbis \ USES= compiler:c++17-lang iconv localbase pkgconfig qmake:no_env qt:5 tar:xz USE_QT= buildtools:build concurrent core linguisttools:build multimedia svg -CONFLICTS= mkvtoolnix-nox11 +CONFLICTS?= mkvtoolnix-nox11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost=${LOCALBASE} \