Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Oct 2021 08:41:21 GMT
From:      =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 00e15405660f - main - textproc/html2text: Update CONFLICTS
Message-ID:  <202110270841.19R8fLH2046856@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=00e15405660fffeb44772bd58ff17e841d71729b

commit 00e15405660fffeb44772bd58ff17e841d71729b
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-10-27 08:30:14 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110270841.19R8fLH2046856>