[pkgsrc/trunk]: pkgsrc/sysutils Update ups-nut* from 2.0.5 to 2.6.1. Changes ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils Update ups-nut* from 2.0.5 to 2.6.1. Changes ...
From: bouyer <bouyer%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 11:01:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4899cae1770
branches:  trunk
changeset: 590922:c4899cae1770
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Fri Jul 29 15:11:40 2011 +0000

description:
Update ups-nut* from 2.0.5 to 2.6.1. Changes are too large to list here,
see: http://www.networkupstools.org/source/2.6/new-2.6.1.txt

diffstat:

 sysutils/ups-nut-cgi/Makefile     |   29 +++++++-
 sysutils/ups-nut-snmp/Makefile    |   16 +++-
 sysutils/ups-nut-usb/Makefile     |   19 ++++-
 sysutils/ups-nut-usb/PLIST        |    9 +-
 sysutils/ups-nut/Makefile         |   28 ++++----
 sysutils/ups-nut/Makefile.common  |   19 ++++-
 sysutils/ups-nut/PLIST            |   86 +++++++++++++-----------
 sysutils/ups-nut/distinfo         |   13 ++-
 sysutils/ups-nut/patches/patch-aa |   24 +++---
 sysutils/ups-nut/patches/patch-ab |  131 +++++++++++++++++++++++++++++++------
 sysutils/ups-nut/patches/patch-ac |  102 +++++++++++++++++++++++++++++
 11 files changed, 363 insertions(+), 113 deletions(-)

diffs (truncated from 724 to 300 lines):

diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut-cgi/Makefile
--- a/sysutils/ups-nut-cgi/Makefile     Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut-cgi/Makefile     Fri Jul 29 15:11:40 2011 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.52 2011/01/13 13:39:26 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2011/07/29 15:11:40 bouyer Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}
-PKGREVISION=           4
 COMMENT=               Network UPS Tools CGI scripts
 
 DEPENDS+=              ups-nut-2.*:../../sysutils/ups-nut
 
-BUILD_TARGET=          cgi
-INSTALL_TARGET=                install-cgi
 INSTALLATION_DIRS+=    ${NUT_EGDIR}
+INSTALLATION_DIRS+=    ${PREFIX}/libexec/cgi-bin
+INSTALLATION_DIRS+=    ${PREFIX}/share/nut/html
+INSTALLATION_DIRS+=    ${PREFIX}/${PKGMANDIR}/man5
+INSTALLATION_DIRS+=    ${PREFIX}/${PKGMANDIR}/man8
 
 CONFIGURE_ARGS+=       --with-cgi
 CONFIGURE_ARGS+=       --with-cgipath=${NUT_CGIDIR:Q}
@@ -27,6 +28,26 @@
 CONF_FILES+=           ${NUT_EGDIR}/upsstats.html.sample \
                        ${NUT_CONFDIR}/upsstats.html
 
+do-install:
+       (cd ${WRKSRC}/clients && env ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install-cgiexecPROGRAMS)
+       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}; \
+       done
+       for f in bottom.html header.html index.html nut-banner.png; do \
+               ${INSTALL_DATA} ${WRKSRC}/data/html/$$f \
+                   ${DESTDIR}${PREFIX}/share/nut/html; \
+       done
+       for f in hosts.conf.5 upsset.conf.5 upsstats.html.5; do \
+               ${INSTALL_MAN} ${WRKSRC}/docs/man/$$f \
+                   ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/; \
+       done
+       for f in upsimage.cgi.8 upsset.cgi.8 upsstats.cgi.8; do \
+               ${INSTALL_MAN} ${WRKSRC}/docs/man/$$f \
+                   ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/; \
+       done
+
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut-snmp/Makefile
--- a/sysutils/ups-nut-snmp/Makefile    Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut-snmp/Makefile    Fri Jul 29 15:11:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/29 15:11:40 bouyer Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -9,12 +9,18 @@
 
 DEPENDS+=              ups-nut-2.*:../../sysutils/ups-nut
 
-BUILD_TARGET=          all snmp
-INSTALL_TARGET=                install-snmp
-
 BUILD_DEFS+=           NUT_STATEDIR
 
-CONFIGURE_ARGS+=       --with-drvpath=${NUT_DRVDIR:Q}
+INSTALLATION_DIRS+=    ${PREFIX}/libexec/nut
+INSTALLATION_DIRS+=    ${PREFIX}/${PKGMANDIR}/man8
+
+CONFIGURE_ARGS+=       --with-snmp --with-drvpath=${NUT_DRVDIR:Q}
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/drivers/snmp-ups \
+           ${DESTDIR}${PREFIX}/libexec/nut/
+       ${INSTALL_MAN} ${WRKSRC}/docs/man/snmp-ups.8 \
+           ${DESTDIR}${PREFIX}//${PKGMANDIR}/man8/
 
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut-usb/Makefile
--- a/sysutils/ups-nut-usb/Makefile     Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut-usb/Makefile     Fri Jul 29 15:11:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/29 15:11:40 bouyer Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -9,12 +9,23 @@
 
 DEPENDS+=              ups-nut-2.*:../../sysutils/ups-nut
 
-BUILD_TARGET=          all usb
-INSTALL_TARGET=                install-usb
+INSTALLATION_DIRS+=    ${PREFIX}/libexec/nut
+INSTALLATION_DIRS+=    ${PREFIX}/${PKGMANDIR}/man8
 
 BUILD_DEFS+=           NUT_STATEDIR
 
-CONFIGURE_ARGS+=       --with-drvpath=${NUT_DRVDIR:Q}
+CONFIGURE_ARGS+=       --with-usb --with-drvpath=${NUT_DRVDIR:Q}
+
+do-install:
+       for f in usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb;\
+        do \
+               ${INSTALL_PROGRAM} ${WRKSRC}/drivers/$$f \
+                   ${DESTDIR}${PREFIX}/libexec/nut/; \
+       done
+       for f in usbhid-ups.8 bcmxcp_usb.8 tripplite_usb.8 richcomm_usb.8; do \
+               ${INSTALL_MAN} ${WRKSRC}/docs/man/$$f \
+                   ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/; \
+       done
 
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut-usb/PLIST
--- a/sysutils/ups-nut-usb/PLIST        Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut-usb/PLIST        Fri Jul 29 15:11:40 2011 +0000
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/16 13:23:16 ghen Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/07/29 15:11:40 bouyer Exp $
 libexec/nut/bcmxcp_usb
-libexec/nut/newhidups
+libexec/nut/blazer_usb
 libexec/nut/tripplite_usb
+libexec/nut/richcomm_usb
+libexec/nut/usbhid-ups
 man/man8/bcmxcp_usb.8
-man/man8/newhidups.8
 man/man8/tripplite_usb.8
+man/man8/richcomm_usb.8
+man/man8/usbhid-ups.8
diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut/Makefile
--- a/sysutils/ups-nut/Makefile Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut/Makefile Fri Jul 29 15:11:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2010/02/19 21:23:34 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2011/07/29 15:11:40 bouyer Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -7,18 +7,13 @@
 PKGNAME=               ups-${DISTNAME}
 COMMENT=               Network UPS Tools
 
-CONFIGURE_ARGS+=       --with-user=${NUT_USER:Q}
-CONFIGURE_ARGS+=       --with-group=${NUT_GROUP:Q}
 CONFIGURE_ARGS+=       --with-drvpath=${NUT_DRVDIR:Q}
 CONFIGURE_ARGS+=       --with-altpidpath=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=       --with-pidpath=${NUT_STATEDIR:Q}
 
-NUT_USER?=             nut
-NUT_GROUP?=            nut
-
 PKG_GROUPS_VARS+=      NUT_GROUP
 PKG_USERS_VARS+=       NUT_USER
-BUILD_DEFS+=           NUT_STATEDIR
+BUILD_DEFS+=           NUT_STATEDIR VARBASE
 
 FILES_SUBST+=          NUT_CONFDIR=${NUT_CONFDIR:Q}
 FILES_SUBST+=          NUT_STATEDIR=${NUT_STATEDIR:Q}
@@ -33,7 +28,8 @@
 PKG_HOME.${NUT_USER}=  ${NUT_STATEDIR}
 PKG_SHELL.${NUT_USER}= ${SH}
 
-CONF_FILES=            ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
+CONF_FILES=            ${NUT_EGDIR}/nut.conf.sample ${NUT_CONFDIR}/nut.conf
+CONF_FILES+=           ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
 CONF_FILES+=           ${NUT_EGDIR}/upssched.conf.sample               \
                        ${NUT_CONFDIR}/upssched.conf
 
@@ -42,7 +38,7 @@
                        ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
 CONF_FILES_PERMS+=     ${NUT_EGDIR}/upsd.users.sample                  \
                        ${NUT_CONFDIR}/upsd.users                       \
-                       ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
+                       ${NUT_USER} ${NUT_GROUP} 0600
 CONF_FILES_PERMS+=     ${NUT_EGDIR}/upsmon.conf.sample                 \
                        ${NUT_CONFDIR}/upsmon.conf                      \
                        ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
@@ -54,13 +50,17 @@
 INSTALLATION_DIRS+=    ${NUT_EGDIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers
 
 post-install:
-       ${INSTALL_DATA_DIR} 
+       ${INSTALL_DATA_DIR} ${DESTDIR}${NUT_EGDIR}
+       ${MV} ${DESTDIR}${NUT_CONFDIR}/*.sample ${DESTDIR}${NUT_EGDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${NUT_DOCDIR}
        for f in COPYING CREDITS ChangeLog NEWS README INSTALL UPGRADING; do \
                ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${NUT_DOCDIR}; \
        done
-       ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DESTDIR}${NUT_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/data/driver.list ${DESTDIR}${NUT_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${NUT_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DESTDIR}${NUT_DOCDIR}/cables
+       for f in ${WRKSRC}/docs/*.txt; do \
+               ${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}; \
+       done
+       for f in ${WRKSRC}/docs/cables/*.txt; do \
+               ${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/cables/; \
+       done
 
 .include "../../mk/bsd.pkg.mk"
diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut/Makefile.common
--- a/sysutils/ups-nut/Makefile.common  Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut/Makefile.common  Fri Jul 29 15:11:40 2011 +0000
@@ -1,21 +1,34 @@
-# $NetBSD: Makefile.common,v 1.2 2008/01/30 22:10:12 ghen Exp $
+# $NetBSD: Makefile.common,v 1.3 2011/07/29 15:11:40 bouyer 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
 
-DISTNAME=              nut-2.0.5
+DISTNAME=              nut-2.6.1
 CATEGORIES=            sysutils
-MASTER_SITES=          http://random.networkupstools.org/source/2.0/
+MASTER_SITES=          http://www.networkupstools.org/source/2.6/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.networkupstools.org/
 
+LICENSE=               gnu-gpl-v2
+
+NUT_USER?=             nut
+NUT_GROUP?=            nut
+
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/ups-nut/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/ups-nut/patches
 
+USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${NUT_CONFDIR:Q}
 CONFIGURE_ARGS+=       --datadir=${NUT_DATADIR:Q}
 CONFIGURE_ARGS+=       --localstatedir=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=       --with-statepath=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=       --with-htmlpath=${PREFIX:Q}/share/nut/html
+CONFIGURE_ARGS+=       --with-user=${NUT_USER}
+CONFIGURE_ARGS+=       --with-group=${NUT_GROUP}
 
 CHECK_PORTABILITY_SKIP=        packaging/*
 
diff -r e6e26858f796 -r c4899cae1770 sysutils/ups-nut/PLIST
--- a/sysutils/ups-nut/PLIST    Fri Jul 29 14:36:01 2011 +0000
+++ b/sysutils/ups-nut/PLIST    Fri Jul 29 15:11:40 2011 +0000
@@ -1,85 +1,86 @@
-@comment $NetBSD: PLIST,v 1.23 2009/06/14 21:28:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.24 2011/07/29 15:11:40 bouyer Exp $
 bin/upsc
 bin/upscmd
 bin/upslog
 bin/upsrw
-libexec/nut/al175
+bin/upssched-cmd
+lib/libupsclient.la
 libexec/nut/apcsmart
 libexec/nut/bcmxcp
 libexec/nut/belkin
 libexec/nut/belkinunv
 libexec/nut/bestfcom
+libexec/nut/bestfortress
 libexec/nut/bestuferrups
 libexec/nut/bestups
-libexec/nut/blazer
-libexec/nut/cpsups
-libexec/nut/cyberpower
-libexec/nut/esupssmart
+libexec/nut/blazer_ser
+libexec/nut/clone
+libexec/nut/clone-outlet
+libexec/nut/dummy-ups
 libexec/nut/etapro
 libexec/nut/everups
-libexec/nut/fentonups
 libexec/nut/gamatronic
 libexec/nut/genericups
-libexec/nut/ippon
 libexec/nut/isbmex
+libexec/nut/ivtscd
 libexec/nut/liebert
+libexec/nut/liebert-esp2
 libexec/nut/masterguard
-libexec/nut/megatec
 libexec/nut/metasys
 libexec/nut/mge-shut
 libexec/nut/mge-utalk
-libexec/nut/mustek
-libexec/nut/nitram
+libexec/nut/microdowell
+libexec/nut/newmge-shut
 libexec/nut/oneac
Prev by Date: [pkgsrc/trunk]: pkgsrc/print/lilypond Fix PR pkg/44693
Next by Date: [pkgsrc/trunk]: pkgsrc Modular Xorg support.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/print/lilypond Fix PR pkg/44693
Next by Thread: [pkgsrc/trunk]: pkgsrc Modular Xorg support.
Indexes:
Home | Main Index | Thread Index | Old Index