svn commit: r569040 - in head/net-mgmt/nagstamon: . files

[Emanuel Haupt]

Author: ehaupt
Date: Tue Mar 23 16:57:36 2021
New Revision: 569040
URL: https://svnweb.freebsd.org/changeset/ports/569040

Log:
  net-mgmt/nagstamon: Fix build with Python 3.8 and onward
  
  While here, pacify portclippy/portfmt.
  
  PR:		254502
  Submitted by:	kai
  Reference:	https://github.com/HenriWahl/Nagstamon/pull/705

Added:
  head/net-mgmt/nagstamon/files/
  head/net-mgmt/nagstamon/files/patch-setup.py   (contents, props changed)
Modified:
  head/net-mgmt/nagstamon/Makefile

Modified: head/net-mgmt/nagstamon/Makefile
==============================================================================
--- head/net-mgmt/nagstamon/Makefile	Tue Mar 23 16:57:12 2021	(r569039)
+++ head/net-mgmt/nagstamon/Makefile	Tue Mar 23 16:57:36 2021	(r569040)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagstamon
 PORTVERSION=	3.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	https://nagstamon.ifw-dresden.de/files/stable/ \
 		LOCAL/ehaupt
@@ -22,12 +22,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-kerberos>0:security/py-requests-kerberos@${PY_FLAVOR}
 
-USES=		cpe python:3.6+ pyqt:5
-USE_PYTHON=	autoplist distutils noflavors
+USES=		cpe pyqt:5 python:3.6+
+CPE_VENDOR=	henri_wahl
 USE_PYQT=	core_run dbus_run gui_run multimedia_run network_run sip_run \
 		svg_run widgets_run
+USE_PYTHON=	autoplist distutils noflavors
 
-CPE_VENDOR=	henri_wahl
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/Nagstamon

Added: head/net-mgmt/nagstamon/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/nagstamon/files/patch-setup.py	Tue Mar 23 16:57:36 2021	(r569040)
@@ -0,0 +1,12 @@
+--- setup.py.orig	2021-03-22 15:58:33 UTC
++++ setup.py
+@@ -36,6 +36,9 @@ OS = platform.system()
+ if OS not in ['Windows', 'Darwin']:
+     if OS == 'Linux':
+         DIST, DIST_VERSION, DIST_NAME = get_distro()
++    # platform.dist() returns "('', '', '')" on FreeBSD
++    elif OS == 'FreeBSD':
++        DIST, DIST_VERSION, DIST_NAME = ('', '', '')
+     else:
+         DIST, DIST_VERSION, DIST_NAME = platform.dist()
+     NAME = NAME.lower()