Update to 3.16.2 Runs fine with python3.12 from pkgsrc-2024Q4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update to 3.16.2 Runs fine with python3.12 from pkgsrc-2024Q4
From: Manuel Bouyer (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 17 Mar 2025 10:33:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Manuel Bouyer <bouyer%netbsd.org@localhost>
Pushed By:	bouyer
Date:		Mon Mar 17 11:30:31 2025 +0100
Changeset:	a41dae9132b75865697ff5d18af74b9ca249d4a5

Modified Files:
	nagstamon/Makefile
	nagstamon/PLIST
	nagstamon/TODO
	nagstamon/distinfo
	nagstamon/patches/patch-setup.py

Log Message:
Update to 3.16.2
Runs fine with python3.12 from pkgsrc-2024Q4

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

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

diffstat:
 nagstamon/Makefile               | 17 ++++----
 nagstamon/PLIST                  | 87 +++++++++++++++++++++-------------------
 nagstamon/TODO                   |  1 +
 nagstamon/distinfo               |  8 ++--
 nagstamon/patches/patch-setup.py | 30 +++++++-------
 5 files changed, 75 insertions(+), 68 deletions(-)

diffs:
diff --git a/nagstamon/Makefile b/nagstamon/Makefile
index 1745a9ded4..14ab349682 100644
--- a/nagstamon/Makefile
+++ b/nagstamon/Makefile
@@ -1,18 +1,19 @@
 # $NetBSD: Makefile,v 1.66 2021/04/21 11:42:27 adam Exp $
 
-DISTNAME=	nagstamon-3.6.0
+DISTNAME=	nagstamon-3.16.2
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_GITHUB:=HenriWahl/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	imil%gcu.info@localhost
-HOMEPAGE=	https://nagstamon.ifw-dresden.de/
+HOMEPAGE=	https://nagstamon.de/
 COMMENT=	Nagios status monitor which takes place in systray or on desktop
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 #DEPENDS+=	${PYPKGPREFIX}-libxslt>=1.1.24:../../textproc/py-libxslt
 #DEPENDS+=	sox>=14.0.1:../../audio/sox
 DEPENDS+=	${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
+DEPENDS+=	${PYPKGPREFIX}-arrow-[0-9]*:../../time/py-arrow
 #        'python3-crypto '
 DEPENDS+=	${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
@@ -26,17 +27,17 @@ DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-requests-gssapi-[0-9]*:../../security/py-requests-gssapi
 DEPENDS+=	${PYPKGPREFIX}-secretstorage-[0-9]*:../../security/py-secretstorage
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/^n/N/}
+SUBST_CLASSES+=         manpath
+SUBST_STAGE.manpath=    pre-configure
+SUBST_FILES.manpath=    setup.py
+SUBST_VARS.manpath=     PKGMANDIR
 
-EGG_NAME=	${DISTNAME}.
+WRKSRC=		${WRKDIR}/${DISTNAME:S/^n/N/}
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
-post-install:
-	${MV} ${DESTDIR}${PREFIX}/share/man/man1/nagstamon.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nagstamon.1.gz
-
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/nagstamon/PLIST b/nagstamon/PLIST
index c0147bae07..a397abce45 100644
--- a/nagstamon/PLIST
+++ b/nagstamon/PLIST
@@ -1,5 +1,4 @@
 @comment $NetBSD$
-bin/nagstamon.py
 ${PYSITELIB}/Nagstamon/Config.py
 ${PYSITELIB}/Nagstamon/Config.pyc
 ${PYSITELIB}/Nagstamon/Config.pyo
@@ -12,39 +11,30 @@ ${PYSITELIB}/Nagstamon/Objects.pyo
 ${PYSITELIB}/Nagstamon/QUI/__init__.py
 ${PYSITELIB}/Nagstamon/QUI/__init__.pyc
 ${PYSITELIB}/Nagstamon/QUI/__init__.pyo
-${PYSITELIB}/Nagstamon/QUI/dialog_about.py
-${PYSITELIB}/Nagstamon/QUI/dialog_about.pyc
-${PYSITELIB}/Nagstamon/QUI/dialog_about.pyo
-${PYSITELIB}/Nagstamon/QUI/dialog_acknowledge.py
-${PYSITELIB}/Nagstamon/QUI/dialog_acknowledge.pyc
-${PYSITELIB}/Nagstamon/QUI/dialog_acknowledge.pyo
-${PYSITELIB}/Nagstamon/QUI/dialog_authentication.py
-${PYSITELIB}/Nagstamon/QUI/dialog_authentication.pyc
-${PYSITELIB}/Nagstamon/QUI/dialog_authentication.pyo
-${PYSITELIB}/Nagstamon/QUI/dialog_downtime.py
-${PYSITELIB}/Nagstamon/QUI/dialog_downtime.pyc
-${PYSITELIB}/Nagstamon/QUI/dialog_downtime.pyo
-${PYSITELIB}/Nagstamon/QUI/dialog_server_missing.py
-${PYSITELIB}/Nagstamon/QUI/dialog_server_missing.pyc
-${PYSITELIB}/Nagstamon/QUI/dialog_server_missing.pyo
-${PYSITELIB}/Nagstamon/QUI/dialog_submit.py
-${PYSITELIB}/Nagstamon/QUI/dialog_submit.pyc
-${PYSITELIB}/Nagstamon/QUI/dialog_submit.pyo
-${PYSITELIB}/Nagstamon/QUI/settings_action.py
-${PYSITELIB}/Nagstamon/QUI/settings_action.pyc
-${PYSITELIB}/Nagstamon/QUI/settings_action.pyo
-${PYSITELIB}/Nagstamon/QUI/settings_main.py
-${PYSITELIB}/Nagstamon/QUI/settings_main.pyc
-${PYSITELIB}/Nagstamon/QUI/settings_main.pyo
-${PYSITELIB}/Nagstamon/QUI/settings_server.py
-${PYSITELIB}/Nagstamon/QUI/settings_server.pyc
-${PYSITELIB}/Nagstamon/QUI/settings_server.pyo
-${PYSITELIB}/Nagstamon/Servers/Alertmanager.py
-${PYSITELIB}/Nagstamon/Servers/Alertmanager.pyc
-${PYSITELIB}/Nagstamon/Servers/Alertmanager.pyo
-${PYSITELIB}/Nagstamon/Servers/Centreon.py
-${PYSITELIB}/Nagstamon/Servers/Centreon.pyc
-${PYSITELIB}/Nagstamon/Servers/Centreon.pyo
+${PYSITELIB}/Nagstamon/QUI/qt.py
+${PYSITELIB}/Nagstamon/QUI/qt.pyc
+${PYSITELIB}/Nagstamon/QUI/qt.pyo
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/__init__.py
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/__init__.pyc
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/__init__.pyo
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/alertmanagerserver.py
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/alertmanagerserver.pyc
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/alertmanagerserver.pyo
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/alertmanagerservice.py
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/alertmanagerservice.pyc
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/alertmanagerservice.pyo
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/helpers.py
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/helpers.pyc
+${PYSITELIB}/Nagstamon/Servers/Alertmanager/helpers.pyo
+${PYSITELIB}/Nagstamon/Servers/Centreon/CentreonAPI.py
+${PYSITELIB}/Nagstamon/Servers/Centreon/CentreonAPI.pyc
+${PYSITELIB}/Nagstamon/Servers/Centreon/CentreonAPI.pyo
+${PYSITELIB}/Nagstamon/Servers/Centreon/CentreonLegacy.py
+${PYSITELIB}/Nagstamon/Servers/Centreon/CentreonLegacy.pyc
+${PYSITELIB}/Nagstamon/Servers/Centreon/CentreonLegacy.pyo
+${PYSITELIB}/Nagstamon/Servers/Centreon/__init__.py
+${PYSITELIB}/Nagstamon/Servers/Centreon/__init__.pyc
+${PYSITELIB}/Nagstamon/Servers/Centreon/__init__.pyo
 ${PYSITELIB}/Nagstamon/Servers/Generic.py
 ${PYSITELIB}/Nagstamon/Servers/Generic.pyc
 ${PYSITELIB}/Nagstamon/Servers/Generic.pyo
@@ -54,6 +44,12 @@ ${PYSITELIB}/Nagstamon/Servers/Icinga.pyo
 ${PYSITELIB}/Nagstamon/Servers/Icinga2API.py
 ${PYSITELIB}/Nagstamon/Servers/Icinga2API.pyc
 ${PYSITELIB}/Nagstamon/Servers/Icinga2API.pyo
+${PYSITELIB}/Nagstamon/Servers/IcingaDBWeb.py
+${PYSITELIB}/Nagstamon/Servers/IcingaDBWeb.pyc
+${PYSITELIB}/Nagstamon/Servers/IcingaDBWeb.pyo
+${PYSITELIB}/Nagstamon/Servers/IcingaDBWebNotifications.py
+${PYSITELIB}/Nagstamon/Servers/IcingaDBWebNotifications.pyc
+${PYSITELIB}/Nagstamon/Servers/IcingaDBWebNotifications.pyo
 ${PYSITELIB}/Nagstamon/Servers/IcingaWeb2.py
 ${PYSITELIB}/Nagstamon/Servers/IcingaWeb2.pyc
 ${PYSITELIB}/Nagstamon/Servers/IcingaWeb2.pyo
@@ -109,7 +105,6 @@ ${PYSITELIB}/Nagstamon/__init__.py
 ${PYSITELIB}/Nagstamon/__init__.pyc
 ${PYSITELIB}/Nagstamon/__init__.pyo
 ${PYSITELIB}/Nagstamon/resources/CREDITS
-${PYSITELIB}/Nagstamon/resources/Info.plist
 ${PYSITELIB}/Nagstamon/resources/LICENSE
 ${PYSITELIB}/Nagstamon/resources/close_template.svg
 ${PYSITELIB}/Nagstamon/resources/critical.wav
@@ -130,10 +125,16 @@ ${PYSITELIB}/Nagstamon/resources/nagstamon_logo_toparea_template.svg
 ${PYSITELIB}/Nagstamon/resources/nagstamon_systrayicon_empty.svg
 ${PYSITELIB}/Nagstamon/resources/nagstamon_systrayicon_template.svg
 ${PYSITELIB}/Nagstamon/resources/qt.conf
+${PYSITELIB}/Nagstamon/resources/qui/dialog_about.ui
+${PYSITELIB}/Nagstamon/resources/qui/dialog_acknowledge.ui
+${PYSITELIB}/Nagstamon/resources/qui/dialog_authentication.ui
+${PYSITELIB}/Nagstamon/resources/qui/dialog_downtime.ui
+${PYSITELIB}/Nagstamon/resources/qui/dialog_server_missing.ui
+${PYSITELIB}/Nagstamon/resources/qui/dialog_submit.ui
+${PYSITELIB}/Nagstamon/resources/qui/settings_action.ui
+${PYSITELIB}/Nagstamon/resources/qui/settings_main.ui
+${PYSITELIB}/Nagstamon/resources/qui/settings_server.ui
 ${PYSITELIB}/Nagstamon/resources/warning.wav
-${PYSITELIB}/Nagstamon/setup.py
-${PYSITELIB}/Nagstamon/setup.pyc
-${PYSITELIB}/Nagstamon/setup.pyo
 ${PYSITELIB}/Nagstamon/thirdparty/Xlib/X.py
 ${PYSITELIB}/Nagstamon/thirdparty/Xlib/X.pyc
 ${PYSITELIB}/Nagstamon/thirdparty/Xlib/X.pyo
@@ -260,10 +261,12 @@ ${PYSITELIB}/Nagstamon/thirdparty/zabbix_api.pyo
 ${PYSITELIB}/Nagstamon/thirdparty/zenoss_api.py
 ${PYSITELIB}/Nagstamon/thirdparty/zenoss_api.pyc
 ${PYSITELIB}/Nagstamon/thirdparty/zenoss_api.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/nagstamon-3.16.2.dist-info/LICENSE
+${PYSITELIB}/nagstamon-3.16.2.dist-info/METADATA
+${PYSITELIB}/nagstamon-3.16.2.dist-info/RECORD
+${PYSITELIB}/nagstamon-3.16.2.dist-info/WHEEL
+${PYSITELIB}/nagstamon-3.16.2.dist-info/top_level.txt
+bin/nagstamon.py
 man/man1/nagstamon.1.gz
 share/applications/nagstamon.desktop
 share/pixmaps/nagstamon.svg
diff --git a/nagstamon/TODO b/nagstamon/TODO
index 2adac9ee37..85a3d6459f 100644
--- a/nagstamon/TODO
+++ b/nagstamon/TODO
@@ -1,2 +1,3 @@
 Dumps core on startup for me:
 https://github.com/HenriWahl/Nagstamon/issues/748
+Fixed with nagstamon 3.16.2 and python3.12 from pkgsrc-2024Q4
diff --git a/nagstamon/distinfo b/nagstamon/distinfo
index 7358343747..463bec4f09 100644
--- a/nagstamon/distinfo
+++ b/nagstamon/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.5 2015/11/04 00:35:14 agc Exp $
 
-RMD160 (nagstamon-3.6.0.tar.gz) = 2d5864304cb15be9a7eac5f01b1cb5a24859cade
-SHA512 (nagstamon-3.6.0.tar.gz) = 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69
-Size (nagstamon-3.6.0.tar.gz) = 573998 bytes
-SHA1 (patch-setup.py) = d3425dc665e7904fb6e3d090ad20f7ff74b823a7
+BLAKE2s (nagstamon-3.16.2.tar.gz) = 2a931192e3684b7d3b3d6f7e6bf42d162864682c636adc9253966b5682e8ce78
+SHA512 (nagstamon-3.16.2.tar.gz) = af8e4f4db0be6966a93c636ad7a44da11d54376c866034dc2779d72250f6e22603f86aedd736cf4d476aae44950f0a02953c7c2dc71ec88d4685f46b05d11a29
+Size (nagstamon-3.16.2.tar.gz) = 582957 bytes
+SHA1 (patch-setup.py) = b7b6bbd20491c1601d99b8864dfb4ba052882446
diff --git a/nagstamon/patches/patch-setup.py b/nagstamon/patches/patch-setup.py
index 1048ad40e1..e65871bcf2 100644
--- a/nagstamon/patches/patch-setup.py
+++ b/nagstamon/patches/patch-setup.py
@@ -1,17 +1,19 @@
 $NetBSD$
 
-Support NetBSD.
-https://github.com/HenriWahl/Nagstamon/pull/747
+Fix paths for pkgsrc
 
---- setup.py.orig	2021-04-06 11:17:33.000000000 +0000
-+++ setup.py
-@@ -39,6 +39,9 @@ if OS not in ['Windows', 'Darwin']:
-     # platform.dist() returns "('', '', '')" on FreeBSD
-     elif OS == 'FreeBSD':
-         DIST, DIST_VERSION, DIST_NAME = ('', '', '')
-+    # platform.dist() does not exist on NetBSD
-+    elif OS == 'NetBSD':
-+        DIST, DIST_VERSION, DIST_NAME = ('', '', '')
-     else:
-         DIST, DIST_VERSION, DIST_NAME = platform.dist()
-     NAME = NAME.lower()
+--- setup.py.orig	2025-03-14 14:32:29.956473467 +0100
++++ setup.py	2025-03-14 14:37:36.786709617 +0100
+@@ -153,9 +153,9 @@
+                                   'resources/qui/*',
+                                   'resources/LICENSE',
+                                   'resources/CREDITS']},
+-      data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']),
+-                  ('%s/share/pixmaps' % sys.prefix, ['Nagstamon/resources/nagstamon.svg']),
+-                  ('%s/share/applications' % sys.prefix, ['Nagstamon/resources/nagstamon.desktop'])],
++      data_files=[('@PKGMANDIR@/man1', ['Nagstamon/resources/nagstamon.1.gz']),
++                  ('share/pixmaps', ['Nagstamon/resources/nagstamon.svg']),
++                  ('share/applications', ['Nagstamon/resources/nagstamon.desktop'])],
+       options=dict(build_exe=build_exe_options,
+                    bdist_mac=bdist_mac_options,
+                    bdist_dmg=bdist_dmg_options,
Prev by Date: Re: chromium: update to 131.0.6778.204
Next by Date: libnoise: mostly done
Previous by Thread: Import www/chromium
Next by Thread: libnoise: mostly done
Indexes:
Home | Main Index | Thread Index | Old Index