4 files changed, 39 insertions, 18 deletions

diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index a19f92bd1084..959200895c51 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ganglia-webfrontend
-PORTVERSION=	2.5.5
+PORTNAME=	webfrontend
+PORTVERSION=	3.0.0
 CATEGORIES=	sysutils net parallel www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ganglia
+PKGNAMEPREFIX=	ganglia-
+DISTNAME=	ganglia-${PORTVERSION}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	"Ganglia cluster monitor, web frontend"
@@ -17,11 +19,15 @@ COMMENT=	"Ganglia cluster monitor, web frontend"
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gmetad:${PORTSDIR}/sysutils/ganglia-monitor-core
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
+
 PLIST_SUB+=	WEBFRONTDIR="${WEBFRONTDIR}"
+
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 USE_PHP=	gd pcre xml
+USE_BZIP2=	yes
 WANT_PHP_MOD=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/web
 
 # The Ganglia Web Frontend port supports a number of options that may be
 # tweaked at buildtime.  Perform a "make options" to see more
@@ -33,7 +39,13 @@ WWWGRP?=	www
 # Set custom variables:
 #
 PKGOPTS=	${FILESDIR}/pkg-opts
-EXCEPTFILES=	AUTHORS ChangeLog COPYING addons webfrontend.spec
+EXCEPTFILES=	AUTHORS \
+		ChangeLog \
+		COPYING \
+		Makefile.am \
+		addons \
+		version.php.in \
+		webfrontend.spec
 
 pre-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -53,7 +65,7 @@ post-extract:
 .endif
 
 post-patch:
-	@ ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/conf.php
+	@ ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/conf.php
 
 do-install:
 	${MKDIR} ${PREFIX}/${WEBFRONTDIR}
diff --git a/sysutils/ganglia-webfrontend/distinfo b/sysutils/ganglia-webfrontend/distinfo
index 8a43d1b5d660..f481fbaed1ea 100644
--- a/sysutils/ganglia-webfrontend/distinfo
+++ b/sysutils/ganglia-webfrontend/distinfo
@@ -1,2 +1,2 @@
-MD5 (ganglia-webfrontend-2.5.5.tar.gz) = 26d32439a49a1b16754138fc5ff72033
-SIZE (ganglia-webfrontend-2.5.5.tar.gz) = 98076
+MD5 (ganglia-3.0.0.tar.bz2) = 62e514a34fb237dfb0649608d8a9377a
+SIZE (ganglia-3.0.0.tar.bz2) = 2528890
diff --git a/sysutils/ganglia-webfrontend/files/patch-conf.php b/sysutils/ganglia-webfrontend/files/patch-conf.php
index dab5eda12ad0..1ffbc959f533 100644
--- a/sysutils/ganglia-webfrontend/files/patch-conf.php
+++ b/sysutils/ganglia-webfrontend/files/patch-conf.php
@@ -1,21 +1,25 @@
 
 $FreeBSD$
 
---- conf.php.orig	Mon Nov 10 10:54:16 2003
-+++ conf.php	Thu Feb 12 18:40:24 2004
-@@ -5,7 +5,7 @@
+--- conf.php.orig
++++ conf.php
+@@ -3,11 +3,7 @@
  #
- $majorversion = 2;
- $minorversion = 5;
--$microversion = 4;
-+$microversion = 5;
+ # Gmetad-webfrontend version. Used to check for updates.
+ #
+-$majorversion = 2;
+-$minorversion = 5;
+-$microversion = 7;
+-
+-$ganglia_version = "$majorversion.$minorversion.$microversion";
++include_once "./version.php";
+ 
  #
  # The name of the directory in "./templates" which contains the
- # templates that you want to use. Templates are like a skin for the
-@@ -22,12 +22,12 @@
- #$gmetad_root = "/usr/local/gmetad";
+@@ -22,12 +18,12 @@
+ #
  
- # The high-performance gmetad.
+ # Where gmetad stores the rrd archives.
 -$gmetad_root = "/var/lib/ganglia";
 +$gmetad_root = "/var/db/ganglia";
  $rrds = "$gmetad_root/rrds";
@@ -23,7 +27,7 @@ $FreeBSD$
  # Leave this alone if rrdtool is installed in $gmetad_root,
  # otherwise, change it if it is installed elsewhere (like /usr/bin)
 -define("RRDTOOL", "/usr/bin/rrdtool");
-+define("RRDTOOL", "%%PREFIX%%/bin/rrdtool");
++define("RRDTOOL", "%%LOCALBASE%%/bin/rrdtool");
  
  #
  # If you want to grab data from a different ganglia source specify it here.
diff --git a/sysutils/ganglia-webfrontend/pkg-plist b/sysutils/ganglia-webfrontend/pkg-plist
index 873ba1fc94d5..4ddc54f480cf 100644
--- a/sysutils/ganglia-webfrontend/pkg-plist
+++ b/sysutils/ganglia-webfrontend/pkg-plist
@@ -10,6 +10,7 @@
 %%WEBFRONTDIR%%/graph.php
 %%WEBFRONTDIR%%/grid_tree.php
 %%WEBFRONTDIR%%/header.php
+%%WEBFRONTDIR%%/host_gmetrics.php
 %%WEBFRONTDIR%%/host_view.php
 %%WEBFRONTDIR%%/index.php
 %%WEBFRONTDIR%%/meta_view.php
@@ -19,10 +20,13 @@
 %%WEBFRONTDIR%%/private_clusters
 %%WEBFRONTDIR%%/show_node.php
 %%WEBFRONTDIR%%/styles.css
+%%WEBFRONTDIR%%/version.php
 %%WEBFRONTDIR%%/templates/Rocks/images/ganglia.jpg
 %%WEBFRONTDIR%%/templates/Rocks/images/rocks.jpg
 %%WEBFRONTDIR%%/templates/Rocks/images/hardhat.png
+%%WEBFRONTDIR%%/templates/Rocks/cluster_extra.tpl
 %%WEBFRONTDIR%%/templates/Rocks/header.tpl
+%%WEBFRONTDIR%%/templates/Rocks/host_extra.tpl
 %%WEBFRONTDIR%%/templates/default/images/cluster_0-24.jpg
 %%WEBFRONTDIR%%/templates/default/images/cluster_25-49.jpg
 %%WEBFRONTDIR%%/templates/default/images/cluster_50-74.jpg
@@ -48,6 +52,7 @@
 %%WEBFRONTDIR%%/templates/default/header-nobanner.tpl
 %%WEBFRONTDIR%%/templates/default/header.tpl
 %%WEBFRONTDIR%%/templates/default/host_extra.tpl
+%%WEBFRONTDIR%%/templates/default/host_gmetrics.tpl
 %%WEBFRONTDIR%%/templates/default/host_view.tpl
 %%WEBFRONTDIR%%/templates/default/meta_view.tpl
 %%WEBFRONTDIR%%/templates/default/node_extra.tpl