aboutsummaryrefslogtreecommitdiffstats
path: root/net-mgmt/nav/files
diff options
context:
space:
mode:
authoranders <anders@FreeBSD.org>2005-02-15 23:00:59 +0800
committeranders <anders@FreeBSD.org>2005-02-15 23:00:59 +0800
commit68171ddc149d6eca417b1227956f3f14f7e28dc7 (patch)
tree8f21be6af8db49db808a99eeded9d82cab0bf0d6 /net-mgmt/nav/files
parent5fe407412091d90c642d2dd8706cec849752ca1b (diff)
downloadfreebsd-ports-gnome-68171ddc149d6eca417b1227956f3f14f7e28dc7.tar.gz
freebsd-ports-gnome-68171ddc149d6eca417b1227956f3f14f7e28dc7.tar.zst
freebsd-ports-gnome-68171ddc149d6eca417b1227956f3f14f7e28dc7.zip
Update to 3.0 beta 10.
Sponsored by: University of Tromsø & University of Bergen
Diffstat (limited to 'net-mgmt/nav/files')
-rw-r--r--net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl15
-rw-r--r--net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in11
2 files changed, 7 insertions, 19 deletions
diff --git a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl b/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl
index 59e24d2a3b50..679515452802 100644
--- a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl
+++ b/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl
@@ -1,9 +1,9 @@
---- subsystem/alertEngine/alertdaemon.pl.orig Wed Apr 28 15:03:41 2004
-+++ subsystem/alertEngine/alertdaemon.pl Thu Nov 11 12:13:15 2004
+--- subsystem/alertEngine/alertdaemon.pl.orig Tue Feb 15 14:05:23 2005
++++ subsystem/alertEngine/alertdaemon.pl Tue Feb 15 14:07:58 2005
@@ -37,9 +37,16 @@
use IO::Handle;
- use Engine;
+ use NAV::AlertEngine::Engine;
+use vars qw ($pscmd);
#BEGIN {require "alertengine.cfg";}
@@ -17,16 +17,15 @@
####################################################
## Engine
####################################################
-@@ -65,7 +72,7 @@
- die "Cannot open pidfile";
+@@ -66,6 +73,7 @@
my ($pid, $tid) = split / /, <pid_file>;
close(pid_file);
-- open ps_file, "ps -e | grep $pid | wc -l|";
+ open ps_file, "ps -e | grep $pid | wc -l|";
+ open ps_file, "$pscmd | grep $pid | wc -l|";
my $count=<ps_file>;
close(ps_file);
if($count==0) {
-@@ -144,7 +151,7 @@
+@@ -144,7 +152,7 @@
die "Cannot open pidfile";
my ($pid, $tid) = split / /, <pid_file>;
close(pid_file);
@@ -35,7 +34,7 @@
my $count=<ps_file>;
close(ps_file);
if($count==0) {
-@@ -179,7 +186,7 @@
+@@ -179,7 +187,7 @@
die "Cannot open pidfile";
my ($pid, $tid) = split / /, <pid_file>;
close(pid_file);
diff --git a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in b/net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in
deleted file mode 100644
index 2e04bc1889e1..000000000000
--- a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- subsystem/alertEngine/alertengine.in.orig Fri Nov 5 00:36:53 2004
-+++ subsystem/alertEngine/alertengine.in Fri Nov 5 00:37:07 2004
-@@ -27,7 +27,7 @@
- case "$1" in
- start)
- # Start daemons.
-- rc= su -c "${bindir}/alertdaemon.pl start" ${user}
-+ rc= su ${user} -c "${bindir}/alertdaemon.pl start"
- echo
- exit $rc;
- ;;