summaryrefslogtreecommitdiff
path: root/net/mrtg/patches
diff options
context:
space:
mode:
authoradrianp <adrianp>2006-08-09 21:42:42 +0000
committeradrianp <adrianp>2006-08-09 21:42:42 +0000
commit9372b89679be19d57cdb8b5edccba65a1bd73af7 (patch)
treef9dbe269e7c3bf283b93b08c1f47f69cc8bad689 /net/mrtg/patches
parentfe86b0cc490ff32fd43be922b62fba00bc449e90 (diff)
downloadpkgsrc-9372b89679be19d57cdb8b5edccba65a1bd73af7.tar.gz
Update to 2.14.5
Package changes include: - pkglintification - move to options.mk - add in extra option for building with snmpv3 support (not tested) - tidy up MESSAGE (no more html docs) MRTG changes include: * updated SNMP_util.pm and Net_SNMP_util.pm * new: clonedirectory function * Updated SNMP_Session to 1.08 * SNMP v3 support added Net::SNMP library required for this For a full list see: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/CHANGES Addresses PR# 32811 ok'ed bouyer@
Diffstat (limited to 'net/mrtg/patches')
-rw-r--r--net/mrtg/patches/patch-ac11
-rw-r--r--net/mrtg/patches/patch-ad34
2 files changed, 28 insertions, 17 deletions
diff --git a/net/mrtg/patches/patch-ac b/net/mrtg/patches/patch-ac
index 0a0a519c453..612cfa51566 100644
--- a/net/mrtg/patches/patch-ac
+++ b/net/mrtg/patches/patch-ac
@@ -1,14 +1,13 @@
-$NetBSD: patch-ac,v 1.7 2004/12/31 10:44:27 minskim Exp $
+$NetBSD: patch-ac,v 1.8 2006/08/09 21:42:42 adrianp Exp $
---- Makefile.in.orig 2004-08-08 04:49:14.000000000 -0500
+--- Makefile.in.orig 2006-07-14 12:39:05.000000000 +0100
+++ Makefile.in
-@@ -36,8 +36,8 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c
+@@ -36,7 +36,7 @@ bin/rateup.o: $(top_srcdir)/src/rateup.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o
subst:
-- $(PERL) -0777 -p -i~ -e 's@^#!\s*/\S*perl@#! $(PERL)@' $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
+- $(PERL) -0777 -p -i~ -e "s'^#!\s*/\S*perl'#! $(PERL)'" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
++ $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/indexmaker $(top_srcdir)/bin/mrtg
$(PERL) -0777 -p -i~ -e 's@GRAPHFMT="...";@GRAPHFMT="$(GDFORM_EXT)";@' $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
-+ $(PERL) -0777 -p -i~ -e "s@__PREFIX__@${prefix}@g" $(top_srcdir)/bin/cfgmaker $(top_srcdir)/bin/mrtg $(top_srcdir)/bin/indexmaker
clean:
- -rm -f bin/rateup
diff --git a/net/mrtg/patches/patch-ad b/net/mrtg/patches/patch-ad
index 1c0fb812038..d15128d751f 100644
--- a/net/mrtg/patches/patch-ad
+++ b/net/mrtg/patches/patch-ad
@@ -1,21 +1,33 @@
-$NetBSD: patch-ad,v 1.10 2005/06/23 08:12:13 martti Exp $
+$NetBSD: patch-ad,v 1.11 2006/08/09 21:42:42 adrianp Exp $
---- bin/mrtg.orig 2005-06-19 16:40:02.000000000 +0300
-+++ bin/mrtg 2005-06-23 08:05:14.000000000 +0300
-@@ -721,4 +721,4 @@
+--- bin/mrtg.orig 2006-07-14 12:39:19.000000000 +0100
++++ bin/mrtg
+@@ -824,8 +824,8 @@ sub writegraphics {
+
+ ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) or
(($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or
- (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or
-- die "ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
-+ (-x "__PREFIX__/libexec/rateup")) ||
-+ die "ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
+- die "$NOW: ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
++ (-x "__PREFIX__/libexec/rateup")) or
++ die "$NOW: ERROR: Can't Execute '__PREFIX__/libexec/rateup'\n";
-@@ -734,3 +734,3 @@
+ # rateup does not know about undef so we make inlast and outlast ready for rateup
+ #warn "$NOW: ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
+@@ -837,7 +837,7 @@ sub writegraphics {
+ $outlast = -1 unless defined $outlast;
+
if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
- @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup",
-+ @exec = ("__PREFIX__/libexec/rateup",
++ @exec = ("__PREFIX__/libexec/rateup",
"$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
-@@ -743,3 +743,3 @@
+ $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
+ "$up_abs"."p", $inlast, $outlast, $absmax,
+@@ -846,7 +846,7 @@ sub writegraphics {
+ $$rcfg{'rgb5'}{$router});
+ } else {
- @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup",
-+ @exec = ("__PREFIX__/libexec/rateup",
++ @exec = ("__PREFIX__/libexec/rateup",
"$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
+ $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
+ "$up_abs", $inlast, $outlast, $absmax,