mtr-graph: bump to 0.85.159 (cmake mtr085)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mtr-graph: bump to 0.85.159 (cmake mtr085)
From: vsyakovetsky <vsyakovetsky%gmail.com@localhost>
Date: Tue, 17 Sep 2024 22:24:32 +0000
Module Name:	pkgsrc-wip
Committed By:	vsyakovetsky <vsyakovetsky%gmail.com@localhost>
Pushed By:	vsyakovetsky
Date:		Wed Sep 18 01:24:18 2024 +0300
Changeset:	bb69a63bbef48983943b0ec06115805d5d059f6d

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

Log Message:
mtr-graph: bump to 0.85.159 (cmake mtr085)

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

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

diffstat:
 mtr-graph/COMMIT_MSG |  4 ++++
 mtr-graph/DESCR      |  7 +++++--
 mtr-graph/Makefile   | 28 +++++++++++++--------------
 mtr-graph/distinfo   |  6 +++---
 mtr-graph/options.mk | 54 +++++++++++++++++++++++-----------------------------
 5 files changed, 49 insertions(+), 50 deletions(-)

diffs:
diff --git a/mtr-graph/COMMIT_MSG b/mtr-graph/COMMIT_MSG
new file mode 100644
index 0000000000..f4cc226bb4
--- /dev/null
+++ b/mtr-graph/COMMIT_MSG
@@ -0,0 +1,4 @@
+net/mtr085: one-threaded v0.85 fork with some extensions (whois info, IDN, unicode, etc.)
+
+Packaged in wip by @yvs
+https://github.com/yvs2014/mtr085
diff --git a/mtr-graph/DESCR b/mtr-graph/DESCR
index 397e94382a..e867f2241a 100644
--- a/mtr-graph/DESCR
+++ b/mtr-graph/DESCR
@@ -1,3 +1,6 @@
-a fork of net/mtr
+mtr combines functionality of traceroute and ping in a single network tool
 
-Mtr is a network diagnostic tool that combines the functionality of the traceroute and ping programs in a single utility.
+v0.85 fork with whois info, IDN, unicode, etc.
+
+This version is built from https://github.com/yvs2014/mtr085 fork
+Main project location is https://github.com/traviscross/mtr
diff --git a/mtr-graph/Makefile b/mtr-graph/Makefile
index d9d16649b1..5c9a67de7f 100644
--- a/mtr-graph/Makefile
+++ b/mtr-graph/Makefile
@@ -2,41 +2,39 @@
 
 CATEGORIES=	net
 PKGBASE=	mtr085
-PKGVERSION=	157
+PKGVERSION=	159
 PKGREVISION=	1
 PKGNAME=	${PKGBASE}-${PKGVERSION}
 DISTNAME=	${PKGBASE}-${GITHUB_HASH}
-MASTER_SITES=	https://github.com/${GITHUB_USER}/${PKGBASE}/tarball/${GITHUB_HASH}/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=${GITHUB_USER}/}/${PKGBASE}/tarball/${GITHUB_HASH}/
 WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PKGBASE}-${GITHUB_HASH}
 
-GITHUB_HASH=	003bb50
+GITHUB_HASH=	30d0e30
 GITHUB_USER=	yvs2014
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.bitwizard.nl/mtr/
-COMMENT=	mtr v0.85 fork with IDN, Unicode, extra IP-address info
+COMMENT=	MTR v0.85 fork with whois info, IDN, unicode
 LICENSE=	gnu-gpl-v2
+USE_LANGUAGES=	c
 
-CONFLICTS=	mtr
+CONFLICTS=	mtr-[0-9]*
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		autoconf autoreconf automake
+USE_TOOLS+=		cmake pkg-config
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/mtr
 
+CMAKE_CONFIGURE_ARGS+=	-DCAP=OFF
+CMAKE_CONFIGURE_ARGS+=	-DSBINDIR=ON
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
+
 .include "options.mk"
 
 SPECIAL_PERMS=	sbin/mtr ${SETUID_ROOT_PERMS}
 
-CONFIGURE_ARGS+=--without-libcap
-CONFIGURE_ARGS+=--enable-suid-last-resort
-
-pre-configure:
-	autoreconf -fi ${WRKSRC}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mtr-graph/distinfo b/mtr-graph/distinfo
index af1f260daf..eb3a955958 100644
--- a/mtr-graph/distinfo
+++ b/mtr-graph/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (mtr085-003bb50.tar.gz) = 7eaacbf2f9af92253114ca82cc138027835330050514de53ebc987dd78c03bd8
-SHA512 (mtr085-003bb50.tar.gz) = 95bb2e9209abf3853ee72237e89d27672ba17250ecf036fd93d0c8f9df25e046f2cb9659ef2a77da6588d3be2731640d6723de52f255c814839cef145e9a9d44
-Size (mtr085-003bb50.tar.gz) = 101719 bytes
+BLAKE2s (mtr085-30d0e30.tar.gz) = e3d811711921d7fe23635799d0ec29989359d93198d9ea10da9ab88e098885ba
+SHA512 (mtr085-30d0e30.tar.gz) = b277b791dd4438fafc22675f780700ea2798c2c0fd0d271e44ed89e9a260d0623e8de31b92c9f3f1176e171648b4665937983a6eb2e9bdda7931542159be504a
+Size (mtr085-30d0e30.tar.gz) = 100401 bytes
diff --git a/mtr-graph/options.mk b/mtr-graph/options.mk
index 1b1606c53f..98712f67cb 100644
--- a/mtr-graph/options.mk
+++ b/mtr-graph/options.mk
@@ -1,62 +1,56 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.mtr-graph
-PKG_SUPPORTED_OPTIONS=		inet6
-PKG_SUPPORTED_OPTIONS+=		mpls
+PKG_OPTIONS_VAR=		PKG_OPTIONS.mtr085
+
 PKG_SUPPORTED_OPTIONS+=		dns
 PKG_SUPPORTED_OPTIONS+=		idn
 PKG_SUPPORTED_OPTIONS+=		unicode
 PKG_SUPPORTED_OPTIONS+=		ipinfo
-PKG_OPTIONS_OPTIONAL_GROUPS+=	graphcairo
-PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xcb
-PKG_OPTIONS_GROUP.graphcairo+=	graphcairo-xlib
-PKG_SUGGESTED_OPTIONS+=		mpls
-PKG_SUGGESTED_OPTIONS+=		dns
-PKG_SUGGESTED_OPTIONS+=		unicode
-PKG_SUGGESTED_OPTIONS+=		ipinfo
+PKG_SUPPORTED_OPTIONS+=		inet6
+PKG_SUPPORTED_OPTIONS+=		mpls
+PKG_SUPPORTED_OPTIONS+=		graph
+
+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_OPTIONS_LEGACY_OPTS=	libidn:idn
 
 .include "../../mk/bsd.options.mk"
 
 .if empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--disable-ipv6
+CMAKE_CONFIGURE_ARGS+=	-DIPV6=OFF
 .endif
 
 .if empty(PKG_OPTIONS:Mdns)
-CONFIGURE_ARGS+=	--disable-dns
+CMAKE_CONFIGURE_ARGS+=	-DDNS=OFF
 .endif
 
 .if empty(PKG_OPTIONS:Mmpls)
-CONFIGURE_ARGS+=	--without-mpls
+CMAKE_CONFIGURE_ARGS+=	-DMPLS=OFF
 .endif
 
 .if empty(PKG_OPTIONS:Mipinfo)
-CONFIGURE_ARGS+=	--without-ipinfo
+CMAKE_CONFIGURE_ARGS+=	-DIPINFO=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Mgraphcairo-xcb)
-USE_TOOLS+=		pkg-config
+.if !empty(PKG_OPTIONS:Mgraph)
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-graphcairo-xcb
-.else
-.  if !empty(PKG_OPTIONS:Mgraphcairo-xlib)
-USE_TOOLS+=		pkg-config
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-graphcairo-xlib
-.  endif
+CMAKE_CONFIGURE_ARGS+=	-DGRAPH=ON
 .endif
 
 .if !empty(PKG_OPTIONS:Midn)
-.include "../../devel/libidn/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libidn
+.include "../../devel/libidn2/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+=	-DIDN=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Municode)
-CONFIGURE_ARGS+=	--with-unicode
+.if empty(PKG_OPTIONS:Municode)
+CMAKE_CONFIGURE_ARGS+=	-DUNICODE=OFF
 .endif
-
Prev by Date: pqueue: new incomplete package
Next by Date: xonotic: Remove, a newer version is already in games/
Previous by Thread: pqueue: new incomplete package
Next by Thread: xonotic: Remove, a newer version is already in games/
Indexes:
Home | Main Index | Thread Index | Old Index