- Update to 2.11 [1]

- Fix wrong mail program path in sample config file [2]

PR:		ports/121866 [1], ports/120320 [2]
Submitted by:	Jarrod Sayers <jarrod at netleader.com.au> (maintainer) [1]

6 files changed, 32 insertions, 16 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index cf1d03815554..91b84d608393 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.10
-PORTREVISION=	1
+PORTVERSION=	2.11
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index 76a564777aea..a7ae792b0d7a 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.10.tar.gz) = 8c3a29e138f2ff8c8abbd3dd8a40c4b6
-SHA256 (nagios-2.10.tar.gz) = d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
-SIZE (nagios-2.10.tar.gz) = 1740558
+MD5 (nagios-2.11.tar.gz) = 058c1f4829de748b42da1b584cccc941
+SHA256 (nagios-2.11.tar.gz) = 0c4425401e0b9a8ba1d2e689fc8dd9a5016ee35ac5c66285d02eca393dd6cda5
+SIZE (nagios-2.11.tar.gz) = 1741962
diff --git a/net-mgmt/nagios/files/patch-configure.in b/net-mgmt/nagios/files/patch-configure.in
index 720af1c7f367..7a67b5fb6901 100644
--- a/net-mgmt/nagios/files/patch-configure.in
+++ b/net-mgmt/nagios/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	2007-10-22 00:09:51.000000000 +0930
-+++ configure.in	2008-01-30 23:25:03.000000000 +1030
+--- configure.in.orig	2008-03-13 00:31:04.000000000 +1030
++++ configure.in	2008-03-19 23:58:49.000000000 +1030
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
@@ -7,7 +7,7 @@
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="2.10"
+ PKG_VERSION="2.11"
 @@ -60,7 +59,15 @@
  dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
  THREADLIBS=""
@@ -41,6 +41,15 @@
  AC_SUBST(INSTALL_OPTS)
  
  AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
+@@ -170,7 +178,7 @@
+ 	AC_PATH_PROG(MAIL_PROG,mail) 
+ fi 
+ dnl Fix for systems that don't (yet) have mail/mailx installed...
+-if test x$MAIL_PROG=x; then
++if test x$MAIL_PROG = x; then
+ 	MAIL_PROG="/bin/mail"
+ fi
+ AC_SUBST(MAIL_PROG)
 @@ -599,6 +607,9 @@
  
  	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index cf1d03815554..91b84d608393 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.10
-PORTREVISION=	1
+PORTVERSION=	2.11
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo
index 76a564777aea..a7ae792b0d7a 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.10.tar.gz) = 8c3a29e138f2ff8c8abbd3dd8a40c4b6
-SHA256 (nagios-2.10.tar.gz) = d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
-SIZE (nagios-2.10.tar.gz) = 1740558
+MD5 (nagios-2.11.tar.gz) = 058c1f4829de748b42da1b584cccc941
+SHA256 (nagios-2.11.tar.gz) = 0c4425401e0b9a8ba1d2e689fc8dd9a5016ee35ac5c66285d02eca393dd6cda5
+SIZE (nagios-2.11.tar.gz) = 1741962
diff --git a/net-mgmt/nagios2/files/patch-configure.in b/net-mgmt/nagios2/files/patch-configure.in
index 720af1c7f367..7a67b5fb6901 100644
--- a/net-mgmt/nagios2/files/patch-configure.in
+++ b/net-mgmt/nagios2/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	2007-10-22 00:09:51.000000000 +0930
-+++ configure.in	2008-01-30 23:25:03.000000000 +1030
+--- configure.in.orig	2008-03-13 00:31:04.000000000 +1030
++++ configure.in	2008-03-19 23:58:49.000000000 +1030
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
@@ -7,7 +7,7 @@
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="2.10"
+ PKG_VERSION="2.11"
 @@ -60,7 +59,15 @@
  dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
  THREADLIBS=""
@@ -41,6 +41,15 @@
  AC_SUBST(INSTALL_OPTS)
  
  AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
+@@ -170,7 +178,7 @@
+ 	AC_PATH_PROG(MAIL_PROG,mail) 
+ fi 
+ dnl Fix for systems that don't (yet) have mail/mailx installed...
+-if test x$MAIL_PROG=x; then
++if test x$MAIL_PROG = x; then
+ 	MAIL_PROG="/bin/mail"
+ fi
+ AC_SUBST(MAIL_PROG)
 @@ -599,6 +607,9 @@
  
  	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)