1 files changed, 189 insertions, 185 deletions

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