Actually install the manual (manual.html), but don't install WML-formatted

docs.

3 files changed, 33 insertions, 25 deletions

diff --git a/sysutils/apcupsd/MESSAGE b/sysutils/apcupsd/MESSAGE
index 0d38887b4fa..d9a3b8bcf57 100644
--- a/sysutils/apcupsd/MESSAGE
+++ b/sysutils/apcupsd/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2007/04/18 08:09:56 cjs Exp $
+$NetBSD: MESSAGE,v 1.4 2012/01/22 09:07:50 shattered Exp $
 
 NOTE:  You may use the (undocumented) NISIP configuration file option to
        determine what interfaces the NIS server will listen on; use
@@ -14,7 +14,7 @@ NOTE:  With most APC cables you must put a "local" flag in /etc/ttys for
        the port you connect your UPS to, and run "ttyflags -a" to turn it
        on the first time.
 
-for complete documentation, see the html docs in
-file://${PREFIX}/share/doc/html/apcupsd
+For complete documentation, see the HTML docs in
+file://${PREFIX}/share/doc/html/apcupsd/index.html
 
 ===========================================================================
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index fbdbe63128a..543877a0daf 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2011/11/01 06:11:58 sbd Exp $
+# $NetBSD: Makefile,v 1.66 2012/01/22 09:07:50 shattered Exp $
 
 DISTNAME=		apcupsd-3.14.9
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=apcupsd/}
 
@@ -16,7 +16,7 @@ USE_LANGUAGES=		c c++
 
 GNU_CONFIGURE=		yes
 
-PKG_SYSCONFSUBDIR= 	apcupsd
+PKG_SYSCONFSUBDIR=	apcupsd
 
 .include "options.mk"
 
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=	--sbindir=${PREFIX}/sbin
 CONFIGURE_ENV+=		SCRIPTSHELL=${TOOLS_SH:Q}
 CONFIGURE_ENV+=		ac_cv_path_MAKE=${MAKE:Q}
 
-EGDIR=          ${PREFIX}/share/examples/apcupsd
+EGDIR=		${PREFIX}/share/examples/apcupsd
 
 CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
 CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
@@ -65,6 +65,7 @@ CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf  ${REAL_ROOT
 CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+
 RCD_SCRIPTS=	apcupsd
 PLATFORM_SUBDIR=${OPSYS:tl}
 .if ${OPSYS} == "DragonFly"
@@ -74,10 +75,9 @@ RCD_SCRIPT_SRC.apcupsd=	${WRKSRC}/platforms/${PLATFORM_SUBDIR}/apcupsd
 
 EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \
     etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
-MANFILES= apcupsd apctest
 
 INSTALLATION_DIRS=	share/examples/apcupsd share/examples/rc.d \
-			share/doc/html/apcupsd
+			share/doc/html/apcupsd share/doc/html/apcupsd/manual
 
 SUBST_CLASSES+=		strip
 SUBST_STAGE.strip=	pre-configure
@@ -90,9 +90,11 @@ SUBST_MESSAGE.strip=	Fixing conflicting STRIP variable name
 # XXX we should probably allow the tty to be set in /etc/mk.conf too
 #
 
-HTMLDOCS= apcupsd.gif bclogo.gif bugs.html bugs.wml index.html index.wml \
-    license.html license.wml lists.html lists.wml mail16d.png menu.inc \
-    publishsite support.html support.wml systems.html systems.wml template.inc
+HTMLDOCS= apcupsd.gif bclogo.gif bugs.html index.html license.html \
+	lists.html mail16d.png support.html systems.html
+HTMLMANUALS=	manual.html apcupsd.png charging.png commlost.png \
+	main_configs.png multimon.png onbatt.png online.png status.png \
+	thanks.png wininstall6.png
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/platforms/etc/apcupsd.conf \
@@ -107,6 +109,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/home-page/${file} \
 		${DESTDIR}${PREFIX}/share/doc/html/apcupsd
 .endfor
+.for file in ${HTMLMANUALS}
+	${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \
+		${DESTDIR}${PREFIX}/share/doc/html/apcupsd/manual
+.endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST
index e83ec6faac2..790976d9bae 100644
--- a/sysutils/apcupsd/PLIST
+++ b/sysutils/apcupsd/PLIST
@@ -1,34 +1,36 @@
-@comment $NetBSD: PLIST,v 1.14 2011/08/14 21:42:14 shattered Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/01/22 09:07:50 shattered Exp $
 ${PLIST.cgi}libexec/cgi-bin/upsstats.cgi
 ${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi
 ${PLIST.cgi}libexec/cgi-bin/apcupsimage.cgi
 ${PLIST.cgi}libexec/cgi-bin/multimon.cgi
-sbin/apcaccess
-sbin/apctest
-sbin/apcupsd
 man/man5/apcupsd.conf.5
 man/man8/apcaccess.8
 man/man8/apccontrol.8
 man/man8/apctest.8
 man/man8/apcupsd.8
+sbin/apcaccess
+sbin/apctest
+sbin/apcupsd
 share/doc/html/apcupsd/apcupsd.gif
 share/doc/html/apcupsd/bclogo.gif
 share/doc/html/apcupsd/bugs.html
-share/doc/html/apcupsd/bugs.wml
 share/doc/html/apcupsd/index.html
-share/doc/html/apcupsd/index.wml
 share/doc/html/apcupsd/license.html
-share/doc/html/apcupsd/license.wml
 share/doc/html/apcupsd/lists.html
-share/doc/html/apcupsd/lists.wml
 share/doc/html/apcupsd/mail16d.png
-share/doc/html/apcupsd/menu.inc
-share/doc/html/apcupsd/publishsite
+share/doc/html/apcupsd/manual/apcupsd.png
+share/doc/html/apcupsd/manual/charging.png
+share/doc/html/apcupsd/manual/commlost.png
+share/doc/html/apcupsd/manual/main_configs.png
+share/doc/html/apcupsd/manual/manual.html
+share/doc/html/apcupsd/manual/multimon.png
+share/doc/html/apcupsd/manual/onbatt.png
+share/doc/html/apcupsd/manual/online.png
+share/doc/html/apcupsd/manual/status.png
+share/doc/html/apcupsd/manual/thanks.png
+share/doc/html/apcupsd/manual/wininstall6.png
 share/doc/html/apcupsd/support.html
-share/doc/html/apcupsd/support.wml
 share/doc/html/apcupsd/systems.html
-share/doc/html/apcupsd/systems.wml
-share/doc/html/apcupsd/template.inc
 share/examples/apcupsd/apccontrol
 share/examples/apcupsd/apcupsd.conf
 share/examples/apcupsd/apcupsd.css