3 files changed, 343 insertions, 297 deletions

diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 50761886381b..fff394f04ec2 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	2.0.b4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -36,6 +36,16 @@ NAGIOSDIR?=	/var/spool/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
+.if defined(NAGIOSWWWDIR) || defined(WITH_NAGIOS_WWWDIR)
+NAGIOSWWWDIRSET=yes
+.endif
+
+.if defined(WITH_NAGIOS_WWWDIR) && !defined(NAGIOSWWWDIR)
+NAGIOSWWWDIR=	www/nagios
+.else
+NAGIOSWWWDIR?=	share/nagios
+.endif
+
 .include <bsd.port.pre.mk>
 
 CPPFLAGS=	-I${LOCALBASE}/include -fPIC
@@ -44,26 +54,62 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -lgd"
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
-		--with-command-group=www \
+		--with-command-group=${WWWGRP} \
 		--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-group=${NAGIOSGROUP} \
 		--with-htmurl=${NAGIOSHTMURL} \
 		--with-cgiurl=${NAGIOSCGIURL} \
-		--sbindir=${PREFIX}/share/nagios/cgi-bin \
+		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
-		--datadir=${PREFIX}/share/nagios \
+		--datadir=${PREFIX}/${NAGIOSWWWDIR} \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
+PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
+		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
+		NAGIOSUSER=${NAGIOSUSER} \
+		NAGIOSGROUP=${NAGIOSGROUP} \
+		WWWGRP=${WWWGRP}
+
 SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
 		-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
 		-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
+		-e 's,%%NAGIOSWWWDIR%%,${NAGIOSWWWDIR},g' \
 		-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
 INSTALL_TARGET=	all install config install-config install-commandmode
 
+pre-everything::
+.if !defined(NAGIOSWWWDIRSET)
+	@${ECHO_CMD} "**********************************************************************"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} " The web component of this port is currently being installed under"
+	@${ECHO_CMD} " ${PREFIX}/${NAGIOSWWWDIR}, the default for which is being changed"
+	@${ECHO_CMD} " when Nagios 2.0 is released.  If this is a new installation, please"
+	@${ECHO_CMD} " consider adding the following option to /etc/make.conf to install the"
+	@${ECHO_CMD} " component under the correct home of ${PREFIX}/www/nagios:"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "   # net-mgmt/nagios"
+	@${ECHO_CMD} "   WITH_NAGIOS_WWWDIR=YES"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} " Existing installations can be upgraded with this option with only"
+	@${ECHO_CMD} " minor changes being required to etc/apache[2]/httpd.conf to change"
+	@${ECHO_CMD} " references of ${PREFIX}/${NAGIOSWWWDIR} to ${PREFIX}/www/nagios."
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} " Should you wish to continue using ${PREFIX}/${NAGIOSWWWDIR}, define"
+	@${ECHO_CMD} " the NAGIOSWWWDIR variable without the ${PREFIX}/ prefix:"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "   # net-mgmt/nagios"
+	@${ECHO_CMD} "   NAGIOSWWWDIR=${NAGIOSWWWDIR}"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} " The WITH_NAGIOS_WWWDIR knob will vanish once the default has been"
+	@${ECHO_CMD} " changed and the NAGIOSWWWDIR tunable option will remain permanently."
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "**********************************************************************"
+.endif
+
 pre-build:
 	for myfile in nagios.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${myfile}.tmpl >${WRKDIR}/$${myfile}; \
@@ -76,7 +122,7 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
 	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw
 	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives
-	@${CHOWN} ${NAGIOSUSER}:www ${NAGIOSDIR}/rw
+	@${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/nagios2/files/MESSAGE.tmpl b/net-mgmt/nagios2/files/MESSAGE.tmpl
index a96b0d6243c3..234bb9c24189 100644
--- a/net-mgmt/nagios2/files/MESSAGE.tmpl
+++ b/net-mgmt/nagios2/files/MESSAGE.tmpl
@@ -7,7 +7,7 @@
  Configuration templates are available in %%PREFIX%%/etc/nagios
  as *.cfg-sample files. Copy them to *.cfg and edit them to suit
  your needs. Documentation is available in HTML form in
- %%PREFIX%%/share/nagios/docs.
+ %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.
 
  If you don't already have a web server running, you need to install
  and configure it to finish your nagios installation.
diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist
index d4cb7ed6cf13..ebf3d0a7244e 100644
--- a/net-mgmt/nagios2/pkg-plist
+++ b/net-mgmt/nagios2/pkg-plist
@@ -1,9 +1,9 @@
-@exec mkdir -p %D/share/nagios/ssi
-@exec mkdir -p /var/spool/nagios/archives
-@exec mkdir -p /var/spool/nagios/rw
-@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
-@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
-@exec chown nagios:www /var/spool/nagios/rw
+@exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi
+@exec mkdir -p %%NAGIOSDIR%%/archives
+@exec mkdir -p %%NAGIOSDIR%%/rw
+@exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/rw
+@exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives
+@exec chown %%NAGIOSUSER%%:%%WWWGRP%% %%NAGIOSDIR%%/rw
 bin/nagios
 bin/nagiostats
 etc/nagios/bigger.cfg-sample
@@ -14,289 +14,289 @@ etc/nagios/misccommands.cfg-sample
 etc/nagios/nagios.cfg-sample
 etc/nagios/resource.cfg-sample
 etc/rc.d/nagios.sh
-share/nagios/cgi-bin/avail.cgi
-share/nagios/cgi-bin/cmd.cgi
-share/nagios/cgi-bin/config.cgi
-share/nagios/cgi-bin/extinfo.cgi
-share/nagios/cgi-bin/histogram.cgi
-share/nagios/cgi-bin/history.cgi
-share/nagios/cgi-bin/notifications.cgi
-share/nagios/cgi-bin/outages.cgi
-share/nagios/cgi-bin/showlog.cgi
-share/nagios/cgi-bin/status.cgi
-share/nagios/cgi-bin/statusmap.cgi
-share/nagios/cgi-bin/statuswml.cgi
-share/nagios/cgi-bin/statuswrl.cgi
-share/nagios/cgi-bin/summary.cgi
-share/nagios/cgi-bin/tac.cgi
-share/nagios/cgi-bin/trends.cgi
-share/nagios/contexthelp/A1.html
-share/nagios/contexthelp/A2.html
-share/nagios/contexthelp/A3.html
-share/nagios/contexthelp/A4.html
-share/nagios/contexthelp/A5.html
-share/nagios/contexthelp/A6.html
-share/nagios/contexthelp/A7.html
-share/nagios/contexthelp/B1.html
-share/nagios/contexthelp/C1.html
-share/nagios/contexthelp/D1.html
-share/nagios/contexthelp/E1.html
-share/nagios/contexthelp/F1.html
-share/nagios/contexthelp/G1.html
-share/nagios/contexthelp/G2.html
-share/nagios/contexthelp/G3.html
-share/nagios/contexthelp/G4.html
-share/nagios/contexthelp/G5.html
-share/nagios/contexthelp/G6.html
-share/nagios/contexthelp/H1.html
-share/nagios/contexthelp/H2.html
-share/nagios/contexthelp/H3.html
-share/nagios/contexthelp/H4.html
-share/nagios/contexthelp/H5.html
-share/nagios/contexthelp/H6.html
-share/nagios/contexthelp/H7.html
-share/nagios/contexthelp/H8.html
-share/nagios/contexthelp/I1.html
-share/nagios/contexthelp/I2.html
-share/nagios/contexthelp/I3.html
-share/nagios/contexthelp/I4.html
-share/nagios/contexthelp/I5.html
-share/nagios/contexthelp/I6.html
-share/nagios/contexthelp/I7.html
-share/nagios/contexthelp/I8.html
-share/nagios/contexthelp/I9.html
-share/nagios/contexthelp/J1.html
-share/nagios/contexthelp/K1.html
-share/nagios/contexthelp/L1.html
-share/nagios/contexthelp/L10.html
-share/nagios/contexthelp/L11.html
-share/nagios/contexthelp/L12.html
-share/nagios/contexthelp/L13.html
-share/nagios/contexthelp/L2.html
-share/nagios/contexthelp/L3.html
-share/nagios/contexthelp/L4.html
-share/nagios/contexthelp/L5.html
-share/nagios/contexthelp/L6.html
-share/nagios/contexthelp/L7.html
-share/nagios/contexthelp/L8.html
-share/nagios/contexthelp/L9.html
-share/nagios/contexthelp/M1.html
-share/nagios/contexthelp/M2.html
-share/nagios/contexthelp/M3.html
-share/nagios/contexthelp/M4.html
-share/nagios/contexthelp/M5.html
-share/nagios/contexthelp/M6.html
-share/nagios/contexthelp/N1.html
-share/nagios/contexthelp/N2.html
-share/nagios/contexthelp/N3.html
-share/nagios/contexthelp/N4.html
-share/nagios/contexthelp/N5.html
-share/nagios/contexthelp/N6.html
-share/nagios/contexthelp/N7.html
-share/nagios/docs/images/activepassive.png
-share/nagios/docs/images/cgi-avail-a.png
-share/nagios/docs/images/cgi-avail-b.png
-share/nagios/docs/images/cgi-cmd.png
-share/nagios/docs/images/cgi-config.png
-share/nagios/docs/images/cgi-extinfo-a.png
-share/nagios/docs/images/cgi-extinfo-b.png
-share/nagios/docs/images/cgi-extinfo-c.png
-share/nagios/docs/images/cgi-extinfo-d.png
-share/nagios/docs/images/cgi-histogram.png
-share/nagios/docs/images/cgi-history.png
-share/nagios/docs/images/cgi-notifications.png
-share/nagios/docs/images/cgi-outages.png
-share/nagios/docs/images/cgi-showlog.png
-share/nagios/docs/images/cgi-status-a.png
-share/nagios/docs/images/cgi-status-b.png
-share/nagios/docs/images/cgi-status-c.png
-share/nagios/docs/images/cgi-status-d.png
-share/nagios/docs/images/cgi-statusmap.png
-share/nagios/docs/images/cgi-statuswml.png
-share/nagios/docs/images/cgi-statuswrl.png
-share/nagios/docs/images/cgi-summary.png
-share/nagios/docs/images/cgi-tac.png
-share/nagios/docs/images/cgi-trends.png
-share/nagios/docs/images/checktiming.png
-share/nagios/docs/images/distributed.png
-share/nagios/docs/images/host-dependencies.png
-share/nagios/docs/images/indirecthostcheck.png
-share/nagios/docs/images/indirectsvccheck.png
-share/nagios/docs/images/indirectsvccheck2.png
-share/nagios/docs/images/interleaved1.png
-share/nagios/docs/images/interleaved2.png
-share/nagios/docs/images/interleaved3.png
-share/nagios/docs/images/logofullsize.png
-share/nagios/docs/images/mrtgstats.png
-share/nagios/docs/images/network-heirarchy.png
-share/nagios/docs/images/network-outage1.png
-share/nagios/docs/images/network-outage2.png
-share/nagios/docs/images/noninterleaved1.png
-share/nagios/docs/images/noninterleaved2.png
-share/nagios/docs/images/physical-network.png
-share/nagios/docs/images/plugintheory.png
-share/nagios/docs/images/redudancy.png
-share/nagios/docs/images/redundancy.png
-share/nagios/docs/images/service-dependencies.png
-share/nagios/docs/images/statetransitions.png
-share/nagios/docs/images/statetransitions2.png
-share/nagios/docs/about.html
-share/nagios/docs/addons.html
-share/nagios/docs/adaptive.html
-share/nagios/docs/beginners.html
-share/nagios/docs/cgiauth.html
-share/nagios/docs/cgiincludes.html
-share/nagios/docs/cgis.html
-share/nagios/docs/checkscheduling.html
-share/nagios/docs/clusters.html
-share/nagios/docs/commandfile.html
-share/nagios/docs/config.html
-share/nagios/docs/configcgi.html
-share/nagios/docs/configextinfo.html
-share/nagios/docs/configmain.html
-share/nagios/docs/configobject.html
-share/nagios/docs/dependencies.html
-share/nagios/docs/distributed.html
-share/nagios/docs/downtime.html
-share/nagios/docs/embeddedperl.html
-share/nagios/docs/escalations.html
-share/nagios/docs/eventhandlers.html
-share/nagios/docs/extcommands.html
-share/nagios/docs/flapping.html
-share/nagios/docs/freshness.html
-share/nagios/docs/funstuff.html
-share/nagios/docs/index.html
-share/nagios/docs/indirectchecks.html
-share/nagios/docs/installing.html
-share/nagios/docs/installweb.html
-share/nagios/docs/int-snmptrap.html
-share/nagios/docs/int-tcpwrappers.html
-share/nagios/docs/macros.html
-share/nagios/docs/nagiostats.html
-share/nagios/docs/networkoutages.html
-share/nagios/docs/networkreachability.html
-share/nagios/docs/notifications.html
-share/nagios/docs/parallelization.html
-share/nagios/docs/passivechecks.html
-share/nagios/docs/perfdata.html
-share/nagios/docs/plugins.html
-share/nagios/docs/plugintheory.html
-share/nagios/docs/redundancy.html
-share/nagios/docs/robots.txt
-share/nagios/docs/security.html
-share/nagios/docs/stalking.html
-share/nagios/docs/starting.html
-share/nagios/docs/statetypes.html
-share/nagios/docs/stoprestart.html
-share/nagios/docs/templaterecursion.html
-share/nagios/docs/templatetricks.html
-share/nagios/docs/timeperiods.html
-share/nagios/docs/toc.html
-share/nagios/docs/tuning.html
-share/nagios/docs/verifyconfig.html
-share/nagios/docs/volatileservices.html
-share/nagios/docs/whatsnew.html
-share/nagios/docs/xodtemplate.html
-share/nagios/images/ack.gif
-share/nagios/images/action.gif
-share/nagios/images/command.png
-share/nagios/images/comment.gif
-share/nagios/images/contexthelp1.gif
-share/nagios/images/contexthelp2.gif
-share/nagios/images/critical.png
-share/nagios/images/delay.gif
-share/nagios/images/delete.gif
-share/nagios/images/detail.gif
-share/nagios/images/disabled.gif
-share/nagios/images/down.gif
-share/nagios/images/downtime.gif
-share/nagios/images/empty.gif
-share/nagios/images/enabled.gif
-share/nagios/images/extinfo.gif
-share/nagios/images/flapping.gif
-share/nagios/images/greendot.gif
-share/nagios/images/histogram.png
-share/nagios/images/history.gif
-share/nagios/images/hostevent.gif
-share/nagios/images/info.png
-share/nagios/images/left.gif
-share/nagios/images/logofullsize.jpg
-share/nagios/images/logos/nagios.gd2
-share/nagios/images/logos/nagios.gif
-share/nagios/images/logos/nagiosvrml.png
-share/nagios/images/logos/unknown.gd2
-share/nagios/images/logos/unknown.gif
-share/nagios/images/logrotate.png
-share/nagios/images/ndisabled.gif
-share/nagios/images/noack.gif
-share/nagios/images/notes.gif
-share/nagios/images/notify.gif
-share/nagios/images/orangedot.gif
-share/nagios/images/passiveonly.gif
-share/nagios/images/recovery.png
-share/nagios/images/redudancy.png
-share/nagios/images/redundancy.png
-share/nagios/images/restart.gif
-share/nagios/images/right.gif
-share/nagios/images/sblogo.jpg
-share/nagios/images/serviceevent.gif
-share/nagios/images/start.gif
-share/nagios/images/status.gif
-share/nagios/images/status2.gif
-share/nagios/images/status3.gif
-share/nagios/images/status4.gif
-share/nagios/images/stop.gif
-share/nagios/images/tacdisabled.jpg
-share/nagios/images/tacdisabled.png
-share/nagios/images/tacenabled.jpg
-share/nagios/images/tacenabled.png
-share/nagios/images/thermcrit.png
-share/nagios/images/thermok.png
-share/nagios/images/thermwarn.png
-share/nagios/images/trends.gif
-share/nagios/images/trendshost.png
-share/nagios/images/trendssvc.png
-share/nagios/images/unknown.png
-share/nagios/images/up.gif
-share/nagios/images/warning.png
-share/nagios/images/weblogo1.png
-share/nagios/images/zoom1.gif
-share/nagios/images/zoom2.gif
-share/nagios/index.html
-share/nagios/main.html
-share/nagios/media/critical.wav
-share/nagios/media/hostdown.wav
-share/nagios/media/warning.wav
-share/nagios/robots.txt
-share/nagios/side.html
-share/nagios/stylesheets/avail.css
-share/nagios/stylesheets/checksanity.css
-share/nagios/stylesheets/cmd.css
-share/nagios/stylesheets/common.css
-share/nagios/stylesheets/config.css
-share/nagios/stylesheets/extinfo.css
-share/nagios/stylesheets/histogram.css
-share/nagios/stylesheets/history.css
-share/nagios/stylesheets/ministatus.css
-share/nagios/stylesheets/notifications.css
-share/nagios/stylesheets/outages.css
-share/nagios/stylesheets/showlog.css
-share/nagios/stylesheets/status.css
-share/nagios/stylesheets/statusmap.css
-share/nagios/stylesheets/summary.css
-share/nagios/stylesheets/tac.css
-share/nagios/stylesheets/trends.css
+%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/config.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/extinfo.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/histogram.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/history.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/notifications.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/outages.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/showlog.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/status.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/statusmap.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/statuswml.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/statuswrl.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
+%%NAGIOSWWWDIR%%/contexthelp/A1.html
+%%NAGIOSWWWDIR%%/contexthelp/A2.html
+%%NAGIOSWWWDIR%%/contexthelp/A3.html
+%%NAGIOSWWWDIR%%/contexthelp/A4.html
+%%NAGIOSWWWDIR%%/contexthelp/A5.html
+%%NAGIOSWWWDIR%%/contexthelp/A6.html
+%%NAGIOSWWWDIR%%/contexthelp/A7.html
+%%NAGIOSWWWDIR%%/contexthelp/B1.html
+%%NAGIOSWWWDIR%%/contexthelp/C1.html
+%%NAGIOSWWWDIR%%/contexthelp/D1.html
+%%NAGIOSWWWDIR%%/contexthelp/E1.html
+%%NAGIOSWWWDIR%%/contexthelp/F1.html
+%%NAGIOSWWWDIR%%/contexthelp/G1.html
+%%NAGIOSWWWDIR%%/contexthelp/G2.html
+%%NAGIOSWWWDIR%%/contexthelp/G3.html
+%%NAGIOSWWWDIR%%/contexthelp/G4.html
+%%NAGIOSWWWDIR%%/contexthelp/G5.html
+%%NAGIOSWWWDIR%%/contexthelp/G6.html
+%%NAGIOSWWWDIR%%/contexthelp/H1.html
+%%NAGIOSWWWDIR%%/contexthelp/H2.html
+%%NAGIOSWWWDIR%%/contexthelp/H3.html
+%%NAGIOSWWWDIR%%/contexthelp/H4.html
+%%NAGIOSWWWDIR%%/contexthelp/H5.html
+%%NAGIOSWWWDIR%%/contexthelp/H6.html
+%%NAGIOSWWWDIR%%/contexthelp/H7.html
+%%NAGIOSWWWDIR%%/contexthelp/H8.html
+%%NAGIOSWWWDIR%%/contexthelp/I1.html
+%%NAGIOSWWWDIR%%/contexthelp/I2.html
+%%NAGIOSWWWDIR%%/contexthelp/I3.html
+%%NAGIOSWWWDIR%%/contexthelp/I4.html
+%%NAGIOSWWWDIR%%/contexthelp/I5.html
+%%NAGIOSWWWDIR%%/contexthelp/I6.html
+%%NAGIOSWWWDIR%%/contexthelp/I7.html
+%%NAGIOSWWWDIR%%/contexthelp/I8.html
+%%NAGIOSWWWDIR%%/contexthelp/I9.html
+%%NAGIOSWWWDIR%%/contexthelp/J1.html
+%%NAGIOSWWWDIR%%/contexthelp/K1.html
+%%NAGIOSWWWDIR%%/contexthelp/L1.html
+%%NAGIOSWWWDIR%%/contexthelp/L10.html
+%%NAGIOSWWWDIR%%/contexthelp/L11.html
+%%NAGIOSWWWDIR%%/contexthelp/L12.html
+%%NAGIOSWWWDIR%%/contexthelp/L13.html
+%%NAGIOSWWWDIR%%/contexthelp/L2.html
+%%NAGIOSWWWDIR%%/contexthelp/L3.html
+%%NAGIOSWWWDIR%%/contexthelp/L4.html
+%%NAGIOSWWWDIR%%/contexthelp/L5.html
+%%NAGIOSWWWDIR%%/contexthelp/L6.html
+%%NAGIOSWWWDIR%%/contexthelp/L7.html
+%%NAGIOSWWWDIR%%/contexthelp/L8.html
+%%NAGIOSWWWDIR%%/contexthelp/L9.html
+%%NAGIOSWWWDIR%%/contexthelp/M1.html
+%%NAGIOSWWWDIR%%/contexthelp/M2.html
+%%NAGIOSWWWDIR%%/contexthelp/M3.html
+%%NAGIOSWWWDIR%%/contexthelp/M4.html
+%%NAGIOSWWWDIR%%/contexthelp/M5.html
+%%NAGIOSWWWDIR%%/contexthelp/M6.html
+%%NAGIOSWWWDIR%%/contexthelp/N1.html
+%%NAGIOSWWWDIR%%/contexthelp/N2.html
+%%NAGIOSWWWDIR%%/contexthelp/N3.html
+%%NAGIOSWWWDIR%%/contexthelp/N4.html
+%%NAGIOSWWWDIR%%/contexthelp/N5.html
+%%NAGIOSWWWDIR%%/contexthelp/N6.html
+%%NAGIOSWWWDIR%%/contexthelp/N7.html
+%%NAGIOSWWWDIR%%/docs/about.html
+%%NAGIOSWWWDIR%%/docs/adaptive.html
+%%NAGIOSWWWDIR%%/docs/addons.html
+%%NAGIOSWWWDIR%%/docs/beginners.html
+%%NAGIOSWWWDIR%%/docs/cgiauth.html
+%%NAGIOSWWWDIR%%/docs/cgiincludes.html
+%%NAGIOSWWWDIR%%/docs/cgis.html
+%%NAGIOSWWWDIR%%/docs/checkscheduling.html
+%%NAGIOSWWWDIR%%/docs/clusters.html
+%%NAGIOSWWWDIR%%/docs/commandfile.html
+%%NAGIOSWWWDIR%%/docs/config.html
+%%NAGIOSWWWDIR%%/docs/configcgi.html
+%%NAGIOSWWWDIR%%/docs/configextinfo.html
+%%NAGIOSWWWDIR%%/docs/configmain.html
+%%NAGIOSWWWDIR%%/docs/configobject.html
+%%NAGIOSWWWDIR%%/docs/dependencies.html
+%%NAGIOSWWWDIR%%/docs/distributed.html
+%%NAGIOSWWWDIR%%/docs/downtime.html
+%%NAGIOSWWWDIR%%/docs/embeddedperl.html
+%%NAGIOSWWWDIR%%/docs/escalations.html
+%%NAGIOSWWWDIR%%/docs/eventhandlers.html
+%%NAGIOSWWWDIR%%/docs/extcommands.html
+%%NAGIOSWWWDIR%%/docs/flapping.html
+%%NAGIOSWWWDIR%%/docs/freshness.html
+%%NAGIOSWWWDIR%%/docs/funstuff.html
+%%NAGIOSWWWDIR%%/docs/images/activepassive.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-avail-a.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-avail-b.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-cmd.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-config.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-a.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-b.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-c.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-d.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-histogram.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-history.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-notifications.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-outages.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-showlog.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-status-a.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-status-b.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-status-c.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-status-d.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-statusmap.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-statuswml.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-statuswrl.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-summary.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-tac.png
+%%NAGIOSWWWDIR%%/docs/images/cgi-trends.png
+%%NAGIOSWWWDIR%%/docs/images/checktiming.png
+%%NAGIOSWWWDIR%%/docs/images/distributed.png
+%%NAGIOSWWWDIR%%/docs/images/host-dependencies.png
+%%NAGIOSWWWDIR%%/docs/images/indirecthostcheck.png
+%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck.png
+%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck2.png
+%%NAGIOSWWWDIR%%/docs/images/interleaved1.png
+%%NAGIOSWWWDIR%%/docs/images/interleaved2.png
+%%NAGIOSWWWDIR%%/docs/images/interleaved3.png
+%%NAGIOSWWWDIR%%/docs/images/logofullsize.png
+%%NAGIOSWWWDIR%%/docs/images/mrtgstats.png
+%%NAGIOSWWWDIR%%/docs/images/network-heirarchy.png
+%%NAGIOSWWWDIR%%/docs/images/network-outage1.png
+%%NAGIOSWWWDIR%%/docs/images/network-outage2.png
+%%NAGIOSWWWDIR%%/docs/images/noninterleaved1.png
+%%NAGIOSWWWDIR%%/docs/images/noninterleaved2.png
+%%NAGIOSWWWDIR%%/docs/images/physical-network.png
+%%NAGIOSWWWDIR%%/docs/images/plugintheory.png
+%%NAGIOSWWWDIR%%/docs/images/redudancy.png
+%%NAGIOSWWWDIR%%/docs/images/redundancy.png
+%%NAGIOSWWWDIR%%/docs/images/service-dependencies.png
+%%NAGIOSWWWDIR%%/docs/images/statetransitions.png
+%%NAGIOSWWWDIR%%/docs/images/statetransitions2.png
+%%NAGIOSWWWDIR%%/docs/index.html
+%%NAGIOSWWWDIR%%/docs/indirectchecks.html
+%%NAGIOSWWWDIR%%/docs/installing.html
+%%NAGIOSWWWDIR%%/docs/installweb.html
+%%NAGIOSWWWDIR%%/docs/int-snmptrap.html
+%%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html
+%%NAGIOSWWWDIR%%/docs/macros.html
+%%NAGIOSWWWDIR%%/docs/nagiostats.html
+%%NAGIOSWWWDIR%%/docs/networkoutages.html
+%%NAGIOSWWWDIR%%/docs/networkreachability.html
+%%NAGIOSWWWDIR%%/docs/notifications.html
+%%NAGIOSWWWDIR%%/docs/parallelization.html
+%%NAGIOSWWWDIR%%/docs/passivechecks.html
+%%NAGIOSWWWDIR%%/docs/perfdata.html
+%%NAGIOSWWWDIR%%/docs/plugins.html
+%%NAGIOSWWWDIR%%/docs/plugintheory.html
+%%NAGIOSWWWDIR%%/docs/redundancy.html
+%%NAGIOSWWWDIR%%/docs/robots.txt
+%%NAGIOSWWWDIR%%/docs/security.html
+%%NAGIOSWWWDIR%%/docs/stalking.html
+%%NAGIOSWWWDIR%%/docs/starting.html
+%%NAGIOSWWWDIR%%/docs/statetypes.html
+%%NAGIOSWWWDIR%%/docs/stoprestart.html
+%%NAGIOSWWWDIR%%/docs/templaterecursion.html
+%%NAGIOSWWWDIR%%/docs/templatetricks.html
+%%NAGIOSWWWDIR%%/docs/timeperiods.html
+%%NAGIOSWWWDIR%%/docs/toc.html
+%%NAGIOSWWWDIR%%/docs/tuning.html
+%%NAGIOSWWWDIR%%/docs/verifyconfig.html
+%%NAGIOSWWWDIR%%/docs/volatileservices.html
+%%NAGIOSWWWDIR%%/docs/whatsnew.html
+%%NAGIOSWWWDIR%%/docs/xodtemplate.html
+%%NAGIOSWWWDIR%%/images/ack.gif
+%%NAGIOSWWWDIR%%/images/action.gif
+%%NAGIOSWWWDIR%%/images/command.png
+%%NAGIOSWWWDIR%%/images/comment.gif
+%%NAGIOSWWWDIR%%/images/contexthelp1.gif
+%%NAGIOSWWWDIR%%/images/contexthelp2.gif
+%%NAGIOSWWWDIR%%/images/critical.png
+%%NAGIOSWWWDIR%%/images/delay.gif
+%%NAGIOSWWWDIR%%/images/delete.gif
+%%NAGIOSWWWDIR%%/images/detail.gif
+%%NAGIOSWWWDIR%%/images/disabled.gif
+%%NAGIOSWWWDIR%%/images/down.gif
+%%NAGIOSWWWDIR%%/images/downtime.gif
+%%NAGIOSWWWDIR%%/images/empty.gif
+%%NAGIOSWWWDIR%%/images/enabled.gif
+%%NAGIOSWWWDIR%%/images/extinfo.gif
+%%NAGIOSWWWDIR%%/images/flapping.gif
+%%NAGIOSWWWDIR%%/images/greendot.gif
+%%NAGIOSWWWDIR%%/images/histogram.png
+%%NAGIOSWWWDIR%%/images/history.gif
+%%NAGIOSWWWDIR%%/images/hostevent.gif
+%%NAGIOSWWWDIR%%/images/info.png
+%%NAGIOSWWWDIR%%/images/left.gif
+%%NAGIOSWWWDIR%%/images/logofullsize.jpg
+%%NAGIOSWWWDIR%%/images/logos/nagios.gd2
+%%NAGIOSWWWDIR%%/images/logos/nagios.gif
+%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png
+%%NAGIOSWWWDIR%%/images/logos/unknown.gd2
+%%NAGIOSWWWDIR%%/images/logos/unknown.gif
+%%NAGIOSWWWDIR%%/images/logrotate.png
+%%NAGIOSWWWDIR%%/images/ndisabled.gif
+%%NAGIOSWWWDIR%%/images/noack.gif
+%%NAGIOSWWWDIR%%/images/notes.gif
+%%NAGIOSWWWDIR%%/images/notify.gif
+%%NAGIOSWWWDIR%%/images/orangedot.gif
+%%NAGIOSWWWDIR%%/images/passiveonly.gif
+%%NAGIOSWWWDIR%%/images/recovery.png
+%%NAGIOSWWWDIR%%/images/redudancy.png
+%%NAGIOSWWWDIR%%/images/redundancy.png
+%%NAGIOSWWWDIR%%/images/restart.gif
+%%NAGIOSWWWDIR%%/images/right.gif
+%%NAGIOSWWWDIR%%/images/sblogo.jpg
+%%NAGIOSWWWDIR%%/images/serviceevent.gif
+%%NAGIOSWWWDIR%%/images/start.gif
+%%NAGIOSWWWDIR%%/images/status.gif
+%%NAGIOSWWWDIR%%/images/status2.gif
+%%NAGIOSWWWDIR%%/images/status3.gif
+%%NAGIOSWWWDIR%%/images/status4.gif
+%%NAGIOSWWWDIR%%/images/stop.gif
+%%NAGIOSWWWDIR%%/images/tacdisabled.jpg
+%%NAGIOSWWWDIR%%/images/tacdisabled.png
+%%NAGIOSWWWDIR%%/images/tacenabled.jpg
+%%NAGIOSWWWDIR%%/images/tacenabled.png
+%%NAGIOSWWWDIR%%/images/thermcrit.png
+%%NAGIOSWWWDIR%%/images/thermok.png
+%%NAGIOSWWWDIR%%/images/thermwarn.png
+%%NAGIOSWWWDIR%%/images/trends.gif
+%%NAGIOSWWWDIR%%/images/trendshost.png
+%%NAGIOSWWWDIR%%/images/trendssvc.png
+%%NAGIOSWWWDIR%%/images/unknown.png
+%%NAGIOSWWWDIR%%/images/up.gif
+%%NAGIOSWWWDIR%%/images/warning.png
+%%NAGIOSWWWDIR%%/images/weblogo1.png
+%%NAGIOSWWWDIR%%/images/zoom1.gif
+%%NAGIOSWWWDIR%%/images/zoom2.gif
+%%NAGIOSWWWDIR%%/index.html
+%%NAGIOSWWWDIR%%/main.html
+%%NAGIOSWWWDIR%%/media/critical.wav
+%%NAGIOSWWWDIR%%/media/hostdown.wav
+%%NAGIOSWWWDIR%%/media/warning.wav
+%%NAGIOSWWWDIR%%/robots.txt
+%%NAGIOSWWWDIR%%/side.html
+%%NAGIOSWWWDIR%%/stylesheets/avail.css
+%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
+%%NAGIOSWWWDIR%%/stylesheets/cmd.css
+%%NAGIOSWWWDIR%%/stylesheets/common.css
+%%NAGIOSWWWDIR%%/stylesheets/config.css
+%%NAGIOSWWWDIR%%/stylesheets/extinfo.css
+%%NAGIOSWWWDIR%%/stylesheets/histogram.css
+%%NAGIOSWWWDIR%%/stylesheets/history.css
+%%NAGIOSWWWDIR%%/stylesheets/ministatus.css
+%%NAGIOSWWWDIR%%/stylesheets/notifications.css
+%%NAGIOSWWWDIR%%/stylesheets/outages.css
+%%NAGIOSWWWDIR%%/stylesheets/showlog.css
+%%NAGIOSWWWDIR%%/stylesheets/status.css
+%%NAGIOSWWWDIR%%/stylesheets/statusmap.css
+%%NAGIOSWWWDIR%%/stylesheets/summary.css
+%%NAGIOSWWWDIR%%/stylesheets/tac.css
+%%NAGIOSWWWDIR%%/stylesheets/trends.css
 @unexec rmdir %D/etc/nagios 2>/dev/null || true
-@dirrm share/nagios/cgi-bin
-@dirrm share/nagios/contexthelp
-@dirrm share/nagios/docs/images
-@dirrm share/nagios/docs
-@dirrm share/nagios/images/logos
-@dirrm share/nagios/images
-@dirrm share/nagios/media
-@dirrm share/nagios/ssi
-@dirrm share/nagios/stylesheets
-@unexec rmdir %D/share/nagios 2>/dev/null || true
-@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
-@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
-@unexec rmdir /var/spool/nagios 2>/dev/null || true
+@dirrm %%NAGIOSWWWDIR%%/cgi-bin
+@dirrm %%NAGIOSWWWDIR%%/contexthelp
+@dirrm %%NAGIOSWWWDIR%%/docs/images
+@dirrm %%NAGIOSWWWDIR%%/docs
+@dirrm %%NAGIOSWWWDIR%%/images/logos
+@dirrm %%NAGIOSWWWDIR%%/images
+@dirrm %%NAGIOSWWWDIR%%/media
+@dirrm %%NAGIOSWWWDIR%%/ssi
+@dirrm %%NAGIOSWWWDIR%%/stylesheets
+@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true
+@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
+@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
+@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true