Sat Oct 12 21:06:48 2019 UTC ()
sysutils/apcupsd: fix location of HTML documentation


(rillig)
diff -r1.4 -r1.5 pkgsrc/sysutils/apcupsd/MESSAGE
diff -r1.86 -r1.87 pkgsrc/sysutils/apcupsd/Makefile
diff -r1.18 -r1.19 pkgsrc/sysutils/apcupsd/PLIST
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/apcupsd/MESSAGE (switch to unified diff)

--- pkgsrc/sysutils/apcupsd/MESSAGE 2012/01/22 09:07:50 1.4
+++ pkgsrc/sysutils/apcupsd/MESSAGE 2019/10/12 21:06:48 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.4 2012/01/22 09:07:50 shattered Exp $ 2$NetBSD: MESSAGE,v 1.5 2019/10/12 21:06:48 rillig Exp $
3 3
4NOTE: You may use the (undocumented) NISIP configuration file option to 4NOTE: You may use the (undocumented) NISIP configuration file option to
5 determine what interfaces the NIS server will listen on; use 5 determine what interfaces the NIS server will listen on; use
6 "NISIP 127.0.0.1" for better security. 6 "NISIP 127.0.0.1" for better security.
7 7
8NOTE: With NetBSD 4.0 and higher, you can leave USB HID devices enabled, 8NOTE: With NetBSD 4.0 and higher, you can leave USB HID devices enabled,
9 but force a single port to attach ugen instead (for the UPS) with 9 but force a single port to attach ugen instead (for the UPS) with
10 a kernel configuration line along the lines of: 10 a kernel configuration line along the lines of:
11 ugen* at uhub0 port 1 flags 1 11 ugen* at uhub0 port 1 flags 1
12 12
13NOTE: With most APC cables you must put a "local" flag in /etc/ttys for 13NOTE: With most APC cables you must put a "local" flag in /etc/ttys for
14 the port you connect your UPS to, and run "ttyflags -a" to turn it 14 the port you connect your UPS to, and run "ttyflags -a" to turn it
15 on the first time. 15 on the first time.
16 16
17For complete documentation, see the HTML docs in 17For complete documentation, see the HTML docs in
18file://${PREFIX}/share/doc/html/apcupsd/index.html 18file://${PREFIX}/share/doc/apcupsd/index.html
19 19
20=========================================================================== 20===========================================================================
cvs diff -r1.86 -r1.87 pkgsrc/sysutils/apcupsd/Makefile (switch to unified diff)

--- pkgsrc/sysutils/apcupsd/Makefile 2018/11/12 14:40:22 1.86
+++ pkgsrc/sysutils/apcupsd/Makefile 2019/10/12 21:06:48 1.87
@@ -1,118 +1,118 @@ @@ -1,118 +1,118 @@
1# $NetBSD: Makefile,v 1.86 2018/11/12 14:40:22 jperkin Exp $ 1# $NetBSD: Makefile,v 1.87 2019/10/12 21:06:48 rillig Exp $
2 2
3DISTNAME= apcupsd-3.14.13r2365 3DISTNAME= apcupsd-3.14.13r2365
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/} 6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/}
7MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
8 8
9MAINTAINER= bouyer@NetBSD.org 9MAINTAINER= bouyer@NetBSD.org
10HOMEPAGE= http://www.apcupsd.org/ 10HOMEPAGE= http://www.apcupsd.org/
11COMMENT= UPS power management for APCC Products 11COMMENT= UPS power management for APCC Products
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= gmake msgfmt sh makedepend 14USE_TOOLS+= gmake msgfmt sh makedepend
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19PKG_SYSCONFSUBDIR= apcupsd 19PKG_SYSCONFSUBDIR= apcupsd
20WRKSRC= ${WRKDIR}/apcupsd 20WRKSRC= ${WRKDIR}/apcupsd
21 21
22CTF_SUPPORTED= no # https://smartos.org/bugview/OS-6533 22CTF_SUPPORTED= no # https://smartos.org/bugview/OS-6533
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26# Thread support is needed to compile powerflute, which has a curses 26# Thread support is needed to compile powerflute, which has a curses
27# interface (apparently needing ncurses), but pthreads isn't very 27# interface (apparently needing ncurses), but pthreads isn't very
28# efficient and is less preferred. 28# efficient and is less preferred.
29# 29#
30#.include "../../devel/ncurses/buildlink3.mk" 30#.include "../../devel/ncurses/buildlink3.mk"
31#CONFIGURE_ARGS+= --enable-threads # compile threading code 31#CONFIGURE_ARGS+= --enable-threads # compile threading code
32#CONFIGURE_ARGS+= --enable-powerflute # compile powerflute program 32#CONFIGURE_ARGS+= --enable-powerflute # compile powerflute program
33 33
34#CONFIGURE_ARGS+= --with-net-port=${APCUPSD_NET_PORT} # un-registered port is 7000 34#CONFIGURE_ARGS+= --with-net-port=${APCUPSD_NET_PORT} # un-registered port is 7000
35 35
36#CONFIGURE_ARGS+= --with-nis-port=${APCUPSD_NIS_PORT} # registered port is 3551 36#CONFIGURE_ARGS+= --with-nis-port=${APCUPSD_NIS_PORT} # registered port is 3551
37#CONFIGURE_ARGS+= --with-upscable=${APCUPSD_UPS_CABLE} 37#CONFIGURE_ARGS+= --with-upscable=${APCUPSD_UPS_CABLE}
38#CONFIGURE_ARGS+= --with-upscable=${APCUPSD_UPS_TYPE} 38#CONFIGURE_ARGS+= --with-upscable=${APCUPSD_UPS_TYPE}
39 39
40CONFIGURE_ARGS+= --enable-net # enable NIS network driver 40CONFIGURE_ARGS+= --enable-net # enable NIS network driver
41CONFIGURE_ARGS+= --enable-usb # enable USB network driver 41CONFIGURE_ARGS+= --enable-usb # enable USB network driver
42CONFIGURE_ARGS+= --enable-snmp # enable SNMP driver 42CONFIGURE_ARGS+= --enable-snmp # enable SNMP driver
43CONFIGURE_ARGS+= --with-lock-dir=${VARBASE}/spool/lock 43CONFIGURE_ARGS+= --with-lock-dir=${VARBASE}/spool/lock
44# XXX is this supposed to be the full filename? 44# XXX is this supposed to be the full filename?
45CONFIGURE_ARGS+= --with-log-dir=${VARBASE}/db/apcupsd.events 45CONFIGURE_ARGS+= --with-log-dir=${VARBASE}/db/apcupsd.events
46# NOTE: You want the /dev/ttyXX for smart cables such as 940-0024C, 46# NOTE: You want the /dev/ttyXX for smart cables such as 940-0024C,
47# but probably the /dev/dtyXX for a basic smart-custom cable 47# but probably the /dev/dtyXX for a basic smart-custom cable
48CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01 48CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01
49CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 49CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
50# configure sets sbindir to '${prefix}/sbin' without expanding $prefix 50# configure sets sbindir to '${prefix}/sbin' without expanding $prefix
51# this breaks .in files that uses @sbindir@ 51# this breaks .in files that uses @sbindir@
52CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin 52CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
53 53
54CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q} 54CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q}
55CONFIGURE_ENV+= ac_cv_path_MAKE=${MAKE:Q} LD=${CXX} 55CONFIGURE_ENV+= ac_cv_path_MAKE=${MAKE:Q} LD=${CXX}
56 56
57CONFIGURE_ARGS.NetBSD+= ac_cv_path_SHUTDOWN=/sbin/shutdown 57CONFIGURE_ARGS.NetBSD+= ac_cv_path_SHUTDOWN=/sbin/shutdown
58 58
59EGDIR= ${PREFIX}/share/examples/apcupsd 59EGDIR= ${PREFIX}/share/examples/apcupsd
60 60
61CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 61CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
62CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 62CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
63CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 63CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
64CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 64CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
65CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 65CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
66CONF_FILES_PERMS+= ${EGDIR}/multimon.conf ${PKG_SYSCONFDIR}/multimon.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 66CONF_FILES_PERMS+= ${EGDIR}/multimon.conf ${PKG_SYSCONFDIR}/multimon.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
67CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 67CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
68CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 68CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
69CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 69CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
70CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 70CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
71 71
72RCD_SCRIPTS= apcupsd 72RCD_SCRIPTS= apcupsd
73 73
74OPSYSVARS+= PLATFORM_SUBDIR 74OPSYSVARS+= PLATFORM_SUBDIR
75PLATFORM_SUBDIR.DragonFly= netbsd 75PLATFORM_SUBDIR.DragonFly= netbsd
76PLATFORM_SUBDIR.SunOS= sun 76PLATFORM_SUBDIR.SunOS= sun
77PLATFORM_SUBDIR.*= ${OPSYS:tl} 77PLATFORM_SUBDIR.*= ${OPSYS:tl}
78 78
79RCD_SCRIPT_SRC.apcupsd= ${WRKSRC}/platforms/${PLATFORM_SUBDIR}/apcupsd 79RCD_SCRIPT_SRC.apcupsd= ${WRKSRC}/platforms/${PLATFORM_SUBDIR}/apcupsd
80 80
81EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \ 81EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \
82 etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf 82 etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
83 83
84INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d \ 84INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d \
85 share/doc/html/apcupsd share/doc/html/apcupsd/manual 85 share/doc/apcupsd share/doc/apcupsd/manual
86 86
87SUBST_CLASSES+= strip 87SUBST_CLASSES+= strip
88SUBST_STAGE.strip= pre-configure 88SUBST_STAGE.strip= pre-configure
89SUBST_FILES.strip= autoconf/install-sh autoconf/targets.mak 89SUBST_FILES.strip= autoconf/install-sh autoconf/targets.mak
90SUBST_FILES.strip+= src/gapcmon/Makefile.in src/cgi/Makefile.in 90SUBST_FILES.strip+= src/gapcmon/Makefile.in src/cgi/Makefile.in
91SUBST_FILES.strip+= src/Makefile.in 91SUBST_FILES.strip+= src/Makefile.in
92SUBST_SED.strip= -e "s|STRIP|STRIPFLAG|g" 92SUBST_SED.strip= -e "s|STRIP|STRIPFLAG|g"
93SUBST_MESSAGE.strip= Fixing conflicting STRIP variable name 93SUBST_MESSAGE.strip= Fixing conflicting STRIP variable name
94 94
95# XXX we should probably allow the tty to be set in /etc/mk.conf too 95# XXX we should probably allow the tty to be set in /etc/mk.conf too
96# 96#
97 97
98HTMLDOCS= manual.html apcupsd.png charging.png commlost.png \ 98HTMLDOCS= manual.html apcupsd.png charging.png commlost.png \
99 main_configs.png multimon.png onbatt.png online.png status.png \ 99 main_configs.png multimon.png onbatt.png online.png status.png \
100 thanks.png wininstall6.png 100 thanks.png wininstall6.png
101 101
102post-install: 102post-install:
103 ${INSTALL_DATA} ${WRKSRC}/platforms/etc/apcupsd.conf \ 103 ${INSTALL_DATA} ${WRKSRC}/platforms/etc/apcupsd.conf \
104 ${DESTDIR}${PREFIX}/share/examples/apcupsd 104 ${DESTDIR}${PREFIX}/share/examples/apcupsd
105 ${INSTALL_DATA} ${WRKSRC}/src/cgi/apcupsd.css \ 105 ${INSTALL_DATA} ${WRKSRC}/src/cgi/apcupsd.css \
106 ${DESTDIR}${PREFIX}/share/examples/apcupsd 106 ${DESTDIR}${PREFIX}/share/examples/apcupsd
107.for file in ${EGFILES} 107.for file in ${EGFILES}
108 ${INSTALL_SCRIPT} ${WRKSRC}/platforms/${file} \ 108 ${INSTALL_SCRIPT} ${WRKSRC}/platforms/${file} \
109 ${DESTDIR}${PREFIX}/share/examples/apcupsd 109 ${DESTDIR}${PREFIX}/share/examples/apcupsd
110.endfor 110.endfor
111.for file in ${HTMLDOCS} 111.for file in ${HTMLDOCS}
112 ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \ 112 ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \
113 ${DESTDIR}${PREFIX}/share/doc/html/apcupsd 113 ${DESTDIR}${PREFIX}/share/doc/apcupsd
114.endfor 114.endfor
115 115
116.include "../../devel/gettext-lib/buildlink3.mk" 116.include "../../devel/gettext-lib/buildlink3.mk"
117.include "../../devel/libusb/buildlink3.mk" 117.include "../../devel/libusb/buildlink3.mk"
118.include "../../mk/bsd.pkg.mk" 118.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/apcupsd/PLIST (switch to unified diff)

--- pkgsrc/sysutils/apcupsd/PLIST 2018/01/01 22:29:55 1.18
+++ pkgsrc/sysutils/apcupsd/PLIST 2019/10/12 21:06:48 1.19
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1@comment $NetBSD: PLIST,v 1.18 2018/01/01 22:29:55 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.19 2019/10/12 21:06:48 rillig Exp $
2${PLIST.cgi}libexec/cgi-bin/apcupsimage.cgi 2${PLIST.cgi}libexec/cgi-bin/apcupsimage.cgi
3${PLIST.cgi}libexec/cgi-bin/multimon.cgi 3${PLIST.cgi}libexec/cgi-bin/multimon.cgi
4${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi 4${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi
5${PLIST.cgi}libexec/cgi-bin/upsstats.cgi 5${PLIST.cgi}libexec/cgi-bin/upsstats.cgi
6man/man5/apcupsd.conf.5 6man/man5/apcupsd.conf.5
7man/man8/apcaccess.8 7man/man8/apcaccess.8
8man/man8/apccontrol.8 8man/man8/apccontrol.8
9man/man8/apctest.8 9man/man8/apctest.8
10man/man8/apcupsd.8 10man/man8/apcupsd.8
11sbin/apcaccess 11sbin/apcaccess
12sbin/apctest 12sbin/apctest
13sbin/apcupsd 13sbin/apcupsd
14share/doc/html/apcupsd/apcupsd.png 14share/doc/apcupsd/apcupsd.png
15share/doc/html/apcupsd/charging.png 15share/doc/apcupsd/charging.png
16share/doc/html/apcupsd/commlost.png 16share/doc/apcupsd/commlost.png
17share/doc/html/apcupsd/main_configs.png 17share/doc/apcupsd/main_configs.png
18share/doc/html/apcupsd/manual.html 18share/doc/apcupsd/manual.html
19share/doc/html/apcupsd/multimon.png 19share/doc/apcupsd/multimon.png
20share/doc/html/apcupsd/onbatt.png 20share/doc/apcupsd/onbatt.png
21share/doc/html/apcupsd/online.png 21share/doc/apcupsd/online.png
22share/doc/html/apcupsd/status.png 22share/doc/apcupsd/status.png
23share/doc/html/apcupsd/thanks.png 23share/doc/apcupsd/thanks.png
24share/doc/html/apcupsd/wininstall6.png 24share/doc/apcupsd/wininstall6.png
25share/examples/apcupsd/apccontrol 25share/examples/apcupsd/apccontrol
26share/examples/apcupsd/apcupsd.conf 26share/examples/apcupsd/apcupsd.conf
27share/examples/apcupsd/apcupsd.css 27share/examples/apcupsd/apcupsd.css
28share/examples/apcupsd/changeme 28share/examples/apcupsd/changeme
29share/examples/apcupsd/commfailure 29share/examples/apcupsd/commfailure
30share/examples/apcupsd/commok 30share/examples/apcupsd/commok
31share/examples/apcupsd/hosts.conf 31share/examples/apcupsd/hosts.conf
32share/examples/apcupsd/multimon.conf 32share/examples/apcupsd/multimon.conf
33share/examples/apcupsd/offbattery 33share/examples/apcupsd/offbattery
34share/examples/apcupsd/onbattery 34share/examples/apcupsd/onbattery