Update to v3.1.2 based upon recent work in pkgsrc-wip. The number of

changes over the intervening years is too large to list here.  See the
ChangeLog file or the home page for details.

6 files changed, 49 insertions, 47 deletions

diff --git a/www/ganglia-webfrontend/MESSAGE b/www/ganglia-webfrontend/MESSAGE
index a7cb42021b8..1f6bba690c9 100644
--- a/www/ganglia-webfrontend/MESSAGE
+++ b/www/ganglia-webfrontend/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/02/07 14:39:28 jschauma Exp $
+$NetBSD: MESSAGE,v 1.2 2009/11/10 14:56:35 brook Exp $
 
 The Ganglia Web Frontend has been installed in the directory
 ${PREFIX}/share/httpd/htdocs/ganglia
@@ -15,5 +15,8 @@ A typical configuration would be:
         AllowOverride None
         Order allow,deny
         Allow from all
+        <IfModule dir_module>
+            DirectoryIndex index.php
+        </IfModule>
     </Directory>
 ===========================================================================
diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile
index ab2694b9507..b8fa407c2f8 100644
--- a/www/ganglia-webfrontend/Makefile
+++ b/www/ganglia-webfrontend/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2009/02/16 13:53:45 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/11/10 14:56:35 brook Exp $
 #
 
-DISTNAME=	ganglia-3.0.1
+DISTNAME=	ganglia-3.1.2
 PKGNAME=	ganglia-webfrontend-3.0.1
-PKGREVISION=	3
 CATEGORIES=	www parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ganglia/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ganglia.sourceforge.net/
@@ -19,7 +17,6 @@ DEPENDS+=	ganglia-monitor-core>=3.0.1:../../parallel/ganglia-monitor-core
 
 USE_TOOLS+=	pax
 
-NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${DISTNAME}/web/
 
 DOCROOT=	${PREFIX}/share/httpd/htdocs/ganglia
@@ -27,14 +24,24 @@ MESSAGE_SUBST+=	PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 INSTALLATION_DIRS=	${DOCROOT}
 
-do-configure:
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" ${WRKSRC}/conf.php >	\
-		${WRKSRC}/conf.php.tmp &&			\
-		${MV} ${WRKSRC}/conf.php.tmp ${WRKSRC}/conf.php
-	${RM} ${WRKSRC}/conf.php.orig ${WRKSRC}/templates/default/footer.tpl.orig
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_MESSAGE.prefix=	Fixing PREFIX
+SUBST_FILES.prefix=	conf.php
+SUBST_VARS.prefix=	PREFIX
+
+JUNKFILES+=		AUTHORS COPYING Makefile.am conf.php.in conf.php.orig
+JUNKFILES+=		templates/default/footer.tpl.orig version.php.in
+
+do-build:
+	${MKDIR} ${WRKDIR}/ganglia
+	cd ${WRKSRC} && ${PAX} -rw . ${WRKDIR}/ganglia/
+.for f in ${JUNKFILES}
+	${RM} ${WRKDIR}/ganglia/$f
+.endfor
 
 do-install:
-	cd ${WRKSRC} && pax -rw . ${DESTDIR}${DOCROOT}/
+	cd ${WRKDIR}/ganglia && ${PAX} -rw . ${DESTDIR}${DOCROOT}/
 
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
diff --git a/www/ganglia-webfrontend/PLIST b/www/ganglia-webfrontend/PLIST
index 6c724f6af06..7c25ad6639a 100644
--- a/www/ganglia-webfrontend/PLIST
+++ b/www/ganglia-webfrontend/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:22 joerg Exp $
-share/httpd/htdocs/ganglia/AUTHORS
-share/httpd/htdocs/ganglia/COPYING
-share/httpd/htdocs/ganglia/ChangeLog
-share/httpd/htdocs/ganglia/Makefile.am
+@comment $NetBSD: PLIST,v 1.4 2009/11/10 14:56:35 brook Exp $
 share/httpd/htdocs/ganglia/auth.php
 share/httpd/htdocs/ganglia/class.TemplatePower.inc.php
 share/httpd/htdocs/ganglia/cluster_legend.html
@@ -13,10 +9,16 @@ share/httpd/htdocs/ganglia/functions.php
 share/httpd/htdocs/ganglia/ganglia.php
 share/httpd/htdocs/ganglia/get_context.php
 share/httpd/htdocs/ganglia/get_ganglia.php
+share/httpd/htdocs/ganglia/graph.d/cpu_report.php
+share/httpd/htdocs/ganglia/graph.d/load_report.php
+share/httpd/htdocs/ganglia/graph.d/mem_report.php
+share/httpd/htdocs/ganglia/graph.d/metric.php
+share/httpd/htdocs/ganglia/graph.d/network_report.php
+share/httpd/htdocs/ganglia/graph.d/packet_report.php
+share/httpd/htdocs/ganglia/graph.d/sample_report.php
 share/httpd/htdocs/ganglia/graph.php
 share/httpd/htdocs/ganglia/grid_tree.php
 share/httpd/htdocs/ganglia/header.php
-share/httpd/htdocs/ganglia/host_gmetrics.php
 share/httpd/htdocs/ganglia/host_view.php
 share/httpd/htdocs/ganglia/index.php
 share/httpd/htdocs/ganglia/meta_view.php
@@ -26,12 +28,6 @@ share/httpd/htdocs/ganglia/pie.php
 share/httpd/htdocs/ganglia/private_clusters
 share/httpd/htdocs/ganglia/show_node.php
 share/httpd/htdocs/ganglia/styles.css
-share/httpd/htdocs/ganglia/templates/Rocks/cluster_extra.tpl
-share/httpd/htdocs/ganglia/templates/Rocks/header.tpl
-share/httpd/htdocs/ganglia/templates/Rocks/host_extra.tpl
-share/httpd/htdocs/ganglia/templates/Rocks/images/ganglia.jpg
-share/httpd/htdocs/ganglia/templates/Rocks/images/hardhat.png
-share/httpd/htdocs/ganglia/templates/Rocks/images/rocks.jpg
 share/httpd/htdocs/ganglia/templates/default/cluster_extra.tpl
 share/httpd/htdocs/ganglia/templates/default/cluster_view.tpl
 share/httpd/htdocs/ganglia/templates/default/footer.tpl
@@ -39,7 +35,6 @@ share/httpd/htdocs/ganglia/templates/default/grid_tree.tpl
 share/httpd/htdocs/ganglia/templates/default/header-nobanner.tpl
 share/httpd/htdocs/ganglia/templates/default/header.tpl
 share/httpd/htdocs/ganglia/templates/default/host_extra.tpl
-share/httpd/htdocs/ganglia/templates/default/host_gmetrics.tpl
 share/httpd/htdocs/ganglia/templates/default/host_view.tpl
 share/httpd/htdocs/ganglia/templates/default/images/cluster_0-24.jpg
 share/httpd/htdocs/ganglia/templates/default/images/cluster_25-49.jpg
@@ -65,4 +60,3 @@ share/httpd/htdocs/ganglia/templates/default/node_extra.tpl
 share/httpd/htdocs/ganglia/templates/default/physical_view.tpl
 share/httpd/htdocs/ganglia/templates/default/show_node.tpl
 share/httpd/htdocs/ganglia/version.php
-share/httpd/htdocs/ganglia/version.php.in
diff --git a/www/ganglia-webfrontend/distinfo b/www/ganglia-webfrontend/distinfo
index 622fef6415c..ddd75280177 100644
--- a/www/ganglia-webfrontend/distinfo
+++ b/www/ganglia-webfrontend/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/04/03 19:15:20 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2009/11/10 14:56:35 brook Exp $
 
-SHA1 (ganglia-3.0.1.tar.bz2) = 3e5c4ec4a509713974dd1e8d516127f6aa2c5a20
-RMD160 (ganglia-3.0.1.tar.bz2) = 1f0ecc7388f1058d64df9ab98734810a983e6d26
-Size (ganglia-3.0.1.tar.bz2) = 2649342 bytes
-SHA1 (patch-aa) = 8f16c03a3f6c4234e2fbb742f54f748ff18e52b4
-SHA1 (patch-ab) = e78f35ea283860b345db4a4247b28898034cd7fd
+SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1
+RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3
+Size (ganglia-3.1.2.tar.gz) = 1213196 bytes
+SHA1 (patch-aa) = 7ccc7f4c807d0808c0cd9b1eb5dc7a24fb6e6897
+SHA1 (patch-ab) = 7b32ee769c7117361b8f81d35f74901a9a018b3d
diff --git a/www/ganglia-webfrontend/patches/patch-aa b/www/ganglia-webfrontend/patches/patch-aa
index 89778d66526..0e99ad2b5a2 100644
--- a/www/ganglia-webfrontend/patches/patch-aa
+++ b/www/ganglia-webfrontend/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/07 14:39:28 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2009/11/10 14:56:35 brook Exp $
 
---- conf.php.orig	2005-02-05 14:32:59.000000000 -0500
-+++ conf.php	2005-02-05 14:33:23.000000000 -0500
-@@ -22,12 +22,12 @@
+--- conf.php.orig	2009-01-28 16:23:20.000000000 -0700
++++ conf.php
+@@ -18,12 +18,12 @@ $template_name = "default";
  #
  
  # Where gmetad stores the rrd archives.
@@ -15,5 +15,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/02/07 14:39:28 jschauma Exp $
 -define("RRDTOOL", "/usr/bin/rrdtool");
 +define("RRDTOOL", "@PREFIX@/bin/rrdtool");
  
- #
- # If you want to grab data from a different ganglia source specify it here.
+ # Location for modular-graph files.
+ $graphdir='./graph.d';
diff --git a/www/ganglia-webfrontend/patches/patch-ab b/www/ganglia-webfrontend/patches/patch-ab
index 345541e1738..89ae5e330eb 100644
--- a/www/ganglia-webfrontend/patches/patch-ab
+++ b/www/ganglia-webfrontend/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:39:29 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2009/11/10 14:56:35 brook Exp $
 
---- templates/default/footer.tpl.orig	2005-02-06 13:29:17.000000000 -0500
-+++ templates/default/footer.tpl	2005-02-06 13:34:17.000000000 -0500
+--- templates/default/footer.tpl.orig	2009-01-28 16:23:20.000000000 -0700
++++ templates/default/footer.tpl
 @@ -1,5 +1,12 @@
  <HR>
  <CENTER>
@@ -13,16 +13,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:39:29 jschauma Exp $
 +    </td>
 +    <td>
  <FONT SIZE="-1" class=footer>
- Gmetad Web Frontend version {webfrontend-version}
+ Ganglia Web Frontend version {webfrontend-version}
  <A HREF="http://ganglia.sourceforge.net/downloads.php?component=ganglia-webfrontend&amp;
-@@ -11,7 +18,10 @@
+@@ -11,6 +18,8 @@ version={webbackend-version}">Check for 
  
  Downloading and parsing ganglia's XML tree took {parsetime}.<BR>
- Images created with <A HREF="http://www.rrdtool.com/">RRDTool</A>.<BR>
-+<br>
+ Images created with <A HREF="http://www.rrdtool.org/">RRDTool</A> version {rrdtool-version}.<BR>
 +Brought to you by <a href="http://www.pkgsrc.org/">pkgsrc - The NetBSD
 +Packages collection</a>.<br>
+ Pages generated using <A HREF="http://templatepower.codocad.com/">TemplatePower</A> version {templatepower-version}.<BR>
  </FONT>
  </CENTER>
- 
- </FORM>