3 files changed, 23 insertions, 28 deletions

diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index 2fef821654f0..22abe52282e7 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -2,10 +2,9 @@
 
 PORTNAME=	ganglia
 PORTVERSION=	3.7.2
+PORTREVISION=	1
 CATEGORIES=	sysutils net parallel www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-web/${PORTVERSION}
 PKGNAMESUFFIX=	-webfrontend
-DISTNAME=	${PORTNAME}-web-${PORTVERSION}
 
 MAINTAINER=	jrm@ftfl.ca
 COMMENT=	Ganglia cluster monitor, web frontend
@@ -14,35 +13,40 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/gmetad:sysutils/ganglia-monitor-core
 
-USE_PHP=	filter gd xml
-NO_BUILD=	YES
-WANT_PHP_WEB=	YES
+USE_GITHUB=	yes
+GH_ACCOUNT=	ganglia
+GH_PROJECT=	ganglia-web
 
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+USES=		php:web
+USE_PHP=	filter gd session xml
 WWWDIR=		${PREFIX}/www/ganglia
 
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" WWWDIR="${WWWDIR}"
 SUB_FILES+=	pkg-message
-SUB_LIST+=	WWWDIR="${WWWDIR}"
-
-PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 REINPLACE_ARGS=	-i ''
 CONFIG_FILES=	default.json event_color.json events.json view_default.json
 
-NO_ARCH=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|@vargwebstatedir@|${DATADIR}|' \
 			  -e 's|@vargmetadir@|/var/db/ganglia|' \
 			  -e 's|/usr/bin/rrdtool|${LOCALBASE}/bin/rrdtool|' \
-			  ${WRKSRC}/conf_default.php.in
+		${WRKSRC}/conf_default.php.in
 	@${REINPLACE_CMD} -e 's|@GWEB_VERSION@|${PORTVERSION}|' \
-			  ${WRKSRC}/version.php.in
-	@${CP} ${WRKSRC}/version.php.in ${WRKSRC}/version.php
-	@${CP} ${WRKSRC}/conf_default.php.in ${WRKSRC}/conf_default.php
+		${WRKSRC}/version.php.in
 
 do-install:
-	@cd ${WRKSRC} && \
-	${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.in -o -name .gitignore -o -name Makefile -o -name apache.conf.in -o -name apache.conf -o -name conf -o -path \./conf/* -o -name debian -o -path \./debian/* -o -name ganglia-web\.spec )"
+	@${CP} ${WRKSRC}/conf_default.php.in ${WRKSRC}/conf_default.php
+	@${CP} ${WRKSRC}/version.php.in      ${WRKSRC}/version.php
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} \
+		"! ( -name .git -o -name \.gitignore -o -name \.travis.yml -o \
+		-name AUTHORS -o -name COPYING -o -name Makefile -o -name \
+		README -o -name TODO -o -name *\.in -o -name conf -o -path \
+		\./conf/* -o -name debian -o -path \./debian/* -o -name \
+		ganglia-web\.spec )")
 	@${MKDIR} ${STAGEDIR}${DATADIR}/conf/sql
 	@${MKDIR} ${STAGEDIR}${DATADIR}/dwoo/cache
 	@${MKDIR} ${STAGEDIR}${DATADIR}/dwoo/compiled
diff --git a/sysutils/ganglia-webfrontend/distinfo b/sysutils/ganglia-webfrontend/distinfo
index 7a10572d208a..923d142b9831 100644
--- a/sysutils/ganglia-webfrontend/distinfo
+++ b/sysutils/ganglia-webfrontend/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466016609
-SHA256 (ganglia-web-3.7.2.tar.gz) = 98820187c98d24d3645b92d31060623de696dad331a361a19874898339523628
-SIZE (ganglia-web-3.7.2.tar.gz) = 704632
+TIMESTAMP = 1470965544
+SHA256 (ganglia-ganglia-web-3.7.2_GH0.tar.gz) = a8f5fd8230b68d79089843aa11b89ae5b819d268573cc02b6c8a68f82abaaed2
+SIZE (ganglia-ganglia-web-3.7.2_GH0.tar.gz) = 693614
diff --git a/sysutils/ganglia-webfrontend/pkg-plist b/sysutils/ganglia-webfrontend/pkg-plist
index 92cbd69a4060..71e21be0843e 100644
--- a/sysutils/ganglia-webfrontend/pkg-plist
+++ b/sysutils/ganglia-webfrontend/pkg-plist
@@ -3,11 +3,6 @@
 @sample %%DATADIR%%/conf/events.json.sample
 %%DATADIR%%/conf/sql/ganglia.mysql
 @sample %%DATADIR%%/conf/view_default.json.sample
-%%WWWDIR%%/.travis.yml
-%%WWWDIR%%/AUTHORS
-%%WWWDIR%%/COPYING
-%%WWWDIR%%/README
-%%WWWDIR%%/TODO
 %%WWWDIR%%/actions.php
 %%WWWDIR%%/aggregate_graphs.php
 %%WWWDIR%%/api/.htaccess
@@ -71,12 +66,9 @@
 %%WWWDIR%%/dwoo/Dwoo.compiled.php
 %%WWWDIR%%/dwoo/Dwoo.php
 %%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/DwooRenderer.php
-%%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/README
 %%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/t.php
 %%WWWDIR%%/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/url.php
-%%WWWDIR%%/dwoo/Dwoo/Adapters/CakePHP/README
 %%WWWDIR%%/dwoo/Dwoo/Adapters/CakePHP/dwoo.php
-%%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/README
 %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php
 %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php
 %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php
@@ -84,7 +76,6 @@
 %%WWWDIR%%/dwoo/Dwoo/Adapters/CodeIgniter/views/page.tpl
 %%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/Dwoo.php
 %%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/PluginProxy.php
-%%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/README
 %%WWWDIR%%/dwoo/Dwoo/Adapters/ZendFramework/View.php
 %%WWWDIR%%/dwoo/Dwoo/Block/Plugin.php
 %%WWWDIR%%/dwoo/Dwoo/Compilation/Exception.php