CVS commit: pkgsrc/sysutils/ups-nut

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May 17 23:34:12 UTC 2025

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common

Log Message:
sysutils/ups-nut: Incremental progress on db/run confusion

The package used /var/db/nut for both databases (of which there are
none) and pidfiles/sockets.  Split the directories logically, but
don't move to /var/run yet, because the rc.d script needs to create
it.

Based on comments form Edgar Fuß, but mistakes are mine.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/ups-nut/Makefile.common

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

Modified files:

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.78 pkgsrc/sysutils/ups-nut/Makefile:1.79
--- pkgsrc/sysutils/ups-nut/Makefile:1.78       Fri May 16 16:55:21 2025
+++ pkgsrc/sysutils/ups-nut/Makefile    Sat May 17 23:34:12 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.78 2025/05/16 16:55:21 martin Exp $
+# $NetBSD: Makefile,v 1.79 2025/05/17 23:34:12 gdt Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
+PKGREVISION=           1
 COMMENT=               Network UPS Tools
 
 PLIST_VARS+=           python
@@ -18,8 +19,8 @@ SUBST_NOOP_OK.man-so= yes
 TOOLS_SCRIPT.perl=     exit 1
 
 CONFIGURE_ARGS+=       --with-drvpath=${NUT_DRVDIR:Q}
-CONFIGURE_ARGS+=       --with-pidpath=${NUT_STATEDIR:Q}
-CONFIGURE_ARGS+=       --with-altpidpath=${NUT_STATEDIR:Q}
+CONFIGURE_ARGS+=       --with-pidpath=${NUT_RUNDIR:Q}
+CONFIGURE_ARGS+=       --with-altpidpath=${NUT_RUNDIR:Q}
 
 # nut, bizarrely, does not install headers by default
 CONFIGURE_ARGS+=       --with-dev
@@ -36,7 +37,7 @@ CONFIGURE_ARGS+=      --without-python2
 
 PKG_GROUPS_VARS+=      NUT_GROUP
 PKG_USERS_VARS+=       NUT_USER
-BUILD_DEFS+=           NUT_STATEDIR VARBASE
+BUILD_DEFS+=           NUT_RUNDIR NUT_STATEDIR VARBASE
 
 FILES_SUBST+=          NUT_CONFDIR=${NUT_CONFDIR:Q}
 FILES_SUBST+=          NUT_STATEDIR=${NUT_STATEDIR:Q}

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.17 pkgsrc/sysutils/ups-nut/Makefile.common:1.18
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.17        Thu Feb 13 19:18:36 2025
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Sat May 17 23:34:12 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2025/02/13 19:18:36 gdt Exp $
+# $NetBSD: Makefile.common,v 1.18 2025/05/17 23:34:12 gdt Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
@@ -45,7 +45,8 @@ NUT_DATADIR=          ${PREFIX}/share/nut
 NUT_DOCDIR=            ${PREFIX}/share/doc/nut
 NUT_DRVDIR=            ${PREFIX}/libexec/nut
 NUT_EGDIR=             ${PREFIX}/share/examples/nut
-# \todo STATEDIR is used for pidfiles and socckets, and thus should be /var/run.
-# Move creation from OWN_DIRS_PERMS into rc.d/upsd.
 NUT_STATEDIR?=         ${VARBASE}/db/nut
+# \todo RUNDIR is used for pidfiles and socckets, and thus should be /var/run.
+# Move creation from OWN_DIRS_PERMS into rc.d/upsd.
+NUT_RUNDIR?=           ${VARBASE}/db/nut
 NUT_CGIDIR=            ${PREFIX}/libexec/cgi-bin