6 files changed, 20 insertions, 48 deletions

diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index 4b83a0dfb9bb..56d0176e188e 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -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 @@ PKGNAMEPREFIX=	ganglia-
 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 @@ SUB_LIST+=	WEBFRONTDIR="${WEBFRONTDIR}"
 PLIST_SUB+=	WEBFRONTDIR="${WEBFRONTDIR}"
 
 USE_PHP=	gd pcre xml
-USE_BZIP2=	yes
 WANT_PHP_MOD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/web
 
@@ -72,6 +70,7 @@ do-build:
 	    -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}
@@ -93,7 +92,7 @@ build-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 --git a/sysutils/ganglia-webfrontend/distinfo b/sysutils/ganglia-webfrontend/distinfo
index e6297436fbc3..2a2e078bebd9 100644
--- a/sysutils/ganglia-webfrontend/distinfo
+++ b/sysutils/ganglia-webfrontend/distinfo
@@ -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 --git a/sysutils/ganglia-webfrontend/files/patch-cluster__view.php b/sysutils/ganglia-webfrontend/files/patch-cluster__view.php
deleted file mode 100644
index b4399bfecb98..000000000000
--- a/sysutils/ganglia-webfrontend/files/patch-cluster__view.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- 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 --git a/sysutils/ganglia-webfrontend/files/patch-ganglia.php b/sysutils/ganglia-webfrontend/files/patch-ganglia.php
deleted file mode 100644
index 1af16d4fe466..000000000000
--- a/sysutils/ganglia-webfrontend/files/patch-ganglia.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- 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 --git a/sysutils/ganglia-webfrontend/files/pkg-message.in b/sysutils/ganglia-webfrontend/files/pkg-message.in
index cfea5c253a47..58b76608f5ed 100644
--- a/sysutils/ganglia-webfrontend/files/pkg-message.in
+++ b/sysutils/ganglia-webfrontend/files/pkg-message.in
@@ -3,8 +3,8 @@ The Ganglia Web Frontend has been installed in the directory
 %%PREFIX%%/%%WEBFRONTDIR%%.
 
 You must add appropriate configuration directives to your
-apache configuration file (%%PREFIX%%/etc/apache/httpd.conf).
-A typical configuration would be:
+web server configuration file.  A typical apache configuration
+would be:
 
     Alias /ganglia/ "%%PREFIX%%/%%WEBFRONTDIR%%/"
 
diff --git a/sysutils/ganglia-webfrontend/files/version.php b/sysutils/ganglia-webfrontend/files/version.php
new file mode 100644
index 000000000000..0dd364c418ac
--- /dev/null
+++ b/sysutils/ganglia-webfrontend/files/version.php
@@ -0,0 +1,11 @@
+<?php
+# This file is autogenerated
+
+$majorversion = 3;
+$minorversion = 0;
+$microversion = 4;
+
+$ganglia_version = "3.0.4";
+$ganglia_release_name    = "Otto";
+
+?>