Update nagios-base to 3.0.3. Changes since 2.12:

 - Check timeperiod can now be modified on-the-fly.
 - Added first_notification_delay to host and object definitions
   to delay first notification.
 - Notifications are now sent out when flap detection is disabled
   on a host/service-specific or program-wide basis
   ($NOTIFICATIONTYPE$ macro = "FLAPPINGDISABLED").
 - Notifications can now be sent out when scheduled downtime starts,
   ends, and is cancelled.  The $NOTIFICATIONTYPE$ macro will be set
   to "DOWNTIMESTART", "DOWNTIMEEND", or "DOWNTIMECANCELLED",
   respectively.  In order to receive downtime notifications,
   specify 's' or 'downtime' in contact, host, and/or service
   notification options.
 - Added ability to use multiple template names (separated by commas)
   in object definitions.
 - Added ability to null out optional character directives in object
   definitions (using 'null' without quotes).
 - Added hostg/service/contactgroup_members directives to
   host/service/contactgroup definitions, respectively, for allowing
   including host, service, or contact members from "sub" groups.
 - Added support for custom variables in host, service, and contact
   definitions.
 - Added host_notifications_enabled, service_notifications_enabled,
   can_submit_commands to contact definitions.
 - Added optional display_name directive to host and service definitions.
 - Removed serviceextinfo definitions and merged variables with
   service definitions.
 - Removed hostextinfo definitions and merged variables with host
   definitions.
 - Services inherit contactgroups, notification interval, and
   notification period from associated host if not specified.
 - Service escalations inherit contactgroups, notification interval,
   and escalation period from associated service if not specified.
 - Host escalations inherit contactgroups, notification interval,
   and escalation period from associated host if not specified.
 - Host, service, host escalation, and service escalation
   definitions now support a 'contacts' directive, along with
   'contact_groups'.
 - Service dependencies with blank dependent host/hostgroup names
   will create "same host" dependencies.
 - Added ability to precache object config files.
 - Added ability to exclude object relationship and circular
   path checks from verification process.
 - Multiline output support for host and service checks.
 - Added $LONGHOSTOUTPUT$ and $LONGSERVICEOUTPUT$ macros.
 - Added $TEMPPATH$ macro.
 - Removed $COMMENTDATAFILE$ and $DOWNTIMEDATAFILE$ macros.
 - Added $HOSTDISPLAYNAME$ and $SERVICEDISPLAYNAME$ macros.
 - Custom host/service/contact macros accessible via $_HOST<varname>$,
   $_SERVICE<varname>$, or $_CONTACT<varname>$. On-demand host/service
   macros for custom vars are working.  Custom vars are also set as
   environment vars.
 - On-demand service macros can contain and empty host name field.
   In this case, the name of the current host will be used.
 - $HOSTNOTES$ and $SERVICENOTES$ macros may now contain macros
   themselves.
 - Added flap_detection_options directive to host and service
   definitions to control which states (i.e. OK, WARNING, UNKNOWN,
   and/or CRITICAL) are used in flap detection logic.
 - Percent state change and state history are now retained and
   recorded even when host/service flap detection is disabled.
 - Hosts and services are immediately check for flapping when flap
   detection is enabled program-wide.
 - Hosts/services that are flapping when flap detection is disabled
   program-wide are now logged.
 - Added PROCESS_FILE external command to allow processing of
   external commands found in an external (regular) file.  Very
   useful for passive checks with long out put or scripting.
 - Custom commands can now be submitted to Nagios.  Custom command
   names are prefixed with an underscore and are not processed
   internally by the Nagios daemon.  They may, however, be processed
   by NEB modules.
 - External commands are now checked by default.  Nagios 2.x and
   earlier did not check for external commands by default.
 - Contact status information is now saved (although it is not
   processed by the old CGIs).
 - Contact status information is now retained across program
   restarts.
 - Comment and downtime IDs are now stored across program restarts,
   should be unique unless reset.
 - Added retained_host/service_attribute_mask variables to control
   what host/service attribs are retained globally.
 - Added retained_process_host/service_attribute_mask variables to
   control what process attribs are retained.
 - Added retained_contact_host/service_attribute_mask variables to
   control what contact attribs are retained globally.
 - Scheduled downtime entries are now stored in the status and
   retention files.
 - Comments are now stored in the status and retention files.
 - Non-persistent acknowledgement comments are now deleted when the
   acknowledgement is removed (instead of when Nagios restarts).
 - Most host checks are now run asynchronously, in parallel!
 - Scheduled host checks now help improve performance, instead of
   hinder it (if caching is enabled).
 - Added cached_host_check_horizon option for enabling use of
   cached host check results.
 - Added enable_predictive_host_dependency_checks for enabling
   predictive checks of dependent hosts.
 - Added retry_interval to host definitions.
 - Added check_for_orphaned_hosts option and support for orphaned
   host checks.
 - Passive host check states can now be translated from their
   original DOWN/UNREACHABLE state if the new
   translate_passive_host_results option is enabled.
 - 'parallelize' option in service definitions deprecated/no longer
   used.
 - Added cached_service_check_horizon option for enabling use of
   cached service check results.
 - Added enable_predictive_service_dependency_checks for enabling
   predictive checks of dependent services.
 - Host and service dependencies can now have a timeperiod during
   which they're valid (dependency_period directive).
 - Updated NEB API version.
 - Modified adaptive program status callback.
 - Added adaptive contact status callback.
 - Added host/service precheck callbacks to allow modules to
   cancel/override internal host/service checks.
 - Added 'enable_embedded_perl' option to main config file to control
   whether epn is enabled/disabled.
 - Added support for perl plugins to specify whether or not they
   should be run under the epn...  The second to tenth line of a perl
   plugin may start with '# nagios: +epn' or '# nagios: -epn' to
   explicity indicate that it should be run under the epn.
 - Added 'use_embedded_perl_implicitly' option to main config file
   to determine whether or not perl plugins will use the epn if they
   don't explicitly allow/disalow it.
 - Hostgroup and servicegroup summaries now show important/unimportant
   problem breakdowns like the TAC CGI.
 - Minor layout changes to host and service detail views in extinfo CGI.
 - More information given when testing scheduling (-s command line
   option).
 - Removed fixed length restrictions for host names and service
   descriptions.
 - Plugin output length restriction bumped up to 4K.
 - Added temp_path directive to main config file for specifying temp
   directory.
 - Multiline output support for system commands via my_system().
 - Added global event_id and notification_id vars that are at least
   unique during a single run of Nagios.
 - Default is now to check for orphaned services, rather than not.
 - Renamed service_reaper_frequency to check_result_reaper_frequency.
 - Fractional notification and check intervals are now supported
   (e.g. "3.5" minutes).
 - Backslash chars are now used to escape command arguments that
   contain \ or ! characters.
 - Added 'external_command_buffer_slots' and
   'check_result_buffer_slots' variables to specify size of internal
   buffers.
 - Added check statistics to status file, available via nagiostats
   for graphing in MRTG.
 - Added $HOSTGROUPNAMES$, $SERVICEGROUPNAMES$, $HOSTACKAUTHORNAME$,
   $HOSTACKAUTHORALIAS$, $SERVICEACKAUTHORNAME$, and
   $SERVICEACKAUTHORALIAS$ macros.
 - Added warning for invalid temp_path directory.
 - Added support for extended regular expression matching in
   object config files.
 - Added new "p" option to host/service_perfdata_file_mode
   directives for pipes.
 - Command definitions and host/service plugin perfdata with HTML
   should now be escaped in CGIs.
 - Hostgroup and servicegroup definitions now have notes, notes_url,
   and action_url directives.
 - Added buffer stats and check statistics to performance
   information in extinfo CGI.
 - Removed legacy 2.x host check logic and use_old_host_check_logic
   option.
 - Added max_check_result_file_age option to control processing of
   check results in older files.
 - Added check_result_path option to set path used to store
   check results.
 - New IPC method for passing host/service check results back to
   main daemon.
 - Removed check_result_buffer_slots option from main
   configuration file.
 - Added test for writeability of temp directory during configuration
   test.
 - Minor changes to freshness threshold calculation.
 - Added 'initial_state' option to host and service definitions
   to allow for non-UP/OK initial states.
 - Changed debug file format to include current pid.
 - Changes to sample config files and installation location.
 - Expanded timeperiod definitions to allow for day/date exceptions.
 - Added new 'passive_host_checks_are_soft' config option.
 - Added new 'exclude' option to timeperiod definitions for
   easy on-call rotation definitions.
 - Added new action and notes URL target frame options to CGI
   config file.
 - Added optional integration with Splunk into the CGIs.
 - Added escape_html_tags option to CGI config file to escape HTML
   tags in plugin output.
 - Program status now updated at least every 5 seconds for addons
   that watch NDOUtils DB.
 - Added $MAXHOSTATTEMPTS$ and $MAXSERVICEATTEMPTS$ macros.
 - Added status CGI host/service property filters for hard and
   soft states.
 - New macros: $SERVICEISVOLATILE$, $TOTALHOSTSERVICES$,
   $TOTALHOSTSERVICESOK$, $TOTALHOSTSERVICESWARNING$,
   $TOTALHOSTSERVICESUNKNOWN$, $TOTALHOSTSERVICESCRITICAL$,
   $HOSTDOWNTIMEAUTHOR$, $HOSTDOWNTIMEAUTHORNAME$,
   $HOSTDOWNTIMEAUTHORALIAS$, $HOSTDOWNTIMECOMMENT$,
   $SERVICEDOWNTIMEAUTHOR$, $SERVICEDOWNTIMEAUTHORNAME$,
   $SERVICEDOWNTIMEAUTHORALIAS$, $SERVICEDOWNTIMECOMMENT$.
 - Improvements to the host check logic performance (more use of
   cached and parallel checks).
 - Version number is now printed in CGI pages.
 - Added custom delimiter option in nagiostats output (useful for
   CSV output).
 - Alias, if not specified, now defaults to object name in host,
   hostgroup, servicegroup, contact, and contactgroup definitions.
 - Added custom host and service notifications, with option to force
   the notifications and broadcast them to all contacts.
 - Added new 'check' option to init script to verify configuration.
 - More complete (but still partial) support for macros in CGIs
   ($xNOTES$, $xNOTESURL$, and $xACTIONURL$ macros).
 - Added on-demand contact and contactgroup macro support.
 - New macros: $HOSTGROUPMEMBERS$, $HOSTGROUPNOTES$, $HOSTGROUPNOTESURL$,
   $HOSTGROUPACTIONURL$, $SERVICEGROUPMEMBERS$, $SERVICEGROUPNOTES$,
   $SERVICEGROUPNOTESURL$, $SERVICEGROUPACTIONURL$, $CONTACTGROUPALIAS$,
   $CONTACTGROUPMEMBERS$, $NOTIFICATIONRECIPIENTS$, $NOTIFICATIONAUTHOR$,
   $NOTIFICATIONAUTHORNAME$, $NOTIFICATIONAUTHORALIAS$,
   $NOTIFICATIONCOMMENT$.
 - Added support for relative paths in config_file and config_dir directives.
 - Added passive check latency stats to nagiostats.
 - Workaround to prevent browsers from incorrectly using cached
   statusmap image on page refresh.
 - Added use_pending_states option to CGI config file to determine
   displayed state of hosts/services that have not been checked.
 - Added $EVENTSTARTTIME$ macro to indicate time Nagios started
   processing events (checks, etc.).
 - Improvements in freshness check logic.
 - Added additional_freshness_latency config file directive.
 - Improvement in service flap detection logic.
 - Status file is no longer deleted during restarts due to a SIGHUP
   or external command.
 - Special additive inheritance rule: escalation contact(group)(s)
   that begin with '+' will  now inherit from associated host/service
   definition if not inheriting from another escalation template.
 - Addition of object pointers to event broker module data structures
   (may require event broker module rebuilds).
 - Added $LASTHOSTSTATE$, $LASTHOSTSTATEID$, $LASTSERVICESTATE$, and
   $LASTSERVICESTATEID$ macros.
 - Better error logging when failing to rename/move files.
 - Summary macros are now available as regular (non-environment) macros
   if requested when large installation tweaks are enabled.
 - Major overhaul (read: complete rewrite) of macro code, so macros are
   now only computed when found.
 - Added enable_environment_macros option to determine whether or not
   macros are set as environment vars.
 - Added $ISVALIDTIME:$ and $NEXTVALIDTIME:$ on-demand macros.
 - Added new external commands to change modified object attributes
   (affecting data retention logic).
 - Added new external commands to change notification period for
   host, services, and contact on-the-fly.
 - Retention of host/service check scheduling options.
 - Caching of Perl scripts now enabled by default if embedded Perl
   interpreter is compiled in.
 - Increased max plugin output length cap from 4kb to 8kb.
 - Additional functionality of additive inheritance feature.
 - Added free_child_process_memory and child_processes_fork_twice
   options for performance tweaks.
 - Added use_timezone option to allow Nagios instances to run in
   non-native timezones.
 - Support for line continuation/breaks in config files - end lines with
   one back slash (\) to continue on next line.
 - Auto-filled comment/author fields for acknowledging problems through
   WAP interface.
 - Faster program startup times (especially in large installs) with new
   object lookup code.
 - Nagios no longer warns or errors when encountering
   host/contact/service groups with empty memberships.
 - Allow non-ASCII characters in notifications, etc.
 - Smarter host check logic to reduce (uncached) on-demand host checks
   during "stable" service problems.
 - New flap detection startup logic speedups when large installations
   tweaks enabled.
 - Speed improvements during startup routines when using precached config.
 - Speed improvements in reading retention data during startup.
 - Changed embedded audio MIME types in CGIs to "application/wav".
 - Safer loading mechanism for NEB modules to prevent segfaults in Nagios.
 - Embedded Perl is now disabled by default.
 - Misc internal performance improvements.
 - More debug/trace log functionality.
 - Internal data structure cleanups.
 - Logging API revamp, cleanup.
 - Error logging improvements.
 - Various bugfixes.
 - Documentation updates.

9 files changed, 223 insertions, 88 deletions

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index b4fba8b560e..48c3a2db197 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2008/06/21 14:35:49 tonnerre Exp $
+# $NetBSD: Makefile,v 1.21 2008/07/21 00:35:42 tonnerre Exp $
 #
 
-DISTNAME=		nagios-2.12
+DISTNAME=		nagios-3.0.3
 PKGNAME=		${DISTNAME:S/-/-base-/}
 CATEGORIES=		net sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -14,23 +14,23 @@ COMMENT=		Network monitor
 .include "../../net/nagios-base/Makefile.common"
 .include "options.mk"
 
-CONFIGURE_ARGS+=	--with-gd-lib=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-gd-inc=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--with-gd-lib=${PREFIX}/lib
+CONFIGURE_ARGS+=	--with-gd-inc=${PREFIX}/include
 CONFIGURE_ARGS+=	--enable-embedded-perl
 CONFIGURE_ARGS+=	--with-perlcache
 
-CONFIGURE_ARGS+=	--with-nagios-user=${NAGIOS_USER:Q}
-CONFIGURE_ARGS+=	--with-nagios-group=${NAGIOS_GROUP:Q}
-CONFIGURE_ARGS+=	--with-command-user=${NAGIOS_USER:Q}
-CONFIGURE_ARGS+=	--with-command-group=${NAGIOSCMD_GROUP:Q}
+CONFIGURE_ARGS+=	--with-nagios-user=${NAGIOS_USER}
+CONFIGURE_ARGS+=	--with-nagios-group=${NAGIOS_GROUP}
+CONFIGURE_ARGS+=	--with-command-user=${NAGIOS_USER}
+CONFIGURE_ARGS+=	--with-command-group=${NAGIOSCMD_GROUP}
 CONFIGURE_ARGS+=	--with-init-dir=${PREFIX}/share/examples/rc.d
 CONFIGURE_ARGS+=	--with-lockfile=/var/run/nagios.lock
 
 USE_TOOLS+=		mail:run perl
-CONFIGURE_ARGS+=	--with-mail=${TOOLS_PLATFORM.mail}
+CONFIGURE_ARGS+=	--with-mail=${TOOLS_PLATFORM.mail:Q}
 
 RCD_SCRIPTS+=		nagios
-FILES_SUBST+=		NAGIOS_USER=${NAGIOS_USER:Q}
+FILES_SUBST+=		NAGIOS_USER=${NAGIOS_USER}
 # XXX Merge this into the package proper.
 # Nagios drops permissions before creating the log file, so the
 # default location doesn't work.  In the config file, change
@@ -39,7 +39,8 @@ FILES_SUBST+=		NAGIOS_USER=${NAGIOS_USER:Q}
 
 INSTALL_TARGET=		install install-config
 
-BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		VARBASE NAGIOS_USER NAGIOS_GROUP NAGIOSCMD_GROUP
+BUILD_DEFS+=		NAGIOSDIR
 
 PKG_GROUPS+=		${NAGIOS_GROUP}
 PKG_GROUPS+=		${NAGIOSCMD_GROUP}
@@ -52,8 +53,13 @@ MESSAGE_SUBST+=		NAGIOS_USER=${NAGIOS_USER}
 MESSAGE_SUBST+=		NAGIOSCMD_GROUP=${NAGIOSCMD_GROUP}
 
 EGDIR=			${PREFIX}/share/examples/nagios
-EGFILES=		cgi.cfg commands.cfg localhost.cfg
-EGFILES+=		nagios.cfg resource.cfg
+EGFILES=		nagios.cfg cgi.cfg resource.cfg
+EGFILES+=		objects/templates.cfg objects/commands.cfg
+EGFILES+=		objects/contacts.cfg objects/timeperiods.cfg
+EGFILES+=		objects/localhost.cfg objects/windows.cfg
+EGFILES+=		objects/printer.cfg objects/switch.cfg
+
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/objects
 
 .for files in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
diff --git a/net/nagios-base/Makefile.common b/net/nagios-base/Makefile.common
index fbc0dca196e..bf133f580fc 100644
--- a/net/nagios-base/Makefile.common
+++ b/net/nagios-base/Makefile.common
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7 2007/11/26 22:14:13 seb Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/07/21 00:35:42 tonnerre Exp $
 #
+# used by net/nagios-base/Makefile
 
 PKG_GROUPS_VARS+=	NAGIOS_GROUP NAGIOSCMD_GROUP
 PKG_USERS_VARS+=	NAGIOS_USER
@@ -13,8 +14,10 @@ PERL5_REQD=		5.6
 
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/nagios
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/nagios
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${NAGIOSDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${NAGIOSDIR}
 
 CONFIGURE_ARGS+=	--with-cgiurl=/nagios/cgi-bin
 CONFIGURE_ARGS+=	--with-htmurl=/nagios
+
+BUILD_DEFS+=		NAGIOSDIR
diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index fdee23eb5ff..d62e51b4493 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/06/21 14:35:49 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -19,10 +19,16 @@ libexec/nagios/cgi-bin/summary.cgi
 libexec/nagios/cgi-bin/tac.cgi
 libexec/nagios/cgi-bin/trends.cgi
 share/examples/nagios/cgi.cfg-sample
-share/examples/nagios/commands.cfg-sample
-share/examples/nagios/localhost.cfg-sample
 share/examples/nagios/nagios.cfg-sample
 share/examples/nagios/nagios.conf
+share/examples/nagios/objects/commands.cfg-sample
+share/examples/nagios/objects/contacts.cfg-sample
+share/examples/nagios/objects/localhost.cfg-sample
+share/examples/nagios/objects/printer.cfg-sample
+share/examples/nagios/objects/switch.cfg-sample
+share/examples/nagios/objects/templates.cfg-sample
+share/examples/nagios/objects/timeperiods.cfg-sample
+share/examples/nagios/objects/windows.cfg-sample
 share/examples/nagios/resource.cfg-sample
 share/examples/rc.d/nagios
 share/nagios/contexthelp/A1.html
@@ -89,31 +95,39 @@ share/nagios/contexthelp/N5.html
 share/nagios/contexthelp/N6.html
 share/nagios/contexthelp/N7.html
 share/nagios/docs/about.html
+share/nagios/docs/activechecks.html
 share/nagios/docs/adaptive.html
 share/nagios/docs/addons.html
 share/nagios/docs/beginners.html
+share/nagios/docs/cachedchecks.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/customobjectvars.html
 share/nagios/docs/dependencies.html
+share/nagios/docs/dependencychecks.html
 share/nagios/docs/distributed.html
 share/nagios/docs/downtime.html
 share/nagios/docs/embeddedperl.html
+share/nagios/docs/epnplugins.html
 share/nagios/docs/escalations.html
 share/nagios/docs/eventhandlers.html
 share/nagios/docs/extcommands.html
+share/nagios/docs/faststartup.html
 share/nagios/docs/flapping.html
 share/nagios/docs/freshness.html
 share/nagios/docs/funstuff.html
-share/nagios/docs/images/activepassive.png
+share/nagios/docs/hostchecks.html
+share/nagios/docs/images/activechecks.png
+share/nagios/docs/images/cachedcheckgraphs.png
+share/nagios/docs/images/cachedchecks.png
+share/nagios/docs/images/cachedchecks1.png
 share/nagios/docs/images/cgi-avail-a.png
 share/nagios/docs/images/cgi-avail-b.png
 share/nagios/docs/images/cgi-cmd.png
@@ -137,61 +151,127 @@ 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/checkmark.png
 share/nagios/docs/images/checktiming.png
+share/nagios/docs/images/configoverview.png
 share/nagios/docs/images/distributed.png
+share/nagios/docs/images/downtime.png
+share/nagios/docs/images/epn.png
+share/nagios/docs/images/eventhandlers.png
+share/nagios/docs/images/externalcommands.png
+share/nagios/docs/images/fast-startup.png
+share/nagios/docs/images/fast-startup1.png
+share/nagios/docs/images/fast-startup2.png
+share/nagios/docs/images/freshness.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/important.gif
+share/nagios/docs/images/integrationoverview.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/monitoring-printers.png
+share/nagios/docs/images/monitoring-routers.png
+share/nagios/docs/images/monitoring-windows.png
+share/nagios/docs/images/mrtg-activehostchecks.png
+share/nagios/docs/images/mrtg-activelychecked.png
+share/nagios/docs/images/mrtg-activeservicechecks.png
+share/nagios/docs/images/mrtg-cachedchecks.png
+share/nagios/docs/images/mrtg-commandbuffers.png
+share/nagios/docs/images/mrtg-externalcommands.png
+share/nagios/docs/images/mrtg-hostperfstats.png
+share/nagios/docs/images/mrtg-hoststatechange.png
+share/nagios/docs/images/mrtg-passivechecks.png
+share/nagios/docs/images/mrtg-passivelychecked.png
+share/nagios/docs/images/mrtg-serviceperfstats.png
+share/nagios/docs/images/mrtg-servicestatechange.png
+share/nagios/docs/images/multiple-templates1.png
+share/nagios/docs/images/multiple-templates2.png
+share/nagios/docs/images/nagios.jpg
+share/nagios/docs/images/ndoutils.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/note.gif
+share/nagios/docs/images/nrpe.png
+share/nagios/docs/images/nsca.png
+share/nagios/docs/images/nscpp.png
+share/nagios/docs/images/objects-commands.png
+share/nagios/docs/images/objects-contacts.png
+share/nagios/docs/images/objects-hosts.png
+share/nagios/docs/images/objects-services.png
+share/nagios/docs/images/objects-timeperiods.png
+share/nagios/docs/images/passivechecks.png
+share/nagios/docs/images/passivehosttranslation.png
+share/nagios/docs/images/plugins.png
+share/nagios/docs/images/predictive-dependency-checks.png
+share/nagios/docs/images/printer.png
+share/nagios/docs/images/reachability1.png
+share/nagios/docs/images/reachability2.png
+share/nagios/docs/images/reachability3.png
+share/nagios/docs/images/reachability4.png
 share/nagios/docs/images/redudancy.png
 share/nagios/docs/images/redundancy.png
+share/nagios/docs/images/security.png
+share/nagios/docs/images/security1.png
+share/nagios/docs/images/security2.png
+share/nagios/docs/images/security3.png
+share/nagios/docs/images/seealso.gif
 share/nagios/docs/images/service-dependencies.png
 share/nagios/docs/images/statetransitions.png
 share/nagios/docs/images/statetransitions2.png
+share/nagios/docs/images/stoprestart.png
+share/nagios/docs/images/switch.png
+share/nagios/docs/images/tcpwrappers.png
+share/nagios/docs/images/tip.gif
+share/nagios/docs/images/tuning.png
+share/nagios/docs/images/upto.gif
 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/integration.html
+share/nagios/docs/largeinstalltweaks.html
+share/nagios/docs/macrolist.html
 share/nagios/docs/macros.html
+share/nagios/docs/monitoring-linux.html
+share/nagios/docs/monitoring-netware.html
+share/nagios/docs/monitoring-printers.html
+share/nagios/docs/monitoring-publicservices.html
+share/nagios/docs/monitoring-routers.html
+share/nagios/docs/monitoring-windows.html
+share/nagios/docs/mrtggraphs.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/objectdefinitions.html
+share/nagios/docs/objectinheritance.html
+share/nagios/docs/objecttricks.html
+share/nagios/docs/oncallrotation.html
 share/nagios/docs/passivechecks.html
+share/nagios/docs/passivestatetranslation.html
 share/nagios/docs/perfdata.html
+share/nagios/docs/pluginapi.html
 share/nagios/docs/plugins.html
-share/nagios/docs/plugintheory.html
+share/nagios/docs/quickstart-fedora.html
+share/nagios/docs/quickstart-opensuse.html
+share/nagios/docs/quickstart-ubuntu.html
+share/nagios/docs/quickstart.html
 share/nagios/docs/redundancy.html
 share/nagios/docs/robots.txt
 share/nagios/docs/security.html
+share/nagios/docs/servicechecks.html
 share/nagios/docs/stalking.html
-share/nagios/docs/starting.html
+share/nagios/docs/startstop.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/upgrading.html
 share/nagios/docs/verifyconfig.html
 share/nagios/docs/volatileservices.html
 share/nagios/docs/whatsnew.html
-share/nagios/docs/xodtemplate.html
+share/nagios/images/NagiosEnterprises-whitebg-112x46.png
 share/nagios/images/ack.gif
 share/nagios/images/action.gif
 share/nagios/images/command.png
@@ -208,14 +288,16 @@ share/nagios/images/downtime.gif
 share/nagios/images/empty.gif
 share/nagios/images/enabled.gif
 share/nagios/images/extinfo.gif
+share/nagios/images/favicon.ico
 share/nagios/images/flapping.gif
+share/nagios/images/globe-support-150x150.png
 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/logofullsize.png
 share/nagios/images/logos/nagios.gd2
 share/nagios/images/logos/nagios.gif
 share/nagios/images/logos/nagiosvrml.png
@@ -235,6 +317,8 @@ share/nagios/images/restart.gif
 share/nagios/images/right.gif
 share/nagios/images/sblogo.jpg
 share/nagios/images/serviceevent.gif
+share/nagios/images/splunk1.gif
+share/nagios/images/splunk2.gif
 share/nagios/images/start.gif
 share/nagios/images/status.gif
 share/nagios/images/status2.gif
@@ -282,15 +366,16 @@ share/nagios/stylesheets/summary.css
 share/nagios/stylesheets/tac.css
 share/nagios/stylesheets/trends.css
 @dirrm share/nagios/stylesheets
+@exec ${MKDIR} %D/share/nagios/ssi 2>/dev/null || ${TRUE}
+@dirrm share/nagios/ssi
 @dirrm share/nagios/media
 @dirrm share/nagios/images/logos
 @dirrm share/nagios/images
 @dirrm share/nagios/docs/images
 @dirrm share/nagios/docs
 @dirrm share/nagios/contexthelp
-@exec ${MKDIR} %D/share/nagios/ssi 2>/dev/null || ${TRUE}
-@dirrm share/nagios/ssi
 @dirrm share/nagios
 @dirrm libexec/nagios/cgi-bin
+@unexec ${RMDIR} %D/share/examples/nagios/objects 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/examples/nagios 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/libexec/nagios 2>/dev/null || ${TRUE}
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index 14b0c93328f..13e8307f455 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.8 2008/06/21 14:35:49 tonnerre Exp $
+$NetBSD: distinfo,v 1.9 2008/07/21 00:35:42 tonnerre Exp $
 
-SHA1 (nagios-2.12.tar.gz) = d3e8e3419f751c66a29775bb5280cec662d26a29
-RMD160 (nagios-2.12.tar.gz) = b44e49166441735473450ba555137c695cc50920
-Size (nagios-2.12.tar.gz) = 1742179 bytes
-SHA1 (patch-aa) = c8a270a81ab482a0a138c6b66185ffe44bfe9e50
-SHA1 (patch-ab) = 5b33da97bc1339d9c7507cf7ed706ee27ae7c68a
-SHA1 (patch-ac) = 268393f07960bda7f60b4ac01e87c462c3e3147c
-SHA1 (patch-ad) = 2d7c6620ed08a64c8df2d26083fa327899305004
+SHA1 (nagios-3.0.3.tar.gz) = 2ab68996ef653f856b609d100a1ee41a4f49aead
+RMD160 (nagios-3.0.3.tar.gz) = 2f0ee991c4baf67b95fcf5d46fd7b34d8ba1118e
+Size (nagios-3.0.3.tar.gz) = 2759396 bytes
+SHA1 (patch-aa) = 0945f27a7f18553644682f1d9ad0f37b962d2a36
+SHA1 (patch-ab) = e633139ab3e3ee0b9b4d34b8fb5c7d8cb1ecac76
+SHA1 (patch-ac) = 779a29237981e1a664192d8a653552c1b7606184
+SHA1 (patch-ad) = ecb505ae21afde224b9186cb031ee5667bce4b1f
 SHA1 (patch-ae) = 088bddbbd8d6a9f6b7aff89f238d510959a7220b
 SHA1 (patch-af) = a1b2c3a51b0ed72ff0f507bacc44a0d0c5924d60
+SHA1 (patch-ag) = da6af670c5d8788c1c46653b73f044cbfead64b1
 SHA1 (patch-ah) = 88122296f9d74648c3dadbd7f6e12e7ef1f32081
+SHA1 (patch-ai) = 738039e46af95a035bf0220eaa5c621938b651fd
diff --git a/net/nagios-base/options.mk b/net/nagios-base/options.mk
index 64e44f11f04..11dd3e83ccc 100644
--- a/net/nagios-base/options.mk
+++ b/net/nagios-base/options.mk
@@ -1,19 +1,19 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
+# $NetBSD: options.mk,v 1.2 2008/07/21 00:35:42 tonnerre Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nagios-base
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql		\
-			--with-mysql-inc=${LOCALBASE}/include/mysql	\
+CONFIGURE_ARGS+=	--with-mysql-lib=${PREFIX}/lib/mysql		\
+			--with-mysql-inc=${PREFIX}/include/mysql	\
 			--with-mysql-xdata
 .include "../../mk/mysql.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+=	--with-pgsql-lib=${LOCALBASE}/pgsql \
-			--with-pgsql-inc=${LOCALBASE}/pgsql \
+CONFIGURE_ARGS+=	--with-pgsql-lib=${PREFIX}/pgsql \
+			--with-pgsql-inc=${PREFIX}/pgsql \
 			--with-pgsql-xdata
 .include "../../mk/pgsql.buildlink3.mk"
 .endif
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa
index 17f99fd308c..f9afa3fd8db 100644
--- a/net/nagios-base/patches/patch-aa
+++ b/net/nagios-base/patches/patch-aa
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.5 2008/06/21 14:35:49 tonnerre Exp $
+$NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
 
---- Makefile.in.orig	2007-04-23 17:44:25.000000000 +0200
+--- Makefile.in.orig	2008-04-13 20:34:26.000000000 +0200
 +++ Makefile.in
-@@ -22,16 +22,16 @@ LDFLAGS=@LDFLAGS@ @LIBS@
- prefix=@prefix@
+@@ -23,17 +23,16 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
+ CHECKRESULTDIR=@CHECKRESULTDIR@
 -CFGDIR=@sysconfdir@
-+CGIDIR=@libexecdir@
++SAMPDIR=@prefix@/share/examples/nagios
  BINDIR=@bindir@
- CGIDIR=@sbindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@
+ LIBEXECDIR=@libexecdir@
  HTMLDIR=@datadir@
-+SAMPDIR=@prefix@/share/examples/nagios
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
@@ -22,11 +23,13 @@ $NetBSD: patch-aa,v 1.5 2008/06/21 14:35:49 tonnerre Exp $
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -58,60 +58,7 @@ all:
+@@ -62,66 +61,6 @@ all:
  	cd $(SRC_BASE) && $(MAKE)
  	cd $(SRC_CGI) && $(MAKE)
  	cd $(SRC_HTM) && $(MAKE)
--	cd $(SRC_MODULE) && $(MAKE)
+-	if [ x$(USE_EVENTBROKER) = xyes ]; then \
+-		cd $(SRC_MODULE) && $(MAKE); \
+-	fi
 -
 -	@echo ""
 -	@echo "*** Compile finished ***"
@@ -53,6 +56,10 @@ $NetBSD: patch-aa,v 1.5 2008/06/21 14:35:49 tonnerre Exp $
 -	@echo "       object configuration files, as they determine what/how"
 -	@echo "       things get monitored!"
 -	@echo ""
+-	@echo "  make install-webconf"
+-	@echo "     - This installs the Apache config file for the Nagios"
+-	@echo "       web interface"
+-	@echo ""
 -	@echo ""
 -	@echo "*** Support Notes *******************************************"
 -	@echo ""
@@ -80,41 +87,70 @@ $NetBSD: patch-aa,v 1.5 2008/06/21 14:35:49 tonnerre Exp $
 -	@echo ""
 -	@echo "Enjoy."
 -	@echo ""
-+#	cd $(SRC_MODULE) && $(MAKE)
  
  nagios:
  	cd $(SRC_BASE) && $(MAKE)
-@@ -183,12 +130,11 @@ install-unstripped: 
+@@ -193,14 +132,10 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
  	if [ $(INSTALLPERLSTUFF) = yes ]; then \
 -		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
-+		${BSD_INSTALL_SCRIPT} p1.pl $(DESTDIR)$(BINDIR); \
++		$(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \
  	fi;
- 
-+
+-
++	
  	@echo ""
  	@echo "*** Main program, CGIs and HTML files installed ***"
  	@echo ""
-@@ -213,12 +159,12 @@ install-basic:
+@@ -220,20 +155,20 @@ install-basic:
  
  
  install-config:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
 -	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
 -	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg
--	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
+-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+-
 +	[ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
++	[ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
 +	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
 +	$(INSTALL) -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
-+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/localhost.cfg-sample
-+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/commands.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample
++	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample
++	
+ 	@echo ""
+ 	@echo "*** Config files installed ***"
+ 	@echo ""
+@@ -261,7 +196,10 @@ install-daemoninit:
+ 
+ 
+ install-commandmode:
+-	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
++	chmod g+s $(DESTDIR)$(LOGDIR)/archives
+ 	chmod g+s $(DESTDIR)$(LOGDIR)/rw
  
  	@echo ""
- 	@echo "*** Sample config file installed ***"
diff --git a/net/nagios-base/patches/patch-ab b/net/nagios-base/patches/patch-ab
index 7106d74fa4b..ebb5a1dc6c6 100644
--- a/net/nagios-base/patches/patch-ab
+++ b/net/nagios-base/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2007/11/26 22:14:14 seb Exp $
+$NetBSD: patch-ab,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
 
---- cgi/Makefile.in.orig	2006-05-30 16:31:44.000000000 +0000
+--- cgi/Makefile.in.orig	2008-02-28 20:26:36.000000000 +0100
 +++ cgi/Makefile.in
 @@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
@@ -11,8 +11,8 @@ $NetBSD: patch-ab,v 1.3 2007/11/26 22:14:14 seb Exp $
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -198,9 +198,9 @@ install-unstripped:
- 	 $(MAKE) install-basic
+@@ -196,9 +196,9 @@ install-unstripped:
+ 	$(MAKE) install-basic
  
  install-basic:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
diff --git a/net/nagios-base/patches/patch-ac b/net/nagios-base/patches/patch-ac
index 9c1b61a0a85..626a2070f1c 100644
--- a/net/nagios-base/patches/patch-ac
+++ b/net/nagios-base/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/06/21 14:35:49 tonnerre Exp $
+$NetBSD: patch-ac,v 1.5 2008/07/21 00:35:42 tonnerre Exp $
 
---- base/Makefile.in.orig	2006-05-30 18:31:44.000000000 +0200
+--- base/Makefile.in.orig	2008-02-28 20:25:45.000000000 +0100
 +++ base/Makefile.in
-@@ -29,7 +29,7 @@ exec_prefix=@exec_prefix@
+@@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
@@ -11,8 +11,8 @@ $NetBSD: patch-ac,v 1.4 2008/06/21 14:35:49 tonnerre Exp $
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -188,9 +188,8 @@ install-unstripped:
- 	 $(MAKE) install-basic
+@@ -202,9 +202,8 @@ install-unstripped:
+ 	$(MAKE) install-basic
  
  install-basic:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-ad
index 969a691f72d..e5093e720b1 100644
--- a/net/nagios-base/patches/patch-ad
+++ b/net/nagios-base/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2007/11/26 22:14:14 seb Exp $
+$NetBSD: patch-ad,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
 
---- html/Makefile.in.orig	2006-05-30 16:31:44.000000000 +0000
+--- html/Makefile.in.orig	2008-01-09 18:51:25.000000000 +0100
 +++ html/Makefile.in
 @@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 2007/11/26 22:14:14 seb Exp $
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -33,37 +33,37 @@ distclean: clean
+@@ -33,39 +33,39 @@ distclean: clean
  devclean: distclean
  
  install:
@@ -64,6 +64,9 @@ $NetBSD: patch-ad,v 1.3 2007/11/26 22:14:14 seb Exp $
  	for file in images/*.png; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
+ 	for file in images/*.ico; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
  	for file in images/logos/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
 +	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done