mtr-graph: update to 0.85.119

[vsyakovetsky <vsyakovetsky%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	vsyakovetsky <vsyakovetsky%gmail.com@localhost>
Pushed By:	vsyakovetsky
Date:		Mon Apr 24 11:56:51 2023 +0300
Changeset:	cf36fcc174d73f9cc1fae67fb4bfc3687741d642

Modified Files:
	mtr-graph/Makefile
	mtr-graph/distinfo
	mtr-graph/options.mk

Log Message:
mtr-graph: update to 0.85.119

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cf36fcc174d73f9cc1fae67fb4bfc3687741d642

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mtr-graph/Makefile   | 13 ++++++-------
 mtr-graph/distinfo   |  6 +++---
 mtr-graph/options.mk | 21 ++++++++++++++-------
 3 files changed, 23 insertions(+), 17 deletions(-)

diffs:
diff --git a/mtr-graph/Makefile b/mtr-graph/Makefile
index 9decaabae1..677e54dfd1 100644
--- a/mtr-graph/Makefile
+++ b/mtr-graph/Makefile
@@ -1,15 +1,15 @@
 # $NetBSD$
 
 CATEGORIES=	net
-PKGBASE=	mtr
-PKGVERSION=	0.85.99
-PKGREVISION=	12
-PKGNAME=	${PKGBASE}-graph-${PKGVERSION}
+PKGBASE=	mtr085
+PKGVERSION=	119
+PKGREVISION=	13
+PKGNAME=	${PKGBASE}-${PKGVERSION}
 DISTNAME=	${PKGBASE}-${GITHUB_HASH}
 MASTER_SITES=	https://github.com/${GITHUB_USER}/${PKGBASE}/tarball/${GITHUB_HASH}/
 WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PKGBASE}-${GITHUB_HASH}
 
-GITHUB_HASH=	8506092
+GITHUB_HASH=	0cfc159
 GITHUB_USER=	yvs2014
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -17,8 +17,7 @@ HOMEPAGE=	https://www.bitwizard.nl/mtr/
 COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	mtr-[0-9]*
-CONFLICTS+=	mtr-current-[0-9]*
+CONFLICTS=	mtr-*
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		autoconf autoreconf automake
diff --git a/mtr-graph/distinfo b/mtr-graph/distinfo
index 31ae32bc7a..1d281b7420 100644
--- a/mtr-graph/distinfo
+++ b/mtr-graph/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-RMD160 (mtr-8506092.tar.gz) = ca8c925f8831674d5ccae290f8b7a135effbc0aa
-SHA512 (mtr-8506092.tar.gz) = 95973fc61aceca6060958ae4e0ae32bc26a96cdce909479afa4e836a81824674fac85f5a306bdcf344adc2d7381fdd2716ab8cf55a9065eabf34bfe681c09a0e
-Size (mtr-8506092.tar.gz) = 98179 bytes
+RMD160 (mtr085-0cfc159.tar.gz) = 4e156e6bff403b8c5ac52dda2c761da716537fce
+SHA512 (mtr085-0cfc159.tar.gz) = 9422feecb9240930272cf21a89b37f68623824ae31dfaafbea10485b1473db006829603bb92933c7954362c8f5604b5e8457771cab3a30fd80e27b89aebdb389
+Size (mtr-0cfc159.tar.gz) = 92969 bytes
diff --git a/mtr-graph/options.mk b/mtr-graph/options.mk
index 417a8a12b9..1b1606c53f 100644
--- a/mtr-graph/options.mk
+++ b/mtr-graph/options.mk
@@ -2,16 +2,18 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mtr-graph
 PKG_SUPPORTED_OPTIONS=		inet6
-PKG_SUPPORTED_OPTIONS+=		ipinfo
+PKG_SUPPORTED_OPTIONS+=		mpls
+PKG_SUPPORTED_OPTIONS+=		dns
 PKG_SUPPORTED_OPTIONS+=		idn
 PKG_SUPPORTED_OPTIONS+=		unicode
-PKG_SUPPORTED_OPTIONS+=		sys-getopt
+PKG_SUPPORTED_OPTIONS+=		ipinfo
 PKG_OPTIONS_OPTIONAL_GROUPS+=	graphcairo
 PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xcb
 PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xlib
-PKG_SUGGESTED_OPTIONS+=		ipinfo
+PKG_SUGGESTED_OPTIONS+=		mpls
+PKG_SUGGESTED_OPTIONS+=		dns
 PKG_SUGGESTED_OPTIONS+=		unicode
-PKG_SUGGESTED_OPTIONS+=		sys-getopt
+PKG_SUGGESTED_OPTIONS+=		ipinfo
 PKG_OPTIONS_LEGACY_OPTS=	libidn:idn
 
 .include "../../mk/bsd.options.mk"
@@ -20,6 +22,14 @@ PKG_OPTIONS_LEGACY_OPTS=	libidn:idn
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+.if empty(PKG_OPTIONS:Mdns)
+CONFIGURE_ARGS+=	--disable-dns
+.endif
+
+.if empty(PKG_OPTIONS:Mmpls)
+CONFIGURE_ARGS+=	--without-mpls
+.endif
+
 .if empty(PKG_OPTIONS:Mipinfo)
 CONFIGURE_ARGS+=	--without-ipinfo
 .endif
@@ -50,6 +60,3 @@ CONFIGURE_ARGS+=	--with-libidn
 CONFIGURE_ARGS+=	--with-unicode
 .endif
 
-.if !empty(PKG_OPTIONS:Msys-getopt)
-CONFIGURE_ARGS+=	--with-sys-getopt
-.endif