Attachment 80426 Details for Bug 115363 – ganglia-webfrontend-3.0.4.patch

[patch] ganglia-webfrontend-3.0.4.patch

ganglia-webfrontend-3.0.4.patch (text/plain), 6.05 KB, created by michael on 2007-08-09 20:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: michael

Created: 2007-08-09 20:20:02 UTC

Size: 6.05 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/Makefile /usr/ports/sysutils/ganglia-webfrontend.new/Makefile
>--- /usr/ports/sysutils/ganglia-webfrontend/Makefile	2007-08-08 19:20:49.000000000 +0200
>+++ /usr/ports/sysutils/ganglia-webfrontend.new/Makefile	2007-08-09 20:55:41.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	webfrontend
>-PORTVERSION=	3.0.1
>-PORTREVISION=	3
>+PORTVERSION=	3.0.4
> CATEGORIES=	sysutils net parallel www
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	ganglia
>@@ -15,7 +14,7 @@
> DISTNAME=	ganglia-${PORTVERSION}
> 
> MAINTAINER=	brooks@FreeBSD.org
>-COMMENT=	"Ganglia cluster monitor, web frontend"
>+COMMENT=	Ganglia cluster monitor, web frontend
> 
> RUN_DEPENDS+=	${LOCALBASE}/sbin/gmetad:${PORTSDIR}/sysutils/ganglia-monitor-core
> 
>@@ -28,7 +27,6 @@
> PLIST_SUB+=	WEBFRONTDIR="${WEBFRONTDIR}"
> 
> USE_PHP=	gd pcre xml
>-USE_BZIP2=	yes
> WANT_PHP_MOD=	yes
> WRKSRC=		${WRKDIR}/${DISTNAME}/web
> 
>@@ -72,6 +70,7 @@
> 	    -a -prune -o -print \
> 	    | ${TAR} cTf - - | ${TAR} xUCf ${TMP_WEBFRONTDIR} -
> 	@${CP} ${WRKSRC}/conf.php ${TMP_WEBFRONTDIR}/conf.php.sample
>+	@${CP} ${FILESDIR}/version.php ${TMP_WEBFRONTDIR}/version.php
> 
> do-install:
> 	@${MKDIR} -m 0755 ${PREFIX}/${WEBFRONTDIR}
>@@ -86,14 +85,14 @@
> 
> build-plist:
> 	${RM} ${PLIST}
>-	@${ECHO_CMD} '@unexec cmp -s %D/%%WEBFRONTDIR%%/conf.php %D/%%WEBFRONTDIR%%/conf.php.sample && rm -f %D/%%WEBFRONTDIR%%/conf.php' >> ${PLIST}
>+	@${ECHO_CMD} '@unexec cmp -s %D/%%WEBFRONTDIR%%/conf.php %D/%%WEBFRONTDIR%%/conf.php.sample && ${RM} -f %D/%%WEBFRONTDIR%%/conf.php' >> ${PLIST}
> 	@${FIND} ${TMP_WEBFRONTDIR}/* -type f | \
> 	    ${SED} -e 's|${TMP_WEBFRONTDIR}|%%WEBFRONTDIR%%|' | \
> 	    ${SORT} >> ${PLIST}
> 	@${FIND} ${TMP_WEBFRONTDIR}/* -type d | \
> 	    ${SED} -e 's|${TMP_WEBFRONTDIR}|@dirrm %%WEBFRONTDIR%%|' | \
> 	    ${SORT} -r >> ${PLIST}
>-	@${ECHO_CMD} '@dirrmtry rmdir %D/%%WEBFRONTDIR%%' >> ${PLIST}
>+	@${ECHO_CMD} '@dirrmtry ${RMDIR} %D/%%WEBFRONTDIR%%' >> ${PLIST}
> 	@${ECHO_CMD} '@unexec (test -d %D/%%WEBFRONTDIR%% && (echo "Configuration information saved.  If you will *NOT* use this package anymore," && echo "please remove %D/%%WEBFRONTDIR%% and its contents manually.")) || true' >> ${PLIST}
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/distinfo /usr/ports/sysutils/ganglia-webfrontend.new/distinfo
>--- /usr/ports/sysutils/ganglia-webfrontend/distinfo	2007-08-08 19:20:49.000000000 +0200
>+++ /usr/ports/sysutils/ganglia-webfrontend.new/distinfo	2007-08-08 19:35:49.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (ganglia-3.0.1.tar.bz2) = 14f086834f91899d921bf7e7fe44b536
>-SHA256 (ganglia-3.0.1.tar.bz2) = 5806fef3d43e57988032b2ce757e6e12a24d68185664868a5b5c6781b7f0656e
>-SIZE (ganglia-3.0.1.tar.bz2) = 2649342
>+MD5 (ganglia-3.0.4.tar.gz) = 9a51023accb59b6ba76c10d7cb7322fa
>+SHA256 (ganglia-3.0.4.tar.gz) = a63c802392d211e8c4beabb9eb175292d72b650a6192bbc332feebd9bb5f3ec4
>+SIZE (ganglia-3.0.4.tar.gz) = 2842708
>diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/files/patch-cluster__view.php /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-cluster__view.php
>--- /usr/ports/sysutils/ganglia-webfrontend/files/patch-cluster__view.php	2007-08-08 19:20:49.000000000 +0200
>+++ /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-cluster__view.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,22 +0,0 @@
>-
>-$FreeBSD: ports/sysutils/ganglia-webfrontend/files/patch-cluster__view.php,v 1.1 2005/04/27 20:36:33 brooks Exp $
>-
>---- cluster_view.php.orig
>-+++ cluster_view.php
>-@@ -6,11 +6,11 @@
>- 
>- $tpl->assign("images","./templates/$template_name/images");
>- 
>--$cpu_num = !$showhosts ? $metrics["cpu_num"][SUM] : cluster_sum("cpu_num", $metrics);
>--$load_one_sum = !$showhosts ? $metrics["load_one"][SUM] : cluster_sum("load_one", $metrics);
>--$load_five_sum = !$showhosts ? $metrics["load_five"][SUM] : cluster_sum("load_five", $metrics);
>--$load_fifteen_sum = !$showhosts ? $metrics["load_fifteen"][SUM] : cluster_sum("load_fifteen", $metrics);
>--$units = !$showhosts ? $metrics[$metricname][UNITS] : $metrics[key($metrics)][$metricname][UNITS];
>-+$cpu_num = cluster_sum("cpu_num", $metrics);
>-+$load_one_sum = cluster_sum("load_one", $metrics);
>-+$load_five_sum = cluster_sum("load_five", $metrics);
>-+$load_fifteen_sum = cluster_sum("load_fifteen", $metrics);
>-+$units = $metrics[key($metrics)][$metricname][UNITS];
>- 
>- $tpl->assign("num_nodes", intval($cluster[HOSTS_UP]));
>- $tpl->assign("num_dead_nodes", intval($cluster[HOSTS_DOWN]));
>diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/files/patch-ganglia.php /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-ganglia.php
>--- /usr/ports/sysutils/ganglia-webfrontend/files/patch-ganglia.php	2007-08-08 19:20:49.000000000 +0200
>+++ /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-ganglia.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,16 +0,0 @@
>-
>-$FreeBSD: ports/sysutils/ganglia-webfrontend/files/patch-ganglia.php,v 1.1 2005/04/27 20:36:33 brooks Exp $
>-
>---- ganglia.php.orig
>-+++ ganglia.php
>-@@ -260,8 +260,8 @@
>-             $request = "/$clustername";
>-              break;
>-          case "cluster-summary":
>--            xml_set_element_handler($parser, "start_cluster_summary", "end_all");
>--            $request = "/$clustername?filter=summary";
>-+            xml_set_element_handler($parser, "start_cluster", "end_all");
>-+            $request = "/$clustername";
>-             break;
>-          case "node":
>-          case "host":
>diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/files/version.php /usr/ports/sysutils/ganglia-webfrontend.new/files/version.php
>--- /usr/ports/sysutils/ganglia-webfrontend/files/version.php	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/sysutils/ganglia-webfrontend.new/files/version.php	2007-08-08 19:38:17.000000000 +0200
>@@ -0,0 +1,11 @@
>+<?php
>+# This file is autogenerated
>+
>+$majorversion = 3;
>+$minorversion = 0;
>+$microversion = 4;
>+
>+$ganglia_version = "3.0.4";
>+$ganglia_release_name    = "Otto";
>+
>+?>
>Files /usr/ports/sysutils/ganglia-webfrontend/ganglia-webfrontend-3.0.4.tbz and /usr/ports/sysutils/ganglia-webfrontend.new/ganglia-webfrontend-3.0.4.tbz differ

Actions: View | Diff

Attachments on bug 115363: 80426