aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
authorTim Bishop <tdb@FreeBSD.org>2006-01-17 10:39:58 +0000
committerTim Bishop <tdb@FreeBSD.org>2006-01-17 10:39:58 +0000
commite9fc35504f8435789b92526485d152a8b8640486 (patch)
treea98b36299a2bcc385046eb56e41573a916c402bf /net-mgmt
parent3933d258d05d155e03ed459cba17859872f80cb9 (diff)
downloadports-e9fc35504f8435789b92526485d152a8b8640486.tar.gz
ports-e9fc35504f8435789b92526485d152a8b8640486.zip
Notes
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/nagios/Makefile4
-rw-r--r--net-mgmt/nagios/distinfo5
-rw-r--r--net-mgmt/nagios/files/nagios.sh.in2
-rw-r--r--net-mgmt/nagios/files/patch-base-utils.c11
-rw-r--r--net-mgmt/nagios/pkg-plist1
-rw-r--r--net-mgmt/nagios2/Makefile4
-rw-r--r--net-mgmt/nagios2/distinfo5
-rw-r--r--net-mgmt/nagios2/files/nagios.sh.in2
-rw-r--r--net-mgmt/nagios2/files/patch-base-utils.c11
-rw-r--r--net-mgmt/nagios2/pkg-plist1
10 files changed, 14 insertions, 32 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 33f6e163cf8d..2b06d1ff55c6 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= nagios
-PORTVERSION= 2.0.r1
-DISTVERSION= 2.0rc1
+PORTVERSION= 2.0.r2
+DISTVERSION= 2.0rc2
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 11d38ba18279..33a4fc7af541 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,2 +1,3 @@
-MD5 (nagios-2.0rc1.tar.gz) = 5807fc2f1cf5355a2eadc6f4d51f6711
-SIZE (nagios-2.0rc1.tar.gz) = 1731687
+MD5 (nagios-2.0rc2.tar.gz) = 373124639093919dc8858a243d760f84
+SHA256 (nagios-2.0rc2.tar.gz) = 1f771155606910a13bb84c1e18d22df99579e48ee26e1301fd08ac4645b93b16
+SIZE (nagios-2.0rc2.tar.gz) = 1732073
diff --git a/net-mgmt/nagios/files/nagios.sh.in b/net-mgmt/nagios/files/nagios.sh.in
index 03207c926b44..b31fa8081eed 100644
--- a/net-mgmt/nagios/files/nagios.sh.in
+++ b/net-mgmt/nagios/files/nagios.sh.in
@@ -18,12 +18,14 @@ rcvar=`set_rcvar`
command="%%PREFIX%%/bin/nagios"
command_args="-d"
+extra_commands="reload"
pidfile="%%NAGIOSDIR%%/nagios.lock"
nagios_user="%%NAGIOSUSER%%"
start_precmd="start_precmd"
stop_postcmd="stop_postcmd"
restart_precmd="nagios_checkconfig"
+sig_reload=HUP
[ -z "${nagios_enable}" ] && nagios_enable="NO"
[ -z "${nagios_flags}" ] && nagios_flags=""
diff --git a/net-mgmt/nagios/files/patch-base-utils.c b/net-mgmt/nagios/files/patch-base-utils.c
deleted file mode 100644
index 22a17a7e9a2f..000000000000
--- a/net-mgmt/nagios/files/patch-base-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/utils.c.orig Sat Dec 24 06:01:36 2005
-+++ base/utils.c Wed Dec 28 17:53:36 2005
-@@ -4546,7 +4546,7 @@
-
- use_embedded_perl=TRUE;
-
-- PERL_SYS_INIT3(&argc,embedding,&env);
-+ PERL_SYS_INIT3(&argc,&embedding,&env);
-
- if((my_perl=perl_alloc())==NULL){
- use_embedded_perl=FALSE;
diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist
index 26ed14683652..098d6696861e 100644
--- a/net-mgmt/nagios/pkg-plist
+++ b/net-mgmt/nagios/pkg-plist
@@ -14,7 +14,6 @@ etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
-etc/rc.d/nagios.sh
%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
%%NAGIOSWWWDIR%%/cgi-bin/config.cgi
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 33f6e163cf8d..2b06d1ff55c6 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= nagios
-PORTVERSION= 2.0.r1
-DISTVERSION= 2.0rc1
+PORTVERSION= 2.0.r2
+DISTVERSION= 2.0rc2
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 11d38ba18279..33a4fc7af541 100644
--- a/net-mgmt/nagios2/distinfo
+++ b/net-mgmt/nagios2/distinfo
@@ -1,2 +1,3 @@
-MD5 (nagios-2.0rc1.tar.gz) = 5807fc2f1cf5355a2eadc6f4d51f6711
-SIZE (nagios-2.0rc1.tar.gz) = 1731687
+MD5 (nagios-2.0rc2.tar.gz) = 373124639093919dc8858a243d760f84
+SHA256 (nagios-2.0rc2.tar.gz) = 1f771155606910a13bb84c1e18d22df99579e48ee26e1301fd08ac4645b93b16
+SIZE (nagios-2.0rc2.tar.gz) = 1732073
diff --git a/net-mgmt/nagios2/files/nagios.sh.in b/net-mgmt/nagios2/files/nagios.sh.in
index 03207c926b44..b31fa8081eed 100644
--- a/net-mgmt/nagios2/files/nagios.sh.in
+++ b/net-mgmt/nagios2/files/nagios.sh.in
@@ -18,12 +18,14 @@ rcvar=`set_rcvar`
command="%%PREFIX%%/bin/nagios"
command_args="-d"
+extra_commands="reload"
pidfile="%%NAGIOSDIR%%/nagios.lock"
nagios_user="%%NAGIOSUSER%%"
start_precmd="start_precmd"
stop_postcmd="stop_postcmd"
restart_precmd="nagios_checkconfig"
+sig_reload=HUP
[ -z "${nagios_enable}" ] && nagios_enable="NO"
[ -z "${nagios_flags}" ] && nagios_flags=""
diff --git a/net-mgmt/nagios2/files/patch-base-utils.c b/net-mgmt/nagios2/files/patch-base-utils.c
deleted file mode 100644
index 22a17a7e9a2f..000000000000
--- a/net-mgmt/nagios2/files/patch-base-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/utils.c.orig Sat Dec 24 06:01:36 2005
-+++ base/utils.c Wed Dec 28 17:53:36 2005
-@@ -4546,7 +4546,7 @@
-
- use_embedded_perl=TRUE;
-
-- PERL_SYS_INIT3(&argc,embedding,&env);
-+ PERL_SYS_INIT3(&argc,&embedding,&env);
-
- if((my_perl=perl_alloc())==NULL){
- use_embedded_perl=FALSE;
diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist
index 26ed14683652..098d6696861e 100644
--- a/net-mgmt/nagios2/pkg-plist
+++ b/net-mgmt/nagios2/pkg-plist
@@ -14,7 +14,6 @@ etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
-etc/rc.d/nagios.sh
%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
%%NAGIOSWWWDIR%%/cgi-bin/config.cgi