ups-nut: use published distfile, minor improvements

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Jan 10 11:57:49 2023 -0500
Changeset:	4082db1b2789ccaee15e4dfc441d2773e4c240b0

Modified Files:
	ups-nut/Makefile
	ups-nut/Makefile.common
	ups-nut/TODO
	ups-nut/distinfo

Log Message:
ups-nut: use published distfile, minor improvements

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

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

diffstat:
 ups-nut/Makefile        |  9 +++++++--
 ups-nut/Makefile.common | 19 ++++++++++---------
 ups-nut/TODO            |  4 ----
 ups-nut/distinfo        |  6 +++---
 4 files changed, 20 insertions(+), 18 deletions(-)

diffs:
diff --git a/ups-nut/Makefile b/ups-nut/Makefile
index b29cf40b71..ab35ef119d 100644
--- a/ups-nut/Makefile
+++ b/ups-nut/Makefile
@@ -20,11 +20,16 @@ CONFIGURE_ARGS+=	--with-drvpath=${NUT_DRVDIR:Q}
 CONFIGURE_ARGS+=	--with-altpidpath=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=	--with-pidpath=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=	--with-dev
-# \todo Consider split package or option.
-CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 CONFIGURE_ARGS+=	--without-snmp		# provided by sysutils/ups-nut-snmp
 CONFIGURE_ARGS+=	--without-nut_monitor	# not packaged
 
+# \todo Consider split package or option.
+# Disable python2 to Workaround
+# https://github.com/networkupstools/nut/issues/1792 which upstream
+# declines to fix.
+CONFIGURE_ARGS+=	--without-python2
+CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
+
 PKG_GROUPS_VARS+=	NUT_GROUP
 PKG_USERS_VARS+=	NUT_USER
 BUILD_DEFS+=		NUT_STATEDIR VARBASE
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index 5d2af4d8e5..2f68f28a13 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -1,13 +1,14 @@
 # $NetBSD: Makefile.common,v 1.12 2022/04/26 23:28:25 gdt Exp $
-# used by sysutils/ups-nut/Makefile
-# used by sysutils/ups-nut-cgi/Makefile
-# used by sysutils/ups-nut-snmp/Makefile
-# used by sysutils/ups-nut-usb/Makefile
-# used by sysutils/p5-UPS-Nut/Makefile
+# used by wip/ups-nut/Makefile
+# used by wip/ups-nut-cgi/Makefile
+# used by wip/ups-nut-snmp/Makefile
+# used by wip/ups-nut-usb/Makefile
+# used by wip/p5-UPS-Nut/Makefile
 
-DISTNAME=		nut-2.8.0.1
+DISTNAME=		nut-2.8.0.1.20230110
 CATEGORIES=		sysutils
-MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
+#MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
+MASTER_SITES=		https://www.netbsd.org/~gdt/
 
 MAINTAINER?=		gdt%NetBSD.org@localhost
 HOMEPAGE=		http://www.networkupstools.org/
@@ -17,8 +18,8 @@ LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3
 NUT_USER?=		nut
 NUT_GROUP?=		nut
 
-DISTINFO_FILE=		${.CURDIR}/../../sysutils/ups-nut/distinfo
-PATCHDIR=		${.CURDIR}/../../sysutils/ups-nut/patches
+DISTINFO_FILE=		${.CURDIR}/../../wip/ups-nut/distinfo
+PATCHDIR=		${.CURDIR}/../../wip/ups-nut/patches
 
 USE_TOOLS=		pkg-config
 USE_LIBTOOL=		yes
diff --git a/ups-nut/TODO b/ups-nut/TODO
index 8b3b2bacf8..4d5733c741 100644
--- a/ups-nut/TODO
+++ b/ups-nut/TODO
@@ -1,7 +1,3 @@
-  - Change naming so distfiles have dates.
-  - Publish distfiles so others can fetch them
-  - Fix multiple python versions
-    https://github.com/networkupstools/nut/issues/1792
   - Check all patches and comment and send upstream
   - Resolve manpage building
   - Test forced shutdown and uncomment upsdrvctl shutdown
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index 1dcf1efb36..35b75ade62 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.40 2022/11/26 14:45:47 gdt Exp $
 
-BLAKE2s (nut-2.8.0.1.tar.gz) = a179c68bf5214f1ae5d7756c2279137218abc9bc0a004bca1ebf327f49a930b9
-SHA512 (nut-2.8.0.1.tar.gz) = 055a9823392b16366391a2f108269f272465bdd43742d0778f9e520dc2b185fa47b4d4d8489e30b133cc8e6441033594441a1a8796a9cf5bc32a55e80a60eb5f
-Size (nut-2.8.0.1.tar.gz) = 3690667 bytes
+BLAKE2s (nut-2.8.0.1.20230110.tar.gz) = 280f035e0f419f75234e366e2f5229b6d82476dd9410467ead517843f1618799
+SHA512 (nut-2.8.0.1.20230110.tar.gz) = 57b0ad6e2e15ba3eb04ef450648703e7bbe65c8129f980256093c4ab6d19b08d205425df922e99c38df77c21c622c1f8352356e04ff4fd6bb893fd6034a4aa94
+Size (nut-2.8.0.1.20230110.tar.gz) = 3694415 bytes
 SHA1 (patch-aa) = a471517e5e05f92b1eb904b227dbf1b0decec848
 SHA1 (patch-clients_upsclient.c) = 50633e97a747b61dfed155b96414992040e6386f
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b