git: f6a177696981 - main - net/speedtest: Mark CONFLICTS with net/py-speedtest-cli

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 16 Aug 2023 18:30:47 UTC
The branch main has been updated by sunpoet:

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

commit f6a177696981ec69f8d3181863d50590594b1d86
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-08-16 18:10:33 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-08-16 18:25:11 +0000

    net/speedtest: Mark CONFLICTS with net/py-speedtest-cli
    
    Reported by:    nivit
---
 net/py-speedtest-cli/Makefile | 2 ++
 net/speedtest/Makefile        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net/py-speedtest-cli/Makefile b/net/py-speedtest-cli/Makefile
index 63f665a13501..cc2e19a2d6df 100644
--- a/net/py-speedtest-cli/Makefile
+++ b/net/py-speedtest-cli/Makefile
@@ -16,6 +16,8 @@ USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	speedtest # bin/speedtest
+
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.rst
diff --git a/net/speedtest/Makefile b/net/speedtest/Makefile
index a2ecc77cf43d..d0b61aca533b 100644
--- a/net/speedtest/Makefile
+++ b/net/speedtest/Makefile
@@ -21,6 +21,8 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/speedtest \
 		share/man/man5/speedtest.5.gz
 
+CONFLICTS_INSTALL=	py*-speedtest-cli # bin/speedtest
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin/ ${STAGEDIR}${PREFIX}/share/man/man5/
 	${INSTALL_PROGRAM} ${WRKSRC}/usr/local/bin/speedtest ${STAGEDIR}${PREFIX}/bin/speedtest