[21624] trunk/dports/net/cacti

[source_changes at macosforge.org]

Revision: 21624
          http://trac.macosforge.org/projects/macports/changeset/21624
Author:   markd at macports.org
Date:     2007-01-30 23:16:54 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Update to 0.8.6j.

Modified Paths:
--------------
    trunk/dports/net/cacti/Portfile

Added Paths:
-----------
    trunk/dports/net/cacti/files/tree_console_missing_hosts.patch

Removed Paths:
-------------
    trunk/dports/net/cacti/files/poller_output_remainder.patch

Modified: trunk/dports/net/cacti/Portfile
===================================================================
--- trunk/dports/net/cacti/Portfile	2007-01-31 05:45:40 UTC (rev 21623)
+++ trunk/dports/net/cacti/Portfile	2007-01-31 07:16:54 UTC (rev 21624)
@@ -3,7 +3,7 @@
 PortSystem	1.0
 
 name			cacti
-version			0.8.6i
+version			0.8.6j
 categories		net
 maintainers		markd at macports.org
 platforms		darwin
@@ -17,9 +17,9 @@
 homepage		http://www.cacti.net					
 master_sites		http://www.cacti.net/downloads/
 
-checksums		${distname}${extract.suffix} md5 341b5828d95db91f81f5fbba65411d63
+checksums		${distname}${extract.suffix} md5 29436be46b289d13dfce48e7618129e2
 
-patchfiles		poller_output_remainder.patch
+patchfiles		tree_console_missing_hosts.patch
 
 depends_lib		port:mysql5 \
 			port:rrdtool

Deleted: trunk/dports/net/cacti/files/poller_output_remainder.patch
===================================================================
--- trunk/dports/net/cacti/files/poller_output_remainder.patch	2007-01-31 05:45:40 UTC (rev 21623)
+++ trunk/dports/net/cacti/files/poller_output_remainder.patch	2007-01-31 07:16:54 UTC (rev 21624)
@@ -1,46 +0,0 @@
-diff -ruBbd lib/poller.php.org lib/poller.php
---- lib/poller.php.org	2006-10-08 23:06:01.000000000 -0400
-+++ lib/poller.php	2006-11-21 23:41:02.000000000 -0500
-@@ -213,7 +213,7 @@
- /* process_poller_output - grabs data from the 'poller_output' table and feeds the *completed*
-      results to RRDTool for processing
-    @arg $rrdtool_pipe - the array of pipes containing the file descriptor for rrdtool */
--function process_poller_output($rrdtool_pipe) {
-+function process_poller_output($rrdtool_pipe, $remainder = FALSE) {
- 	global $config;
- 
- 	include_once($config["library_path"] . "/rrd.php");
-@@ -221,6 +221,12 @@
- 	/* let's count the number of rrd files we processed */
- 	$rrds_processed = 0;
- 
-+	if ($remainder) {
-+		$limit = "";
-+	}else{
-+		$limit = "LIMIT 10000";
-+	}
-+
- 	/* create/update the rrd files */
- 	$results = db_fetch_assoc("select
- 		poller_output.output,
-@@ -231,7 +237,7 @@
- 		poller_item.rrd_num
- 		from (poller_output,poller_item)
- 		where (poller_output.local_data_id=poller_item.local_data_id and poller_output.rrd_name=poller_item.rrd_name)
--		limit 10000");
-+		$limit");
- 
- 	if (sizeof($results) > 0) {
- 		/* create an array keyed off of each .rrd file */
-diff -ruBbd poller.php.org poller.php
---- poller.php.org	2006-10-08 23:06:01.000000000 -0400
-+++ poller.php	2006-11-12 11:49:05.000000000 -0500
-@@ -166,7 +166,7 @@
- 		$polling_items = db_fetch_assoc("select poller_id,end_time from poller_time where poller_id = 0");
- 
- 		if (sizeof($polling_items) == $process_file_number) {
--			$rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe);
-+			$rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe, TRUE);
- 
- 			/* take time and log performance data */
- 			list($micro,$seconds) = split(" ", microtime());

Added: trunk/dports/net/cacti/files/tree_console_missing_hosts.patch
===================================================================
--- trunk/dports/net/cacti/files/tree_console_missing_hosts.patch	                        (rev 0)
+++ trunk/dports/net/cacti/files/tree_console_missing_hosts.patch	2007-01-31 07:16:54 UTC (rev 21624)
@@ -0,0 +1,20 @@
+--- lib/html_tree.php.org	2007-01-17 19:23:10.000000000 -0500
++++ lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
+@@ -328,7 +328,7 @@
+ 	while ($i > 1) {
+ 		$i--;
+ 
+-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
++		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
+ 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
+ 
+ 		$effective = @$_SESSION[$parent_variable];
+@@ -365,8 +365,6 @@
+    @returns - the string representing the leaf position
+ */
+ function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
+-	$root_test = str_pad('', $chars_per_tier, '0');
+-
+ 	$new_string = preg_replace("/0+$/",'',$order_key);
+ 
+ 	return $new_string;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070130/54a52da3/attachment.html