- Update to 2.7

- Change examples to read freebsd-server instead of linux-server

PR:		ports/108417
Submitted by:	Jarrod Sayers <jarrod@netleader.com.au> (maintainer)

8 files changed, 128 insertions, 8 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index be2472e5a97..878e35f0693 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 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 c8f34bfe38b..b8913739e7f 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02
-SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42
-SIZE (nagios-2.6.tar.gz) = 1734400
+MD5 (nagios-2.7.tar.gz) = d664d2785cdca3c5c8a3e84c033e8e6e
+SHA256 (nagios-2.7.tar.gz) = defb4062f077f999d1da2bcfcb87786c5d7fbca7d1346c7e6a19084b5629b2c1
+SIZE (nagios-2.7.tar.gz) = 1737308
diff --git a/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html b/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html
new file mode 100644
index 00000000000..156de7c7a39
--- /dev/null
+++ b/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html
@@ -0,0 +1,24 @@
+--- html/docs/xodtemplate.html.orig	Wed Dec 27 05:03:22 2006
++++ html/docs/xodtemplate.html	Sat Jan 27 18:56:48 2007
+@@ -493,9 +493,9 @@
+ <p class="SectionBody">
+ <pre>
+ define service{
+-	host_name		linux-server
+-	service_description	check-disk-sda1
+-	check_command		check-disk!/dev/sda1
++	host_name		freebsd-server
++	service_description	check-disk-ad0s1a
++	check_command		check-disk!/dev/ad0s1a
+ 	max_check_attempts	5
+ 	normal_check_interval	5
+ 	retry_check_interval	3
+@@ -503,7 +503,7 @@
+ 	notification_interval	30
+ 	notification_period	24x7
+ 	notification_options	w,c,r
+-	contact_groups		linux-admins
++	contact_groups		freebsd-admins
+ 	}
+ </pre>
+ </p>
diff --git a/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in b/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in
new file mode 100644
index 00000000000..ff3f25aac04
--- /dev/null
+++ b/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in
@@ -0,0 +1,36 @@
+--- sample-config/template-object/localhost.cfg.in.orig	Tue Nov 28 12:59:05 2006
++++ sample-config/template-object/localhost.cfg.in	Sat Jan 27 19:01:52 2007
+@@ -151,15 +151,15 @@
+         }
+ 
+ 
+-# Linux host definition template - This is NOT a real host, just a template!
++# FreeBSD host definition template - This is NOT a real host, just a template!
+ 
+ define host{
+-	name				linux-server	; The name of this host template
++	name				freebsd-server	; The name of this host template
+ 	use				generic-host	; This template inherits other values from the generic-host template
+-	check_period			24x7		; By default, Linux hosts are checked round the clock
+-	max_check_attempts		10		; Check each Linux host 10 times (max)
+-        check_command           	check-host-alive ; Default command to check Linux hosts
+-	notification_period		workhours	; Linux admins hate to be woken up, so we only notify during the day
++	check_period			24x7		; By default, FreeBSD hosts are checked round the clock
++	max_check_attempts		10		; Check each FreeBSD host 10 times (max)
++        check_command           	check-host-alive ; Default command to check FreeBSD hosts
++	notification_period		workhours	; FreeBSD admins hate to be woken up, so we only notify during the day
+ 							; Note that the notification_period variable is being overridden from
+ 							; the value that is inherited from the generic-host template!
+ 	notification_interval		120		; Resend notification every 2 hours
+@@ -173,9 +173,9 @@
+ # local host (this machine).
+ 
+ define host{
+-        use                     linux-server            ; Name of host template to use
++        use                     freebsd-server            ; Name of host template to use
+ 							; This host definition will inherit all variables that are defined
+-							; in (or inherited by) the linux-server host template definition.
++							; in (or inherited by) the freebsd-server host template definition.
+         host_name               localhost
+         alias                   localhost
+         address                 127.0.0.1
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index be2472e5a97..878e35f0693 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 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 c8f34bfe38b..b8913739e7f 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02
-SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42
-SIZE (nagios-2.6.tar.gz) = 1734400
+MD5 (nagios-2.7.tar.gz) = d664d2785cdca3c5c8a3e84c033e8e6e
+SHA256 (nagios-2.7.tar.gz) = defb4062f077f999d1da2bcfcb87786c5d7fbca7d1346c7e6a19084b5629b2c1
+SIZE (nagios-2.7.tar.gz) = 1737308
diff --git a/net-mgmt/nagios2/files/patch-html-docs-xodtemplate.html b/net-mgmt/nagios2/files/patch-html-docs-xodtemplate.html
new file mode 100644
index 00000000000..156de7c7a39
--- /dev/null
+++ b/net-mgmt/nagios2/files/patch-html-docs-xodtemplate.html
@@ -0,0 +1,24 @@
+--- html/docs/xodtemplate.html.orig	Wed Dec 27 05:03:22 2006
++++ html/docs/xodtemplate.html	Sat Jan 27 18:56:48 2007
+@@ -493,9 +493,9 @@
+ <p class="SectionBody">
+ <pre>
+ define service{
+-	host_name		linux-server
+-	service_description	check-disk-sda1
+-	check_command		check-disk!/dev/sda1
++	host_name		freebsd-server
++	service_description	check-disk-ad0s1a
++	check_command		check-disk!/dev/ad0s1a
+ 	max_check_attempts	5
+ 	normal_check_interval	5
+ 	retry_check_interval	3
+@@ -503,7 +503,7 @@
+ 	notification_interval	30
+ 	notification_period	24x7
+ 	notification_options	w,c,r
+-	contact_groups		linux-admins
++	contact_groups		freebsd-admins
+ 	}
+ </pre>
+ </p>
diff --git a/net-mgmt/nagios2/files/patch-sample-config-template-object-localhost.cfg.in b/net-mgmt/nagios2/files/patch-sample-config-template-object-localhost.cfg.in
new file mode 100644
index 00000000000..ff3f25aac04
--- /dev/null
+++ b/net-mgmt/nagios2/files/patch-sample-config-template-object-localhost.cfg.in
@@ -0,0 +1,36 @@
+--- sample-config/template-object/localhost.cfg.in.orig	Tue Nov 28 12:59:05 2006
++++ sample-config/template-object/localhost.cfg.in	Sat Jan 27 19:01:52 2007
+@@ -151,15 +151,15 @@
+         }
+ 
+ 
+-# Linux host definition template - This is NOT a real host, just a template!
++# FreeBSD host definition template - This is NOT a real host, just a template!
+ 
+ define host{
+-	name				linux-server	; The name of this host template
++	name				freebsd-server	; The name of this host template
+ 	use				generic-host	; This template inherits other values from the generic-host template
+-	check_period			24x7		; By default, Linux hosts are checked round the clock
+-	max_check_attempts		10		; Check each Linux host 10 times (max)
+-        check_command           	check-host-alive ; Default command to check Linux hosts
+-	notification_period		workhours	; Linux admins hate to be woken up, so we only notify during the day
++	check_period			24x7		; By default, FreeBSD hosts are checked round the clock
++	max_check_attempts		10		; Check each FreeBSD host 10 times (max)
++        check_command           	check-host-alive ; Default command to check FreeBSD hosts
++	notification_period		workhours	; FreeBSD admins hate to be woken up, so we only notify during the day
+ 							; Note that the notification_period variable is being overridden from
+ 							; the value that is inherited from the generic-host template!
+ 	notification_interval		120		; Resend notification every 2 hours
+@@ -173,9 +173,9 @@
+ # local host (this machine).
+ 
+ define host{
+-        use                     linux-server            ; Name of host template to use
++        use                     freebsd-server            ; Name of host template to use
+ 							; This host definition will inherit all variables that are defined
+-							; in (or inherited by) the linux-server host template definition.
++							; in (or inherited by) the freebsd-server host template definition.
+         host_name               localhost
+         alias                   localhost
+         address                 127.0.0.1