Index: head/net-mgmt/nagios4/Makefile
===================================================================
--- head/net-mgmt/nagios4/Makefile	(revision 395657)
+++ head/net-mgmt/nagios4/Makefile	(revision 395658)
@@ -1,105 +1,105 @@
 # Created by: Blaz Zupan <blaz@si.FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nagios
 PORTVERSION=	4.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Powerful network monitoring system
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
 		libgd.so:${PORTSDIR}/graphics/gd
 
 USES=		cpe gmake perl5
 USE_PERL5=	build
 USE_PHP=	xml
 USE_RC_SUBR=	nagios
 
 CONFLICTS=	nagios-[123].* nagios-devel-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-group=${WWWGRP} \
 		--with-nagios-user=${NAGIOSUSER} \
 		--with-nagios-group=${NAGIOSGROUP} \
 		--with-htmurl=${NAGIOSHTMURL} \
 		--with-cgiurl=${NAGIOSCGIURL} \
 		--sbindir=${WWWDIR}/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${WWWDIR} \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--with-httpd-conf=${PREFIX}/etc \
 		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
 		--disable-statuswrl \
 		--enable-event-broker \
 		ac_cv_lib_iconv_main=no
 CONFIGURE_ENV=	PERL=${PERL}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
 LIBS+=		-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install install-commandmode install-config
 PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
 		WWWGRP=${WWWGRP}
 SUB_LIST=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
 		NAGIOSHTMURL=${NAGIOSHTMURL} \
 		NAGIOSCGIURL=${NAGIOSCGIURL}
 
 SUB_FILES=	pkg-message
 
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
 .if defined(NAGIOSWWWDIR)
 WWWDIR=	${PREFIX}/${NAGIOSWWWDIR}
 .endif
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
 USERS=		${NAGIOSUSER}
 GROUPS=		${NAGIOSGROUP}
 
 OPTIONS_DEFINE=	NANOSLEEP UNHANDLED_HACK
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 OPTIONS_DEFAULT=	NAGPLUGINS
 NANOSLEEP_DESC=		Use nanosleep in event timing
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 OPTIONS_SUB=
 
 NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
 
 .if !defined(MAKING_PATCHES)
 # make clean patch makepatch MAKING_PATCHES=
 post-patch:
 	${REINPLACE_CMD} -e 's/\<77\([0-7]\)\>/75\1/g; s/\<66\([0-7]\)\>/64\1/; /chmod/d; \
 		/\.cfg$$/s/$$/-sample/' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/base/Makefile.in ${WRKSRC}/cgi/Makefile.in ${WRKSRC}/contrib/Makefile.in ${WRKSRC}/html/Makefile.in
 
 post-patch-UNHANDLED_HACK-on:
 	${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' -e \
 		's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
 .endif
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	@${MV} ${STAGEDIR}${WWWDIR}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample
 
 .include <bsd.port.mk>
Index: head/net-mgmt/nagios4/files/nagios.in
===================================================================
--- head/net-mgmt/nagios4/files/nagios.in	(revision 395657)
+++ head/net-mgmt/nagios4/files/nagios.in	(revision 395658)
@@ -1,107 +1,108 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: nagios
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable nagios:
 # nagios_enable (bool):    Set to "NO" by default.
 #                          Set it to "YES" to enable nagios.
 # nagios_precache (bool):  Set to "NO" by default.
 #                          Set it to "YES" to enable pre-caching.
 # nagios_flags (str):      Set to "" by default.
 # nagios_configfile (str): Set to "%%ETCDIR%%/nagios.cfg" by default.
 #
 
 . /etc/rc.subr
 
 name=nagios
 rcvar=nagios_enable
 
 load_rc_config "${name}"
 
 start_precmd=start_precmd
 stop_postcmd=stop_postcmd
 restart_precmd=nagios_checkconfig
 reload_precmd=reload_precmd
 configtest_cmd=nagios_checkconfig
 sig_reload=HUP
 
+nagios_enable=${nagios_enable:-"NO"}
 nagios_program=${nagios_program:-"%%PREFIX%%/bin/nagios"}	# Path to named, if you want a different one.
 command_args=${command_args:-"-d"}
 extra_commands=${extra_commands:-"reload configtest"}
 pidfile=${pidfile:-"%%NAGIOSDIR%%/nagios.lock"}
 nagios_user=${nagios_user:-"%%NAGIOSUSER%%"}
 nagios_group=${nagios_group:-"%%NAGIOSGROUP%%"}
 nagios_configfile=${nagios_configfile:-"%%ETCDIR%%/nagios.cfg"}
 nagios_precache=${nagios_precache:-"NO"}
 
 required_files="${nagios_configfile}"
 command_args="${command_args} ${nagios_configfile}"
 
 nagios_cacheconfig()
 {
   if ! checkyesno nagios_precache; then
     return 0
   fi
 
   echo -n "Pre-Caching nagios configuration: "
   ${command} -pv ${nagios_configfile} 2>&1 >/dev/null
   if [ $? != 0 ]; then
     echo "FAILED"
     ${command} -v ${nagios_configfile}
     return 1
   else
     command_args="-u -x ${command_args}"
     echo "OK"
   fi
 }
 
 nagios_checkconfig()
 {
   echo -n "Performing sanity check of nagios configuration: "
   ${command} -v ${nagios_configfile} 2>&1 >/dev/null
   if [ $? != 0 ]; then
     echo "FAILED"
     ${command} -v ${nagios_configfile}
     return 1
   else
     echo "OK"
   fi
 }
 
 reload_precmd()
 {
   if ! nagios_checkconfig; then
     return 1
   fi
 
   if ! nagios_cacheconfig; then
     return 1
   fi
 }
 
 start_precmd()
 {
   if ! nagios_checkconfig; then
     return 1
   fi
 
   if ! nagios_cacheconfig; then
     return 1
   fi
 
   su -m "${nagios_user}" -c "touch \"%%NAGIOSDIR%%/nagios.log\" \"%%NAGIOSDIR%%/status.sav\""
   rm -f "%%NAGIOSDIR%%/rw/nagios.cmd"
 }
 
 stop_postcmd()
 {
   rm -f "%%NAGIOSDIR%%/nagios.tmp" "%%NAGIOSDIR%%/rw/nagios.cmd"
 }
 
 run_rc_command "$1"