Update www/ganglia-webfrontend to 3.7.1.

Move config files to standard location.
Make Apache/Nginx compatible (based on mail/rouncube).

Upstream changes follow.

3.7.1
* Fix for auth bypass when using the authentication module
* Fix for a XSS in the view adding interface
* Update JQuery Mobile library to 1.4.5

3.7.0
* Cubism integration
* Ganglia Reporting
* Couple reported XSS issues have been corrected

3.6.2
* Performance improvements
* New clearer heatmaps
* Other minor improvements and fixes

3.5.7
* Required Jquery files were missing from 3.5.6 release.

3.5.6
* Number of fixes to address XSS (Cross Site Scripting) issues
* Enhancement to the host view if use option
  "metric_groups_initially_collapsed". Clicking on metric groups
  dynamically loads images instead of reloading the page
* Fixed mobile view
* Incorporate legend in the selection when doing Inspect graph
* Stacked graph fixes
* Numerous other fixes and enhancements

3.5.2
* Fix for stacked graphs not showing after upgrading to 3.5.1
* Inspect graph now uses AJAX calls to retrieve data which should
  help in situations where users use Basic authentication

3.5.1
* Security advisory
* Support for same hostname being in multiple clusters

3.5.0
* Enable zoom to a selection in Inspect Graph
* Add Jump to Metric group drop down
* Add Timeshift functionality to graphs
* Other misc fixes and improvements

3.4.2
* Improvements to the live dashboard
* Fixed the aggregate graphs metric auto complete which broke in 3.4.1
* Add ability to specify critical and warning thresholds. Use in
  Live Dashboard and Views.
* Minor bug fixes

3.4.1
* Major improvements to Inspect Graph thanks to Peter Piela - deselect
  all data sources, select individual sources, change graph type from
  stack to line and vice versa
* Live Dashboard - integration of Tasseo
* Metrics drop down now includes ability to select optional reports

No changelog could be found for 3.1.3-3.4.0.

13 files changed, 584 insertions, 149 deletions

diff --git a/www/ganglia-webfrontend/MESSAGE b/www/ganglia-webfrontend/MESSAGE
index 1f6bba690c9..6f4ae51228e 100644
--- a/www/ganglia-webfrontend/MESSAGE
+++ b/www/ganglia-webfrontend/MESSAGE
@@ -1,22 +1,17 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2009/11/10 14:56:35 brook Exp $
+$NetBSD: MESSAGE,v 1.3 2016/02/16 13:05:23 fhajny Exp $
 
 The Ganglia Web Frontend has been installed in the directory
 ${PREFIX}/share/httpd/htdocs/ganglia
 
 You must add appropriate configuration directives to your
-apache configuration file (${PKG_SYSCONFDIR}/httpd/httpd.conf).
-A typical configuration would be:
+web server configuration file. You can use this example
+include line, for Apache:
 
-    Alias /ganglia/ "${PREFIX}/share/httpd/htdocs/ganglia/"
+  Include ${PKG_SYSCONFDIR}/apache.conf
+
+or for Nginx:
+
+  include ${PKG_SYSCONFDIR}/nginx.conf;
 
-    <Directory "${PREFIX}/share/httpd/htdocs/ganglia/">
-        Options Indexes FollowSymlinks MultiViews
-        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 31fc25d6904..49add46854d 100644
--- a/www/ganglia-webfrontend/Makefile
+++ b/www/ganglia-webfrontend/Makefile
@@ -1,47 +1,72 @@
-# $NetBSD: Makefile,v 1.16 2013/03/16 07:21:24 obache Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/16 13:05:23 fhajny Exp $
 #
 
-DISTNAME=	ganglia-3.1.2
-PKGNAME=	ganglia-webfrontend-3.1.2
-PKGREVISION=	2
+DISTNAME=	ganglia-web-3.7.1
+PKGNAME=	${DISTNAME:S/web/webfrontend/}
 CATEGORIES=	www parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ganglia/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ganglia.sourceforge.net/
 COMMENT=	PHP based frontend for the Ganglia Cluster Monitor
+LICENSE=	modified-bsd
 
-DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.1:../../www/ap-php
-DEPENDS+=	ganglia-monitor-core>=3.1.2:../../parallel/ganglia-monitor-core
+DEPENDS+=	ganglia-monitor-core>=3.7.1:../../parallel/ganglia-monitor-core
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/web/
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
-DOCROOT=	${PREFIX}/share/httpd/htdocs/ganglia
-MESSAGE_SUBST+=	PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+=		DOCROOT=${DOCROOT}
 
-INSTALLATION_DIRS=	${DOCROOT}
+PKG_SYSCONFSUBDIR=	ganglia
+DOCROOT=		share/ganglia
+EGDIR=			share/examples/ganglia
+
+# Should match parallel/ganglia-monitor-core
+GANGLIA_VARBASE?=	${VARBASE}/db
+GWEB_DIR?=		${GANGLIA_VARBASE}/ganglia
+
+OWN_DIRS_PERMS+=	${GWEB_DIR}/dwoo ${WWW_USER} ${WWW_GROUP} 0755
+OWN_DIRS_PERMS+=	${GWEB_DIR}/dwoo/cache ${WWW_USER} ${WWW_GROUP} 0755
+OWN_DIRS_PERMS+=	${GWEB_DIR}/dwoo/compiled ${WWW_USER} ${WWW_GROUP} 0755
+PKG_SYSCONFDIR_PERMS=	${WWW_USER} ${WWW_GROUP} 0755
+MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/filters ${WWW_USER} ${WWW_GROUP} 0755
+
+CONF_FILES+=		${EGDIR}/conf.php ${PKG_SYSCONFDIR}/conf.php
+CONF_FILES+=		${EGDIR}/apache.conf ${PKG_SYSCONFDIR}/apache.conf
+CONF_FILES+=		${EGDIR}/nginx.conf ${PKG_SYSCONFDIR}/nginx.conf
+CONF_FILES_PERMS+=	${EGDIR}/default.json ${PKG_SYSCONFDIR}/default.json ${WWW_USER} ${WWW_GROUP} 0644
+CONF_FILES_PERMS+=	${EGDIR}/event_color.json ${PKG_SYSCONFDIR}/event_color.json ${WWW_USER} ${WWW_GROUP} 0644
+CONF_FILES_PERMS+=	${EGDIR}/events.json ${PKG_SYSCONFDIR}/events.json ${WWW_USER} ${WWW_GROUP} 0644
+CONF_FILES_PERMS+=	${EGDIR}/view_default.json ${PKG_SYSCONFDIR}/view_default.json ${WWW_USER} ${WWW_GROUP} 0644
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fixing PREFIX
-SUBST_FILES.prefix=	conf.php
-SUBST_VARS.prefix=	PREFIX
+SUBST_FILES.prefix=	conf_default.php.in eval_conf.php conf/conf.php conf/apache.conf conf/nginx.conf
+SUBST_VARS.prefix=	PREFIX PKG_SYSCONFDIR PKG_SYSCONFBASE VARBASE DOCROOT EGDIR
+
+REPLACE_SH+=		nagios/*.sh
+
+MAKE_FLAGS+=		GCONFDIR=${PKG_SYSCONFDIR}
+MAKE_FLAGS+=		GDESTDIR=${PREFIX}/${DOCROOT}
+MAKE_FLAGS+=		GMETAD_ROOTDIR=${GANGLIA_VARBASE}/ganglia
+MAKE_FLAGS+=		GWEB_STATEDIR=${GWEB_DIR}
 
-JUNKFILES+=		AUTHORS COPYING Makefile.am conf.php.in conf.php.orig
-JUNKFILES+=		templates/default/footer.tpl.orig version.php.in
+INSTALLATION_DIRS+=	${DOCROOT} ${EGDIR}
 
-do-build:
-	${MKDIR} ${WRKDIR}/ganglia
-	cd ${WRKSRC} && ${PAX} -rw . ${WRKDIR}/ganglia/
-.for f in ${JUNKFILES}
-	${RM} ${WRKDIR}/ganglia/${f}
-.endfor
+post-extract:
+	${INSTALL_DATA} ${FILESDIR}/conf.php ${WRKSRC}/conf
+	${INSTALL_DATA} ${FILESDIR}/apache.conf ${WRKSRC}/conf
+	${INSTALL_DATA} ${FILESDIR}/nginx.conf ${WRKSRC}/conf
 
 do-install:
-	cd ${WRKDIR}/ganglia && ${PAX} -rw . ${DESTDIR}${DOCROOT}/
+	cd ${WRKSRC} && ${PAX} -rw -pp *.php *.html *.css api css	\
+		docs dwoo graph.d img js lib nagios templates test	\
+		${DESTDIR}${PREFIX}/${DOCROOT}
+	cd ${WRKSRC}/conf && ${PAX} -rw -pp * ${DESTDIR}${PREFIX}/${EGDIR}
 
-.include "../../mk/apache.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ganglia-webfrontend/PLIST b/www/ganglia-webfrontend/PLIST
index 7c25ad6639a..74ed6f510aa 100644
--- a/www/ganglia-webfrontend/PLIST
+++ b/www/ganglia-webfrontend/PLIST
@@ -1,62 +1,360 @@
-@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
-share/httpd/htdocs/ganglia/cluster_view.php
-share/httpd/htdocs/ganglia/conf.php
-share/httpd/htdocs/ganglia/footer.php
-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_view.php
-share/httpd/htdocs/ganglia/index.php
-share/httpd/htdocs/ganglia/meta_view.php
-share/httpd/htdocs/ganglia/node_legend.html
-share/httpd/htdocs/ganglia/physical_view.php
-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/default/cluster_extra.tpl
-share/httpd/htdocs/ganglia/templates/default/cluster_view.tpl
-share/httpd/htdocs/ganglia/templates/default/footer.tpl
-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_view.tpl
-share/httpd/htdocs/ganglia/templates/default/images/cluster_0-24.jpg
-share/httpd/htdocs/ganglia/templates/default/images/cluster_25-49.jpg
-share/httpd/htdocs/ganglia/templates/default/images/cluster_50-74.jpg
-share/httpd/htdocs/ganglia/templates/default/images/cluster_75-100.jpg
-share/httpd/htdocs/ganglia/templates/default/images/cluster_overloaded.jpg
-share/httpd/htdocs/ganglia/templates/default/images/cluster_private.jpg
-share/httpd/htdocs/ganglia/templates/default/images/grid_0-24.jpg
-share/httpd/htdocs/ganglia/templates/default/images/grid_25-49.jpg
-share/httpd/htdocs/ganglia/templates/default/images/grid_50-74.jpg
-share/httpd/htdocs/ganglia/templates/default/images/grid_75-100.jpg
-share/httpd/htdocs/ganglia/templates/default/images/grid_overloaded.jpg
-share/httpd/htdocs/ganglia/templates/default/images/grid_private.jpg
-share/httpd/htdocs/ganglia/templates/default/images/logo.jpg
-share/httpd/htdocs/ganglia/templates/default/images/node_0-24.jpg
-share/httpd/htdocs/ganglia/templates/default/images/node_25-49.jpg
-share/httpd/htdocs/ganglia/templates/default/images/node_50-74.jpg
-share/httpd/htdocs/ganglia/templates/default/images/node_75-100.jpg
-share/httpd/htdocs/ganglia/templates/default/images/node_dead.jpg
-share/httpd/htdocs/ganglia/templates/default/images/node_overloaded.jpg
-share/httpd/htdocs/ganglia/templates/default/meta_view.tpl
-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
+@comment $NetBSD: PLIST,v 1.5 2016/02/16 13:05:23 fhajny Exp $
+share/examples/ganglia/apache.conf
+share/examples/ganglia/conf.php
+share/examples/ganglia/default.json
+share/examples/ganglia/event_color.json
+share/examples/ganglia/events.json
+share/examples/ganglia/nginx.conf
+share/examples/ganglia/sql/ganglia.mysql
+share/examples/ganglia/view_default.json
+share/ganglia/actions.php
+share/ganglia/aggregate_graphs.php
+share/ganglia/api/.htaccess
+share/ganglia/api/events.php
+share/ganglia/api/host.php
+share/ganglia/api/metrics.php
+share/ganglia/api/metrics_autocomplete.php
+share/ganglia/api/rundeck.php
+share/ganglia/api/search.php
+share/ganglia/api/views.php
+share/ganglia/autorotation.php
+share/ganglia/breakdown_report_results.php
+share/ganglia/breakdown_reports.php
+share/ganglia/calendar.php
+share/ganglia/cluster_legend.html
+share/ganglia/cluster_view.php
+share/ganglia/compare_hosts.php
+share/ganglia/conf_default.php
+share/ganglia/css/chosen-sprite.png
+share/ganglia/css/chosen-sprite@2x.png
+share/ganglia/css/chosen.css
+share/ganglia/css/chosen.min.css
+share/ganglia/css/cubism.css
+share/ganglia/css/fullcalendar.css
+share/ganglia/css/images/ajax-loader.png
+share/ganglia/css/images/form-check-off.png
+share/ganglia/css/images/form-check-on.png
+share/ganglia/css/images/form-radio-off.png
+share/ganglia/css/images/form-radio-on.png
+share/ganglia/css/images/icon-search-black.png
+share/ganglia/css/images/icons-18-black.png
+share/ganglia/css/images/icons-18-white.png
+share/ganglia/css/images/icons-36-black.png
+share/ganglia/css/images/icons-36-white.png
+share/ganglia/css/jquery.flot.events.css
+share/ganglia/css/jquery.liveSearch.css
+share/ganglia/css/jquery.mobile-1.4.5.min.css
+share/ganglia/css/jquery.multiselect.css
+share/ganglia/css/qtip.min.css
+share/ganglia/css/smoothness/images/animated-overlay.gif
+share/ganglia/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+share/ganglia/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+share/ganglia/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+share/ganglia/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+share/ganglia/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+share/ganglia/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+share/ganglia/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+share/ganglia/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+share/ganglia/css/smoothness/images/ui-icons_222222_256x240.png
+share/ganglia/css/smoothness/images/ui-icons_2e83ff_256x240.png
+share/ganglia/css/smoothness/images/ui-icons_454545_256x240.png
+share/ganglia/css/smoothness/images/ui-icons_888888_256x240.png
+share/ganglia/css/smoothness/images/ui-icons_cd0a0a_256x240.png
+share/ganglia/css/smoothness/jquery-ui-1.10.2.custom.css
+share/ganglia/css/smoothness/jquery-ui-1.10.2.custom.min.css
+share/ganglia/css/tasseo.css
+share/ganglia/cubism.php
+share/ganglia/cubism_form.php
+share/ganglia/decompose_graph.php
+share/ganglia/docs/ad-hoc-views.mdown
+share/ganglia/dwoo/Dwoo.compiled.php
+share/ganglia/dwoo/Dwoo.php
+share/ganglia/dwoo/Dwoo/Adapters/Agavi/DwooRenderer.php
+share/ganglia/dwoo/Dwoo/Adapters/Agavi/README
+share/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/t.php
+share/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/url.php
+share/ganglia/dwoo/Dwoo/Adapters/CakePHP/README
+share/ganglia/dwoo/Dwoo/Adapters/CakePHP/dwoo.php
+share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/README
+share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php
+share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php
+share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php
+share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/views/dwoowelcome.tpl
+share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/views/page.tpl
+share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/Dwoo.php
+share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/PluginProxy.php
+share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/README
+share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/View.php
+share/ganglia/dwoo/Dwoo/Block/Plugin.php
+share/ganglia/dwoo/Dwoo/Compilation/Exception.php
+share/ganglia/dwoo/Dwoo/Compiler.php
+share/ganglia/dwoo/Dwoo/Core.php
+share/ganglia/dwoo/Dwoo/Data.php
+share/ganglia/dwoo/Dwoo/Exception.php
+share/ganglia/dwoo/Dwoo/Filter.php
+share/ganglia/dwoo/Dwoo/ICompilable.php
+share/ganglia/dwoo/Dwoo/ICompilable/Block.php
+share/ganglia/dwoo/Dwoo/ICompiler.php
+share/ganglia/dwoo/Dwoo/IDataProvider.php
+share/ganglia/dwoo/Dwoo/IElseable.php
+share/ganglia/dwoo/Dwoo/ILoader.php
+share/ganglia/dwoo/Dwoo/IPluginProxy.php
+share/ganglia/dwoo/Dwoo/ITemplate.php
+share/ganglia/dwoo/Dwoo/Loader.php
+share/ganglia/dwoo/Dwoo/Plugin.php
+share/ganglia/dwoo/Dwoo/Processor.php
+share/ganglia/dwoo/Dwoo/Security/Exception.php
+share/ganglia/dwoo/Dwoo/Security/Policy.php
+share/ganglia/dwoo/Dwoo/Smarty/Adapter.php
+share/ganglia/dwoo/Dwoo/Template/File.php
+share/ganglia/dwoo/Dwoo/Template/String.php
+share/ganglia/dwoo/dwooAutoload.php
+share/ganglia/dwoo/plugins/builtin/blocks/a.php
+share/ganglia/dwoo/plugins/builtin/blocks/auto_escape.php
+share/ganglia/dwoo/plugins/builtin/blocks/block.php
+share/ganglia/dwoo/plugins/builtin/blocks/capture.php
+share/ganglia/dwoo/plugins/builtin/blocks/dynamic.php
+share/ganglia/dwoo/plugins/builtin/blocks/else.php
+share/ganglia/dwoo/plugins/builtin/blocks/elseif.php
+share/ganglia/dwoo/plugins/builtin/blocks/for.php
+share/ganglia/dwoo/plugins/builtin/blocks/foreach.php
+share/ganglia/dwoo/plugins/builtin/blocks/foreachelse.php
+share/ganglia/dwoo/plugins/builtin/blocks/forelse.php
+share/ganglia/dwoo/plugins/builtin/blocks/if.php
+share/ganglia/dwoo/plugins/builtin/blocks/loop.php
+share/ganglia/dwoo/plugins/builtin/blocks/section.php
+share/ganglia/dwoo/plugins/builtin/blocks/smartyinterface.php
+share/ganglia/dwoo/plugins/builtin/blocks/strip.php
+share/ganglia/dwoo/plugins/builtin/blocks/template.php
+share/ganglia/dwoo/plugins/builtin/blocks/textformat.php
+share/ganglia/dwoo/plugins/builtin/blocks/topLevelBlock.php
+share/ganglia/dwoo/plugins/builtin/blocks/with.php
+share/ganglia/dwoo/plugins/builtin/blocks/withelse.php
+share/ganglia/dwoo/plugins/builtin/filters/html_format.php
+share/ganglia/dwoo/plugins/builtin/functions/assign.php
+share/ganglia/dwoo/plugins/builtin/functions/capitalize.php
+share/ganglia/dwoo/plugins/builtin/functions/cat.php
+share/ganglia/dwoo/plugins/builtin/functions/count_characters.php
+share/ganglia/dwoo/plugins/builtin/functions/count_paragraphs.php
+share/ganglia/dwoo/plugins/builtin/functions/count_sentences.php
+share/ganglia/dwoo/plugins/builtin/functions/count_words.php
+share/ganglia/dwoo/plugins/builtin/functions/counter.php
+share/ganglia/dwoo/plugins/builtin/functions/cycle.php
+share/ganglia/dwoo/plugins/builtin/functions/date_format.php
+share/ganglia/dwoo/plugins/builtin/functions/default.php
+share/ganglia/dwoo/plugins/builtin/functions/dump.php
+share/ganglia/dwoo/plugins/builtin/functions/eol.php
+share/ganglia/dwoo/plugins/builtin/functions/escape.php
+share/ganglia/dwoo/plugins/builtin/functions/eval.php
+share/ganglia/dwoo/plugins/builtin/functions/extends.php
+share/ganglia/dwoo/plugins/builtin/functions/extendsCheck.php
+share/ganglia/dwoo/plugins/builtin/functions/fetch.php
+share/ganglia/dwoo/plugins/builtin/functions/include.php
+share/ganglia/dwoo/plugins/builtin/functions/indent.php
+share/ganglia/dwoo/plugins/builtin/functions/isset.php
+share/ganglia/dwoo/plugins/builtin/functions/load_templates.php
+share/ganglia/dwoo/plugins/builtin/functions/lower.php
+share/ganglia/dwoo/plugins/builtin/functions/mailto.php
+share/ganglia/dwoo/plugins/builtin/functions/math.php
+share/ganglia/dwoo/plugins/builtin/functions/nl2br.php
+share/ganglia/dwoo/plugins/builtin/functions/optional.php
+share/ganglia/dwoo/plugins/builtin/functions/regex_replace.php
+share/ganglia/dwoo/plugins/builtin/functions/replace.php
+share/ganglia/dwoo/plugins/builtin/functions/return.php
+share/ganglia/dwoo/plugins/builtin/functions/reverse.php
+share/ganglia/dwoo/plugins/builtin/functions/safe.php
+share/ganglia/dwoo/plugins/builtin/functions/spacify.php
+share/ganglia/dwoo/plugins/builtin/functions/string_format.php
+share/ganglia/dwoo/plugins/builtin/functions/strip_tags.php
+share/ganglia/dwoo/plugins/builtin/functions/tif.php
+share/ganglia/dwoo/plugins/builtin/functions/truncate.php
+share/ganglia/dwoo/plugins/builtin/functions/upper.php
+share/ganglia/dwoo/plugins/builtin/functions/whitespace.php
+share/ganglia/dwoo/plugins/builtin/functions/wordwrap.php
+share/ganglia/dwoo/plugins/builtin/helper.array.php
+share/ganglia/dwoo/plugins/builtin/processors/pre.smarty_compat.php
+share/ganglia/edit_optional_graphs.php
+share/ganglia/eval_conf.php
+share/ganglia/events.php
+share/ganglia/footer.php
+share/ganglia/functions.php
+share/ganglia/ganglia.php
+share/ganglia/get_context.php
+share/ganglia/get_ganglia.php
+share/ganglia/get_overlay_events.php
+share/ganglia/global.php
+share/ganglia/graph.d/apache_report.json
+share/ganglia/graph.d/apache_response_report.json
+share/ganglia/graph.d/cpu_report.json
+share/ganglia/graph.d/cpu_report.php
+share/ganglia/graph.d/load_all_report.json
+share/ganglia/graph.d/load_report.json
+share/ganglia/graph.d/mem_report.json
+share/ganglia/graph.d/mem_report.php
+share/ganglia/graph.d/metric.php
+share/ganglia/graph.d/network_report.json
+share/ganglia/graph.d/nfs_v3_client_report.json
+share/ganglia/graph.d/packet_report.json
+share/ganglia/graph.d/sample_report.php
+share/ganglia/graph.d/varnish_report.php
+share/ganglia/graph.php
+share/ganglia/graph_all_periods.php
+share/ganglia/grid_tree.php
+share/ganglia/header.php
+share/ganglia/host_overview.php
+share/ganglia/host_view.php
+share/ganglia/img/access-denied.jpg
+share/ganglia/img/calendar.gif
+share/ganglia/img/red-pointer.png
+share/ganglia/img/spin-night.gif
+share/ganglia/img/spin.gif
+share/ganglia/img/spinner.gif
+share/ganglia/img/toggle-night.png
+share/ganglia/img/toggle-number.png
+share/ganglia/index.php
+share/ganglia/inspect_graph.php
+share/ganglia/js/chosen.jquery.js
+share/ganglia/js/chosen.jquery.min.js
+share/ganglia/js/combobox.js
+share/ganglia/js/create-flot-graphs.js
+share/ganglia/js/excanvas.js
+share/ganglia/js/excanvas.min.js
+share/ganglia/js/fullcalendar.js
+share/ganglia/js/ganglia.js
+share/ganglia/js/jquery-ui-timepicker-addon.js
+share/ganglia/js/jquery-ui.min.js
+share/ganglia/js/jquery.ba-bbq.js
+share/ganglia/js/jquery.ba-bbq.min.js
+share/ganglia/js/jquery.buttonsetv.js
+share/ganglia/js/jquery.cookie.js
+share/ganglia/js/jquery.flot.crosshair.js
+share/ganglia/js/jquery.flot.crosshair.min.js
+share/ganglia/js/jquery.flot.events.js
+share/ganglia/js/jquery.flot.js
+share/ganglia/js/jquery.flot.min.js
+share/ganglia/js/jquery.flot.selection.js
+share/ganglia/js/jquery.flot.selection.min.js
+share/ganglia/js/jquery.flot.stack.js
+share/ganglia/js/jquery.flot.stack.min.js
+share/ganglia/js/jquery.flot.time.js
+share/ganglia/js/jquery.flot.time.min.js
+share/ganglia/js/jquery.gangZoom.js
+share/ganglia/js/jquery.livesearch.js
+share/ganglia/js/jquery.livesearch.min.js
+share/ganglia/js/jquery.multiselect.filter.css
+share/ganglia/js/jquery.multiselect.filter.js
+share/ganglia/js/jquery.multiselect.js
+share/ganglia/js/jquery.qtip.min.js
+share/ganglia/js/jquery.scrollTo-1.4.2.js
+share/ganglia/js/jquery.scrollTo-1.4.3.1-min.js
+share/ganglia/js/jstree/jstree.js
+share/ganglia/js/jstree/jstree.min.js
+share/ganglia/js/jstree/libs/jquery.js
+share/ganglia/js/jstree/libs/require.js
+share/ganglia/js/jstree/themes/default/32px.png
+share/ganglia/js/jstree/themes/default/40px.png
+share/ganglia/js/jstree/themes/default/style.css
+share/ganglia/js/jstree/themes/default/style.min.css
+share/ganglia/js/jstree/themes/default/throbber.gif
+share/ganglia/js/tasseo.js
+share/ganglia/lib/Cache/Driver_Json.php
+share/ganglia/lib/Cache/Driver_Memcache.php
+share/ganglia/lib/Events/Driver_Json.php
+share/ganglia/lib/Events/Driver_Mdb2.php
+share/ganglia/lib/GangliaAcl.php
+share/ganglia/lib/GangliaAuth.php
+share/ganglia/lib/Services/JSON.php
+share/ganglia/lib/Zend/Acl.php
+share/ganglia/lib/Zend/Acl/Assert/Interface.php
+share/ganglia/lib/Zend/Acl/Exception.php
+share/ganglia/lib/Zend/Acl/Resource.php
+share/ganglia/lib/Zend/Acl/Resource/Interface.php
+share/ganglia/lib/Zend/Acl/Role.php
+share/ganglia/lib/Zend/Acl/Role/Interface.php
+share/ganglia/lib/Zend/Acl/Role/Registry.php
+share/ganglia/lib/Zend/Acl/Role/Registry/Exception.php
+share/ganglia/lib/Zend/Exception.php
+share/ganglia/lib/cache.php
+share/ganglia/lib/common_api.php
+share/ganglia/lib/json.php
+share/ganglia/login.php
+share/ganglia/logout.php
+share/ganglia/meta_view.php
+share/ganglia/metric_group_view.php
+share/ganglia/mobile.php
+share/ganglia/mobile_helper.php
+share/ganglia/nagios/check_for_stuck_gmonds.php
+share/ganglia/nagios/check_for_stuck_gmonds.sh
+share/ganglia/nagios/check_ganglia_metric.sh
+share/ganglia/nagios/check_heartbeat.php
+share/ganglia/nagios/check_heartbeat.sh
+share/ganglia/nagios/check_host_regex.php
+share/ganglia/nagios/check_host_regex.sh
+share/ganglia/nagios/check_metric.php
+share/ganglia/nagios/check_metric_regex.php
+share/ganglia/nagios/check_metric_regex.sh
+share/ganglia/nagios/check_multiple_metrics.php
+share/ganglia/nagios/check_multiple_metrics.sh
+share/ganglia/nagios/check_multiple_metrics_warn.php
+share/ganglia/nagios/check_multiple_metrics_warn.sh
+share/ganglia/nagios/check_value_same_everywhere.php
+share/ganglia/nagios/check_value_same_everywhere.sh
+share/ganglia/nagios/warmup_ganglia_cache.php
+share/ganglia/nagios/warmup_metric_cache.php
+share/ganglia/nagios/warmup_metric_cache.sh
+share/ganglia/node_legend.html
+share/ganglia/physical_view.php
+share/ganglia/pie.php
+share/ganglia/search.php
+share/ganglia/show_node.php
+share/ganglia/stacked.php
+share/ganglia/styles.css
+share/ganglia/tasseo.php
+share/ganglia/tattle_autocomplete.php
+share/ganglia/templates/default/cluster_extra.tpl
+share/ganglia/templates/default/cluster_host_metric_graphs.tpl
+share/ganglia/templates/default/cluster_overview.tpl
+share/ganglia/templates/default/cluster_refresh.tpl
+share/ganglia/templates/default/cluster_view.tpl
+share/ganglia/templates/default/compare_hosts.tpl
+share/ganglia/templates/default/decompose_graph.tpl
+share/ganglia/templates/default/footer.tpl
+share/ganglia/templates/default/grid_tree.tpl
+share/ganglia/templates/default/header-nobanner.tpl
+share/ganglia/templates/default/header.tpl
+share/ganglia/templates/default/host_extra.tpl
+share/ganglia/templates/default/host_overview.tpl
+share/ganglia/templates/default/host_view.tpl
+share/ganglia/templates/default/images/cluster_0-24.jpg
+share/ganglia/templates/default/images/cluster_25-49.jpg
+share/ganglia/templates/default/images/cluster_50-74.jpg
+share/ganglia/templates/default/images/cluster_75-100.jpg
+share/ganglia/templates/default/images/cluster_overloaded.jpg
+share/ganglia/templates/default/images/cluster_private.jpg
+share/ganglia/templates/default/images/grid_0-24.jpg
+share/ganglia/templates/default/images/grid_25-49.jpg
+share/ganglia/templates/default/images/grid_50-74.jpg
+share/ganglia/templates/default/images/grid_75-100.jpg
+share/ganglia/templates/default/images/grid_overloaded.jpg
+share/ganglia/templates/default/images/grid_private.jpg
+share/ganglia/templates/default/images/logo.jpg
+share/ganglia/templates/default/images/node_0-24.jpg
+share/ganglia/templates/default/images/node_25-49.jpg
+share/ganglia/templates/default/images/node_50-74.jpg
+share/ganglia/templates/default/images/node_75-100.jpg
+share/ganglia/templates/default/images/node_dead.jpg
+share/ganglia/templates/default/images/node_overloaded.jpg
+share/ganglia/templates/default/meta_view.tpl
+share/ganglia/templates/default/metric_group_view.tpl
+share/ganglia/templates/default/node_extra.tpl
+share/ganglia/templates/default/physical_view.tpl
+share/ganglia/templates/default/show_node.tpl
+share/ganglia/templates/default/view_content.tpl
+share/ganglia/templates/default/views_view.tpl
+share/ganglia/test/GangliaAclTest.php
+share/ganglia/test/GangliaAuthTest.php
+share/ganglia/test/phpcs-ganglia-web.xml
+share/ganglia/trend_navigation.php
+share/ganglia/version.php
+share/ganglia/view_content.php
+share/ganglia/views_view.php
diff --git a/www/ganglia-webfrontend/distinfo b/www/ganglia-webfrontend/distinfo
index b5025d1ca2f..4aef6892dbc 100644
--- a/www/ganglia-webfrontend/distinfo
+++ b/www/ganglia-webfrontend/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 02:46:54 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/02/16 13:05:23 fhajny Exp $
 
-SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1
-RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3
-SHA512 (ganglia-3.1.2.tar.gz) = 788d6a369c2d5c9186b491659c9d3986fbebf0b34021e3b1d26eaf534d0457c922b33dcca735bd7e4ce302428d95040473d097f9363595c3c4e131272c4da07e
-Size (ganglia-3.1.2.tar.gz) = 1213196 bytes
-SHA1 (patch-aa) = 7ccc7f4c807d0808c0cd9b1eb5dc7a24fb6e6897
-SHA1 (patch-ab) = 7b32ee769c7117361b8f81d35f74901a9a018b3d
+SHA1 (ganglia-web-3.7.1.tar.gz) = f7852fed1e3afdfa093c1c12a5db9dc7b7b91028
+RMD160 (ganglia-web-3.7.1.tar.gz) = b0693c44bbdc4b32b095957c1ccf4735b7941119
+SHA512 (ganglia-web-3.7.1.tar.gz) = 5a907a4d35b363713c3b0ba43964c0076e5f85972ba9721c1cf14c164bca2c96327b442e7cb92d11f1d5d94f15b10289cf71b2e3aa122ebcd73153be133c1a64
+Size (ganglia-web-3.7.1.tar.gz) = 854938 bytes
+SHA1 (patch-Makefile) = c246326e81b3df16b3289891e0b6ad37fb8fca55
+SHA1 (patch-conf__default.php.in) = 0d5d9417d20f74bd1b1e3ab4e83738779a19fda1
+SHA1 (patch-eval__conf.php) = ce40cbee4c9867f86a67009074d0d46308dcb561
diff --git a/www/ganglia-webfrontend/files/apache.conf b/www/ganglia-webfrontend/files/apache.conf
new file mode 100644
index 00000000000..8ad9c5d44cd
--- /dev/null
+++ b/www/ganglia-webfrontend/files/apache.conf
@@ -0,0 +1,23 @@
+# $NetBSD: apache.conf,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+#
+# Ganglia Web configuration file fragment for Apache
+# Add to your existing httpd.conf configuration file.
+
+Alias /ganglia/ "@PREFIX@/@DOCROOT@/"
+
+<Directory "@PREFIX@/@DOCROOT@/">
+    Options Indexes FollowSymlinks MultiViews
+    AllowOverride None
+    <IfModule authn_core_module>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !authn_core_module>
+        # Apache 2.2
+        Order allow,deny
+        Allow from all
+    </IfModule>
+    <IfModule dir_module>
+        DirectoryIndex index.php
+    </IfModule>
+</Directory>
diff --git a/www/ganglia-webfrontend/files/conf.php b/www/ganglia-webfrontend/files/conf.php
new file mode 100644
index 00000000000..ae29bd72c24
--- /dev/null
+++ b/www/ganglia-webfrontend/files/conf.php
@@ -0,0 +1,9 @@
+<?php
+
+/* $NetBSD: conf.php,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+
+   Use this file to override defaults in @PREFIX@/DOCROOT@/conf_default.php
+
+*/
+
+?>
diff --git a/www/ganglia-webfrontend/files/nginx.conf b/www/ganglia-webfrontend/files/nginx.conf
new file mode 100644
index 00000000000..be12fc25916
--- /dev/null
+++ b/www/ganglia-webfrontend/files/nginx.conf
@@ -0,0 +1,15 @@
+# $NetBSD: nginx.conf,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+#
+# Ganglia Web configuration file fragment for nginx
+# Add to your existing server{} definition.
+
+    location /ganglia {
+        alias @PREFIX@/@DOCROOT@;
+        index index.php;
+        location ~ \.php$ {
+            include @PKG_SYSCONFBASE@/nginx/fastcgi_params;
+            fastcgi_pass unix:@VARBASE@/run/php-fpm.sock;
+            fastcgi_param SCRIPT_FILENAME $request_filename;
+            fastcgi_index index.php;
+        }
+    }
diff --git a/www/ganglia-webfrontend/options.mk b/www/ganglia-webfrontend/options.mk
new file mode 100644
index 00000000000..e485009b0f8
--- /dev/null
+++ b/www/ganglia-webfrontend/options.mk
@@ -0,0 +1,34 @@
+# $NetBSD: options.mk,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ganglia-webfrontend
+
+PKG_OPTIONS_REQUIRED_GROUPS=	webserver
+PKG_OPTIONS_GROUP.webserver=	apache nginx
+
+PKG_SUPPORTED_OPTIONS=		#
+PKG_SUGGESTED_OPTIONS=		apache
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Use apache web server
+###
+.if !empty(PKG_OPTIONS:Mapache)
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.1:../../www/ap-php
+WWW_USER?=		${APACHE_USER}
+WWW_GROUP?=		${APACHE_GROUP}
+BUILD_DEFS+=		APACHE_USER APACHE_GROUP
+.include "../../mk/apache.mk"
+.endif
+
+###
+### Use nginx web server
+###
+.if !empty(PKG_OPTIONS:Mnginx)
+DEPENDS+=	nginx-[0-9]*:../../www/nginx
+NGINX_USER?=		nginx
+NGINX_GROUP?=		nginx
+WWW_USER?=		${NGINX_USER}
+WWW_GROUP?=		${NGINX_USER}
+BUILD_DEFS+=		NGINX_USER NGINX_GROUP
+.endif
diff --git a/www/ganglia-webfrontend/patches/patch-Makefile b/www/ganglia-webfrontend/patches/patch-Makefile
new file mode 100644
index 00000000000..cd92e93de22
--- /dev/null
+++ b/www/ganglia-webfrontend/patches/patch-Makefile
@@ -0,0 +1,28 @@
+$NetBSD: patch-Makefile,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+
+Assert proper paths.
+
+--- Makefile.orig	2015-10-01 15:47:41.000000000 +0000
++++ Makefile
+@@ -33,7 +33,7 @@ clean:
+ 	rm -rf $(TARGETS) $(DIST_DIR) $(DIST_TARBALL) rpmbuild
+ 
+ conf_default.php:	conf_default.php.in
+-	sed -e "s|@vargmetadir@|$(GMETAD_ROOTDIR)|" -e "s|@vargwebstatedir@|$(GWEB_STATEDIR)|g" conf_default.php.in > conf_default.php
++	sed -e "s|@etcdir@|$(GCONFDIR)|" -e "s|@vargmetadir@|$(GMETAD_ROOTDIR)|" -e "s|@vargwebstatedir@|$(GWEB_STATEDIR)|g" conf_default.php.in > conf_default.php
+ 
+ ganglia-web.spec:	ganglia-web.spec.in
+ 	sed -e s/@GWEB_VERSION@/$(GWEB_VERSION)/ -e "s|@vargwebdir@|$(GWEB_STATEDIR)|" -e "s|@varapacheuser@|$(APACHE_USER)|g" -e "s|@etcdir@|$(GCONFDIR)|g" ganglia-web.spec.in > ganglia-web.spec
+@@ -51,10 +51,9 @@ install:	dist-dir
+ 	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/compiled && \
+ 	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/cache && \
+ 	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR) && \
+-	rsync -a $(DIST_DIR)/conf $(DESTDIR)/$(GWEB_STATEDIR) && \
++	rsync -a $(DIST_DIR)/conf $(DESTDIR)/$(GCONFDIR) && \
+ 	mkdir -p $(DESTDIR)/$(GDESTDIR) && \
+-	rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR) && \
+-	chown -R $(APACHE_USER):$(APACHE_USER) $(DESTDIR)/$(GWEB_STATEDIR)
++	rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR)
+ 
+ dist-gzip:	dist-dir
+ 	if [ -f $(DIST_TARBALL) ]; then \
diff --git a/www/ganglia-webfrontend/patches/patch-aa b/www/ganglia-webfrontend/patches/patch-aa
deleted file mode 100644
index 0e99ad2b5a2..00000000000
--- a/www/ganglia-webfrontend/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/11/10 14:56:35 brook Exp $
-
---- 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.
--$gmetad_root = "/var/lib/ganglia";
-+$gmetad_root = "/var/db/ganglia";
- $rrds = "$gmetad_root/rrds";
- 
- # 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");
- 
- # Location for modular-graph files.
- $graphdir='./graph.d';
diff --git a/www/ganglia-webfrontend/patches/patch-ab b/www/ganglia-webfrontend/patches/patch-ab
deleted file mode 100644
index 89ae5e330eb..00000000000
--- a/www/ganglia-webfrontend/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/11/10 14:56:35 brook Exp $
-
---- templates/default/footer.tpl.orig	2009-01-28 16:23:20.000000000 -0700
-+++ templates/default/footer.tpl
-@@ -1,5 +1,12 @@
- <HR>
- <CENTER>
-+<table border="0" cellspacing="5" cellpadding="5">
-+  <tr>
-+    <td>
-+      <a href="http://www.netbsd.org/"><img src="http://www.netbsd.org/images/NetBSD-flag.png"
-+        border="0" alt="Of course it runs NetBSD!"></a>
-+    </td>
-+    <td>
- <FONT SIZE="-1" class=footer>
- Ganglia Web Frontend version {webfrontend-version}
- <A HREF="http://ganglia.sourceforge.net/downloads.php?component=ganglia-webfrontend&amp;
-@@ -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.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>
diff --git a/www/ganglia-webfrontend/patches/patch-conf__default.php.in b/www/ganglia-webfrontend/patches/patch-conf__default.php.in
new file mode 100644
index 00000000000..8599f848172
--- /dev/null
+++ b/www/ganglia-webfrontend/patches/patch-conf__default.php.in
@@ -0,0 +1,35 @@
+$NetBSD: patch-conf__default.php.in,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+
+Assert proper paths.
+
+--- conf_default.php.in.orig	2015-10-01 15:47:41.000000000 +0000
++++ conf_default.php.in
+@@ -11,6 +11,7 @@
+ #
+ $conf['gweb_root'] = dirname(__FILE__);
+ $conf['gweb_confdir'] = "@vargwebstatedir@";
++$conf['gweb_sysconfdir'] = "@etcdir@";
+ 
+ include_once $conf['gweb_root'] . "/version.php";
+ 
+@@ -42,16 +43,16 @@ $conf['dwoo_compiled_dir'] = "${conf['gw
+ $conf['dwoo_cache_dir'] = "${conf['gweb_confdir']}/dwoo/cache";
+ 
+ # Where to store web-based configuration
+-$conf['views_dir'] = $conf['gweb_confdir'] . '/conf';
+-$conf['conf_dir'] = $conf['gweb_confdir'] . '/conf';
++$conf['views_dir'] = $conf['gweb_sysconfdir'];
++$conf['conf_dir'] = $conf['gweb_sysconfdir'];
+ 
+ # Where to find filter configuration files, if not set filtering
+ # will be disabled
+-#$conf['filter_dir'] = "${conf['gweb_confdir']}/filters";
++#$conf['filter_dir'] = "${conf['gweb_sysconfdir']}/filters";
+ 
+ # Leave this alone if rrdtool is installed in $conf['gmetad_root'],
+ # otherwise, change it if it is installed elsewhere (like /usr/bin)
+-$conf['rrdtool'] = "/usr/bin/rrdtool";
++$conf['rrdtool'] = "@PREFIX@/bin/rrdtool";
+ 
+ # Render graphs with rrdtool's --slope-mode option
+ $conf['rrdtool_slope_mode'] = true;
diff --git a/www/ganglia-webfrontend/patches/patch-eval__conf.php b/www/ganglia-webfrontend/patches/patch-eval__conf.php
new file mode 100644
index 00000000000..33527082d0c
--- /dev/null
+++ b/www/ganglia-webfrontend/patches/patch-eval__conf.php
@@ -0,0 +1,17 @@
+$NetBSD: patch-eval__conf.php,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+
+Assert proper paths.
+
+--- eval_conf.php.orig	2015-04-12 00:04:33.000000000 +0000
++++ eval_conf.php
+@@ -13,8 +13,8 @@ require_once 'lib/GangliaAcl.php';
+ require_once 'lib/GangliaAuth.php';
+ 
+ # Include user-defined overrides if they exist.
+-if( file_exists( $base_dir . "/conf.php" ) ) {
+-  include_once $base_dir . "/conf.php";
++if( file_exists( "@PKG_SYSCONFDIR@/conf.php" ) ) {
++  include_once "@PKG_SYSCONFDIR@/conf.php";
+ }
+ 
+ $errors = array();