sysutils/apcupsd: fix location of HTML documentation

3 files changed, 18 insertions, 18 deletions

diff --git a/sysutils/apcupsd/MESSAGE b/sysutils/apcupsd/MESSAGE
index d9a3b8bcf57..0bd64a5fa8e 100644
--- a/sysutils/apcupsd/MESSAGE
+++ b/sysutils/apcupsd/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2012/01/22 09:07:50 shattered Exp $
+$NetBSD: MESSAGE,v 1.5 2019/10/12 21:06:48 rillig Exp $
 
 NOTE:  You may use the (undocumented) NISIP configuration file option to
        determine what interfaces the NIS server will listen on; use
@@ -15,6 +15,6 @@ NOTE:  With most APC cables you must put a "local" flag in /etc/ttys for
        on the first time.
 
 For complete documentation, see the HTML docs in
-file://${PREFIX}/share/doc/html/apcupsd/index.html
+file://${PREFIX}/share/doc/apcupsd/index.html
 
 ===========================================================================
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 7c1bf8da02f..1665bf16665 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2018/11/12 14:40:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.87 2019/10/12 21:06:48 rillig Exp $
 
 DISTNAME=		apcupsd-3.14.13r2365
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils
 #MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=apcupsd/}
 MASTER_SITES=		${MASTER_SITE_LOCAL}
@@ -82,7 +82,7 @@ EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \
     etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
 
 INSTALLATION_DIRS=	share/examples/apcupsd share/examples/rc.d \
-			share/doc/html/apcupsd share/doc/html/apcupsd/manual
+			share/doc/apcupsd share/doc/apcupsd/manual
 
 SUBST_CLASSES+=		strip
 SUBST_STAGE.strip=	pre-configure
@@ -110,7 +110,7 @@ post-install:
 .endfor
 .for file in ${HTMLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \
-		${DESTDIR}${PREFIX}/share/doc/html/apcupsd
+		${DESTDIR}${PREFIX}/share/doc/apcupsd
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST
index 241fb33aef1..458e8703cad 100644
--- a/sysutils/apcupsd/PLIST
+++ b/sysutils/apcupsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/01/01 22:29:55 rillig Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/10/12 21:06:48 rillig Exp $
 ${PLIST.cgi}libexec/cgi-bin/apcupsimage.cgi
 ${PLIST.cgi}libexec/cgi-bin/multimon.cgi
 ${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi
@@ -11,17 +11,17 @@ man/man8/apcupsd.8
 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
-share/doc/html/apcupsd/apcupsd.png
-share/doc/html/apcupsd/charging.png
-share/doc/html/apcupsd/commlost.png
-share/doc/html/apcupsd/main_configs.png
-share/doc/html/apcupsd/manual.html
-share/doc/html/apcupsd/multimon.png
-share/doc/html/apcupsd/onbatt.png
-share/doc/html/apcupsd/online.png
-share/doc/html/apcupsd/status.png
-share/doc/html/apcupsd/thanks.png
-share/doc/html/apcupsd/wininstall6.png
+share/doc/apcupsd/apcupsd.png
+share/doc/apcupsd/charging.png
+share/doc/apcupsd/commlost.png
+share/doc/apcupsd/main_configs.png
+share/doc/apcupsd/manual.html
+share/doc/apcupsd/multimon.png
+share/doc/apcupsd/onbatt.png
+share/doc/apcupsd/online.png
+share/doc/apcupsd/status.png
+share/doc/apcupsd/thanks.png
+share/doc/apcupsd/wininstall6.png
 share/examples/apcupsd/apccontrol
 share/examples/apcupsd/apcupsd.conf
 share/examples/apcupsd/apcupsd.css