mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
Numerous changes:
- Explicitly USE_GMAKE. - Add a switch WITH_UCDSNMP to only depend on p5-SNMP if net-snmp4 is preferred over net-snmp, as net-snmp provides SNMP.pm (unless compiled WITHOUT_PERL). - Add some files to pkg-plist as makefile install targets are lazy (i.e. they use wildcards) to avoid package deinstall failures. - Add some needed FreeBSD patches. Submitted by: Hiroki Sato (patches)
This commit is contained in:
parent
8ffa74d90d
commit
d7c7a482a8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=109561
@ -20,11 +20,19 @@ RUN_DEPENDS= \
|
||||
${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
|
||||
${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
|
||||
${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
|
||||
${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/p5-SNMP \
|
||||
${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
|
||||
${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
|
||||
|
||||
# net-snmp provides SNMP.pm. ucd-snmp does not; requires p5-SNMP.
|
||||
# Depend on net-snmp by default.
|
||||
.if defined(WITH_UCDSNMP)
|
||||
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/p5-SNMP
|
||||
.else
|
||||
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net-mgmt/net-snmp
|
||||
.endif
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_GMAKE= yes
|
||||
USE_RC_SUBR= yes
|
||||
USE_REINPLACE= yes
|
||||
NO_BUILD= yes
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- bsmonitor/Statusmon/DisplayCFG.pm.orig Sat Feb 28 16:46:51 2004
|
||||
+++ bsmonitor/Statusmon/DisplayCFG.pm Sat Feb 28 16:47:15 2004
|
||||
@@ -358,7 +358,7 @@
|
||||
"name" => $table
|
||||
} );
|
||||
$tab{"group"} = $table;
|
||||
- foreach my $arg qw( refto itemref sort select select_names items ) {
|
||||
+ foreach my $arg (qw( refto itemref sort select select_names items )) {
|
||||
$tab{$arg} = $args{$arg} if( $args{$arg} );
|
||||
}
|
||||
$tab{"type"} = "table";
|
@ -0,0 +1,11 @@
|
||||
--- bsmonitor/Statusmon/bs_evgen.pm.orig Sat Feb 28 16:47:57 2004
|
||||
+++ bsmonitor/Statusmon/bs_evgen.pm Sat Feb 28 16:47:30 2004
|
||||
@@ -405,7 +405,7 @@
|
||||
elsif( $event->{"cmd"} eq "remove" ) {
|
||||
my $host = $event->{"host"};
|
||||
my $check = $event->{"check"};
|
||||
- foreach my $queuename qw( alarms new_alarms old_alarms ) {
|
||||
+ foreach my $queuename (qw( alarms new_alarms old_alarms )) {
|
||||
my $queue = $self->{$queuename};
|
||||
for( my $i=$#$queue; $i>=0; $i-- ) {
|
||||
my $alarm = $queue->[$i];
|
20
net-mgmt/bigsister/files/patch-tools::bb_start.pl
Normal file
20
net-mgmt/bigsister/files/patch-tools::bb_start.pl
Normal file
@ -0,0 +1,20 @@
|
||||
--- tools/bb_start.pl.orig Mon Aug 11 21:29:38 2003
|
||||
+++ tools/bb_start.pl Sat Feb 28 17:28:29 2004
|
||||
@@ -161,7 +161,7 @@
|
||||
|
||||
sub proclist {
|
||||
my @result;
|
||||
- foreach my $cmd ( "ps cax", "ps -e", "ps -ef" ) {
|
||||
+ foreach my $cmd ( "/bin/ps ax" ) {
|
||||
open( CMD, "$cmd 2>/dev/null|" );
|
||||
@result = ();
|
||||
while( <CMD> ) {
|
||||
@@ -197,7 +197,7 @@
|
||||
exec( $cmd );
|
||||
}
|
||||
else {
|
||||
- exec( "su", "-", "$user", "-c", $cmd );
|
||||
+ exec( "/usr/bin/su", "-m", "$user", "-c", $cmd );
|
||||
}
|
||||
exit(1);
|
||||
}
|
11
net-mgmt/bigsister/files/patch-tools::module.pl
Normal file
11
net-mgmt/bigsister/files/patch-tools::module.pl
Normal file
@ -0,0 +1,11 @@
|
||||
--- tools/module.pl.orig Sat Feb 28 15:03:52 2004
|
||||
+++ tools/module.pl Sat Feb 28 15:04:06 2004
|
||||
@@ -419,7 +419,7 @@
|
||||
|
||||
|
||||
sub lock_mod {
|
||||
- my $lock = "$BigSister::common::fs{'var'}/module.lock";
|
||||
+ my $lock = "$BigSister::common::fs{'tmp'}/module.lock";
|
||||
my $locktmp = "$lock.$$";
|
||||
push( @tmp, $locktmp );
|
||||
my $timeout = time + 5;
|
@ -72,6 +72,7 @@ bigsister/bin/StatusLog.pm
|
||||
bigsister/bin/Statusmon/BBLog.pm
|
||||
bigsister/bin/Statusmon/Display.pm
|
||||
bigsister/bin/Statusmon/DisplayCFG.pm
|
||||
bigsister/bin/Statusmon/DisplayCFG.pm.orig
|
||||
bigsister/bin/Statusmon/Grapher.pm
|
||||
bigsister/bin/Statusmon/HTMLLog.pm
|
||||
bigsister/bin/Statusmon/RRDi.pm
|
||||
@ -80,6 +81,7 @@ bigsister/bin/Statusmon/Rsync.pm
|
||||
bigsister/bin/Statusmon/Statusmon.pm
|
||||
bigsister/bin/Statusmon/TrackLast.pm
|
||||
bigsister/bin/Statusmon/bs_evgen.pm
|
||||
bigsister/bin/Statusmon/bs_evgen.pm.orig
|
||||
bigsister/bin/Statusmon/grouping.pm
|
||||
bigsister/bin/Statusmon/history.pm
|
||||
bigsister/bin/Statusmon/test.pm
|
||||
|
Loading…
Reference in New Issue
Block a user