Tue Feb 16 13:05:23 2016 UTC ()
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.


(fhajny)
diff -r1.2 -r1.3 pkgsrc/www/ganglia-webfrontend/MESSAGE
diff -r1.16 -r1.17 pkgsrc/www/ganglia-webfrontend/Makefile
diff -r1.4 -r1.5 pkgsrc/www/ganglia-webfrontend/PLIST
diff -r1.6 -r1.7 pkgsrc/www/ganglia-webfrontend/distinfo
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/options.mk
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/files/apache.conf
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/files/conf.php
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/files/nginx.conf
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/patches/patch-conf__default.php.in
diff -r0 -r1.1 pkgsrc/www/ganglia-webfrontend/patches/patch-eval__conf.php
diff -r1.2 -r0 pkgsrc/www/ganglia-webfrontend/patches/patch-aa
diff -r1.2 -r0 pkgsrc/www/ganglia-webfrontend/patches/patch-ab

cvs diff -r1.2 -r1.3 pkgsrc/www/ganglia-webfrontend/MESSAGE (expand / switch to unified diff)

--- pkgsrc/www/ganglia-webfrontend/MESSAGE 2009/11/10 14:56:35 1.2
+++ pkgsrc/www/ganglia-webfrontend/MESSAGE 2016/02/16 13:05:23 1.3
@@ -1,22 +1,17 @@ @@ -1,22 +1,17 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.2 2009/11/10 14:56:35 brook Exp $ 2$NetBSD: MESSAGE,v 1.3 2016/02/16 13:05:23 fhajny Exp $
3 3
4The Ganglia Web Frontend has been installed in the directory 4The Ganglia Web Frontend has been installed in the directory
5${PREFIX}/share/httpd/htdocs/ganglia 5${PREFIX}/share/httpd/htdocs/ganglia
6 6
7You must add appropriate configuration directives to your 7You must add appropriate configuration directives to your
8apache configuration file (${PKG_SYSCONFDIR}/httpd/httpd.conf). 8web server configuration file. You can use this example
9A typical configuration would be: 9include line, for Apache:
10 10
11 Alias /ganglia/ "${PREFIX}/share/httpd/htdocs/ganglia/" 11 Include ${PKG_SYSCONFDIR}/apache.conf
 12
 13or for Nginx:
 14
 15 include ${PKG_SYSCONFDIR}/nginx.conf;
12 16
13 <Directory "${PREFIX}/share/httpd/htdocs/ganglia/"> 
14 Options Indexes FollowSymlinks MultiViews 
15 AllowOverride None 
16 Order allow,deny 
17 Allow from all 
18 <IfModule dir_module> 
19 DirectoryIndex index.php 
20 </IfModule> 
21 </Directory> 
22=========================================================================== 17===========================================================================

cvs diff -r1.16 -r1.17 pkgsrc/www/ganglia-webfrontend/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ganglia-webfrontend/Makefile 2013/03/16 07:21:24 1.16
+++ pkgsrc/www/ganglia-webfrontend/Makefile 2016/02/16 13:05:23 1.17
@@ -1,47 +1,72 @@ @@ -1,47 +1,72 @@
1# $NetBSD: Makefile,v 1.16 2013/03/16 07:21:24 obache Exp $ 1# $NetBSD: Makefile,v 1.17 2016/02/16 13:05:23 fhajny Exp $
2# 2#
3 3
4DISTNAME= ganglia-3.1.2 4DISTNAME= ganglia-web-3.7.1
5PKGNAME= ganglia-webfrontend-3.1.2 5PKGNAME= ${DISTNAME:S/web/webfrontend/}
6PKGREVISION= 2 
7CATEGORIES= www parallel 6CATEGORIES= www parallel
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ganglia.sourceforge.net/ 10HOMEPAGE= http://ganglia.sourceforge.net/
12COMMENT= PHP based frontend for the Ganglia Cluster Monitor 11COMMENT= PHP based frontend for the Ganglia Cluster Monitor
 12LICENSE= modified-bsd
13 13
14DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.1:../../www/ap-php 14DEPENDS+= ganglia-monitor-core>=3.7.1:../../parallel/ganglia-monitor-core
15DEPENDS+= ganglia-monitor-core>=3.1.2:../../parallel/ganglia-monitor-core 
16 15
17USE_TOOLS+= pax 16USE_TOOLS+= pax
18 17
19WRKSRC= ${WRKDIR}/${DISTNAME}/web/ 18.include "../../mk/bsd.prefs.mk"
 19.include "options.mk"
20 20
21DOCROOT= ${PREFIX}/share/httpd/htdocs/ganglia 21MESSAGE_SUBST+= DOCROOT=${DOCROOT}
22MESSAGE_SUBST+= PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 
23 22
24INSTALLATION_DIRS= ${DOCROOT} 23PKG_SYSCONFSUBDIR= ganglia
 24DOCROOT= share/ganglia
 25EGDIR= share/examples/ganglia
 26
 27# Should match parallel/ganglia-monitor-core
 28GANGLIA_VARBASE?= ${VARBASE}/db
 29GWEB_DIR?= ${GANGLIA_VARBASE}/ganglia
 30
 31OWN_DIRS_PERMS+= ${GWEB_DIR}/dwoo ${WWW_USER} ${WWW_GROUP} 0755
 32OWN_DIRS_PERMS+= ${GWEB_DIR}/dwoo/cache ${WWW_USER} ${WWW_GROUP} 0755
 33OWN_DIRS_PERMS+= ${GWEB_DIR}/dwoo/compiled ${WWW_USER} ${WWW_GROUP} 0755
 34PKG_SYSCONFDIR_PERMS= ${WWW_USER} ${WWW_GROUP} 0755
 35MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/filters ${WWW_USER} ${WWW_GROUP} 0755
 36
 37CONF_FILES+= ${EGDIR}/conf.php ${PKG_SYSCONFDIR}/conf.php
 38CONF_FILES+= ${EGDIR}/apache.conf ${PKG_SYSCONFDIR}/apache.conf
 39CONF_FILES+= ${EGDIR}/nginx.conf ${PKG_SYSCONFDIR}/nginx.conf
 40CONF_FILES_PERMS+= ${EGDIR}/default.json ${PKG_SYSCONFDIR}/default.json ${WWW_USER} ${WWW_GROUP} 0644
 41CONF_FILES_PERMS+= ${EGDIR}/event_color.json ${PKG_SYSCONFDIR}/event_color.json ${WWW_USER} ${WWW_GROUP} 0644
 42CONF_FILES_PERMS+= ${EGDIR}/events.json ${PKG_SYSCONFDIR}/events.json ${WWW_USER} ${WWW_GROUP} 0644
 43CONF_FILES_PERMS+= ${EGDIR}/view_default.json ${PKG_SYSCONFDIR}/view_default.json ${WWW_USER} ${WWW_GROUP} 0644
25 44
26SUBST_CLASSES+= prefix 45SUBST_CLASSES+= prefix
27SUBST_STAGE.prefix= pre-configure 46SUBST_STAGE.prefix= pre-configure
28SUBST_MESSAGE.prefix= Fixing PREFIX 47SUBST_MESSAGE.prefix= Fixing PREFIX
29SUBST_FILES.prefix= conf.php 48SUBST_FILES.prefix= conf_default.php.in eval_conf.php conf/conf.php conf/apache.conf conf/nginx.conf
30SUBST_VARS.prefix= PREFIX 49SUBST_VARS.prefix= PREFIX PKG_SYSCONFDIR PKG_SYSCONFBASE VARBASE DOCROOT EGDIR
31 50
32JUNKFILES+= AUTHORS COPYING Makefile.am conf.php.in conf.php.orig 51REPLACE_SH+= nagios/*.sh
33JUNKFILES+= templates/default/footer.tpl.orig version.php.in 
34 52
35do-build: 53MAKE_FLAGS+= GCONFDIR=${PKG_SYSCONFDIR}
36 ${MKDIR} ${WRKDIR}/ganglia 54MAKE_FLAGS+= GDESTDIR=${PREFIX}/${DOCROOT}
37 cd ${WRKSRC} && ${PAX} -rw . ${WRKDIR}/ganglia/ 55MAKE_FLAGS+= GMETAD_ROOTDIR=${GANGLIA_VARBASE}/ganglia
38.for f in ${JUNKFILES} 56MAKE_FLAGS+= GWEB_STATEDIR=${GWEB_DIR}
39 ${RM} ${WRKDIR}/ganglia/${f} 57
40.endfor 58INSTALLATION_DIRS+= ${DOCROOT} ${EGDIR}
 59
 60post-extract:
 61 ${INSTALL_DATA} ${FILESDIR}/conf.php ${WRKSRC}/conf
 62 ${INSTALL_DATA} ${FILESDIR}/apache.conf ${WRKSRC}/conf
 63 ${INSTALL_DATA} ${FILESDIR}/nginx.conf ${WRKSRC}/conf
41 64
42do-install: 65do-install:
43 cd ${WRKDIR}/ganglia && ${PAX} -rw . ${DESTDIR}${DOCROOT}/ 66 cd ${WRKSRC} && ${PAX} -rw -pp *.php *.html *.css api css \
 67 docs dwoo graph.d img js lib nagios templates test \
 68 ${DESTDIR}${PREFIX}/${DOCROOT}
 69 cd ${WRKSRC}/conf && ${PAX} -rw -pp * ${DESTDIR}${PREFIX}/${EGDIR}
44 70
45.include "../../mk/apache.mk" 
46.include "../../lang/php/phpversion.mk" 71.include "../../lang/php/phpversion.mk"
47.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/www/ganglia-webfrontend/PLIST (expand / switch to unified diff)

--- pkgsrc/www/ganglia-webfrontend/PLIST 2009/11/10 14:56:35 1.4
+++ pkgsrc/www/ganglia-webfrontend/PLIST 2016/02/16 13:05:23 1.5
@@ -1,62 +1,360 @@ @@ -1,62 +1,360 @@
1@comment $NetBSD: PLIST,v 1.4 2009/11/10 14:56:35 brook Exp $ 1@comment $NetBSD: PLIST,v 1.5 2016/02/16 13:05:23 fhajny Exp $
2share/httpd/htdocs/ganglia/auth.php 2share/examples/ganglia/apache.conf
3share/httpd/htdocs/ganglia/class.TemplatePower.inc.php 3share/examples/ganglia/conf.php
4share/httpd/htdocs/ganglia/cluster_legend.html 4share/examples/ganglia/default.json
5share/httpd/htdocs/ganglia/cluster_view.php 5share/examples/ganglia/event_color.json
6share/httpd/htdocs/ganglia/conf.php 6share/examples/ganglia/events.json
7share/httpd/htdocs/ganglia/footer.php 7share/examples/ganglia/nginx.conf
8share/httpd/htdocs/ganglia/functions.php 8share/examples/ganglia/sql/ganglia.mysql
9share/httpd/htdocs/ganglia/ganglia.php 9share/examples/ganglia/view_default.json
10share/httpd/htdocs/ganglia/get_context.php 10share/ganglia/actions.php
11share/httpd/htdocs/ganglia/get_ganglia.php 11share/ganglia/aggregate_graphs.php
12share/httpd/htdocs/ganglia/graph.d/cpu_report.php 12share/ganglia/api/.htaccess
13share/httpd/htdocs/ganglia/graph.d/load_report.php 13share/ganglia/api/events.php
14share/httpd/htdocs/ganglia/graph.d/mem_report.php 14share/ganglia/api/host.php
15share/httpd/htdocs/ganglia/graph.d/metric.php 15share/ganglia/api/metrics.php
16share/httpd/htdocs/ganglia/graph.d/network_report.php 16share/ganglia/api/metrics_autocomplete.php
17share/httpd/htdocs/ganglia/graph.d/packet_report.php 17share/ganglia/api/rundeck.php
18share/httpd/htdocs/ganglia/graph.d/sample_report.php 18share/ganglia/api/search.php
19share/httpd/htdocs/ganglia/graph.php 19share/ganglia/api/views.php
20share/httpd/htdocs/ganglia/grid_tree.php 20share/ganglia/autorotation.php
21share/httpd/htdocs/ganglia/header.php 21share/ganglia/breakdown_report_results.php
22share/httpd/htdocs/ganglia/host_view.php 22share/ganglia/breakdown_reports.php
23share/httpd/htdocs/ganglia/index.php 23share/ganglia/calendar.php
24share/httpd/htdocs/ganglia/meta_view.php 24share/ganglia/cluster_legend.html
25share/httpd/htdocs/ganglia/node_legend.html 25share/ganglia/cluster_view.php
26share/httpd/htdocs/ganglia/physical_view.php 26share/ganglia/compare_hosts.php
27share/httpd/htdocs/ganglia/pie.php 27share/ganglia/conf_default.php
28share/httpd/htdocs/ganglia/private_clusters 28share/ganglia/css/chosen-sprite.png
29share/httpd/htdocs/ganglia/show_node.php 29share/ganglia/css/chosen-sprite@2x.png
30share/httpd/htdocs/ganglia/styles.css 30share/ganglia/css/chosen.css
31share/httpd/htdocs/ganglia/templates/default/cluster_extra.tpl 31share/ganglia/css/chosen.min.css
32share/httpd/htdocs/ganglia/templates/default/cluster_view.tpl 32share/ganglia/css/cubism.css
33share/httpd/htdocs/ganglia/templates/default/footer.tpl 33share/ganglia/css/fullcalendar.css
34share/httpd/htdocs/ganglia/templates/default/grid_tree.tpl 34share/ganglia/css/images/ajax-loader.png
35share/httpd/htdocs/ganglia/templates/default/header-nobanner.tpl 35share/ganglia/css/images/form-check-off.png
36share/httpd/htdocs/ganglia/templates/default/header.tpl 36share/ganglia/css/images/form-check-on.png
37share/httpd/htdocs/ganglia/templates/default/host_extra.tpl 37share/ganglia/css/images/form-radio-off.png
38share/httpd/htdocs/ganglia/templates/default/host_view.tpl 38share/ganglia/css/images/form-radio-on.png
39share/httpd/htdocs/ganglia/templates/default/images/cluster_0-24.jpg 39share/ganglia/css/images/icon-search-black.png
40share/httpd/htdocs/ganglia/templates/default/images/cluster_25-49.jpg 40share/ganglia/css/images/icons-18-black.png
41share/httpd/htdocs/ganglia/templates/default/images/cluster_50-74.jpg 41share/ganglia/css/images/icons-18-white.png
42share/httpd/htdocs/ganglia/templates/default/images/cluster_75-100.jpg 42share/ganglia/css/images/icons-36-black.png
43share/httpd/htdocs/ganglia/templates/default/images/cluster_overloaded.jpg 43share/ganglia/css/images/icons-36-white.png
44share/httpd/htdocs/ganglia/templates/default/images/cluster_private.jpg 44share/ganglia/css/jquery.flot.events.css
45share/httpd/htdocs/ganglia/templates/default/images/grid_0-24.jpg 45share/ganglia/css/jquery.liveSearch.css
46share/httpd/htdocs/ganglia/templates/default/images/grid_25-49.jpg 46share/ganglia/css/jquery.mobile-1.4.5.min.css
47share/httpd/htdocs/ganglia/templates/default/images/grid_50-74.jpg 47share/ganglia/css/jquery.multiselect.css
48share/httpd/htdocs/ganglia/templates/default/images/grid_75-100.jpg 48share/ganglia/css/qtip.min.css
49share/httpd/htdocs/ganglia/templates/default/images/grid_overloaded.jpg 49share/ganglia/css/smoothness/images/animated-overlay.gif
50share/httpd/htdocs/ganglia/templates/default/images/grid_private.jpg 50share/ganglia/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
51share/httpd/htdocs/ganglia/templates/default/images/logo.jpg 51share/ganglia/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
52share/httpd/htdocs/ganglia/templates/default/images/node_0-24.jpg 52share/ganglia/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
53share/httpd/htdocs/ganglia/templates/default/images/node_25-49.jpg 53share/ganglia/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
54share/httpd/htdocs/ganglia/templates/default/images/node_50-74.jpg 54share/ganglia/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
55share/httpd/htdocs/ganglia/templates/default/images/node_75-100.jpg 55share/ganglia/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
56share/httpd/htdocs/ganglia/templates/default/images/node_dead.jpg 56share/ganglia/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
57share/httpd/htdocs/ganglia/templates/default/images/node_overloaded.jpg 57share/ganglia/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
58share/httpd/htdocs/ganglia/templates/default/meta_view.tpl 58share/ganglia/css/smoothness/images/ui-icons_222222_256x240.png
59share/httpd/htdocs/ganglia/templates/default/node_extra.tpl 59share/ganglia/css/smoothness/images/ui-icons_2e83ff_256x240.png
60share/httpd/htdocs/ganglia/templates/default/physical_view.tpl 60share/ganglia/css/smoothness/images/ui-icons_454545_256x240.png
61share/httpd/htdocs/ganglia/templates/default/show_node.tpl 61share/ganglia/css/smoothness/images/ui-icons_888888_256x240.png
62share/httpd/htdocs/ganglia/version.php 62share/ganglia/css/smoothness/images/ui-icons_cd0a0a_256x240.png
 63share/ganglia/css/smoothness/jquery-ui-1.10.2.custom.css
 64share/ganglia/css/smoothness/jquery-ui-1.10.2.custom.min.css
 65share/ganglia/css/tasseo.css
 66share/ganglia/cubism.php
 67share/ganglia/cubism_form.php
 68share/ganglia/decompose_graph.php
 69share/ganglia/docs/ad-hoc-views.mdown
 70share/ganglia/dwoo/Dwoo.compiled.php
 71share/ganglia/dwoo/Dwoo.php
 72share/ganglia/dwoo/Dwoo/Adapters/Agavi/DwooRenderer.php
 73share/ganglia/dwoo/Dwoo/Adapters/Agavi/README
 74share/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/t.php
 75share/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/url.php
 76share/ganglia/dwoo/Dwoo/Adapters/CakePHP/README
 77share/ganglia/dwoo/Dwoo/Adapters/CakePHP/dwoo.php
 78share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/README
 79share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php
 80share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php
 81share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php
 82share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/views/dwoowelcome.tpl
 83share/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/views/page.tpl
 84share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/Dwoo.php
 85share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/PluginProxy.php
 86share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/README
 87share/ganglia/dwoo/Dwoo/Adapters/ZendFramework/View.php
 88share/ganglia/dwoo/Dwoo/Block/Plugin.php
 89share/ganglia/dwoo/Dwoo/Compilation/Exception.php
 90share/ganglia/dwoo/Dwoo/Compiler.php
 91share/ganglia/dwoo/Dwoo/Core.php
 92share/ganglia/dwoo/Dwoo/Data.php
 93share/ganglia/dwoo/Dwoo/Exception.php
 94share/ganglia/dwoo/Dwoo/Filter.php
 95share/ganglia/dwoo/Dwoo/ICompilable.php
 96share/ganglia/dwoo/Dwoo/ICompilable/Block.php
 97share/ganglia/dwoo/Dwoo/ICompiler.php
 98share/ganglia/dwoo/Dwoo/IDataProvider.php
 99share/ganglia/dwoo/Dwoo/IElseable.php
 100share/ganglia/dwoo/Dwoo/ILoader.php
 101share/ganglia/dwoo/Dwoo/IPluginProxy.php
 102share/ganglia/dwoo/Dwoo/ITemplate.php
 103share/ganglia/dwoo/Dwoo/Loader.php
 104share/ganglia/dwoo/Dwoo/Plugin.php
 105share/ganglia/dwoo/Dwoo/Processor.php
 106share/ganglia/dwoo/Dwoo/Security/Exception.php
 107share/ganglia/dwoo/Dwoo/Security/Policy.php
 108share/ganglia/dwoo/Dwoo/Smarty/Adapter.php
 109share/ganglia/dwoo/Dwoo/Template/File.php
 110share/ganglia/dwoo/Dwoo/Template/String.php
 111share/ganglia/dwoo/dwooAutoload.php
 112share/ganglia/dwoo/plugins/builtin/blocks/a.php
 113share/ganglia/dwoo/plugins/builtin/blocks/auto_escape.php
 114share/ganglia/dwoo/plugins/builtin/blocks/block.php
 115share/ganglia/dwoo/plugins/builtin/blocks/capture.php
 116share/ganglia/dwoo/plugins/builtin/blocks/dynamic.php
 117share/ganglia/dwoo/plugins/builtin/blocks/else.php
 118share/ganglia/dwoo/plugins/builtin/blocks/elseif.php
 119share/ganglia/dwoo/plugins/builtin/blocks/for.php
 120share/ganglia/dwoo/plugins/builtin/blocks/foreach.php
 121share/ganglia/dwoo/plugins/builtin/blocks/foreachelse.php
 122share/ganglia/dwoo/plugins/builtin/blocks/forelse.php
 123share/ganglia/dwoo/plugins/builtin/blocks/if.php
 124share/ganglia/dwoo/plugins/builtin/blocks/loop.php
 125share/ganglia/dwoo/plugins/builtin/blocks/section.php
 126share/ganglia/dwoo/plugins/builtin/blocks/smartyinterface.php
 127share/ganglia/dwoo/plugins/builtin/blocks/strip.php
 128share/ganglia/dwoo/plugins/builtin/blocks/template.php
 129share/ganglia/dwoo/plugins/builtin/blocks/textformat.php
 130share/ganglia/dwoo/plugins/builtin/blocks/topLevelBlock.php
 131share/ganglia/dwoo/plugins/builtin/blocks/with.php
 132share/ganglia/dwoo/plugins/builtin/blocks/withelse.php
 133share/ganglia/dwoo/plugins/builtin/filters/html_format.php
 134share/ganglia/dwoo/plugins/builtin/functions/assign.php
 135share/ganglia/dwoo/plugins/builtin/functions/capitalize.php
 136share/ganglia/dwoo/plugins/builtin/functions/cat.php
 137share/ganglia/dwoo/plugins/builtin/functions/count_characters.php
 138share/ganglia/dwoo/plugins/builtin/functions/count_paragraphs.php
 139share/ganglia/dwoo/plugins/builtin/functions/count_sentences.php
 140share/ganglia/dwoo/plugins/builtin/functions/count_words.php
 141share/ganglia/dwoo/plugins/builtin/functions/counter.php
 142share/ganglia/dwoo/plugins/builtin/functions/cycle.php
 143share/ganglia/dwoo/plugins/builtin/functions/date_format.php
 144share/ganglia/dwoo/plugins/builtin/functions/default.php
 145share/ganglia/dwoo/plugins/builtin/functions/dump.php
 146share/ganglia/dwoo/plugins/builtin/functions/eol.php
 147share/ganglia/dwoo/plugins/builtin/functions/escape.php
 148share/ganglia/dwoo/plugins/builtin/functions/eval.php
 149share/ganglia/dwoo/plugins/builtin/functions/extends.php
 150share/ganglia/dwoo/plugins/builtin/functions/extendsCheck.php
 151share/ganglia/dwoo/plugins/builtin/functions/fetch.php
 152share/ganglia/dwoo/plugins/builtin/functions/include.php
 153share/ganglia/dwoo/plugins/builtin/functions/indent.php
 154share/ganglia/dwoo/plugins/builtin/functions/isset.php
 155share/ganglia/dwoo/plugins/builtin/functions/load_templates.php
 156share/ganglia/dwoo/plugins/builtin/functions/lower.php
 157share/ganglia/dwoo/plugins/builtin/functions/mailto.php
 158share/ganglia/dwoo/plugins/builtin/functions/math.php
 159share/ganglia/dwoo/plugins/builtin/functions/nl2br.php
 160share/ganglia/dwoo/plugins/builtin/functions/optional.php
 161share/ganglia/dwoo/plugins/builtin/functions/regex_replace.php
 162share/ganglia/dwoo/plugins/builtin/functions/replace.php
 163share/ganglia/dwoo/plugins/builtin/functions/return.php
 164share/ganglia/dwoo/plugins/builtin/functions/reverse.php
 165share/ganglia/dwoo/plugins/builtin/functions/safe.php
 166share/ganglia/dwoo/plugins/builtin/functions/spacify.php
 167share/ganglia/dwoo/plugins/builtin/functions/string_format.php
 168share/ganglia/dwoo/plugins/builtin/functions/strip_tags.php
 169share/ganglia/dwoo/plugins/builtin/functions/tif.php
 170share/ganglia/dwoo/plugins/builtin/functions/truncate.php
 171share/ganglia/dwoo/plugins/builtin/functions/upper.php
 172share/ganglia/dwoo/plugins/builtin/functions/whitespace.php
 173share/ganglia/dwoo/plugins/builtin/functions/wordwrap.php
 174share/ganglia/dwoo/plugins/builtin/helper.array.php
 175share/ganglia/dwoo/plugins/builtin/processors/pre.smarty_compat.php
 176share/ganglia/edit_optional_graphs.php
 177share/ganglia/eval_conf.php
 178share/ganglia/events.php
 179share/ganglia/footer.php
 180share/ganglia/functions.php
 181share/ganglia/ganglia.php
 182share/ganglia/get_context.php
 183share/ganglia/get_ganglia.php
 184share/ganglia/get_overlay_events.php
 185share/ganglia/global.php
 186share/ganglia/graph.d/apache_report.json
 187share/ganglia/graph.d/apache_response_report.json
 188share/ganglia/graph.d/cpu_report.json
 189share/ganglia/graph.d/cpu_report.php
 190share/ganglia/graph.d/load_all_report.json
 191share/ganglia/graph.d/load_report.json
 192share/ganglia/graph.d/mem_report.json
 193share/ganglia/graph.d/mem_report.php
 194share/ganglia/graph.d/metric.php
 195share/ganglia/graph.d/network_report.json
 196share/ganglia/graph.d/nfs_v3_client_report.json
 197share/ganglia/graph.d/packet_report.json
 198share/ganglia/graph.d/sample_report.php
 199share/ganglia/graph.d/varnish_report.php
 200share/ganglia/graph.php
 201share/ganglia/graph_all_periods.php
 202share/ganglia/grid_tree.php
 203share/ganglia/header.php
 204share/ganglia/host_overview.php
 205share/ganglia/host_view.php
 206share/ganglia/img/access-denied.jpg
 207share/ganglia/img/calendar.gif
 208share/ganglia/img/red-pointer.png
 209share/ganglia/img/spin-night.gif
 210share/ganglia/img/spin.gif
 211share/ganglia/img/spinner.gif
 212share/ganglia/img/toggle-night.png
 213share/ganglia/img/toggle-number.png
 214share/ganglia/index.php
 215share/ganglia/inspect_graph.php
 216share/ganglia/js/chosen.jquery.js
 217share/ganglia/js/chosen.jquery.min.js
 218share/ganglia/js/combobox.js
 219share/ganglia/js/create-flot-graphs.js
 220share/ganglia/js/excanvas.js
 221share/ganglia/js/excanvas.min.js
 222share/ganglia/js/fullcalendar.js
 223share/ganglia/js/ganglia.js
 224share/ganglia/js/jquery-ui-timepicker-addon.js
 225share/ganglia/js/jquery-ui.min.js
 226share/ganglia/js/jquery.ba-bbq.js
 227share/ganglia/js/jquery.ba-bbq.min.js
 228share/ganglia/js/jquery.buttonsetv.js
 229share/ganglia/js/jquery.cookie.js
 230share/ganglia/js/jquery.flot.crosshair.js
 231share/ganglia/js/jquery.flot.crosshair.min.js
 232share/ganglia/js/jquery.flot.events.js
 233share/ganglia/js/jquery.flot.js
 234share/ganglia/js/jquery.flot.min.js
 235share/ganglia/js/jquery.flot.selection.js
 236share/ganglia/js/jquery.flot.selection.min.js
 237share/ganglia/js/jquery.flot.stack.js
 238share/ganglia/js/jquery.flot.stack.min.js
 239share/ganglia/js/jquery.flot.time.js
 240share/ganglia/js/jquery.flot.time.min.js
 241share/ganglia/js/jquery.gangZoom.js
 242share/ganglia/js/jquery.livesearch.js
 243share/ganglia/js/jquery.livesearch.min.js
 244share/ganglia/js/jquery.multiselect.filter.css
 245share/ganglia/js/jquery.multiselect.filter.js
 246share/ganglia/js/jquery.multiselect.js
 247share/ganglia/js/jquery.qtip.min.js
 248share/ganglia/js/jquery.scrollTo-1.4.2.js
 249share/ganglia/js/jquery.scrollTo-1.4.3.1-min.js
 250share/ganglia/js/jstree/jstree.js
 251share/ganglia/js/jstree/jstree.min.js
 252share/ganglia/js/jstree/libs/jquery.js
 253share/ganglia/js/jstree/libs/require.js
 254share/ganglia/js/jstree/themes/default/32px.png
 255share/ganglia/js/jstree/themes/default/40px.png
 256share/ganglia/js/jstree/themes/default/style.css
 257share/ganglia/js/jstree/themes/default/style.min.css
 258share/ganglia/js/jstree/themes/default/throbber.gif
 259share/ganglia/js/tasseo.js
 260share/ganglia/lib/Cache/Driver_Json.php
 261share/ganglia/lib/Cache/Driver_Memcache.php
 262share/ganglia/lib/Events/Driver_Json.php
 263share/ganglia/lib/Events/Driver_Mdb2.php
 264share/ganglia/lib/GangliaAcl.php
 265share/ganglia/lib/GangliaAuth.php
 266share/ganglia/lib/Services/JSON.php
 267share/ganglia/lib/Zend/Acl.php
 268share/ganglia/lib/Zend/Acl/Assert/Interface.php
 269share/ganglia/lib/Zend/Acl/Exception.php
 270share/ganglia/lib/Zend/Acl/Resource.php
 271share/ganglia/lib/Zend/Acl/Resource/Interface.php
 272share/ganglia/lib/Zend/Acl/Role.php
 273share/ganglia/lib/Zend/Acl/Role/Interface.php
 274share/ganglia/lib/Zend/Acl/Role/Registry.php
 275share/ganglia/lib/Zend/Acl/Role/Registry/Exception.php
 276share/ganglia/lib/Zend/Exception.php
 277share/ganglia/lib/cache.php
 278share/ganglia/lib/common_api.php
 279share/ganglia/lib/json.php
 280share/ganglia/login.php
 281share/ganglia/logout.php
 282share/ganglia/meta_view.php
 283share/ganglia/metric_group_view.php
 284share/ganglia/mobile.php
 285share/ganglia/mobile_helper.php
 286share/ganglia/nagios/check_for_stuck_gmonds.php
 287share/ganglia/nagios/check_for_stuck_gmonds.sh
 288share/ganglia/nagios/check_ganglia_metric.sh
 289share/ganglia/nagios/check_heartbeat.php
 290share/ganglia/nagios/check_heartbeat.sh
 291share/ganglia/nagios/check_host_regex.php
 292share/ganglia/nagios/check_host_regex.sh
 293share/ganglia/nagios/check_metric.php
 294share/ganglia/nagios/check_metric_regex.php
 295share/ganglia/nagios/check_metric_regex.sh
 296share/ganglia/nagios/check_multiple_metrics.php
 297share/ganglia/nagios/check_multiple_metrics.sh
 298share/ganglia/nagios/check_multiple_metrics_warn.php
 299share/ganglia/nagios/check_multiple_metrics_warn.sh
 300share/ganglia/nagios/check_value_same_everywhere.php
 301share/ganglia/nagios/check_value_same_everywhere.sh
 302share/ganglia/nagios/warmup_ganglia_cache.php
 303share/ganglia/nagios/warmup_metric_cache.php
 304share/ganglia/nagios/warmup_metric_cache.sh
 305share/ganglia/node_legend.html
 306share/ganglia/physical_view.php
 307share/ganglia/pie.php
 308share/ganglia/search.php
 309share/ganglia/show_node.php
 310share/ganglia/stacked.php
 311share/ganglia/styles.css
 312share/ganglia/tasseo.php
 313share/ganglia/tattle_autocomplete.php
 314share/ganglia/templates/default/cluster_extra.tpl
 315share/ganglia/templates/default/cluster_host_metric_graphs.tpl
 316share/ganglia/templates/default/cluster_overview.tpl
 317share/ganglia/templates/default/cluster_refresh.tpl
 318share/ganglia/templates/default/cluster_view.tpl
 319share/ganglia/templates/default/compare_hosts.tpl
 320share/ganglia/templates/default/decompose_graph.tpl
 321share/ganglia/templates/default/footer.tpl
 322share/ganglia/templates/default/grid_tree.tpl
 323share/ganglia/templates/default/header-nobanner.tpl
 324share/ganglia/templates/default/header.tpl
 325share/ganglia/templates/default/host_extra.tpl
 326share/ganglia/templates/default/host_overview.tpl
 327share/ganglia/templates/default/host_view.tpl
 328share/ganglia/templates/default/images/cluster_0-24.jpg
 329share/ganglia/templates/default/images/cluster_25-49.jpg
 330share/ganglia/templates/default/images/cluster_50-74.jpg
 331share/ganglia/templates/default/images/cluster_75-100.jpg
 332share/ganglia/templates/default/images/cluster_overloaded.jpg
 333share/ganglia/templates/default/images/cluster_private.jpg
 334share/ganglia/templates/default/images/grid_0-24.jpg
 335share/ganglia/templates/default/images/grid_25-49.jpg
 336share/ganglia/templates/default/images/grid_50-74.jpg
 337share/ganglia/templates/default/images/grid_75-100.jpg
 338share/ganglia/templates/default/images/grid_overloaded.jpg
 339share/ganglia/templates/default/images/grid_private.jpg
 340share/ganglia/templates/default/images/logo.jpg
 341share/ganglia/templates/default/images/node_0-24.jpg
 342share/ganglia/templates/default/images/node_25-49.jpg
 343share/ganglia/templates/default/images/node_50-74.jpg
 344share/ganglia/templates/default/images/node_75-100.jpg
 345share/ganglia/templates/default/images/node_dead.jpg
 346share/ganglia/templates/default/images/node_overloaded.jpg
 347share/ganglia/templates/default/meta_view.tpl
 348share/ganglia/templates/default/metric_group_view.tpl
 349share/ganglia/templates/default/node_extra.tpl
 350share/ganglia/templates/default/physical_view.tpl
 351share/ganglia/templates/default/show_node.tpl
 352share/ganglia/templates/default/view_content.tpl
 353share/ganglia/templates/default/views_view.tpl
 354share/ganglia/test/GangliaAclTest.php
 355share/ganglia/test/GangliaAuthTest.php
 356share/ganglia/test/phpcs-ganglia-web.xml
 357share/ganglia/trend_navigation.php
 358share/ganglia/version.php
 359share/ganglia/view_content.php
 360share/ganglia/views_view.php

cvs diff -r1.6 -r1.7 pkgsrc/www/ganglia-webfrontend/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ganglia-webfrontend/distinfo 2015/11/04 02:46:54 1.6
+++ pkgsrc/www/ganglia-webfrontend/distinfo 2016/02/16 13:05:23 1.7
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.6 2015/11/04 02:46:54 agc Exp $ 1$NetBSD: distinfo,v 1.7 2016/02/16 13:05:23 fhajny Exp $
2 2
3SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1 3SHA1 (ganglia-web-3.7.1.tar.gz) = f7852fed1e3afdfa093c1c12a5db9dc7b7b91028
4RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3 4RMD160 (ganglia-web-3.7.1.tar.gz) = b0693c44bbdc4b32b095957c1ccf4735b7941119
5SHA512 (ganglia-3.1.2.tar.gz) = 788d6a369c2d5c9186b491659c9d3986fbebf0b34021e3b1d26eaf534d0457c922b33dcca735bd7e4ce302428d95040473d097f9363595c3c4e131272c4da07e 5SHA512 (ganglia-web-3.7.1.tar.gz) = 5a907a4d35b363713c3b0ba43964c0076e5f85972ba9721c1cf14c164bca2c96327b442e7cb92d11f1d5d94f15b10289cf71b2e3aa122ebcd73153be133c1a64
6Size (ganglia-3.1.2.tar.gz) = 1213196 bytes 6Size (ganglia-web-3.7.1.tar.gz) = 854938 bytes
7SHA1 (patch-aa) = 7ccc7f4c807d0808c0cd9b1eb5dc7a24fb6e6897 7SHA1 (patch-Makefile) = c246326e81b3df16b3289891e0b6ad37fb8fca55
8SHA1 (patch-ab) = 7b32ee769c7117361b8f81d35f74901a9a018b3d 8SHA1 (patch-conf__default.php.in) = 0d5d9417d20f74bd1b1e3ab4e83738779a19fda1
 9SHA1 (patch-eval__conf.php) = ce40cbee4c9867f86a67009074d0d46308dcb561

File Added: pkgsrc/www/ganglia-webfrontend/options.mk
# $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

File Added: pkgsrc/www/ganglia-webfrontend/files/apache.conf
# $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>

File Added: pkgsrc/www/ganglia-webfrontend/files/conf.php
<?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

*/

?>

File Added: pkgsrc/www/ganglia-webfrontend/files/nginx.conf
# $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;
        }
    }

File Added: pkgsrc/www/ganglia-webfrontend/patches/patch-Makefile
$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 \

File Added: pkgsrc/www/ganglia-webfrontend/patches/patch-conf__default.php.in
$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;

File Added: pkgsrc/www/ganglia-webfrontend/patches/patch-eval__conf.php
$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();

File Deleted: pkgsrc/www/ganglia-webfrontend/patches/Attic/patch-aa

File Deleted: pkgsrc/www/ganglia-webfrontend/patches/Attic/patch-ab