- Update to 3.3.1 [1]

- Use USERS/GROUPS [1]
- Fix whitespace in Makefile [1]
- Add LICENSE [1]
- Correct rc script issues [2]

PR:		ports/159304
Submitted by:	Ryan Steinmetz (zi@) [1], Doug Barton (dougb@) [2]
Approved by: 	wxs (mentor), maintainer

10 files changed, 273 insertions, 326 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index d6c92852c016..cc6ca868a413 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jarrod@downtools.com.au
 COMMENT=	Extremely powerful network monitoring system
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 USE_ICONV=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	autoconf libltdl
 USE_RC_SUBR=	nagios
 
@@ -26,7 +28,7 @@ CONFLICTS=	nagios-[12].* nagios-devel-*
 OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \
 		NANOSLEEP "Use nanosleep in event timing" off \
 		EVENT_BROKER "Enable event broker functionality" off \
-		UNHANDLED_HACK "Display passive checks in unhandled queries" off \
+		UNHANDLED_HACK "Display passive checks in unhandled queries" off
 
 GNU_CONFIGURE=	yes
 
@@ -41,6 +43,9 @@ NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
+USERS=		${NAGIOSUSER}
+GROUPS=		${NAGIOSGROUP}
+
 .include <bsd.port.pre.mk>
 
 CPPFLAGS=	-I${LOCALBASE}/include -fPIC
@@ -62,9 +67,7 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
 		--disable-statuswrl
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib" \
 		PERL=${PERL}
 
@@ -82,9 +85,7 @@ PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSCGIURL=${NAGIOSCGIURL} \
 		WWWGRP=${WWWGRP}
 
-SUB_FILES=	pkg-install \
-		pkg-deinstall \
-		pkg-message
+SUB_FILES=	pkg-message
 
 # XXX: Don't remove PREFIX from SUB_LIST here.
 SUB_LIST=	PREFIX=${PREFIX} \
@@ -94,7 +95,7 @@ USE_PHP=	yes
 
 .if defined(WITH_EMBEDDED_PERL)
 USE_PERL5=	5.8.0+
-CONFIGURE_ARGS+=	--enable-embedded-perl \
+CONFIGURE_ARGS+=--enable-embedded-perl \
 		--with-perlcache
 PLIST_SUB+=	EMBEDDED_PERL=""
 .else
@@ -102,24 +103,24 @@ PLIST_SUB+=	EMBEDDED_PERL="@comment "
 .endif
 
 .if defined(WITH_NANOSLEEP)
-CONFIGURE_ARGS+=	--enable-nanosleep
+CONFIGURE_ARGS+=--enable-nanosleep
 .endif
 
 .if defined(WITH_EVENT_BROKER)
-CONFIGURE_ARGS+=	--enable-event-broker
+CONFIGURE_ARGS+=--enable-event-broker
 .else
-CONFIGURE_ARGS+=	--disable-event-broker
+CONFIGURE_ARGS+=--disable-event-broker
 .endif
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 .if defined(WITH_UNHANDLED_HACK)
 	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
 		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
 .endif
 
-pre-su-install:
-	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
-
 post-install:
 	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw
 	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index c128dddc7c6b..ee083cdce1a4 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagios-3.2.3.tar.gz) = 7ec850a4d1d8d8ee36b06419ac912695e29962641c757cf21301b1befcb23434
-SIZE (nagios-3.2.3.tar.gz) = 3249447
+SHA256 (nagios-3.3.1.tar.gz) = c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652
+SIZE (nagios-3.3.1.tar.gz) = 1714630
diff --git a/net-mgmt/nagios/files/nagios.in b/net-mgmt/nagios/files/nagios.in
index 77a906e9e62d..e4d535ad3180 100644
--- a/net-mgmt/nagios/files/nagios.in
+++ b/net-mgmt/nagios/files/nagios.in
@@ -4,8 +4,7 @@
 #
 
 # PROVIDE: nagios
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
@@ -35,12 +34,12 @@ restart_precmd="nagios_checkconfig"
 reload_precmd="reload_precmd"
 sig_reload=HUP
 
+load_rc_config "${name}"
+
 [ -z "${nagios_enable}" ]       && nagios_enable="NO"
 [ -z "${nagios_configfile}" ]   && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg"
 [ -z "${nagios_precache}" ]     && nagios_precache="NO"
 
-load_rc_config "${name}"
-
 required_files="${nagios_configfile}"
 command_args="${command_args} ${nagios_configfile}"
 
diff --git a/net-mgmt/nagios/files/patch-configure.in b/net-mgmt/nagios/files/patch-configure.in
index 0a2b8152cb94..566a3b355de3 100644
--- a/net-mgmt/nagios/files/patch-configure.in
+++ b/net-mgmt/nagios/files/patch-configure.in
@@ -3,7 +3,7 @@
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
+ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
diff --git a/net-mgmt/nagios/files/patch-html-Makefile.in b/net-mgmt/nagios/files/patch-html-Makefile.in
index 12516ac1b168..cef12efbbde1 100644
--- a/net-mgmt/nagios/files/patch-html-Makefile.in
+++ b/net-mgmt/nagios/files/patch-html-Makefile.in
@@ -1,6 +1,6 @@
---- html/Makefile.in.orig	2009-06-17 13:27:21.000000000 +0930
-+++ html/Makefile.in	2009-07-06 19:27:38.000000000 +0930
-@@ -33,46 +33,46 @@
+--- html/Makefile.in.orig	2011-07-25 03:23:52.000000000 +0930
++++ html/Makefile.in	2011-08-20 19:32:21.000000000 +0930
+@@ -33,52 +33,52 @@
  devclean: distclean
  
  install:
@@ -13,9 +13,11 @@
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+-#	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
@@ -25,9 +27,11 @@
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
++	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 +	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
-+	$(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++#	$(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
  # Remove old HTML files (PHP files are used now)
  	rm -f $(DESTDIR)$(HTMLDIR)/index.html
  	rm -f $(DESTDIR)$(HTMLDIR)/main.html
@@ -44,12 +48,12 @@
  	for file in contexthelp/*.html; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
- 	for file in docs/*.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
- 	for file in docs/images/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ #	for file in docs/*.html; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
++#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ #	for file in docs/images/*.*; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
++#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
  	for file in images/*.gif; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
@@ -67,7 +71,14 @@
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
  	for file in includes/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+-	for file in includes/rss/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
 +	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
++	for file in includes/rss/*.*; \
++	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+ 	for file in includes/rss/extlib/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
++	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
  
  install-unstripped:
  	$(MAKE) install
diff --git a/net-mgmt/nagios/files/patch-html-docs-configcgi.html b/net-mgmt/nagios/files/patch-html-docs-configcgi.html
deleted file mode 100644
index 18d710944800..000000000000
--- a/net-mgmt/nagios/files/patch-html-docs-configcgi.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- html/docs/configcgi.html.orig	2009-06-17 17:13:52.000000000 +0200
-+++ html/docs/configcgi.html	2009-11-27 23:16:02.000000000 +0100
-@@ -1250,7 +1250,7 @@
- 
- <td valign=top>Example:</td>
- 
--<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
-+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
- 
- </tr>
- 
diff --git a/net-mgmt/nagios/files/patch-html-main.php b/net-mgmt/nagios/files/patch-html-main.php
new file mode 100644
index 000000000000..2d7ab38e2980
--- /dev/null
+++ b/net-mgmt/nagios/files/patch-html-main.php
@@ -0,0 +1,39 @@
+--- html/main.php.orig	2011-07-26 12:46:26.000000000 +0930
++++ html/main.php	2011-08-20 19:57:13.000000000 +0930
+@@ -36,36 +36,10 @@
+ <div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>

+ <div class="version">Version 3.3.1</div>

+ <div class="releasedate">July 25, 2011</div>

+-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.3.1&product=nagioscore" target="_blank">Check for updates</a></div>

+ <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->

+ </div>

+ 

+ 

+-<div id="updateversioninfo">

+-<?php

+-	$updateinfo=get_update_information();

+-	//print_r($updateinfo);

+-	//$updateinfo['update_checks_enabled']=false;

+-	//$updateinfo['update_available']=true;

+-	if($updateinfo['update_checks_enabled']==false && $this_version!=$updateinfo['update_version']){

+-?>

+-		<div class="updatechecksdisabled">

+-		<div class="warningmessage">Warning: Automatic Update Checks are Disabled!</div>

+-		<div class="submessage">Disabling update checks presents a possible security risk.  Visit <a href="http://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>

+-		</div>

+-<?php

+-		}

+-	else if($updateinfo['update_available']==true){

+-?>

+-		<div class="updateavailable">

+-		<div class="updatemessage">A new version of Nagios Core is available!</div>

+-		<div class="submessage">Visit <a href="http://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>

+-		</div>

+-<?php

+-		}

+-?>

+-</div>

+-

+ <div id="splashboxes">

+ <div id="splashbox1" class="splashbox">

+ <h2>Get Started</h2>

diff --git a/net-mgmt/nagios/files/pkg-deinstall.in b/net-mgmt/nagios/files/pkg-deinstall.in
deleted file mode 100644
index 6b20aa9bc962..000000000000
--- a/net-mgmt/nagios/files/pkg-deinstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-NAGIOSDIR=%%NAGIOSDIR%%
-NAGIOSUSER=%%NAGIOSUSER%%
-NAGIOSGROUP=%%NAGIOSGROUP%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-  if /usr/sbin/pw group show "${NAGIOSGROUP}" 2>&1 >/dev/null; then
-    echo "You should manually remove the \"${NAGIOSGROUP}\" group."
-  fi
-
-  if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then
-    echo "You should manually remove the \"${NAGIOSUSER}\" user."
-  fi
-
-  if [ -e "${NAGIOSDIR}" ]; then
-    echo "You should manually remove the \"${NAGIOSDIR}\" directory."
-  fi
-fi
diff --git a/net-mgmt/nagios/files/pkg-install.in b/net-mgmt/nagios/files/pkg-install.in
deleted file mode 100644
index f670f79b45ff..000000000000
--- a/net-mgmt/nagios/files/pkg-install.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-NAGIOSDIR=%%NAGIOSDIR%%
-NAGIOSUSER=%%NAGIOSUSER%%
-NAGIOSGROUP=%%NAGIOSGROUP%%
-NAGIOSUID=%%NAGIOSUID%%
-NAGIOSGID=%%NAGIOSGID%%
-
-ask() {
-  local question default answer
-
-  question=$1
-  default=$2
-  if [ -z "${PACKAGE_BUILDING}" ]; then
-    read -p "${question} [${default}]? " answer
-  fi
-  if [ "x${answer}" = "x" ]; then
-    answer=${default}
-  fi
-  echo ${answer}
-}
-
-yesno() {
-  local default question answer
-
-  question=$1
-  default=$2
-  while :; do
-    answer=$(ask "${question}" "${default}")
-    case "${answer}" in
-      [Yy][Ee][Ss]|[Yy])
-        return 0
-        ;;
-      [Nn][Oo]|[Nn])
-        return 1
-        ;;
-    esac
-    echo "Please answer yes or no."
-   done
-}
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  if /usr/sbin/pw group show "${NAGIOSGROUP}" 2>&1 >/dev/null; then
-    echo "You already have a \"${NAGIOSGROUP}\" group, so I will use it."
-  else
-    echo "You need a \"${NAGIOSGROUP}\" group."
-    if yesno "Would you like me to create it" "YES"; then
-      /usr/sbin/pw groupadd "${NAGIOSGROUP}" -g "${NAGIOSGID}" -h - || \
-        /usr/sbin/pw groupadd "${NAGIOSGROUP}" -h - || exit
-      echo "Done."
-    else
-      echo "Please create the \"${NAGIOSGROUP}\" group manually and try again."
-      exit 1
-    fi
-  fi
-
-  if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then
-    echo "You already have a \"${NAGIOSUSER}\" user, so I will use it."
-  else
-    echo "You need a \"${NAGIOSUSER}\" user."
-    if yesno "Would you like me to create it" "YES"; then
-      /usr/sbin/pw useradd "${NAGIOSUSER}" -u "${NAGIOSUID}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
-        -s /sbin/nologin -c "Nagios pseudo-user" || \
-        /usr/sbin/pw useradd "${NAGIOSUSER}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
-        -s /sbin/nologin -c "Nagios pseudo-user" || exit
-    else
-      echo "Please create the \"${NAGIOSUSER}\" user manually and try again."
-      exit 1
-    fi
-  fi
-fi
diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist
index a75abf02e065..9ae7e1e03ee7 100644
--- a/net-mgmt/nagios/pkg-plist
+++ b/net-mgmt/nagios/pkg-plist
@@ -97,189 +97,11 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/contexthelp/N5.html
 %%NAGIOSWWWDIR%%/contexthelp/N6.html
 %%NAGIOSWWWDIR%%/contexthelp/N7.html
-%%NAGIOSWWWDIR%%/docs/about.html
-%%NAGIOSWWWDIR%%/docs/activechecks.html
-%%NAGIOSWWWDIR%%/docs/adaptive.html
-%%NAGIOSWWWDIR%%/docs/addons.html
-%%NAGIOSWWWDIR%%/docs/beginners.html
-%%NAGIOSWWWDIR%%/docs/cachedchecks.html
-%%NAGIOSWWWDIR%%/docs/cgiauth.html
-%%NAGIOSWWWDIR%%/docs/cgiincludes.html
-%%NAGIOSWWWDIR%%/docs/cgis.html
-%%NAGIOSWWWDIR%%/docs/cgisecurity.html
-%%NAGIOSWWWDIR%%/docs/checkscheduling.html
-%%NAGIOSWWWDIR%%/docs/clusters.html
-%%NAGIOSWWWDIR%%/docs/config.html
-%%NAGIOSWWWDIR%%/docs/configcgi.html
-%%NAGIOSWWWDIR%%/docs/configmain.html
-%%NAGIOSWWWDIR%%/docs/configobject.html
-%%NAGIOSWWWDIR%%/docs/customobjectvars.html
-%%NAGIOSWWWDIR%%/docs/dependencies.html
-%%NAGIOSWWWDIR%%/docs/dependencychecks.html
-%%NAGIOSWWWDIR%%/docs/distributed.html
-%%NAGIOSWWWDIR%%/docs/downtime.html
-%%NAGIOSWWWDIR%%/docs/embeddedperl.html
-%%NAGIOSWWWDIR%%/docs/epnplugins.html
-%%NAGIOSWWWDIR%%/docs/escalations.html
-%%NAGIOSWWWDIR%%/docs/eventhandlers.html
-%%NAGIOSWWWDIR%%/docs/extcommands.html
-%%NAGIOSWWWDIR%%/docs/faststartup.html
-%%NAGIOSWWWDIR%%/docs/flapping.html
-%%NAGIOSWWWDIR%%/docs/freshness.html
-%%NAGIOSWWWDIR%%/docs/funstuff.html
-%%NAGIOSWWWDIR%%/docs/hostchecks.html
-%%NAGIOSWWWDIR%%/docs/knownissues.html
-%%NAGIOSWWWDIR%%/docs/images/activechecks.png
-%%NAGIOSWWWDIR%%/docs/images/cachedcheckgraphs.png
-%%NAGIOSWWWDIR%%/docs/images/cachedchecks.png
-%%NAGIOSWWWDIR%%/docs/images/cachedchecks1.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/checkmark.png
-%%NAGIOSWWWDIR%%/docs/images/checktiming.png
-%%NAGIOSWWWDIR%%/docs/images/configoverview.png
-%%NAGIOSWWWDIR%%/docs/images/distributed.png
-%%NAGIOSWWWDIR%%/docs/images/downtime.png
-%%NAGIOSWWWDIR%%/docs/images/epn.png
-%%NAGIOSWWWDIR%%/docs/images/eventhandlers.png
-%%NAGIOSWWWDIR%%/docs/images/externalcommands.png
-%%NAGIOSWWWDIR%%/docs/images/fast-startup.png
-%%NAGIOSWWWDIR%%/docs/images/fast-startup1.png
-%%NAGIOSWWWDIR%%/docs/images/fast-startup2.png
-%%NAGIOSWWWDIR%%/docs/images/freshness.png
-%%NAGIOSWWWDIR%%/docs/images/host-dependencies.png
-%%NAGIOSWWWDIR%%/docs/images/important.gif
-%%NAGIOSWWWDIR%%/docs/images/integrationoverview.png
-%%NAGIOSWWWDIR%%/docs/images/interleaved1.png
-%%NAGIOSWWWDIR%%/docs/images/interleaved2.png
-%%NAGIOSWWWDIR%%/docs/images/interleaved3.png
-%%NAGIOSWWWDIR%%/docs/images/logofullsize.png
-%%NAGIOSWWWDIR%%/docs/images/monitoring-printers.png
-%%NAGIOSWWWDIR%%/docs/images/monitoring-routers.png
-%%NAGIOSWWWDIR%%/docs/images/monitoring-windows.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-activehostchecks.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-activelychecked.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-activeservicechecks.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-cachedchecks.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-commandbuffers.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-externalcommands.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-hostperfstats.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-hoststatechange.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-passivechecks.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-passivelychecked.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-serviceperfstats.png
-%%NAGIOSWWWDIR%%/docs/images/mrtg-servicestatechange.png
-%%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png
-%%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png
-%%NAGIOSWWWDIR%%/docs/images/nagios.jpg
-%%NAGIOSWWWDIR%%/docs/images/nagiosexchange.png
-%%NAGIOSWWWDIR%%/docs/images/nagiossupport.png
-%%NAGIOSWWWDIR%%/docs/images/ndoutils.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/note.gif
-%%NAGIOSWWWDIR%%/docs/images/nrpe.png
-%%NAGIOSWWWDIR%%/docs/images/nsca.png
-%%NAGIOSWWWDIR%%/docs/images/nscpp.png
-%%NAGIOSWWWDIR%%/docs/images/objects-commands.png
-%%NAGIOSWWWDIR%%/docs/images/objects-contacts.png
-%%NAGIOSWWWDIR%%/docs/images/objects-hosts.png
-%%NAGIOSWWWDIR%%/docs/images/objects-services.png
-%%NAGIOSWWWDIR%%/docs/images/objects-timeperiods.png
-%%NAGIOSWWWDIR%%/docs/images/passivechecks.png
-%%NAGIOSWWWDIR%%/docs/images/passivehosttranslation.png
-%%NAGIOSWWWDIR%%/docs/images/plugins.png
-%%NAGIOSWWWDIR%%/docs/images/predictive-dependency-checks.png
-%%NAGIOSWWWDIR%%/docs/images/printer.png
-%%NAGIOSWWWDIR%%/docs/images/reachability1.png
-%%NAGIOSWWWDIR%%/docs/images/reachability2.png
-%%NAGIOSWWWDIR%%/docs/images/reachability3.png
-%%NAGIOSWWWDIR%%/docs/images/reachability4.png
-%%NAGIOSWWWDIR%%/docs/images/redudancy.png
-%%NAGIOSWWWDIR%%/docs/images/redundancy.png
-%%NAGIOSWWWDIR%%/docs/images/security.png
-%%NAGIOSWWWDIR%%/docs/images/security1.png
-%%NAGIOSWWWDIR%%/docs/images/security2.png
-%%NAGIOSWWWDIR%%/docs/images/security3.png
-%%NAGIOSWWWDIR%%/docs/images/seealso.gif
-%%NAGIOSWWWDIR%%/docs/images/service-dependencies.png
-%%NAGIOSWWWDIR%%/docs/images/statetransitions.png
-%%NAGIOSWWWDIR%%/docs/images/statetransitions2.png
-%%NAGIOSWWWDIR%%/docs/images/stoprestart.png
-%%NAGIOSWWWDIR%%/docs/images/switch.png
-%%NAGIOSWWWDIR%%/docs/images/tcpwrappers.png
-%%NAGIOSWWWDIR%%/docs/images/tip.gif
-%%NAGIOSWWWDIR%%/docs/images/tuning.png
-%%NAGIOSWWWDIR%%/docs/images/upto.gif
-%%NAGIOSWWWDIR%%/docs/index.html
-%%NAGIOSWWWDIR%%/docs/int-snmptrap.html
-%%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html
-%%NAGIOSWWWDIR%%/docs/integration.html
-%%NAGIOSWWWDIR%%/docs/largeinstalltweaks.html
-%%NAGIOSWWWDIR%%/docs/macrolist.html
-%%NAGIOSWWWDIR%%/docs/macros.html
-%%NAGIOSWWWDIR%%/docs/monitoring-linux.html
-%%NAGIOSWWWDIR%%/docs/monitoring-netware.html
-%%NAGIOSWWWDIR%%/docs/monitoring-printers.html
-%%NAGIOSWWWDIR%%/docs/monitoring-publicservices.html
-%%NAGIOSWWWDIR%%/docs/monitoring-routers.html
-%%NAGIOSWWWDIR%%/docs/monitoring-windows.html
-%%NAGIOSWWWDIR%%/docs/mrtggraphs.html
-%%NAGIOSWWWDIR%%/docs/nagiostats.html
-%%NAGIOSWWWDIR%%/docs/networkreachability.html
-%%NAGIOSWWWDIR%%/docs/notifications.html
-%%NAGIOSWWWDIR%%/docs/objectdefinitions.html
-%%NAGIOSWWWDIR%%/docs/objectinheritance.html
-%%NAGIOSWWWDIR%%/docs/objecttricks.html
-%%NAGIOSWWWDIR%%/docs/oncallrotation.html
-%%NAGIOSWWWDIR%%/docs/passivechecks.html
-%%NAGIOSWWWDIR%%/docs/passivestatetranslation.html
-%%NAGIOSWWWDIR%%/docs/perfdata.html
-%%NAGIOSWWWDIR%%/docs/pluginapi.html
-%%NAGIOSWWWDIR%%/docs/plugins.html
-%%NAGIOSWWWDIR%%/docs/quickstart-fedora.html
-%%NAGIOSWWWDIR%%/docs/quickstart-opensuse.html
-%%NAGIOSWWWDIR%%/docs/quickstart-ubuntu.html
-%%NAGIOSWWWDIR%%/docs/quickstart.html
-%%NAGIOSWWWDIR%%/docs/redundancy.html
-%%NAGIOSWWWDIR%%/docs/robots.txt
-%%NAGIOSWWWDIR%%/docs/security.html
-%%NAGIOSWWWDIR%%/docs/servicechecks.html
-%%NAGIOSWWWDIR%%/docs/stalking.html
-%%NAGIOSWWWDIR%%/docs/startstop.html
-%%NAGIOSWWWDIR%%/docs/statetypes.html
-%%NAGIOSWWWDIR%%/docs/timeperiods.html
-%%NAGIOSWWWDIR%%/docs/toc.html
-%%NAGIOSWWWDIR%%/docs/tuning.html
-%%NAGIOSWWWDIR%%/docs/upgrading.html
-%%NAGIOSWWWDIR%%/docs/verifyconfig.html
-%%NAGIOSWWWDIR%%/docs/volatileservices.html
-%%NAGIOSWWWDIR%%/docs/whatsnew.html
 %%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
 %%NAGIOSWWWDIR%%/images/ack.gif
+%%NAGIOSWWWDIR%%/images/action-graph.gif
+%%NAGIOSWWWDIR%%/images/action-nagios.gif
+%%NAGIOSWWWDIR%%/images/action-orig.gif
 %%NAGIOSWWWDIR%%/images/action.gif
 %%NAGIOSWWWDIR%%/images/command.png
 %%NAGIOSWWWDIR%%/images/comment.gif
@@ -298,6 +120,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/favicon.ico
 %%NAGIOSWWWDIR%%/images/flapping.gif
 %%NAGIOSWWWDIR%%/images/globe-support-150x150.png
+%%NAGIOSWWWDIR%%/images/graph.gif
 %%NAGIOSWWWDIR%%/images/greendot.gif
 %%NAGIOSWWWDIR%%/images/histogram.png
 %%NAGIOSWWWDIR%%/images/history.gif
@@ -305,11 +128,183 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/info.png
 %%NAGIOSWWWDIR%%/images/left.gif
 %%NAGIOSWWWDIR%%/images/logofullsize.png
+%%NAGIOSWWWDIR%%/images/logos/aix.gd2
+%%NAGIOSWWWDIR%%/images/logos/aix.gif
+%%NAGIOSWWWDIR%%/images/logos/aix.jpg
+%%NAGIOSWWWDIR%%/images/logos/aix.png
+%%NAGIOSWWWDIR%%/images/logos/amiga.gd2
+%%NAGIOSWWWDIR%%/images/logos/amiga.gif
+%%NAGIOSWWWDIR%%/images/logos/amiga.jpg
+%%NAGIOSWWWDIR%%/images/logos/amiga.png
+%%NAGIOSWWWDIR%%/images/logos/apple.gd2
+%%NAGIOSWWWDIR%%/images/logos/apple.gif
+%%NAGIOSWWWDIR%%/images/logos/apple.jpg
+%%NAGIOSWWWDIR%%/images/logos/apple.png
+%%NAGIOSWWWDIR%%/images/logos/beos.gd2
+%%NAGIOSWWWDIR%%/images/logos/beos.gif
+%%NAGIOSWWWDIR%%/images/logos/beos.jpg
+%%NAGIOSWWWDIR%%/images/logos/beos.png
+%%NAGIOSWWWDIR%%/images/logos/bluetooth.png
+%%NAGIOSWWWDIR%%/images/logos/caldera.gd2
+%%NAGIOSWWWDIR%%/images/logos/caldera.gif
+%%NAGIOSWWWDIR%%/images/logos/caldera.jpg
+%%NAGIOSWWWDIR%%/images/logos/caldera.png
+%%NAGIOSWWWDIR%%/images/logos/cat1900.gd2
+%%NAGIOSWWWDIR%%/images/logos/cat2900.gd2
+%%NAGIOSWWWDIR%%/images/logos/cat5000.gd2
+%%NAGIOSWWWDIR%%/images/logos/database.gd2
+%%NAGIOSWWWDIR%%/images/logos/database.gif
+%%NAGIOSWWWDIR%%/images/logos/debian.gd2
+%%NAGIOSWWWDIR%%/images/logos/debian.gif
+%%NAGIOSWWWDIR%%/images/logos/debian.jpg
+%%NAGIOSWWWDIR%%/images/logos/debian.png
+%%NAGIOSWWWDIR%%/images/logos/desktop-server.gd2
+%%NAGIOSWWWDIR%%/images/logos/desktop-server.gif
+%%NAGIOSWWWDIR%%/images/logos/ethernet_card.png
+%%NAGIOSWWWDIR%%/images/logos/fax.gd2
+%%NAGIOSWWWDIR%%/images/logos/fax.gif
+%%NAGIOSWWWDIR%%/images/logos/firewall.gd2
+%%NAGIOSWWWDIR%%/images/logos/firewall.gif
+%%NAGIOSWWWDIR%%/images/logos/freebsd40.gd2
+%%NAGIOSWWWDIR%%/images/logos/freebsd40.gif
+%%NAGIOSWWWDIR%%/images/logos/freebsd40.jpg
+%%NAGIOSWWWDIR%%/images/logos/freebsd40.png
+%%NAGIOSWWWDIR%%/images/logos/globe.png
+%%NAGIOSWWWDIR%%/images/logos/graph.gif
+%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gd2
+%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gif
+%%NAGIOSWWWDIR%%/images/logos/hp-printer40.jpg
+%%NAGIOSWWWDIR%%/images/logos/hp-printer40.png
+%%NAGIOSWWWDIR%%/images/logos/hpux.gd2
+%%NAGIOSWWWDIR%%/images/logos/hpux.gif
+%%NAGIOSWWWDIR%%/images/logos/hpux.jpg
+%%NAGIOSWWWDIR%%/images/logos/hpux.png
+%%NAGIOSWWWDIR%%/images/logos/hub.gd2
+%%NAGIOSWWWDIR%%/images/logos/hub.gif
+%%NAGIOSWWWDIR%%/images/logos/internet.gd2
+%%NAGIOSWWWDIR%%/images/logos/internet.gif
+%%NAGIOSWWWDIR%%/images/logos/internet_device.png
+%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gd2
+%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gif
+%%NAGIOSWWWDIR%%/images/logos/irix.gd2
+%%NAGIOSWWWDIR%%/images/logos/irix.gif
+%%NAGIOSWWWDIR%%/images/logos/irix.jpg
+%%NAGIOSWWWDIR%%/images/logos/irix.png
+%%NAGIOSWWWDIR%%/images/logos/linux40.gd2
+%%NAGIOSWWWDIR%%/images/logos/linux40.gif
+%%NAGIOSWWWDIR%%/images/logos/linux40.jpg
+%%NAGIOSWWWDIR%%/images/logos/linux40.png
+%%NAGIOSWWWDIR%%/images/logos/logo.gd2
+%%NAGIOSWWWDIR%%/images/logos/mac40.gd2
+%%NAGIOSWWWDIR%%/images/logos/mac40.gif
+%%NAGIOSWWWDIR%%/images/logos/mac40.jpg
+%%NAGIOSWWWDIR%%/images/logos/mac40.png
+%%NAGIOSWWWDIR%%/images/logos/mainframe.gd2
+%%NAGIOSWWWDIR%%/images/logos/mainframe.gif
+%%NAGIOSWWWDIR%%/images/logos/mandrake.gd2
+%%NAGIOSWWWDIR%%/images/logos/mandrake.gif
+%%NAGIOSWWWDIR%%/images/logos/mandrake.jpg
+%%NAGIOSWWWDIR%%/images/logos/mandrake.png
+%%NAGIOSWWWDIR%%/images/logos/monitor.png
 %%NAGIOSWWWDIR%%/images/logos/nagios.gd2
 %%NAGIOSWWWDIR%%/images/logos/nagios.gif
 %%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png
+%%NAGIOSWWWDIR%%/images/logos/next.gd2
+%%NAGIOSWWWDIR%%/images/logos/next.gif
+%%NAGIOSWWWDIR%%/images/logos/next.jpg
+%%NAGIOSWWWDIR%%/images/logos/next.png
+%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gd2
+%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gif
+%%NAGIOSWWWDIR%%/images/logos/ng-switch40.jpg
+%%NAGIOSWWWDIR%%/images/logos/ng-switch40.png
+%%NAGIOSWWWDIR%%/images/logos/notebook.gd2
+%%NAGIOSWWWDIR%%/images/logos/notebook.gif
+%%NAGIOSWWWDIR%%/images/logos/novell40.gd2
+%%NAGIOSWWWDIR%%/images/logos/novell40.gif
+%%NAGIOSWWWDIR%%/images/logos/novell40.jpg
+%%NAGIOSWWWDIR%%/images/logos/novell40.png
+%%NAGIOSWWWDIR%%/images/logos/openbsd.gd2
+%%NAGIOSWWWDIR%%/images/logos/openbsd.gif
+%%NAGIOSWWWDIR%%/images/logos/openbsd.jpg
+%%NAGIOSWWWDIR%%/images/logos/openbsd.png
+%%NAGIOSWWWDIR%%/images/logos/printer.gd2
+%%NAGIOSWWWDIR%%/images/logos/printer.gif
+%%NAGIOSWWWDIR%%/images/logos/rack-server.gd2
+%%NAGIOSWWWDIR%%/images/logos/rack-server.gif
+%%NAGIOSWWWDIR%%/images/logos/redhat.gd2
+%%NAGIOSWWWDIR%%/images/logos/redhat.gif
+%%NAGIOSWWWDIR%%/images/logos/redhat.jpg
+%%NAGIOSWWWDIR%%/images/logos/redhat.png
+%%NAGIOSWWWDIR%%/images/logos/router.gd2
+%%NAGIOSWWWDIR%%/images/logos/router.gif
+%%NAGIOSWWWDIR%%/images/logos/router40.gd2
+%%NAGIOSWWWDIR%%/images/logos/router40.gif
+%%NAGIOSWWWDIR%%/images/logos/router40.jpg
+%%NAGIOSWWWDIR%%/images/logos/router40.png
+%%NAGIOSWWWDIR%%/images/logos/san.gd2
+%%NAGIOSWWWDIR%%/images/logos/san.gif
+%%NAGIOSWWWDIR%%/images/logos/satellite.png
+%%NAGIOSWWWDIR%%/images/logos/server.png
+%%NAGIOSWWWDIR%%/images/logos/signal.png
+%%NAGIOSWWWDIR%%/images/logos/slackware.gd2
+%%NAGIOSWWWDIR%%/images/logos/slackware.gif
+%%NAGIOSWWWDIR%%/images/logos/slackware.jpg
+%%NAGIOSWWWDIR%%/images/logos/slackware.png
+%%NAGIOSWWWDIR%%/images/logos/stampede.gd2
+%%NAGIOSWWWDIR%%/images/logos/stampede.gif
+%%NAGIOSWWWDIR%%/images/logos/stampede.jpg
+%%NAGIOSWWWDIR%%/images/logos/stampede.png
+%%NAGIOSWWWDIR%%/images/logos/station.gd2
+%%NAGIOSWWWDIR%%/images/logos/storm.gd2
+%%NAGIOSWWWDIR%%/images/logos/storm.gif
+%%NAGIOSWWWDIR%%/images/logos/storm.jpg
+%%NAGIOSWWWDIR%%/images/logos/storm.png
+%%NAGIOSWWWDIR%%/images/logos/sun40.gd2
+%%NAGIOSWWWDIR%%/images/logos/sun40.gif
+%%NAGIOSWWWDIR%%/images/logos/sun40.jpg
+%%NAGIOSWWWDIR%%/images/logos/sun40.png
+%%NAGIOSWWWDIR%%/images/logos/sunlogo.gd2
+%%NAGIOSWWWDIR%%/images/logos/sunlogo.gif
+%%NAGIOSWWWDIR%%/images/logos/sunlogo.jpg
+%%NAGIOSWWWDIR%%/images/logos/sunlogo.png
+%%NAGIOSWWWDIR%%/images/logos/switch.gd2
+%%NAGIOSWWWDIR%%/images/logos/switch.gif
+%%NAGIOSWWWDIR%%/images/logos/switch40.gd2
+%%NAGIOSWWWDIR%%/images/logos/switch40.gif
+%%NAGIOSWWWDIR%%/images/logos/switch40.jpg
+%%NAGIOSWWWDIR%%/images/logos/switch40.png
+%%NAGIOSWWWDIR%%/images/logos/thin-client.gd2
+%%NAGIOSWWWDIR%%/images/logos/thin-client.gif
+%%NAGIOSWWWDIR%%/images/logos/turbolinux.gd2
+%%NAGIOSWWWDIR%%/images/logos/turbolinux.gif
+%%NAGIOSWWWDIR%%/images/logos/turbolinux.jpg
+%%NAGIOSWWWDIR%%/images/logos/turbolinux.png
+%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gd2
+%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gif
+%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.jpg
+%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.png
+%%NAGIOSWWWDIR%%/images/logos/unicos.gd2
+%%NAGIOSWWWDIR%%/images/logos/unicos.gif
+%%NAGIOSWWWDIR%%/images/logos/unicos.jpg
+%%NAGIOSWWWDIR%%/images/logos/unicos.png
 %%NAGIOSWWWDIR%%/images/logos/unknown.gd2
 %%NAGIOSWWWDIR%%/images/logos/unknown.gif
+%%NAGIOSWWWDIR%%/images/logos/webcamera.png
+%%NAGIOSWWWDIR%%/images/logos/wifi.gd2
+%%NAGIOSWWWDIR%%/images/logos/wifi.gif
+%%NAGIOSWWWDIR%%/images/logos/wifi_modem.png
+%%NAGIOSWWWDIR%%/images/logos/win40.gd2
+%%NAGIOSWWWDIR%%/images/logos/win40.gif
+%%NAGIOSWWWDIR%%/images/logos/win40.jpg
+%%NAGIOSWWWDIR%%/images/logos/win40.png
+%%NAGIOSWWWDIR%%/images/logos/workstation.gd2
+%%NAGIOSWWWDIR%%/images/logos/workstation.gif
+%%NAGIOSWWWDIR%%/images/logos/workstation.png
+%%NAGIOSWWWDIR%%/images/logos/workstation_locked.png
+%%NAGIOSWWWDIR%%/images/logos/yellowdog.gd2
+%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif
+%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg
+%%NAGIOSWWWDIR%%/images/logos/yellowdog.png
 %%NAGIOSWWWDIR%%/images/logrotate.png
 %%NAGIOSWWWDIR%%/images/ndisabled.gif
 %%NAGIOSWWWDIR%%/images/noack.gif
@@ -349,6 +344,11 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/images/weblogo1.png
 %%NAGIOSWWWDIR%%/images/zoom1.gif
 %%NAGIOSWWWDIR%%/images/zoom2.gif
+%%NAGIOSWWWDIR%%/includes/rss/extlib/Snoopy.class.inc
+%%NAGIOSWWWDIR%%/includes/rss/rss_cache.inc
+%%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc
+%%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc
+%%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc
 %%NAGIOSWWWDIR%%/includes/utils.inc.php
 %%NAGIOSWWWDIR%%/index.php
 %%NAGIOSWWWDIR%%/main.php
@@ -379,12 +379,16 @@ etc/nagios/resource.cfg-sample
 @dirrm %%NAGIOSWWWDIR%%/docs
 @dirrm %%NAGIOSWWWDIR%%/images/logos
 @dirrm %%NAGIOSWWWDIR%%/images
+@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
+@dirrm %%NAGIOSWWWDIR%%/includes/rss
 @dirrm %%NAGIOSWWWDIR%%/includes
 @dirrm %%NAGIOSWWWDIR%%/media
 @dirrm %%NAGIOSWWWDIR%%/ssi
 @dirrm %%NAGIOSWWWDIR%%/stylesheets
 @dirrmtry %%NAGIOSWWWDIR%%
-@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
-@unexec rmdir %%NAGIOSDIR%%/checkresults 2>/dev/null || true
-@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
-@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOSDIR%%/archives
+@dirrmtry %%NAGIOSDIR%%/checkresults
+@dirrmtry %%NAGIOSDIR%%/rw
+@dirrmtry %%NAGIOSDIR%%
+@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi
+@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi