From nobody Wed Oct 27 08:41:21 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 1FC041822ED8; Wed, 27 Oct 2021 08:41:22 +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 4HfMc20KrTz3QjQ; Wed, 27 Oct 2021 08:41:22 +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 E0CE34FB4; Wed, 27 Oct 2021 08:41:21 +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 19R8fLUP046857; Wed, 27 Oct 2021 08:41:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R8fLH2046856; Wed, 27 Oct 2021 08:41:21 GMT (envelope-from git) Date: Wed, 27 Oct 2021 08:41:21 GMT Message-Id: <202110270841.19R8fLH2046856@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 00e15405660f - main - textproc/html2text: Update CONFLICTS 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00e15405660fffeb44772bd58ff17e841d71729b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=00e15405660fffeb44772bd58ff17e841d71729b commit 00e15405660fffeb44772bd58ff17e841d71729b Author: Stefan Eßer AuthorDate: 2021-10-27 08:30:14 +0000 Commit: Stefan Eßer CommitDate: 2021-10-27 08:30:14 +0000 textproc/html2text: Update CONFLICTS The CONFLICTS definition did only match conflicting packages built for Python-2.7, not for later Python versions. I have not checked whether CONFLICTS_INSTALL would suffice as used in the conflicting ports. The PORTREVISION has not been bumped since this parameter is relevant for port building, less so for installing from a package (which detects the conflicting files). Approved by: bapt (maintainer) --- textproc/html2text/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index 584eaa790266..e64bcffdd003 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes PORTDOCS= CHANGES CREDITS KNOWN_BUGS README TODO PLIST_FILES= bin/html2text man/man1/html2text.1.gz man/man5/html2textrc.5.gz -CONFLICTS= py27-html2text-[0-9]* +CONFLICTS= py*-html2text-[0-9]* PORTSCOUT= skipb:0 skipv:1.3.2