From nobody Mon Nov 29 12:55:11 2021 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 7B89F18CD67C; Mon, 29 Nov 2021 12:55:12 +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 4J2lgh19lLz4hRk; Mon, 29 Nov 2021 12:55:12 +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 046C122DCF; Mon, 29 Nov 2021 12:55:12 +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 1ATCtBW9038665; Mon, 29 Nov 2021 12:55:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATCtBRZ038664; Mon, 29 Nov 2021 12:55:11 GMT (envelope-from git) Date: Mon, 29 Nov 2021 12:55:11 GMT Message-Id: <202111291255.1ATCtBRZ038664@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 45adb0cd9578 - main - converters/yj-bruceadams: Fix CONFLICTS_INSTALL 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45adb0cd9578796e4aa0df2769ab35c80a77c25d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638190512; 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=xXi5bFDgZMJmyjLsS/HrgT2NNbW0ZAVg3PmmyhS4KYY=; b=LUO6MG4boxKn5HzVgSDGz0Y0aMbD3ADv26jWKJH9N83OrHpZLohkdLW4VmLfy3Y2HiV5dC kQaFg78oMAN1C3OyATUoKKQPpRQor8iRZt5zd7ygYoKpHlF1pvoJJQMLAkynAJy79MfhUN whpgf6GVkQfrKklWkugFmWczCmzE3dRia88cfW2/cXx6LfPBq7qDHNdeD3sHvSu5yP2qt6 ZhUePeOIpQcGwWqWsUV/Ti3fp7U1zwzs4hUFWLfIXoc4cFLwRfUAmhEku3ASO66CRSwC3t K0pqO5ZM1fOuwE+3sGa3XA2iBR+f8NRyCFh0SOWgK9621sYFxVSL06rwecilMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638190512; a=rsa-sha256; cv=none; b=hRlE46G/wZrBQaVat0xpOY5pDxsBUXkwENhEGjgFlLvH69FMm0roxeNSw30cc6eTTM3Q4X Z94TtALoQK0kvVm1GM+O6qWYJmhZuLZE1jYZHVlvefiyzsrF6LEBHBA5St+/DOzTrrnw4i dRaOrIi0M8qYKEEnOlgXBBk0aTBsNTD3xUD/Vc1uxT8IinHWo8uzVR6ZMbwlzntdFE4nHy HFEtiwAjpp/sqbguhT49p8623tnI1goMcxZSoy1Jk/pzikp9eXg/pMf7JSkOST65zoJIZd 1uOUB2/+C9iAFrRD3G6DnMegEx+F8ZrxTK2l11DYtiRF3qOXLs2wsyJGrHRfsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=45adb0cd9578796e4aa0df2769ab35c80a77c25d commit 45adb0cd9578796e4aa0df2769ab35c80a77c25d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-11-28 16:26:03 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-11-29 12:54:48 +0000 converters/yj-bruceadams: Fix CONFLICTS_INSTALL Reported by: se --- converters/yj-bruceadams/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/converters/yj-bruceadams/Makefile b/converters/yj-bruceadams/Makefile index c1aeea723ae5..3472a9912e70 100644 --- a/converters/yj-bruceadams/Makefile +++ b/converters/yj-bruceadams/Makefile @@ -1,5 +1,6 @@ PORTNAME= yj DISTVERSION= 1.1.34 +PORTREVISION= 1 CATEGORIES= converters textproc PKGNAMESUFFIX= -${GH_ACCOUNT} @@ -68,7 +69,7 @@ CARGO_CRATES= addr2line-0.16.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ yaml-rust-0.4.5 -CONFLICTS_INSTALL= yj-[0-9]*.[0-9]* +CONFLICTS_INSTALL= yj PLIST_FILES= bin/yj