aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2005-06-09 20:20:07 +0800
committersem <sem@FreeBSD.org>2005-06-09 20:20:07 +0800
commitab143b4d113a51a1f105375c467fac8d52f3b5dd (patch)
treec2752729bf88d0cf41463572e8d4bbb5b5c121d8
parent9042a841e41e09c61058fe9975828a5d30deebae (diff)
downloadfreebsd-ports-gnome-ab143b4d113a51a1f105375c467fac8d52f3b5dd.tar.gz
freebsd-ports-gnome-ab143b4d113a51a1f105375c467fac8d52f3b5dd.tar.zst
freebsd-ports-gnome-ab143b4d113a51a1f105375c467fac8d52f3b5dd.zip
- Integrate vendor patches:
1) Poller Auto Recache on Empty Output Fixes a problem where the poller would force a data query recache when a device returned empty output. This may have caused problems for hosts that are frequently down. 2) Poller Output SQL Order By Removes an SQL "order by" statement from the poller output processing that might cause graph gaps for installations with a large number of poller processes. 3) Additional RRDTool 1.2 Support Adds more font control options that are supported in RRDTool 1.2. The default slope mode has been changed for more organic looking graph lines.
-rw-r--r--net-mgmt/cacti/Makefile10
-rw-r--r--net-mgmt/cacti/distinfo6
-rw-r--r--net/cacti/Makefile10
-rw-r--r--net/cacti/distinfo6
4 files changed, 26 insertions, 6 deletions
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index cea422f1cba0..ccde1624758a 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cacti
PORTVERSION= 0.8.6d
+PORTREVISION= 1
CATEGORIES= net www
MASTER_SITES= http://www.cacti.net/downloads/
@@ -14,9 +15,12 @@ MAINTAINER= sem@FreeBSD.org
COMMENT= Web-driven graphing interface for RRDTool
# Vendor's patches
-#PATCH_SITES= http://www.cacti.net/downloads/patches/0.8.6c/
-#PATCHFILES= rrd_fetch_negative_numbers.patch
-#PATCH_DIST_STRIP=-p1
+PATCH_SITES= http://www.cacti.net/downloads/patches/${PORTVERSION}/
+PATCHFILES= auto_recache_empty_output.patch \
+ poller_output_order_by.patch \
+ rrdtool12_additional_features.patch
+
+PATCH_DIST_STRIP=-p1
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 7bc712eec401..74ed6411cf24 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,2 +1,8 @@
MD5 (cacti-0.8.6d.tar.gz) = f149a874dd06b639a5b6b78cf994b4cb
SIZE (cacti-0.8.6d.tar.gz) = 1037551
+MD5 (auto_recache_empty_output.patch) = 166b5bb99b722b2c04cb50e5b1af1f23
+SIZE (auto_recache_empty_output.patch) = 2500
+MD5 (poller_output_order_by.patch) = bb59937bfcdef930ef20b5191a1d94e3
+SIZE (poller_output_order_by.patch) = 590
+MD5 (rrdtool12_additional_features.patch) = d7f879664d714fdc737da736b164bb2f
+SIZE (rrdtool12_additional_features.patch) = 6527
diff --git a/net/cacti/Makefile b/net/cacti/Makefile
index cea422f1cba0..ccde1624758a 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cacti
PORTVERSION= 0.8.6d
+PORTREVISION= 1
CATEGORIES= net www
MASTER_SITES= http://www.cacti.net/downloads/
@@ -14,9 +15,12 @@ MAINTAINER= sem@FreeBSD.org
COMMENT= Web-driven graphing interface for RRDTool
# Vendor's patches
-#PATCH_SITES= http://www.cacti.net/downloads/patches/0.8.6c/
-#PATCHFILES= rrd_fetch_negative_numbers.patch
-#PATCH_DIST_STRIP=-p1
+PATCH_SITES= http://www.cacti.net/downloads/patches/${PORTVERSION}/
+PATCHFILES= auto_recache_empty_output.patch \
+ poller_output_order_by.patch \
+ rrdtool12_additional_features.patch
+
+PATCH_DIST_STRIP=-p1
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
index 7bc712eec401..74ed6411cf24 100644
--- a/net/cacti/distinfo
+++ b/net/cacti/distinfo
@@ -1,2 +1,8 @@
MD5 (cacti-0.8.6d.tar.gz) = f149a874dd06b639a5b6b78cf994b4cb
SIZE (cacti-0.8.6d.tar.gz) = 1037551
+MD5 (auto_recache_empty_output.patch) = 166b5bb99b722b2c04cb50e5b1af1f23
+SIZE (auto_recache_empty_output.patch) = 2500
+MD5 (poller_output_order_by.patch) = bb59937bfcdef930ef20b5191a1d94e3
+SIZE (poller_output_order_by.patch) = 590
+MD5 (rrdtool12_additional_features.patch) = d7f879664d714fdc737da736b164bb2f
+SIZE (rrdtool12_additional_features.patch) = 6527