mtr-graph(mtr085): update to 0.85.346, update Makefile and options.mk

[vsyakovetsky (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	vsyakovetsky <vsyakovetsky%gmail.com@localhost>
Pushed By:	vsyakovetsky
Date:		Thu Nov 12 23:48:02 2026 +0200
Changeset:	16a04247d1fbffe5c7621e772c88dc9b7a34bf2d

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

Log Message:
mtr-graph(mtr085): update to 0.85.346, update Makefile and options.mk

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

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

diffstat:
 mtr-graph/MESSAGE    |  9 -------
 mtr-graph/Makefile   |  7 +++---
 mtr-graph/distinfo   |  6 ++---
 mtr-graph/options.mk | 69 ++++++++++++++++++++++++++++++++++------------------
 4 files changed, 52 insertions(+), 39 deletions(-)

diffs:
diff --git a/mtr-graph/MESSAGE b/mtr-graph/MESSAGE
deleted file mode 100644
index 183a7dd52c..0000000000
--- a/mtr-graph/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2014/09/25 14:05:46 yvs4sf Exp $
-
-	${PREFIX}/sbin/mtr is setuid "root".
-
-        Please read about potential security issues in
-		${PREFIX}/share/doc/mtr/SECURITY
-
-===========================================================================
diff --git a/mtr-graph/Makefile b/mtr-graph/Makefile
index 3a5f4ca694..245ab7de47 100644
--- a/mtr-graph/Makefile
+++ b/mtr-graph/Makefile
@@ -2,12 +2,12 @@
 
 CATEGORIES=	net
 PKGBASE=	mtr085
-PKGVERSION=	307
+PKGVERSION=	346
 PKGREVISION=	1
 DISTNAME=	${PKGBASE}-${PKGVERSION}
 
 MASTER_SITES=	${MASTER_SITE_GITHUB:=yvs2014/}
-GITHUB_TAG=	e99d753823df2dd6fba3ca4d1c4636b78ee3e559
+GITHUB_TAG=	5fc0abd4db22dc83f02a3289ca0b9e7b0d60ee8e
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 COMMENT=	Experimenting with MTR tool: mtr085 with whois info, IDN, NLS
@@ -19,12 +19,11 @@ CONFLICTS=	mtr-[0-9]*
 USE_TOOLS+=		pkg-config
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/mtr
 
-MESON_ARGS+=	-DCAP=false
 MESON_ARGS+=	-DSBIN=true
 
 .include "options.mk"
 
-#SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS}
+#SPECIAL_PERMS=	sbin/mtr ${SETUID_ROOT_PERMS}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
diff --git a/mtr-graph/distinfo b/mtr-graph/distinfo
index f747e14c28..8dbc04c6b2 100644
--- a/mtr-graph/distinfo
+++ b/mtr-graph/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (mtr085-307-e99d753823df2dd6fba3ca4d1c4636b78ee3e559.tar.gz) = ef90d9bbe3527cedfe3563618422d3630933f1e0a5c39df1449d7a7a1663b851
-SHA512 (mtr085-307-e99d753823df2dd6fba3ca4d1c4636b78ee3e559.tar.gz) = 16abfc9d4f1116553534e5c81433a282812d6f5c77175c26f5cb4cde238f84d03f07baf9f3676b3b5f9b4593555b65c47bc4ac050ba44c7ceee081fc94643ea9
-Size (mtr085-307-e99d753823df2dd6fba3ca4d1c4636b78ee3e559.tar.gz) = 118578 bytes
+BLAKE2s (mtr085-346-5fc0abd4db22dc83f02a3289ca0b9e7b0d60ee8e.tar.gz) = 2a31a47bfa21c8b7cbf8951639c140423304a4844ed5cbba5d1b388dc5c5e0f4
+SHA512 (mtr085-346-5fc0abd4db22dc83f02a3289ca0b9e7b0d60ee8e.tar.gz) = fd39369e1f89d03aab014533a8493c70c72c99c29a43857d7368e19c6bfdc03a973c34d970f003fef23e19a2badbe773a6a6968a43571521667d6bef20e2188e
+Size (mtr085-346-5fc0abd4db22dc83f02a3289ca0b9e7b0d60ee8e.tar.gz) = 141997 bytes
diff --git a/mtr-graph/options.mk b/mtr-graph/options.mk
index 686a61155f..619a459cac 100644
--- a/mtr-graph/options.mk
+++ b/mtr-graph/options.mk
@@ -2,54 +2,77 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mtr085
 
-PKG_SUPPORTED_OPTIONS+=		dns
-PKG_SUPPORTED_OPTIONS+=		idn
-PKG_SUPPORTED_OPTIONS+=		nls
+PKG_SUPPORTED_OPTIONS+=		tui
+PKG_SUPPORTED_OPTIONS+=		color
+PKG_SUPPORTED_OPTIONS+=		mouse
+#PKG_SUPPORTED_OPTIONS+=	menu # not ready yet
 PKG_SUPPORTED_OPTIONS+=		unicode
+PKG_SUPPORTED_OPTIONS+=		nls
+PKG_SUPPORTED_OPTIONS+=		dns
 PKG_SUPPORTED_OPTIONS+=		ipinfo
 PKG_SUPPORTED_OPTIONS+=		inet6
 PKG_SUPPORTED_OPTIONS+=		mpls
 
-PKG_SUGGESTED_OPTIONS+=	dns
-PKG_SUGGESTED_OPTIONS+=	idn
-PKG_SUGGESTED_OPTIONS+=	unicode
-PKG_SUGGESTED_OPTIONS+=	ipinfo
-PKG_SUGGESTED_OPTIONS+=	inet6
-PKG_SUGGESTED_OPTIONS+=	mpls
+PKG_SUGGESTED_OPTIONS+=		tui
+PKG_SUGGESTED_OPTIONS+=		color
+#PKG_SUGGESTED_OPTIONS+=	mouse
+#PKG_SUGGESTED_OPTIONS+=	menu  # not ready yet
+PKG_SUGGESTED_OPTIONS+=		unicode
+PKG_SUGGESTED_OPTIONS+=		dns
+PKG_SUGGESTED_OPTIONS+=		ipinfo
+PKG_SUGGESTED_OPTIONS+=		inet6
+PKG_SUGGESTED_OPTIONS+=		mpls
 
 PKG_OPTIONS_LEGACY_OPTS=	libidn:idn
 PLIST_VARS+=	nls
 
 .include "../../mk/bsd.options.mk"
 
-.if !${PKG_OPTIONS:Minet6}
-MESON_ARGS+=	-DIPV6=false
+.if empty(PKG_OPTIONS:Mtui)
+MESON_ARGS+=	-DTUI=false
 .endif
 
-.if !${PKG_OPTIONS:Mdns}
-MESON_ARGS+=	-DDNS=false
+.if empty(PKG_OPTIONS:Mcolor)
+MESON_ARGS+=	-DCOLOR=false
 .endif
 
-.if !${PKG_OPTIONS:Mmpls}
-MESON_ARGS+=	-DMPLS=false
+.if empty(PKG_OPTIONS:Mmouse)
+MESON_ARGS+=	-DMOUSE=false
 .endif
 
-.if !${PKG_OPTIONS:Mipinfo}
-MESON_ARGS+=	-DIPINFO=false
-.endif
+## not ready yet
+#.if empty(PKG_OPTIONS:Mmenu)
+MESON_ARGS+=	-DMENU=false
+#.endif
 
-.if ${PKG_OPTIONS:Midn}
-.include "../../devel/libidn2/buildlink3.mk"
+.if empty(PKG_OPTIONS:Municode)
+MESON_ARGS+=	-DUNICODE=false
 .endif
 
-.if !${PKG_OPTIONS:Municode}
-MESON_ARGS+=	-DUNICODE=false
+.if !empty(PKG_OPTIONS:Municode) && !empty(PKG_OPTIONS:Mdns)
+.include "../../devel/libidn2/buildlink3.mk"
 .endif
 
-.if ${PKG_OPTIONS:Mnls}
+.if !empty(PKG_OPTIONS:Mnls)
 USE_TOOLS+=		gettext msgfmt
 USE_PKGLOCALEDIR=	yes
 PLIST.nls=		yes
 .else
 MESON_ARGS+=		-DNLS=false
 .endif
+
+.if empty(PKG_OPTIONS:Mdns)
+MESON_ARGS+=	-DDNS=false
+.endif
+
+.if empty(PKG_OPTIONS:Mipinfo)
+MESON_ARGS+=	-DIPINFO=false
+.endif
+
+.if empty(PKG_OPTIONS:Minet6)
+MESON_ARGS+=	-DIPV6=false
+.endif
+
+.if empty(PKG_OPTIONS:Mmpls)
+MESON_ARGS+=	-DMPLS=false
+.endif