CVS commit: pkgsrc/sysutils/ups-nut-cgi

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Aug 10 22:01:38 UTC 2025

Modified Files:
        pkgsrc/sysutils/ups-nut-cgi: Makefile

Log Message:
sysutils/ups-nut-cgi: Avoid installing nut libs

This is a split build, and after the update to 2.8.4, it's installing
nut internal libs that are already installed.  Rather than trying to
rototill nut's build systems to play nicer with split packages, just
remove the libs from the destdir.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/sysutils/ups-nut-cgi/Makefile

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-cgi/Makefile
diff -u pkgsrc/sysutils/ups-nut-cgi/Makefile:1.80 pkgsrc/sysutils/ups-nut-cgi/Makefile:1.81
--- pkgsrc/sysutils/ups-nut-cgi/Makefile:1.80   Sat May 17 23:56:37 2025
+++ pkgsrc/sysutils/ups-nut-cgi/Makefile        Sun Aug 10 22:01:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2025/05/17 23:56:37 gdt Exp $
+# $NetBSD: Makefile,v 1.81 2025/08/10 22:01:38 gdt Exp $
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
@@ -27,9 +27,16 @@ CONF_FILES+=         ${NUT_EGDIR}/upsstats-sing
 CONF_FILES+=           ${NUT_EGDIR}/upsstats.html.sample \
                        ${NUT_CONFDIR}/upsstats.html
 
+# cgi links against libupsclient, but it's in the base package.
+# Rather than fight the build system to add
+# --with-system-libnutclient, remove it from the destdir for now.
+# libnutclient is installed for reasons that are not clear, but again
+# just prune it.
 do-install:
        (cd ${WRKSRC}/clients && env ${MAKE_ENV} \
            ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install-cgiexecPROGRAMS)
+       rm -f ${DESTDIR}${PREFIX}/lib/libupsclient*
+       rm -f ${DESTDIR}${PREFIX}/lib/libnutclient*
        for f in hosts.conf.sample upsset.conf.sample \
            upsstats.html.sample upsstats-single.html.sample; do \
                ${INSTALL_DATA} ${WRKSRC}/conf/$$f ${DESTDIR}${NUT_EGDIR}; \