CVS commit: pkgsrc/sysutils/ups-nut

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Feb 13 19:18:37 UTC 2025

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

Log Message:
sysutils/nut: Cleanup and add notes about irregular usages

NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/ups-nut/files/ups.sh

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.76 pkgsrc/sysutils/ups-nut/Makefile:1.77
--- pkgsrc/sysutils/ups-nut/Makefile:1.76       Wed Apr  3 17:42:53 2024
+++ pkgsrc/sysutils/ups-nut/Makefile    Thu Feb 13 19:18:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2024/04/03 17:42:53 gdt Exp $
+# $NetBSD: Makefile,v 1.77 2025/02/13 19:18:36 gdt Exp $
 
 .include "Makefile.common"
 
@@ -43,10 +43,12 @@ BUILD_DEFS+=                NUT_STATEDIR VARBASE
 FILES_SUBST+=          NUT_CONFDIR=${NUT_CONFDIR:Q}
 FILES_SUBST+=          NUT_STATEDIR=${NUT_STATEDIR:Q}
 
-PKG_GROUPS=            ${NUT_GROUP}
 PKG_USERS=             ${NUT_USER}:${NUT_GROUP}
+PKG_GROUPS=            ${NUT_GROUP}
 PKG_GECOS.${NUT_USER}= Network UPS Tools
+# \todo Remove or justify.
 PKG_HOME.${NUT_USER}=  ${NUT_STATEDIR}
+# \todo Remove or justify.
 PKG_SHELL.${NUT_USER}= ${SH}
 
 CONF_FILES=            ${NUT_EGDIR}/nut.conf.sample ${NUT_CONFDIR}/nut.conf
@@ -68,26 +70,27 @@ RCD_SCRIPTS=                ups upskillpower upsdriver
 PY_PATCHPLIST=         yes
 
 OWN_DIRS=              ${NUT_CONFDIR}
+# \todo Explain why this is 770 instead of 755.
 OWN_DIRS_PERMS=                ${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770
 
-INSTALLATION_DIRS+=    ${NUT_EGDIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers
+INSTALLATION_DIRS+=    ${NUT_EGDIR}
+INSTALLATION_DIRS+=    ${NUT_DOCDIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/detailed
+# \todo Drop, after understanding why it is here.
+INSTALLATION_DIRS+=    ${NUT_DOCDIR}/drivers
 
 CHECK_INTERPRETER_SKIP+=       share/nut/solaris-init/nut
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${NUT_EGDIR}
        ${MV} ${DESTDIR}${NUT_CONFDIR}/*.sample ${DESTDIR}${NUT_EGDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${NUT_DOCDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${NUT_DOCDIR}/detailed
        for f in AUTHORS COPYING ChangeLog NEWS.adoc README.adoc UPGRADING.adoc; do \
                ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${NUT_DOCDIR}; \
        done
+       for f in ${WRKSRC}/docs/cables/*.txt; do \
+               ${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/cables; \
+       done
        for f in ${WRKSRC}/docs/*.txt; do \
                ${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/detailed; \
        done
-       for f in ${WRKSRC}/docs/cables/*.txt; do \
-               ${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/cables/; \
-       done
 
 # nut-scanner needs libltdl, but this is not documented
 .include "../../devel/libltdl/buildlink3.mk"

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.16 pkgsrc/sysutils/ups-nut/Makefile.common:1.17
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.16        Wed Apr  3 17:42:53 2024
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Thu Feb 13 19:18:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2024/04/03 17:42:53 gdt Exp $
+# $NetBSD: Makefile.common,v 1.17 2025/02/13 19:18:36 gdt Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
@@ -45,6 +45,7 @@ NUT_DATADIR=          ${PREFIX}/share/nut
 NUT_DOCDIR=            ${PREFIX}/share/doc/nut
 NUT_DRVDIR=            ${PREFIX}/libexec/nut
 NUT_EGDIR=             ${PREFIX}/share/examples/nut
-# \todo Change to /var/run rather than /var/db
+# \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
 NUT_CGIDIR=            ${PREFIX}/libexec/cgi-bin

Index: pkgsrc/sysutils/ups-nut/files/ups.sh
diff -u pkgsrc/sysutils/ups-nut/files/ups.sh:1.11 pkgsrc/sysutils/ups-nut/files/ups.sh:1.12
--- pkgsrc/sysutils/ups-nut/files/ups.sh:1.11   Sat Jan  7 16:16:10 2023
+++ pkgsrc/sysutils/ups-nut/files/ups.sh        Thu Feb 13 19:18:37 2025
@@ -1,10 +1,10 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: ups.sh,v 1.11 2023/01/07 16:16:10 gdt Exp $
+# $NetBSD: ups.sh,v 1.12 2025/02/13 19:18:37 gdt Exp $
 #
 # KEYWORD: nostart
 
-# NB: This file is not intended to be run automaticlally at boot.  It
+# NB: This file is not intended to be run automatically at boot.  It
 # is a convenience script for humans to start or stop all 4 nut-ups
 # daemons as a group.