git: 8e14b46fd525 - main - net/mtr: - Update WWW and clean up pkg-descr

The branch main has been updated by sunpoet:

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

commit 8e14b46fd525b3bea17be827b09b38f37d500b88
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-03-23 14:18:36 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-03-23 14:30:45 +0000

    net/mtr: - Update WWW and clean up pkg-descr
    
    - Simplify CONFLICTS_INSTALL
---
 net/mtr-nox11/Makefile | 4 +---
 net/mtr/Makefile       | 9 +++++----
 net/mtr/pkg-descr      | 2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/net/mtr-nox11/Makefile b/net/mtr-nox11/Makefile
index 10ccc41c3157..027273e455f5 100644
--- a/net/mtr-nox11/Makefile
+++ b/net/mtr-nox11/Makefile
@@ -2,10 +2,8 @@ PKGNAMESUFFIX=	-nox11
 
 MASTERDIR=	${.CURDIR}/../mtr
 
-CONFLICTS_INSTALL=	mtr
+PORTSCOUT=	ignore:1
 
 OPTIONS_EXCLUDE=	X11
 
-PORTSCOUT=	ignore:1
-
 .include "${MASTERDIR}/Makefile"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 30cd4dce735e..1ae1449df372 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -6,7 +6,8 @@ CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Traceroute and ping in a single network diagnostic tool
-WWW=		https://www.bitwizard.nl/mtr/
+WWW=		https://www.bitwizard.nl/mtr/ \
+		https://github.com/traviscross/mtr
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -14,13 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		autoreconf ncurses pkgconfig
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 LDFLAGS+=	-lncurses
 
-GH_ACCOUNT=	traviscross
 USE_GITHUB=	yes
+GH_ACCOUNT=	traviscross
 
-CONFLICTS_INSTALL?=	mtr-nox11
+CONFLICTS_INSTALL=	mtr mtr-nox11
 
 OPTIONS_DEFINE=	IPV6 JSON X11
 OPTIONS_DEFAULT=JSON X11
diff --git a/net/mtr/pkg-descr b/net/mtr/pkg-descr
index a363b54205dc..0828d0e27910 100644
--- a/net/mtr/pkg-descr
+++ b/net/mtr/pkg-descr
@@ -6,5 +6,3 @@ on and a user-specified destination host. After it determines the address of
 each network hop between the machines, it sends a sequence ICMP ECHO requests to
 each one to determine the quality of the link to each machine. As it does this,
 it prints running statistics about each machine.
-
-Official mtr repository is at https://github.com/traviscross/mtr